Changeset 85795 in webkit

Timestamp:

May 4, 2011 3:32:28 PM (13 years ago)

Author:

Adam Roben

Message:

Clip and reposition windowed plugins when the UI process paints

This ensures that their geometry updates in sync with the rest of the page.

Most of this patch is just plumbing the scheduleWindowedPluginGeometryUpdate and
scheduleChildWindowGeometryUpdate calls through from NetscapePlugin all the way over to
WebView. I've tried to call out the other parts below.

Fixes <​http://webkit.org/b/60210> <rdar://problem/8483441> REGRESSION (WebKit2): Windowed
plugins don't scroll at the same speed as the rest of the page

Reviewed by Darin Adler and Anders Carlsson.

• UIProcess/PageClient.h:
• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in:
• UIProcess/win/WebPageProxyWin.cpp:

(WebKit::WebPageProxy::scheduleChildWindowGeometryUpdate):
Added plumbing.

• UIProcess/win/WebView.cpp:

(WebKit::WebView::onPaintEvent): Update child windows before painting so that they will stay
in sync with the rest of the page.
(WebKit::WebView::scheduleChildWindowGeometryUpdate): Add this update information to the
set of geometries to update on the next paint.
(WebKit::setWindowRegion): Moved this helper function here from NetscapePluginWin.cpp.
(WebKit::WebView::updateChildWindowGeometries): Update the size, position, and clip rects of
all the child windows with scheduled geometry updates.

• UIProcess/win/WebView.h: Added new members to track and update child window geometries.

• WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:

(WebKit::NetscapePlugin::platformPostInitialize): Don't show the window immediately. Let the
UI process take care of it.
(WebKit::NetscapePlugin::platformGeometryDidChange): Don't update the window's position or
clip rect. Let the UI process take care of it.

• WebProcess/Plugins/PluginController.h:
• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::scheduleWindowedPluginGeometryUpdate):

• WebProcess/Plugins/PluginView.h:
• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/win/WebPageWin.cpp:

(WebKit::WebPage::scheduleChildWindowGeometryUpdate):
Added plumbing.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• UIProcess/win/WebPageProxyWin.cpp (modified) (1 diff)
• UIProcess/win/WebView.cpp (modified) (2 diffs)
• UIProcess/win/WebView.h (modified) (3 diffs)
• WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp (modified) (3 diffs)
• WebProcess/Plugins/PluginController.h (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (1 diff)
• WebProcess/Plugins/PluginView.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/win/WebPageWin.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-04  Adam Roben  <aroben@apple.com>
+
+        Clip and reposition windowed plugins when the UI process paints
+
+        This ensures that their geometry updates in sync with the rest of the page.
+
+        Most of this patch is just plumbing the scheduleWindowedPluginGeometryUpdate and
+        scheduleChildWindowGeometryUpdate calls through from NetscapePlugin all the way over to
+        WebView. I've tried to call out the other parts below.
+
+        Fixes <http://webkit.org/b/60210> <rdar://problem/8483441> REGRESSION (WebKit2): Windowed
+        plugins don't scroll at the same speed as the rest of the page
+
+        Reviewed by Darin Adler and Anders Carlsson.
+
+        * UIProcess/PageClient.h:
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/win/WebPageProxyWin.cpp:
+        (WebKit::WebPageProxy::scheduleChildWindowGeometryUpdate):
+        Added plumbing.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::onPaintEvent): Update child windows before painting so that they will stay
+        in sync with the rest of the page.
+        (WebKit::WebView::scheduleChildWindowGeometryUpdate): Add this update information to the
+        set of geometries to update on the next paint.
+        (WebKit::setWindowRegion): Moved this helper function here from NetscapePluginWin.cpp.
+        (WebKit::WebView::updateChildWindowGeometries): Update the size, position, and clip rects of
+        all the child windows with scheduled geometry updates.
+
+        * UIProcess/win/WebView.h: Added new members to track and update child window geometries.
+
+        * WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp:
+        (WebKit::NetscapePlugin::platformPostInitialize): Don't show the window immediately. Let the
+        UI process take care of it.
+        (WebKit::NetscapePlugin::platformGeometryDidChange): Don't update the window's position or
+        clip rect. Let the UI process take care of it.
+
+        * WebProcess/Plugins/PluginController.h:
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::scheduleWindowedPluginGeometryUpdate):
+        * WebProcess/Plugins/PluginView.h:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/win/WebPageWin.cpp:
+        (WebKit::WebPage::scheduleChildWindowGeometryUpdate):
+        Added plumbing.
+
 2011-05-04  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -140 +140 @@
     virtual HWND nativeWindow() = 0;
     virtual void setGestureReachedScrollingLimit(bool) = 0;
+    virtual void scheduleChildWindowGeometryUpdate(HWND, const WebCore::IntRect& rectInParentClientCoordinates, const WebCore::IntRect& clipRectInChildClientCoordinates) = 0;
 #endif
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -734 +734 @@
     void updateBackingStoreDiscardableState();
 
