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

andersca at apple.com andersca at apple.com
Sun Feb 20 23:10:44 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit cecb74191a0ab17090121b3affbaf0d9afaed1b2
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 18:24:13 2011 +0000

    2011-01-18  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            ASSERT in plug-in code when going to youtube
            https://bugs.webkit.org/show_bug.cgi?id=52638
    
            * PluginProcess/PluginControllerProxy.cpp:
            (WebKit::PluginControllerProxy::paintEntirePlugin):
            Don't try to paint the plug-in if the plug-in frame is empty.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76036 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 63ae025..9b0250d 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2011-01-18  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Sam Weinig.
+
+        ASSERT in plug-in code when going to youtube
+        https://bugs.webkit.org/show_bug.cgi?id=52638
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::paintEntirePlugin):
+        Don't try to paint the plug-in if the plug-in frame is empty.
+
+2011-01-18  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Plug-in hosting WebProcess instances appear in Activity Monitor as WebProcess
diff --git a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
index 5eb8dd4..42e9e6d 100644
--- a/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
+++ b/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
@@ -390,6 +390,9 @@ void PluginControllerProxy::handleKeyboardEvent(const WebKeyboardEvent& keyboard
 
 void PluginControllerProxy::paintEntirePlugin()
 {
+    if (m_frameRect.isEmpty())
+        return;
+
     m_dirtyRect = m_frameRect;
     paint();
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list