From 1ecec0ba4f6d1aba43bd4d60182fd9f918998fc9 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 11 Jun 2012 16:45:39 +1200
Subject: [PATCH] Bug 539356 - Part 16 - Revoke any pending ViewManager flushes
 when we do one (sometimes we get this called from Will Paint events). r=roc

---
 view/src/Makefile.in       | 2 ++
 view/src/nsViewManager.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/view/src/Makefile.in b/view/src/Makefile.in
index f50d80b67e12..bfe5dceff6a2 100644
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -17,6 +17,8 @@ MODULE_NAME	= nsViewModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
+DEFINES += -D_IMPL_NS_LAYOUT
+
 CPPSRCS		= \
 		nsView.cpp \
 		nsViewManager.cpp \
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index 9a8d3cf04dc8..81935c29d27c 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -1309,6 +1309,7 @@ nsViewManager::ProcessPendingUpdates()
     return;
   }
 
+  mPresShell->GetPresContext()->RefreshDriver()->RevokeViewManagerFlush();
   ProcessPendingUpdatesForView(mRootView, true);
 }