+#if PLATFORM(WIN)
+    void scheduleChildWindowGeometryUpdate(uint64_t window, const WebCore::IntRect& rectInParentClientCoordinates, const WebCore::IntRect& clipRectInChildClientCoordinates);
+#endif
+
     PageClient* m_pageClient;
     WebLoaderClient m_loaderClient;

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -242 +242 @@
     # Windows 7 Gesture Messages
     SetGestureReachedScrollingLimit(bool limitReached)
+
+    # Miscellaneous Windows messages
+    ScheduleChildWindowGeometryUpdate(uint64_t window, WebCore::IntRect rectInParentClientCoordinates, WebCore::IntRect clipRectInChildClientCoordinates)
 #endif
 

trunk/Source/WebKit2/UIProcess/win/WebPageProxyWin.cpp

@@ -71 +71 @@
 }
 
+void WebPageProxy::scheduleChildWindowGeometryUpdate(uint64_t window, const IntRect& rectInParentClientCoordinates, const IntRect& clipRectInChildClientCoordinates)
+{
+    m_pageClient->scheduleChildWindowGeometryUpdate(reinterpret_cast<HWND>(window), rectInParentClientCoordinates, clipRectInChildClientCoordinates);
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/win/WebView.cpp

@@ -686 +686 @@
 LRESULT WebView::onPaintEvent(HWND hWnd, UINT message, WPARAM, LPARAM, bool& handled)
 {
+    // Update child windows now so that any areas of our window they reveal will be included in the
+    // invalid region that ::BeginPaint sees.
+    updateChildWindowGeometries();
+
     PAINTSTRUCT paintStruct;
     HDC hdc = ::BeginPaint(m_window, &paintStruct);
@@ -1525 +1529 @@
 }
 
+void WebView::scheduleChildWindowGeometryUpdate(HWND window, const WebCore::IntRect& rectInParentClientCoordinates, const WebCore::IntRect& clipRectInChildClientCoordinates)
+{
+    ChildWindowGeometry geometry;
+    geometry.rectInParentClientCoordinates = rectInParentClientCoordinates;
+    geometry.clipRectInChildClientCoordinates = clipRectInChildClientCoordinates;
+
+    m_childWindowGeometriesToUpdate.set(window, geometry);
+}
+
+static void setWindowRegion(HWND window, PassOwnPtr<HRGN> popRegion)
+{
+    OwnPtr<HRGN> region = popRegion;
+
+    if (!::SetWindowRgn(window, region.get(), TRUE))
+        return;
+
+    // Windows owns the region now.
+    region.leakPtr();
+}
+
+void WebView::updateChildWindowGeometries()
+{
+    HashMap<HWND, ChildWindowGeometry> geometriesToUpdate;
+    geometriesToUpdate.swap(m_childWindowGeometriesToUpdate);
+
+    HDWP deferWindowPos = ::BeginDeferWindowPos(geometriesToUpdate.size());
+
+    HashMap<HWND, ChildWindowGeometry>::const_iterator end = geometriesToUpdate.end();
+    for (HashMap<HWND, ChildWindowGeometry>::const_iterator it = geometriesToUpdate.begin(); it != end; ++it) {
+        HWND window = it->first;
+        if (!::IsWindow(window))
+            continue;
+
+        const ChildWindowGeometry& geometry = it->second;
+
+        const IntRect& windowRect = geometry.rectInParentClientCoordinates;
+        deferWindowPos = ::DeferWindowPos(deferWindowPos, window, 0, windowRect.x(), windowRect.y(), windowRect.width(), windowRect.height(), SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
+
+        const IntRect& clipRect = geometry.clipRectInChildClientCoordinates;
+        setWindowRegion(window, adoptPtr(::CreateRectRgn(clipRect.x(), clipRect.y(), clipRect.maxX(), clipRect.maxY())));
+    }
+
+    ::EndDeferWindowPos(deferWindowPos);
+}
+
 // WebCore::WindowMessageListener
 

trunk/Source/WebKit2/UIProcess/win/WebView.h

@@ -161 +161 @@
     HCURSOR cursorToShow() const;
     void updateNativeCursor();
+
+    void updateChildWindowGeometries();
 
     // PageClient
@@ -210 +212 @@
 
     virtual HWND nativeWindow();
+    virtual void scheduleChildWindowGeometryUpdate(HWND, const WebCore::IntRect& rectInParentClientCoordinates, const WebCore::IntRect& clipRectInChildClientCoordinates);
 
     virtual void setGestureReachedScrollingLimit(bool limitReached) { m_gestureReachedScrollingLimit = limitReached; }
@@ -266 +269 @@
     bool m_gestureReachedScrollingLimit;
 
+    struct ChildWindowGeometry {
+        WebCore::IntRect rectInParentClientCoordinates;
+        WebCore::IntRect clipRectInChildClientCoordinates;
+    };
+
+    HashMap<HWND, ChildWindowGeometry> m_childWindowGeometriesToUpdate;
+
 #if ENABLE(FULLSCREEN_API)
     OwnPtr<WebCore::FullScreenController> m_fullScreenController;

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/win/NetscapePluginWin.cpp

@@ -102 +102 @@
     registerPluginView();
 
-    m_window = ::CreateWindowExW(0, windowClassName, 0, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, containingWindow(), 0, instanceHandle(), 0);
+    // Start out with the window hidden. The UI process will take care of showing it once it's correctly positioned the window.
+    m_window = ::CreateWindowExW(0, windowClassName, 0, WS_CHILD, 0, 0, 0, 0, containingWindow(), 0, instanceHandle(), 0);
     if (!m_window)
         return false;
@@ -139 +140 @@
 }
 
-enum RedrawOrNot { DoNotRedraw, Redraw };
-static void setWindowRegion(HWND window, PassOwnPtr<HRGN> popRegion, RedrawOrNot redrawOrNot)
-{
-    OwnPtr<HRGN> region = popRegion;
-
-    if (!::SetWindowRgn(window, region.get(), redrawOrNot == Redraw))
-        return;
-
-    // Windows owns the region now.
-    region.leakPtr();
-}
-
 void NetscapePlugin::platformGeometryDidChange()
 {
@@ -159 +148 @@
     clipRectInPluginWindowCoordinates.move(-m_frameRect.x(), -m_frameRect.y());
 
-    OwnPtr<HRGN> clipRegion = adoptPtr(::CreateRectRgn(clipRectInPluginWindowCoordinates.x(), clipRectInPluginWindowCoordinates.y(), clipRectInPluginWindowCoordinates.maxX(), clipRectInPluginWindowCoordinates.maxY()));
-    setWindowRegion(m_window, clipRegion.release(), Redraw);
-
-    // FIXME: We should only update the size here and let the UI process update our position so
-    // that we can keep our position in sync when scrolling, etc.
-    ::MoveWindow(m_window, m_frameRect.x(), m_frameRect.y(), m_frameRect.width(), m_frameRect.height(), TRUE);
+    // We only update the size here and let the UI process update our position and clip rect so
+    // that we can keep our position in sync when scrolling, etc. See <http://webkit.org/b/60210>.
+    ::SetWindowPos(m_window, 0, 0, 0, m_frameRect.width(), m_frameRect.height(), SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER);
+
+    m_pluginController->scheduleWindowedPluginGeometryUpdate(m_window, m_frameRect, clipRectInPluginWindowCoordinates);
 }
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h

@@ -90 +90 @@
     // The window to use as the parent of the plugin's window.
     virtual HWND nativeParentWindow() = 0;
+
+    // Tells the controller that the given HWND needs to be positioned and clipped to the given
+    // coordinates sometime soon. The controller will decide exactly when this will happen.
+    virtual void scheduleWindowedPluginGeometryUpdate(HWND, const WebCore::IntRect& rectInParentClientCoordinates, const WebCore::IntRect& clipRectInPluginWindowCoordinates) = 0;
 #endif
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -1004 +1004 @@
     return m_webPage->nativeWindow();
 }
