[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

kdecker at apple.com kdecker at apple.com
Thu Oct 29 20:44:50 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit e1840f0578927826e081f3197cf099a32a8c3859
Author: kdecker at apple.com <kdecker at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 00:33:32 2009 +0000

            Unbreak the world.
    
            * Plugins/WebBaseNetscapePluginView.mm:
            (WebHaltablePlugin::restart):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 398284b..18720ad 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,12 @@
 2009-10-14  Kevin Decker  <kdecker at apple.com>
 
+        Unbreak the world.
+        
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (WebHaltablePlugin::restart):
+
+2009-10-14  Kevin Decker  <kdecker at apple.com>
+
         Reviewed by Anders Carlsson and Jon Honeycutt
 
         <rdar://problem/7304295> snapshots of halted plug-ins are missing
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index f95f3d1..bce4dcb 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -101,6 +101,7 @@ void WebHaltablePlugin::halt()
 
 void WebHaltablePlugin::restart()
 { 
+    Element* element = [m_view element];
     ASSERT(element->renderer());
     toRenderWidget(element->renderer())->showSubstituteImage(0);
     [m_view start];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list