Changeset 217779 in webkit

Timestamp:

Jun 5, 2017 5:01:53 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

[WPE] Use AcceleratedDrawingArea instead of its fork
​https://bugs.webkit.org/show_bug.cgi?id=172496

Reviewed by Žan Doberšek.

WPE uses its own drawing area implementation, which is actually a fork of AcceleratedDrawingArea, but simplified
for the case of compositing being always forced. AcceleratedDrawingArea already handles the case of compositing
being forced, so now that WPE is upstream we could simply use AcceleratedDrawingArea instead.

• PlatformWPE.cmake:
• Shared/DrawingAreaInfo.h: Remove DrawingAreaTypeWPE type.
• UIProcess/API/wpe/DrawingAreaProxyWPE.cpp: Removed.
• UIProcess/API/wpe/DrawingAreaProxyWPE.h: Removed.
• UIProcess/API/wpe/PageClientImpl.cpp:

(WebKit::PageClientImpl::createDrawingAreaProxy): Create an AcceleratedDrawingAreaProxy.

• WebProcess/WebPage/AcceleratedDrawingArea.cpp:

(WebKit::AcceleratedDrawingArea::mainFrameContentSizeChanged): Moved from DrawingAreaImpl since it actually
belongs here.

• WebProcess/WebPage/DrawingArea.cpp:

(WebKit::DrawingArea::create): Create an AcceleratedDrawingArea for WPE port.

• WebProcess/WebPage/DrawingAreaImpl.cpp: Remove mainFrameContentSizeChanged() that doesn't belong here.
• WebProcess/WebPage/DrawingAreaImpl.h:
• WebProcess/WebPage/wpe/DrawingAreaWPE.cpp: Removed.
• WebProcess/WebPage/wpe/DrawingAreaWPE.h: Removed.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformWPE.cmake (modified) (4 diffs)
• Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (modified) (1 diff)
• Shared/DrawingAreaInfo.h (modified) (1 diff)
• UIProcess/API/wpe/DrawingAreaProxyWPE.cpp (deleted)
• UIProcess/API/wpe/DrawingAreaProxyWPE.h (deleted)
• UIProcess/API/wpe/PageClientImpl.cpp (modified) (2 diffs)
• WebProcess/WebPage/AcceleratedDrawingArea.cpp (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.cpp (modified) (2 diffs)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.h (modified) (1 diff)
• WebProcess/WebPage/wpe/DrawingAreaWPE.cpp (deleted)
• WebProcess/WebPage/wpe/DrawingAreaWPE.h (deleted)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-06-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [WPE] Use AcceleratedDrawingArea instead of its fork
+        https://bugs.webkit.org/show_bug.cgi?id=172496
+
+        Reviewed by Žan Doberšek.
+
+        WPE uses its own drawing area implementation, which is actually a fork of AcceleratedDrawingArea, but simplified
+        for the case of compositing being always forced. AcceleratedDrawingArea already handles the case of compositing
+        being forced, so now that WPE is upstream we could simply use AcceleratedDrawingArea instead.
+
+        * PlatformWPE.cmake:
+        * Shared/DrawingAreaInfo.h: Remove DrawingAreaTypeWPE type.
+        * UIProcess/API/wpe/DrawingAreaProxyWPE.cpp: Removed.
+        * UIProcess/API/wpe/DrawingAreaProxyWPE.h: Removed.
+        * UIProcess/API/wpe/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::createDrawingAreaProxy): Create an AcceleratedDrawingAreaProxy.
+        * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
+        (WebKit::AcceleratedDrawingArea::mainFrameContentSizeChanged): Moved from DrawingAreaImpl since it actually
+        belongs here.
+        * WebProcess/WebPage/DrawingArea.cpp:
+        (WebKit::DrawingArea::create): Create an AcceleratedDrawingArea for WPE port.
+        * WebProcess/WebPage/DrawingAreaImpl.cpp: Remove mainFrameContentSizeChanged() that doesn't belong here.
+        * WebProcess/WebPage/DrawingAreaImpl.h:
+        * WebProcess/WebPage/wpe/DrawingAreaWPE.cpp: Removed.
+        * WebProcess/WebPage/wpe/DrawingAreaWPE.h: Removed.
+
 2017-06-03  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/PlatformWPE.cmake

@@ -91 +91 @@
     Shared/wpe/WebEventFactory.cpp
 
+    UIProcess/AcceleratedDrawingAreaProxy.cpp
     UIProcess/BackingStore.cpp
     UIProcess/DefaultUndoController.cpp
