Changeset 70162 in webkit

Timestamp:

Oct 20, 2010 12:37:57 PM (14 years ago)

Author:

andersca@apple.com

Message:

Out of process plug-ins are never asked to initially paint
​https://bugs.webkit.org/show_bug.cgi?id=47993
<rdar://problem/8570342>

Reviewed by Darin Adler.

• Platform/CoreIPC/HandleMessage.h:

(CoreIPC::callMemberFunction):
Add new callMemberFunction overload.

• PluginProcess/PluginControllerProxy.cpp:

(WebKit::PluginControllerProxy::paintEntirePlugin):
Set the dirty rect to be the entire plug-in rect and then paint the plug-in.

• PluginProcess/PluginControllerProxy.messages.in:

Add PaintEntirePlugin message.

• WebProcess/Plugins/PluginProxy.cpp:

(WebKit::PluginProxy::PluginProxy):
Initialize m_pluginBackingStoreContainsValidData to false.

(WebKit::PluginProxy::paint):
If m_pluginBackingStoreContainsValidData is false, synchronously ask the plug-in to paint,
then blit the plug-in backing store into our own backing store.

(WebKit::PluginProxy::geometryDidChange):
Set m_pluginBackingStoreContainsValidData to false.

(WebKit::PluginProxy::update):
Set m_pluginBackingStoreContainsValidData to true if the plug-in has painted its entire area.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/HandleMessage.h (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (2 diffs)
• PluginProcess/PluginControllerProxy.h (modified) (1 diff)
• PluginProcess/PluginControllerProxy.messages.in (modified) (1 diff)
• WebProcess/Plugins/PluginProxy.cpp (modified) (4 diffs)
• WebProcess/Plugins/PluginProxy.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-20  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Out of process plug-ins are never asked to initially paint
+        https://bugs.webkit.org/show_bug.cgi?id=47993
+        <rdar://problem/8570342>
+
+        * Platform/CoreIPC/HandleMessage.h:
+        (CoreIPC::callMemberFunction):
+        Add new callMemberFunction overload.
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::paintEntirePlugin):
+        Set the dirty rect to be the entire plug-in rect and then paint the plug-in.
+
+        * PluginProcess/PluginControllerProxy.messages.in:
+        Add PaintEntirePlugin message.
+
+        * WebProcess/Plugins/PluginProxy.cpp:
+        (WebKit::PluginProxy::PluginProxy):
+        Initialize m_pluginBackingStoreContainsValidData to false.
+
+        (WebKit::PluginProxy::paint):
+        If m_pluginBackingStoreContainsValidData is false, synchronously ask the plug-in to paint,
+        then blit the plug-in backing store into our own backing store.
+
+        (WebKit::PluginProxy::geometryDidChange):
+        Set m_pluginBackingStoreContainsValidData to false.
+
+        (WebKit::PluginProxy::update):
+        Set m_pluginBackingStoreContainsValidData to true if the plug-in has painted its entire area.
+
 2010-10-19  Jessie Berlin  <jberlin@apple.com>
 

trunk/WebKit2/Platform/CoreIPC/HandleMessage.h

@@ -55 +55 @@
 
 // Dispatch functions with reply arguments.
+
+template<typename C, typename MF>
+void callMemberFunction(const Arguments0&, Arguments0&, C* object, MF function)
+{
+    (object->*function)();
+}
 
 template<typename C, typename MF, typename R1>

trunk/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -87 +87 @@
 {
     ASSERT(!m_dirtyRect.isEmpty());
+    m_paintTimer.stop();
 
     if (!m_backingStore)
@@ -292 +293 @@
 }
 
+void PluginControllerProxy::paintEntirePlugin()
+{
+    m_dirtyRect = m_frameRect;
+    paint();
+}
+
 void PluginControllerProxy::setFocus(bool hasFocus)
 {

trunk/WebKit2/PluginProcess/PluginControllerProxy.h

@@ -95 +95 @@
     void handleMouseLeaveEvent(const WebMouseEvent&, bool& handled);
     void handleKeyboardEvent(const WebKeyboardEvent&, bool& handled);
+    void paintEntirePlugin();
     void setFocus(bool);
     void didUpdate();

trunk/WebKit2/PluginProcess/PluginControllerProxy.messages.in

@@ -63 +63 @@
     DidUpdate()
 
+    # Paint the entire plug-in.
+    PaintEntirePlugin() -> ()
+    
 #if PLATFORM(MAC)
     # Sent when the containing NSWindow's focus changes

trunk/WebKit2/WebProcess/Plugins/PluginProxy.cpp

@@ -58 +58 @@
     , m_pluginInstanceID(generatePluginInstanceID())
     , m_pluginController(0)
+    , m_pluginBackingStoreContainsValidData(false)
     , m_isStarted(false)
     , m_waitingForPaintInResponseToUpdate(false)
@@ -113 +114 @@
     if (!m_backingStore)
         return;
+
+    if (!m_pluginBackingStoreContainsValidData) {
+        m_connection->connection()->sendSync(Messages::PluginControllerProxy::PaintEntirePlugin(), Messages::PluginControllerProxy::PaintEntirePlugin::Reply(), m_pluginInstanceID, CoreIPC::Connection::NoTimeout);
+    
+        // Blit the plug-in backing store into our own backing store.
+        OwnPtr<WebCore::GraphicsContext> graphicsContext = m_backingStore->createGraphicsContext();
+        
+        m_pluginBackingStore->paint(graphicsContext.get(), IntRect(0, 0, m_frameRect.width(), m_frameRect.height()));
+        
+        m_pluginBackingStoreContainsValidData = true;
+    }
 
     IntRect dirtyRectInPluginCoordinates = dirtyRect;
@@ -170 +182 @@
             return;
         }
+
+        m_pluginBackingStoreContainsValidData = false;
     }
 
@@ -346 +360 @@
 void PluginProxy::update(const IntRect& paintedRect)
 {
+    if (paintedRect == m_frameRect)
+        m_pluginBackingStoreContainsValidData = true;
+
     IntRect paintedRectPluginCoordinates = paintedRect;
     paintedRectPluginCoordinates.move(-m_frameRect.x(), -m_frameRect.y());

trunk/WebKit2/WebProcess/Plugins/PluginProxy.h

@@ -113 +113 @@
     // that it's painted something in it, we'll blit from it to our own backing store.
     RefPtr<BackingStore> m_pluginBackingStore;
+    
+    // Whether all of the plug-in backing store contains valid data.
+    bool m_pluginBackingStoreContainsValidData;
 
     bool m_isStarted;