Bug 813024. Restore mTemporarilyUseBasicLayerManager to the previous value instead of setting it to false when using an AutoUseBasicLayerManager object. r=roc

widget/xpwidgets/nsBaseWidget.cpp

@@ -761,12 +761,15 @@ nsBaseWidget::AutoLayerManagerSetup::~AutoLayerManagerSetup()
 nsBaseWidget::AutoUseBasicLayerManager::AutoUseBasicLayerManager(nsBaseWidget* aWidget)
   : mWidget(aWidget)
 {
+  mPreviousTemporarilyUseBasicLayerManager =
+    mWidget->mTemporarilyUseBasicLayerManager;
   mWidget->mTemporarilyUseBasicLayerManager = true;
 }
 
 nsBaseWidget::AutoUseBasicLayerManager::~AutoUseBasicLayerManager()
 {
-  mWidget->mTemporarilyUseBasicLayerManager = false;
+  mWidget->mTemporarilyUseBasicLayerManager =
+    mPreviousTemporarilyUseBasicLayerManager;
 }
 
 bool

widget/xpwidgets/nsBaseWidget.h

@@ -226,6 +226,7 @@ public:
     ~AutoUseBasicLayerManager();
   private:
     nsBaseWidget* mWidget;
+    bool mPreviousTemporarilyUseBasicLayerManager;
   };
   friend class AutoUseBasicLayerManager;