[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

ap at apple.com ap at apple.com
Wed Dec 22 15:32:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f85543f0896a99f35ef22f324c3448f52f1db0e8
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 6 06:13:17 2010 +0000

    2010-11-05  Alexey Proskuryakov  <ap at apple.com>
    
            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=49100
            ASSERT([self window]) fails in -[WebBaseNetscapePluginView restartTimers]
    
            * Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView restartTimers]):
            Removed the assertion. Multiple callers provide no guarantee that the plug-in is still alive
            (see bug comments), and there seems to be no harm in executing this function in that case.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index fee4c9b..dbbb720 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-05  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49100
+        ASSERT([self window]) fails in -[WebBaseNetscapePluginView restartTimers]
+
+        * Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView restartTimers]):
+        Removed the assertion. Multiple callers provide no guarantee that the plug-in is still alive
+        (see bug comments), and there seems to be no harm in executing this function in that case.
+
 2010-11-05  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index 708b017..b6b8b64 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -326,8 +326,6 @@ String WebHaltablePlugin::pluginName() const
 
 - (void)restartTimers
 {
-    ASSERT([self window]);
-    
     [self stopTimers];
     
     if (!_isStarted || [[self window] isMiniaturized])

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list