Bug 718631 - Fix Gonk build after bug 598482, r=cjones

This commit is contained in:
Michael Wu 2012-01-18 13:22:12 -08:00
parent 9f0f1b80b7
commit da2da99f70
2 changed files with 5 additions and 20 deletions

View File

@ -296,8 +296,7 @@ nsWindow::ConfigureChildren(const nsTArray<nsIWidget::Configuration>&)
}
NS_IMETHODIMP
nsWindow::Invalidate(const nsIntRect &aRect,
bool aIsSynchronous)
nsWindow::Invalidate(const nsIntRect &aRect)
{
nsWindow *parent = mParent;
while (parent && parent != sTopWindows[0])
@ -307,20 +306,8 @@ nsWindow::Invalidate(const nsIntRect &aRect,
mDirtyRegion.Or(mDirtyRegion, aRect);
gWindowToRedraw = this;
if (aIsSynchronous) {
gDrawRequest = false;
DoDraw();
} else {
gDrawRequest = true;
mozilla::NotifyEvent();
}
return NS_OK;
}
NS_IMETHODIMP
nsWindow::Update()
{
Invalidate(gScreenBounds, false);
gDrawRequest = true;
mozilla::NotifyEvent();
return NS_OK;
}
@ -442,7 +429,7 @@ nsWindow::BringToTop()
nsGUIEvent event(true, NS_ACTIVATE, this);
(*mEventCallback)(&event);
Update();
Invalidate(gScreenBounds);
}
void

View File

@ -98,9 +98,7 @@ public:
NS_IMETHOD IsEnabled(bool *aState);
NS_IMETHOD SetFocus(bool aRaise = false);
NS_IMETHOD ConfigureChildren(const nsTArray<nsIWidget::Configuration>&);
NS_IMETHOD Invalidate(const nsIntRect &aRect,
bool aIsSynchronous);
NS_IMETHOD Update();
NS_IMETHOD Invalidate(const nsIntRect &aRect);
virtual void* GetNativeData(PRUint32 aDataType);
NS_IMETHOD SetTitle(const nsAString& aTitle)
{