Attachment 356698 Details for Bug 191997 – Patch

[patch] Patch

bug-191997-20181206042815.patch (text/plain), 4.99 KB, created by Carlos Bentzen on 2018-12-05 19:28:17 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Bentzen

Created: 2018-12-05 19:28:17 PST

Size: 4.99 KB

patch

obsolete

>Subversion Revision: 238917
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d3e4d463aae9ad658212c0272f99687a3d77b2f3..afb02d7db945bb2672f6e42137d711e97a659297 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-05  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>+        REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
>+        https://bugs.webkit.org/show_bug.cgi?id=191997
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix build with -DENABLE_OPENGL=OFF and -DENABLE_VIDEO=OFF.
>+
>+        No new tests required. Only fixing build.
>+
>+        * platform/gtk/PlatformWheelEventGtk.cpp:
>+        (WebCore::PlatformWheelEvent::PlatformWheelEvent): add required #if ENABLE(ASYNC_SCROLLING)
>+
> 2018-12-05  Don Olmstead  <don.olmstead@sony.com>
> 
>         [PlayStation] Enable WebCore
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index bc6fa2fce937a4b68e11d965aa7b486ca78a36ae..761377ba3116de361aeaf1d340f91c86989397f5 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-12-05  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>+        REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
>+        https://bugs.webkit.org/show_bug.cgi?id=191997
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix build with -DENABLE_OPENGL=OFF and -DENABLE_VIDEO=OFF.
>+
>+        * Shared/WebEventConversion.cpp:
>+        (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent): add required #if ENABLE(ASYNC_SCROLLING)
>+
> 2018-12-05  Chris Dumez  <cdumez@apple.com>
> 
>         Simplify logic inside WebPageProxy::continueNavigationInNewProcess()
>diff --git a/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp
>index 311a6b4e5970f1a03406601b2feaaafafc850322..b96ee0706554d70098b606aa1059f259fb015eb3 100644
>--- a/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp
>+++ b/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp
>@@ -87,6 +87,7 @@ PlatformWheelEvent::PlatformWheelEvent(GdkEventScroll* event)
>     m_wheelTicksX = m_deltaX;
>     m_wheelTicksY = m_deltaY;
> 
>+#if ENABLE(ASYNC_SCROLLING)
> #ifndef GTK_API_VERSION_2
> #if GTK_CHECK_VERSION(3, 20, 0)
>     m_phase = event->is_stop ?
>@@ -100,6 +101,7 @@ PlatformWheelEvent::PlatformWheelEvent(GdkEventScroll* event)
> #else
>     m_phase = PlatformWheelEventPhaseChanged;
> #endif // GTK_API_VERSION_2
>+#endif // ENABLE(ASYNC_SCROLLING)
> 
>     m_position = IntPoint(static_cast<int>(event->x), static_cast<int>(event->y));
>     m_globalPosition = IntPoint(static_cast<int>(event->x_root), static_cast<int>(event->y_root));
>diff --git a/Source/WebKit/Shared/WebEventConversion.cpp b/Source/WebKit/Shared/WebEventConversion.cpp
>index 8e6b5d9f017b3669d397e85ed5f893f90f28c204..cf27bffde0214570e7c1e17e5959c970db022488 100644
>--- a/Source/WebKit/Shared/WebEventConversion.cpp
>+++ b/Source/WebKit/Shared/WebEventConversion.cpp
>@@ -157,7 +157,7 @@ public:
>         m_wheelTicksY = webEvent.wheelTicks().height();
>         m_granularity = (webEvent.granularity() == WebWheelEvent::ScrollByPageWheelEvent) ? WebCore::ScrollByPageWheelEvent : WebCore::ScrollByPixelWheelEvent;
>         m_directionInvertedFromDevice = webEvent.directionInvertedFromDevice();
>-#if PLATFORM(COCOA) || PLATFORM(GTK)
>+#if (PLATFORM(COCOA) || PLATFORM(GTK)) && ENABLE(ASYNC_SCROLLING)
>         m_phase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.phase());
>         m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.momentumPhase());
> #endif
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 3f0d37d60b638cf1979426d222229098590282ab..eefe02e31b1395957f010a4661478f6239e53b3a 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -95,6 +95,7 @@ WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
> 
> WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL)
> WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_OPENGL)
>+WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_OPENGL)
> WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL)
> WEBKIT_OPTION_DEPEND(ENABLE_PLUGIN_PROCESS_GTK2 ENABLE_X11_TARGET)
> WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
>diff --git a/ChangeLog b/ChangeLog
>index 3efe87583e2dd810aa6e881747dad9474441244a..fb8f4c4b4fe788d988e49b7305683a74f19e41c6 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-12-05  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
>+
>+        REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
>+        https://bugs.webkit.org/show_bug.cgi?id=191997
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix build with -DENABLE_OPENGL=OFF and -DENABLE_VIDEO=OFF
>+
>+        * Source/cmake/OptionsGTK.cmake: make ENABLE_ASYNC_SCROLLING depend on ENABLE_OPENGL
>+
> 2018-12-05  Don Olmstead  <don.olmstead@sony.com>
> 
>         [PlayStation] Enable WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 191997: 356698