[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mitz at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit b34dabff3fb54945a5793f772c1b1494e1f8a6ca
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 04:21:50 2011 +0000

    Assertion failure (!inSetWindow) with in-process plug-in in plugins/destroy-on-setwindow.html
    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.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75907 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 6274a01..9169abb 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-16  Dan Bernstein  <mitz at 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 at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/Plugins/WebNetscapePluginView.mm b/WebKit/mac/Plugins/WebNetscapePluginView.mm
index f2abab7..f9f41e9 100644
--- a/WebKit/mac/Plugins/WebNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebNetscapePluginView.mm
@@ -988,8 +988,8 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
         // 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];
         {
@@ -997,7 +997,7 @@ static inline void getNPRect(const NSRect& nr, NPRect& npr)
             npErr = [_pluginPackage.get() pluginFuncs]->setwindow(plugin, &window);
         }
         [self didCallPlugInFunction];
-        inSetWindow = NO;
+        inSetWindow = wasInSetWindow;
 
 #ifndef NDEBUG
         switch (drawingModel) {

-- 
WebKit Debian packaging