Changeset 201923 in webkit

Timestamp:

Jun 10, 2016 5:58:12 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[Threaded Compositor] Content and viewport sizes are mixed
​https://bugs.webkit.org/show_bug.cgi?id=158564

Reviewed by Žan Doberšek.

Make ThreadedCoordinatedLayerTreeHost::sizeDidChange() update the viewport size for consistency with all other
LayerTreeHost implementations and rename viewportSizeChanged() as contentsSizeChanged() and update the contents
size.

• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::contentsSizeChanged): Remove ifdefed code here, the drawing area is notified two lines below.

• WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:

(WebKit::CoordinatedDrawingArea::mainFrameContentSizeChanged): Update the viewport size to the contents size
only when using a fixed layout here instead of in cross-platform code.

• WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:

(WebKit::ThreadedCoordinatedLayerTreeHost::contentsSizeChanged):
(WebKit::ThreadedCoordinatedLayerTreeHost::sizeDidChange):
(WebKit::ThreadedCoordinatedLayerTreeHost::viewportSizeChanged): Deleted.

• WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
• WebProcess/WebPage/DrawingAreaImpl.cpp:

(WebKit::DrawingAreaImpl::mainFrameContentSizeChanged): Call LayerTreeHost::contentsSizeChanged().
(WebKit::DrawingAreaImpl::updateBackingStoreState): Remove ifdefed code for the threadecd compositor since it's
now consistent with all other LayerTreeHost implementations.

• WebProcess/WebPage/LayerTreeHost.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp (modified) (1 diff)
• WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp (modified) (2 diffs)
• WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h (modified) (2 diffs)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (2 diffs)
• WebProcess/WebPage/LayerTreeHost.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [Threaded Compositor] Content and viewport sizes are mixed
+        https://bugs.webkit.org/show_bug.cgi?id=158564
+
+        Reviewed by Žan Doberšek.
+
+        Make ThreadedCoordinatedLayerTreeHost::sizeDidChange() update the viewport size for consistency with all other
+        LayerTreeHost implementations and rename viewportSizeChanged() as contentsSizeChanged() and update the contents
+        size.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::contentsSizeChanged): Remove ifdefed code here, the drawing area is notified two lines below.
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
+        (WebKit::CoordinatedDrawingArea::mainFrameContentSizeChanged): Update the viewport size to the contents size
+        only when using a fixed layout here instead of in cross-platform code.
+        * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
+        (WebKit::ThreadedCoordinatedLayerTreeHost::contentsSizeChanged):
+        (WebKit::ThreadedCoordinatedLayerTreeHost::sizeDidChange):
+        (WebKit::ThreadedCoordinatedLayerTreeHost::viewportSizeChanged): Deleted.
+        * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::mainFrameContentSizeChanged): Call LayerTreeHost::contentsSizeChanged().
+        (WebKit::DrawingAreaImpl::updateBackingStoreState): Remove ifdefed code for the threadecd compositor since it's
+        now consistent with all other LayerTreeHost implementations.
+        * WebProcess/WebPage/LayerTreeHost.h:
+
 2016-06-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -511 +511 @@
         return;
 
-#if USE(COORDINATED_GRAPHICS)
-    if (m_page->useFixedLayout())
-        m_page->drawingArea()->layerTreeHost()->sizeDidChange(size);
-#endif
-
     m_page->send(Messages::WebPageProxy::DidChangeContentSize(size));
 

trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp

@@ -152 +152 @@
 }
 
-void CoordinatedDrawingArea::mainFrameContentSizeChanged(const WebCore::IntSize&)
-{
+void CoordinatedDrawingArea::mainFrameContentSizeChanged(const WebCore::IntSize& size)
+{
+    if (m_webPage.useFixedLayout())
+        m_layerTreeHost->sizeDidChange(size);
     m_webPage.mainFrame()->pageOverlayController().didChangeDocumentSize();
 }

trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp

@@ -141 +141 @@
 }
 
-void ThreadedCoordinatedLayerTreeHost::sizeDidChange(const WebCore::IntSize& newSize)
-{
-    m_coordinator->sizeDidChange(newSize);
+void ThreadedCoordinatedLayerTreeHost::contentsSizeChanged(const WebCore::IntSize& newSize)
+{
     m_compositor->didChangeContentsSize(newSize);
 }
@@ -169 +168 @@
 }
 
-void ThreadedCoordinatedLayerTreeHost::viewportSizeChanged(const WebCore::IntSize& size)
-{
+void ThreadedCoordinatedLayerTreeHost::sizeDidChange(const WebCore::IntSize& size)
+{
+    m_coordinator->sizeDidChange(size);
     m_compositor->didChangeViewportSize(size);
 }

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

@@ -78 +78 @@
     void forceRepaint() override;
     bool forceRepaintAsync(uint64_t /*callbackID*/) override;
-    void sizeDidChange(const WebCore::IntSize& newSize) override;
+    void sizeDidChange(const WebCore::IntSize&) override;
     void deviceOrPageScaleFactorChanged() override;
 
@@ -87 +87 @@
     void pageBackgroundTransparencyChanged() override { };
 
-    void viewportSizeChanged(const WebCore::IntSize&) override;
+    void contentsSizeChanged(const WebCore::IntSize&) override;
     void didChangeViewportProperties(const WebCore::ViewportAttributes&) override;
 

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -231 +231 @@
 #if USE(COORDINATED_GRAPHICS_THREADED)
     if (m_layerTreeHost)
-        m_layerTreeHost->sizeDidChange(newSize);
+        m_layerTreeHost->contentsSizeChanged(newSize);
 #else
     UNUSED_PARAM(newSize);
@@ -350 +350 @@
         m_webPage.scrollMainFrameIfNotAtMaxScrollPosition(scrollOffset);
 
-        if (m_layerTreeHost) {
-#if USE(COORDINATED_GRAPHICS_THREADED)
-            m_layerTreeHost->viewportSizeChanged(m_webPage.size());
-#else
+        if (m_layerTreeHost)
             m_layerTreeHost->sizeDidChange(m_webPage.size());
-#endif
-        } else
+        else
             m_dirtyRegion = m_webPage.bounds();
     } else {

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

@@ -87 +87 @@
 
 #if USE(COORDINATED_GRAPHICS_THREADED)
-    virtual void viewportSizeChanged(const WebCore::IntSize&) = 0;
+    virtual void contentsSizeChanged(const WebCore::IntSize&) = 0;
     virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&) = 0;
 #endif