@@ -106 +107 @@
 
     UIProcess/API/wpe/CompositingManagerProxy.cpp
-    UIProcess/API/wpe/DrawingAreaProxyWPE.cpp
     UIProcess/API/wpe/PageClientImpl.cpp
     UIProcess/API/wpe/ScrollGestureController.cpp
@@ -153 +153 @@
     WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp
 
+    WebProcess/WebPage/AcceleratedDrawingArea.cpp
     WebProcess/WebPage/AcceleratedSurface.cpp
 
@@ -165 +166 @@
     WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
     WebProcess/WebPage/wpe/CompositingManager.cpp
-    WebProcess/WebPage/wpe/DrawingAreaWPE.cpp
     WebProcess/WebPage/wpe/WebInspectorUIWPE.cpp
     WebProcess/WebPage/wpe/WebPageWPE.cpp

trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp

@@ -183 +183 @@
 void ThreadedCompositor::forceRepaint()
 {
+    // FIXME: Enable this for WPE once it's possible to do these forced updates
+    // in a way that doesn't starve out the underlying graphics buffers.
+#if PLATFORM(GTK)
     m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] {
         SetForScope<bool> change(m_inForceRepaint, true);
         renderLayerTree();
     });
+#endif
 }
 

trunk/Source/WebKit2/Shared/DrawingAreaInfo.h

@@ -35 +35 @@
 #endif
     DrawingAreaTypeRemoteLayerTree,
-#elif PLATFORM(WPE)
-    DrawingAreaTypeWPE
 #else
     DrawingAreaTypeImpl

trunk/Source/WebKit2/UIProcess/API/wpe/PageClientImpl.cpp

@@ -27 +27 @@
 #include "PageClientImpl.h"
 
-#include "DrawingAreaProxyWPE.h"
+#include "AcceleratedDrawingAreaProxy.h"
 #include "NativeWebMouseEvent.h"
 #include "NativeWebWheelEvent.h"
@@ -48 +48 @@
 std::unique_ptr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy()
 {
-    return std::make_unique<DrawingAreaProxyWPE>(m_view.page());
+    return std::make_unique<AcceleratedDrawingAreaProxy>(m_view.page());
 }
 

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

@@ -163 +163 @@
         else if (m_previousLayerTreeHost)
             m_previousLayerTreeHost->sizeDidChange(size);
+    } else {
+        if (m_layerTreeHost)
+            m_layerTreeHost->contentsSizeChanged(size);
+        else if (m_previousLayerTreeHost)
+            m_previousLayerTreeHost->contentsSizeChanged(size);
     }
     m_webPage.mainFrame()->pageOverlayController().didChangeDocumentSize();

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

@@ -39 +39 @@
 #include "TiledCoreAnimationDrawingArea.h"
 #elif PLATFORM(WPE)
-#include "DrawingAreaWPE.h"
+#include "AcceleratedDrawingArea.h"
 #else
 #include "DrawingAreaImpl.h"
@@ -58 +58 @@
     case DrawingAreaTypeRemoteLayerTree:
         return std::make_unique<RemoteLayerTreeDrawingArea>(webPage, parameters);
-#elif PLATFORM(WPE)
-    case DrawingAreaTypeWPE:
-        return std::make_unique<DrawingAreaWPE>(webPage, parameters);
 #else
     case DrawingAreaTypeImpl:
+#if PLATFORM(WPE)
+        return std::make_unique<AcceleratedDrawingArea>(webPage, parameters);
+#else
         return std::make_unique<DrawingAreaImpl>(webPage, parameters);
+#endif
 #endif
     }

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

@@ -170 +170 @@
 }
 
-void DrawingAreaImpl::mainFrameContentSizeChanged(const WebCore::IntSize& newSize)
-{
-#if USE(COORDINATED_GRAPHICS_THREADED)
-    if (m_layerTreeHost)
-        m_layerTreeHost->contentsSizeChanged(newSize);
-    else if (m_previousLayerTreeHost)
-        m_previousLayerTreeHost->contentsSizeChanged(newSize);
-#else
-    UNUSED_PARAM(newSize);
-#endif
-}
-
 void DrawingAreaImpl::updatePreferences(const WebPreferencesStore& store)
 {

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

@@ -50 +50 @@
     void forceRepaint() override;
 
-    void mainFrameContentSizeChanged(const WebCore::IntSize&) override;
     void updatePreferences(const WebPreferencesStore&) override;