Title: [238998] releases/WebKitGTK/webkit-2.22
- Revision
- 238998
- Author
- [email protected]
- Date
- 2018-12-07 17:19:46 -0800 (Fri, 07 Dec 2018)
Log Message
Merge r238928 - REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
https://bugs.webkit.org/show_bug.cgi?id=191997
Patch by Carlos Eduardo Ramalho <[email protected]> on 2018-12-06
Reviewed by Philippe Normand.
.:
Fix build with -DENABLE_OPENGL=OFF and -DENABLE_VIDEO=OFF
* Source/cmake/OptionsGTK.cmake: make ENABLE_ASYNC_SCROLLING depend on ENABLE_OPENGL
Source/WebCore:
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)
Source/WebKit:
Fix build with -DENABLE_OPENGL=OFF and -DENABLE_VIDEO=OFF.
* Shared/WebEventConversion.cpp:
(WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent): add required #if ENABLE(ASYNC_SCROLLING)
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/ChangeLog (238997 => 238998)
--- releases/WebKitGTK/webkit-2.22/ChangeLog 2018-12-08 01:12:57 UTC (rev 238997)
+++ releases/WebKitGTK/webkit-2.22/ChangeLog 2018-12-08 01:19:46 UTC (rev 238998)
@@ -1,3 +1,14 @@
+2018-12-06 Carlos Eduardo Ramalho <[email protected]>
+
+ REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=191997
+
+ Reviewed by Philippe Normand.
+
+ Fix build with -DENABLE_OPENGL=OFF and -DENABLE_VIDEO=OFF
+
+ * Source/cmake/OptionsGTK.cmake: make ENABLE_ASYNC_SCROLLING depend on ENABLE_OPENGL
+
2018-11-21 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for 2.22.2 release.
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (238997 => 238998)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-12-08 01:12:57 UTC (rev 238997)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog 2018-12-08 01:19:46 UTC (rev 238998)
@@ -1,3 +1,17 @@
+2018-12-06 Carlos Eduardo Ramalho <[email protected]>
+
+ REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=191997
+
+ Reviewed by Philippe Normand.
+
+ 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-01 Brent Fulgham <[email protected]>
Lifetime of HTMLMediaElement is not properly handled in asynchronous actions
Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp (238997 => 238998)
--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp 2018-12-08 01:12:57 UTC (rev 238997)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp 2018-12-08 01:19:46 UTC (rev 238998)
@@ -87,6 +87,7 @@
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 @@
#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));
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (238997 => 238998)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-12-08 01:12:57 UTC (rev 238997)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-12-08 01:19:46 UTC (rev 238998)
@@ -1,3 +1,15 @@
+2018-12-06 Carlos Eduardo Ramalho <[email protected]>
+
+ REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
+ https://bugs.webkit.org/show_bug.cgi?id=191997
+
+ Reviewed by Philippe Normand.
+
+ Fix build with -DENABLE_OPENGL=OFF and -DENABLE_VIDEO=OFF.
+
+ * Shared/WebEventConversion.cpp:
+ (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent): add required #if ENABLE(ASYNC_SCROLLING)
+
2018-09-19 Chris Dumez <[email protected]>
Crash under WebPageProxy::decidePolicyForNavigationAction()
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/WebEventConversion.cpp (238997 => 238998)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/WebEventConversion.cpp 2018-12-08 01:12:57 UTC (rev 238997)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/WebEventConversion.cpp 2018-12-08 01:19:46 UTC (rev 238998)
@@ -157,7 +157,7 @@
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
Modified: releases/WebKitGTK/webkit-2.22/Source/cmake/OptionsGTK.cmake (238997 => 238998)
--- releases/WebKitGTK/webkit-2.22/Source/cmake/OptionsGTK.cmake 2018-12-08 01:12:57 UTC (rev 238997)
+++ releases/WebKitGTK/webkit-2.22/Source/cmake/OptionsGTK.cmake 2018-12-08 01:19:46 UTC (rev 238998)
@@ -95,6 +95,7 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
