From da2da99f70c73f1d0b6f31b57cd2cc31b29d3464 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Wed, 18 Jan 2012 13:22:12 -0800
Subject: [PATCH] Bug 718631 - Fix Gonk build after bug 598482, r=cjones

---
 widget/gonk/nsWindow.cpp | 21 ++++-----------------
 widget/gonk/nsWindow.h   |  4 +---
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp
index 5d6c58c5c74..c4b0cccdf08 100644
--- a/widget/gonk/nsWindow.cpp
+++ b/widget/gonk/nsWindow.cpp
@@ -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
diff --git a/widget/gonk/nsWindow.h b/widget/gonk/nsWindow.h
index ac899962667..5bd12a962c0 100644
--- a/widget/gonk/nsWindow.h
+++ b/widget/gonk/nsWindow.h
@@ -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)
     {