1From 646e347c173dbb9782492ac7cb4f54b65533ba90 Mon Sep 17 00:00:00 2001 2From: Martin Jansa <Martin.Jansa@gmail.com> 3Date: Sun, 17 Oct 2021 20:49:21 +0000 4Subject: [PATCH] Fix build without opengl-or-es 5 6* fix build failure when opengl-or-es is disabled: 7 In file included from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:30, 8 from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/build/DerivedSources/WebKit/unified-sources/UnifiedSource-54928a2b-36.cpp:1: 9 /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:41:10: fatal error: WebCore/CoordinatedGraphicsLayer.h: No such file or directory 10 41 | #include <WebCore/CoordinatedGraphicsLayer.h> 11 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 12 compilation terminated. 13 14* the CoordinatedGraphicsLayer.h header installation is controled by 15 USE_COORDINATED_GRAPHICS in webkitgtk-2.34.0/Source/WebCore/platform/TextureMapper.cmake 16 but in Source/cmake/OptionsGTK.cmake USE_COORDINATED_GRAPHICS was enabled only inside 17 if (USE_OPENGL_OR_ES) 18 19Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232934] 20--- 21 .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- 22 .../DrawingAreaProxyCoordinatedGraphics.h | 2 +- 23 .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp | 2 +- 24 .../CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h | 2 +- 25 .../WebPage/CoordinatedGraphics/LayerTreeHost.cpp | 4 ++-- 26 .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 6 +++--- 27 6 files changed, 9 insertions(+), 9 deletions(-) 28 29diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp 30index 038d9ee2..5e828a10 100644 31--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp 32+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp 33@@ -152,7 +152,7 @@ void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBa 34 #endif 35 } 36 37-#if PLATFORM(GTK) 38+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 39 void DrawingAreaProxyCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin) 40 { 41 send(Messages::DrawingArea::AdjustTransientZoom(scale, origin)); 42diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h 43index b23a45ff..cd263402 100644 44--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h 45+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h 46@@ -57,7 +57,7 @@ private: 47 void waitForBackingStoreUpdateOnNextPaint() override; 48 void setBackingStoreIsDiscardable(bool) override; 49 50-#if PLATFORM(GTK) 51+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 52 void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override; 53 void commitTransientZoom(double scale, WebCore::FloatPoint origin) override; 54 #endif 55diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 56index 33ac2e1d..42375784 100644 57--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 58+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 59@@ -486,7 +486,7 @@ void DrawingAreaCoordinatedGraphics::didUpdate() 60 displayTimerFired(); 61 } 62 63-#if PLATFORM(GTK) 64+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 65 void DrawingAreaCoordinatedGraphics::adjustTransientZoom(double scale, FloatPoint origin) 66 { 67 if (!m_transientZoom) { 68diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h 69index d8dc6df7..c8322364 100644 70--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h 71+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h 72@@ -84,7 +84,7 @@ private: 73 void updateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset) override; 74 void didUpdate() override; 75 76-#if PLATFORM(GTK) 77+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 78 void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override; 79 void commitTransientZoom(double scale, WebCore::FloatPoint origin) override; 80 #endif 81diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp 82index f3304d10..ca0476ff 100644 83--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp 84+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp 85@@ -156,7 +156,7 @@ void LayerTreeHost::layerFlushTimerFired() 86 87 bool didSync = m_coordinator.flushPendingLayerChanges(flags); 88 89-#if PLATFORM(GTK) 90+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 91 // If we have an active transient zoom, we want the zoom to win over any changes 92 // that WebCore makes to the relevant layers, so re-apply our changes after flushing. 93 if (m_transientZoom) 94@@ -453,7 +453,7 @@ void LayerTreeHost::renderNextFrame(bool forceRepaint) 95 } 96 } 97 98-#if PLATFORM(GTK) 99+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 100 FloatPoint LayerTreeHost::constrainTransientZoomOrigin(double scale, FloatPoint origin) const 101 { 102 FrameView& frameView = *m_webPage.mainFrameView(); 103diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 104index 4f727e41..b070266e 100644 105--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 106+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 107@@ -37,7 +37,7 @@ 108 #include <wtf/Forward.h> 109 #include <wtf/OptionSet.h> 110 #include <wtf/RunLoop.h> 111-#if PLATFORM(GTK) 112+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 113 #include <WebCore/CoordinatedGraphicsLayer.h> 114 #endif 115 116@@ -100,7 +100,7 @@ public: 117 118 WebCore::PlatformDisplayID displayID() const { return m_displayID; } 119 120-#if PLATFORM(GTK) 121+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 122 void adjustTransientZoom(double, WebCore::FloatPoint); 123 void commitTransientZoom(double, WebCore::FloatPoint); 124 #endif 125@@ -213,7 +213,7 @@ private: 126 #endif // USE(COORDINATED_GRAPHICS) 127 WebCore::PlatformDisplayID m_displayID; 128 129-#if PLATFORM(GTK) 130+#if PLATFORM(GTK) && USE(COORDINATED_GRAPHICS) 131 bool m_transientZoom { false }; 132 double m_transientZoomScale { 1 }; 133 WebCore::FloatPoint m_transientZoomOrigin; 134