+
+void PluginView::scheduleWindowedPluginGeometryUpdate(HWND pluginWindow, const IntRect& rectInParentClientCoordinates, const IntRect& clipRectInPluginWindowCoordinates)
+{
+    m_webPage->scheduleChildWindowGeometryUpdate(pluginWindow, rectInParentClientCoordinates, clipRectInPluginWindowCoordinates);
+}
 #endif
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h

@@ -133 +133 @@
 #if PLATFORM(WIN)
     virtual HWND nativeParentWindow();
+    virtual void scheduleWindowedPluginGeometryUpdate(HWND, const WebCore::IntRect& rectInClientCoordinates, const WebCore::IntRect& clipRectInPluginWindowCoordinates);
 #endif
 #if PLATFORM(MAC)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -259 +259 @@
 #elif PLATFORM(WIN)
     HWND nativeWindow() const { return m_nativeWindow; }
+    void scheduleChildWindowGeometryUpdate(HWND, const WebCore::IntRect& rectInParentClientCoordinates, const WebCore::IntRect& clipRectInChildClientCoordinates);
 #endif
 

trunk/Source/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp

@@ -28 +28 @@
 
 #include "FontSmoothingLevel.h"
+#include "WebCoreArgumentCoders.h"
 #include "WebEvent.h"
 #include "WebPageProxyMessages.h"
 #include "WebPreferencesStore.h"
+#include "WebProcess.h"
 #include <WebCore/FocusController.h>
 #include <WebCore/FontRenderingMode.h>
@@ -458 +460 @@
 }
 
+void WebPage::scheduleChildWindowGeometryUpdate(HWND window, const IntRect& rectInParentClientCoordinates, const IntRect& clipRectInChildClientCoordinates)
+{
+    WebProcess::shared().connection()->send(Messages::WebPageProxy::ScheduleChildWindowGeometryUpdate(reinterpret_cast<uint64_t>(window), rectInParentClientCoordinates, clipRectInChildClientCoordinates), m_pageID);
+}
+
 } // namespace WebKit