Changeset 70098 in webkit

Timestamp:

Oct 19, 2010 3:48:18 PM (14 years ago)

Author:

andersca@apple.com

Message:

Coalesce plug-in drawing
​https://bugs.webkit.org/show_bug.cgi?id=47939

Reviewed by Sam Weinig.

Coalesce plug-in drawing in the same manner as we do it in the chunked update drawing area.

• PluginProcess/PluginControllerProxy.cpp:

(WebKit::PluginControllerProxy::PluginControllerProxy):
Initialize m_waitingForDidUpdate to false.

(WebKit::PluginControllerProxy::startPaintTimer):
Move code from invalidate out to here. Don't start the paint timer if m_waitingForDidUpdate is true.

(WebKit::PluginControllerProxy::invalidate):
Call startPaintTimer.

(WebKit::PluginControllerProxy::didUpdate):
Set m_waitingForDidUpdate to false and start the paint timer.

• PluginProcess/PluginControllerProxy.messages.in:

Add DidUpdate message.

• WebProcess/Plugins/PluginProxy.cpp:

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

(WebKit::PluginProxy::paint):
If m_waitingForPaintInResponseToUpdate is true, send a DidUpdate message.

(WebKit::PluginProxy::update):
Set m_waitingForPaintInResponseToUpdate to true.

Location:

trunk/WebKit2

Files:

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

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Coalesce plug-in drawing
+        https://bugs.webkit.org/show_bug.cgi?id=47939
+
+        Coalesce plug-in drawing in the same manner as we do it in the chunked update drawing area.
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::PluginControllerProxy):
+        Initialize m_waitingForDidUpdate to false.
+
+        (WebKit::PluginControllerProxy::startPaintTimer):
+        Move code from invalidate out to here. Don't start the paint timer if m_waitingForDidUpdate is true.
+
+        (WebKit::PluginControllerProxy::invalidate):
+        Call startPaintTimer.
+
+        (WebKit::PluginControllerProxy::didUpdate):
+        Set m_waitingForDidUpdate to false and start the paint timer.
+
+        * PluginProcess/PluginControllerProxy.messages.in:
+        Add DidUpdate message.
+
+        * WebProcess/Plugins/PluginProxy.cpp:
+        (WebKit::PluginProxy::PluginProxy):
+        Initialize m_waitingForPaintInResponseToUpdate to false.
+
+        (WebKit::PluginProxy::paint):
+        If m_waitingForPaintInResponseToUpdate is true, send a DidUpdate message.
+
+        (WebKit::PluginProxy::update):
+        Set m_waitingForPaintInResponseToUpdate to true.
+
 2010-10-19  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -54 +54 @@
     , m_isPrivateBrowsingEnabled(isPrivateBrowsingEnabled)
     , m_paintTimer(RunLoop::main(), this, &PluginControllerProxy::paint)
+    , m_waitingForDidUpdate(false)
 {
 }
@@ -103 +104 @@
 }
 
+void PluginControllerProxy::startPaintTimer()
+{
+    // Check if we should start the timer.
+    
+    if (m_dirtyRect.isEmpty())
+        return;
+
+    // FIXME: Check clip rect.
+    
+    if (m_paintTimer.isActive())
+        return;
+
+    if (m_waitingForDidUpdate)
+        return;
+
+    // Start the timer.
+    m_paintTimer.startOneShot(0);
+
+    m_waitingForDidUpdate = true;
+}
+
 void PluginControllerProxy::invalidate(const IntRect& rect)
 {
@@ -114 +136 @@
     m_dirtyRect.unite(dirtyRect);
 
-    // Check if we should start the timer.
-    
-    if (m_dirtyRect.isEmpty())
-        return;
-    
-    // FIXME: Check clip rect.
-    
-    if (m_paintTimer.isActive())
-        return;
-
-    // Start the timer.
-    m_paintTimer.startOneShot(0);
+    startPaintTimer();
 }
 
@@ -286 +297 @@
 }
 
+void PluginControllerProxy::didUpdate()
+{
+    m_waitingForDidUpdate = false;
+    startPaintTimer();
+}
+
 #if PLATFORM(MAC)
 void PluginControllerProxy::windowFocusChanged(bool hasFocus)

trunk/WebKit2/PluginProcess/PluginControllerProxy.h

@@ -63 +63 @@
     PluginControllerProxy(WebProcessConnection* connection, uint64_t pluginInstanceID, const String& userAgent, bool isPrivateBrowsingEnabled);
 
+    void startPaintTimer();
     void paint();
 
@@ -95 +96 @@
     void handleKeyboardEvent(const WebKeyboardEvent&, bool& handled);
     void setFocus(bool);
+    void didUpdate();
 #if PLATFORM(MAC)
     void windowFocusChanged(bool);
@@ -120 +122 @@
     RunLoop::Timer<PluginControllerProxy> m_paintTimer;
 
+    // Whether we're waiting for the plug-in proxy in the web process to draw the contents of its
+    // backing store into the web process backing store.
+    bool m_waitingForDidUpdate;
+
     // The backing store that this plug-in draws into.
     RefPtr<BackingStore> m_backingStore;

trunk/WebKit2/PluginProcess/PluginControllerProxy.messages.in

@@ -60 +60 @@
     SetFocus(bool isFocused)
 
+    # Sent when the update requested by Update has been painted.
+    DidUpdate()
+
 #if PLATFORM(MAC)
     # Sent when the containing NSWindow's focus changes

trunk/WebKit2/WebProcess/Plugins/PluginProxy.cpp

@@ -59 +59 @@
     , m_pluginController(0)
     , m_isStarted(false)
-
+    , m_waitingForPaintInResponseToUpdate(false)
 {
 }
@@ -123 +123 @@
 
     graphicsContext->restore();
+
+    if (m_waitingForPaintInResponseToUpdate) {
+        m_waitingForPaintInResponseToUpdate = false;
+        m_connection->connection()->send(Messages::PluginControllerProxy::DidUpdate(), m_pluginInstanceID);
+        return;
+    }
 }
 
@@ -350 +356 @@
     }
 
-    // Ask the controller to invalidate the rect for us.        
+    // Ask the controller to invalidate the rect for us.
+    m_waitingForPaintInResponseToUpdate = true;
     m_pluginController->invalidate(paintedRectPluginCoordinates);
 }

trunk/WebKit2/WebProcess/Plugins/PluginProxy.h

@@ -115 +115 @@
 
     bool m_isStarted;
+
+    // Whether we're called invalidate in response to an update call, and are now waiting for a paint call.
+    bool m_waitingForPaintInResponseToUpdate;
 };