Changeset 87805 in webkit

Timestamp:

Jun 1, 2011 8:12:16 AM (13 years ago)

Author:

Adam Roben

Message:

Move WebView's window geometry updating code to a new class

This will allow us to share this code with LayerTreeHostCAWin.

Prep work for <​http://webkit.org/b/58054> <rdar://problem/9249839> REGRESSION (WebKit2):
Accelerated CSS animations have a lower framerate than in WebKit1

Reviewed by Anders Carlsson.

• Shared/win/CoalescedWindowGeometriesUpdater.cpp: Added.

(WebKit::CoalescedWindowGeometriesUpdater::CoalescedWindowGeometriesUpdater):
(WebKit::CoalescedWindowGeometriesUpdater::~CoalescedWindowGeometriesUpdater):
Simple constructor/destructor.

(WebKit::CoalescedWindowGeometriesUpdater::addPendingUpdate):
(WebKit::setWindowRegion):
(WebKit::CoalescedWindowGeometriesUpdater::updateGeometries):

• Shared/win/CoalescedWindowGeometriesUpdater.h: Added.

Moved code here...

• UIProcess/win/WebView.cpp:

(WebKit::WebView::scheduleChildWindowGeometryUpdate):
(WebKit::WebView::updateChildWindowGeometries):

• UIProcess/win/WebView.h:

...from here.

• win/WebKit2.vcproj: Added new files.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/win/CoalescedWindowGeometriesUpdater.cpp (added)
• Shared/win/CoalescedWindowGeometriesUpdater.h (added)
• UIProcess/win/WebView.cpp (modified) (2 diffs)
• UIProcess/win/WebView.h (modified) (2 diffs)
• win/WebKit2.vcproj (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-01  Adam Roben  <aroben@apple.com>
+
+        Move WebView's window geometry updating code to a new class
+
+        This will allow us to share this code with LayerTreeHostCAWin.
+
+        Prep work for <http://webkit.org/b/58054> <rdar://problem/9249839> REGRESSION (WebKit2):
+        Accelerated CSS animations have a lower framerate than in WebKit1
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/win/CoalescedWindowGeometriesUpdater.cpp: Added.
+        (WebKit::CoalescedWindowGeometriesUpdater::CoalescedWindowGeometriesUpdater):
+        (WebKit::CoalescedWindowGeometriesUpdater::~CoalescedWindowGeometriesUpdater):
+        Simple constructor/destructor.
+
+        (WebKit::CoalescedWindowGeometriesUpdater::addPendingUpdate):
+        (WebKit::setWindowRegion):
+        (WebKit::CoalescedWindowGeometriesUpdater::updateGeometries):
+        * Shared/win/CoalescedWindowGeometriesUpdater.h: Added.
+        Moved code here...
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::scheduleChildWindowGeometryUpdate):
+        (WebKit::WebView::updateChildWindowGeometries):
+        * UIProcess/win/WebView.h:
+        ...from here.
+
+        * win/WebKit2.vcproj: Added new files.
+
 2011-06-01  Adam Roben  <aroben@apple.com>
 

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

@@ -42 +42 @@
 #include "WebPageProxy.h"
 #include "WebPopupMenuProxyWin.h"
-#include "WindowGeometry.h"
 #include <Commctrl.h>
 #include <WebCore/BitmapInfo.h>
@@ -1532 +1531 @@
 void WebView::scheduleChildWindowGeometryUpdate(const WindowGeometry& geometry)
 {
-    m_childWindowGeometriesToUpdate.set(geometry.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();
+    m_geometriesUpdater.addPendingUpdate(geometry);
 }
 
 void WebView::updateChildWindowGeometries()
 {
-    HashMap<HWND, WindowGeometry> geometriesToUpdate;
-    geometriesToUpdate.swap(m_childWindowGeometriesToUpdate);
-
-    HDWP deferWindowPos = ::BeginDeferWindowPos(geometriesToUpdate.size());
-
-    for (HashMap<HWND, WindowGeometry>::const_iterator::Values it = geometriesToUpdate.begin().values(), end = geometriesToUpdate.end().values(); it != end; ++it) {
-        const WindowGeometry& geometry = *it;
-
-        if (!::IsWindow(geometry.window))
-            continue;
-
-        UINT flags = SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER;
-        if (geometry.visible)
-            flags |= SWP_SHOWWINDOW;
-        else
-            flags |= SWP_HIDEWINDOW;
-
-        deferWindowPos = ::DeferWindowPos(deferWindowPos, geometry.window, 0, geometry.frame.x(), geometry.frame.y(), geometry.frame.width(), geometry.frame.height(), flags);
-
-        setWindowRegion(geometry.window, adoptPtr(::CreateRectRgn(geometry.clipRect.x(), geometry.clipRect.y(), geometry.clipRect.maxX(), geometry.clipRect.maxY())));
-    }
-
-    ::EndDeferWindowPos(deferWindowPos);
+    m_geometriesUpdater.updateGeometries();
 }
 

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

@@ -28 +28 @@
 
 #include "APIObject.h"
+#include "CoalescedWindowGeometriesUpdater.h"
 #include "PageClient.h"
 #include "WKView.h"
@@ -275 +276 @@
     bool m_gestureReachedScrollingLimit;
 
-    HashMap<HWND, WindowGeometry> m_childWindowGeometriesToUpdate;
+    CoalescedWindowGeometriesUpdater m_geometriesUpdater;
 
 #if ENABLE(FULLSCREEN_API)

trunk/Source/WebKit2/win/WebKit2.vcproj

@@ -1171 +1171 @@
                                 >
                                 <File
+                                        RelativePath="..\Shared\win\CoalescedWindowGeometriesUpdater.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\Shared\win\CoalescedWindowGeometriesUpdater.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\Shared\win\CommandLineWin.cpp"
                                         >