Assertion failure (!inSetWindow) with in-process plug-in in plugins/destroy-on-setwindow.html

Dan Bernstein · Dan Bernstein · commit 6d1851fabb8f · 2011-01-17T04:21:50.000Z
https://bugs.webkit.org/show_bug.cgi?id=52550 Reviewed by Simon Fraser. * Plugins/WebNetscapePluginView.mm: (-[WebNetscapePluginView setWindowIfNecessary]): Removed the assertion, making sure that inSetWindow remains YES until we exit the top-level setWindowIfNecessary. Canonical link: https://commits.webkit.org/66153@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@75907 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-16  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Assertion failure (!inSetWindow) with in-process plug-in in plugins/destroy-on-setwindow.html
+        https://bugs.webkit.org/show_bug.cgi?id=52550
+
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView setWindowIfNecessary]): Removed the assertion, making sure
+        that inSetWindow remains YES until we exit the top-level setWindowIfNecessary.
+
 2011-01-16  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -988,16 +988,16 @@ - (void)setWindowIfNecessary
         // protecting only against this one case, which actually comes up when
         // you first install the SVG viewer plug-in.
         NPError npErr;
-        ASSERT(!inSetWindow);
         
+        BOOL wasInSetWindow = inSetWindow;
         inSetWindow = YES;        
         [self willCallPlugInFunction];
         {
             JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
             npErr = [_pluginPackage.get() pluginFuncs]->setwindow(plugin, &window);
         }
         [self didCallPlugInFunction];
-        inSetWindow = NO;
+        inSetWindow = wasInSetWindow;
 
 #ifndef NDEBUG
         switch (drawingModel) {
