Diff
Modified: trunk/Source/WebCore/ChangeLog (259324 => 259325)
--- trunk/Source/WebCore/ChangeLog 2020-04-01 00:09:44 UTC (rev 259324)
+++ trunk/Source/WebCore/ChangeLog 2020-04-01 00:12:10 UTC (rev 259325)
@@ -1,3 +1,15 @@
+2020-03-31 Don Olmstead <[email protected]>
+
+ [PlayStation] Fix build breaks after r259112
+ https://bugs.webkit.org/show_bug.cgi?id=209830
+
+ Unreviewed build fix.
+
+ Add USE(GLIB) guards around RunLoopSourcePriority usage.
+
+ * platform/ScrollAnimationKinetic.cpp:
+ (WebCore::ScrollAnimationKinetic::ScrollAnimationKinetic):
+
2020-03-31 Sihui Liu <[email protected]>
IndexedDB: destroy WebIDBServer when session is removed in network process
Modified: trunk/Source/WebCore/platform/ScrollAnimationKinetic.cpp (259324 => 259325)
--- trunk/Source/WebCore/platform/ScrollAnimationKinetic.cpp 2020-04-01 00:09:44 UTC (rev 259324)
+++ trunk/Source/WebCore/platform/ScrollAnimationKinetic.cpp 2020-04-01 00:12:10 UTC (rev 259325)
@@ -27,7 +27,10 @@
#include "ScrollAnimationKinetic.h"
#include "PlatformWheelEvent.h"
+
+#if USE(GLIB)
#include <wtf/glib/RunLoopSourcePriority.h>
+#endif
/*
* PerAxisData is a port of GtkKineticScrolling as of GTK+ 3.20,
@@ -111,7 +114,9 @@
, m_notifyPositionChangedFunction(WTFMove(notifyPositionChangedFunction))
, m_animationTimer(RunLoop::current(), this, &ScrollAnimationKinetic::animationTimerFired)
{
+#if USE(GLIB)
m_animationTimer.setPriority(WTF::RunLoopSourcePriority::DisplayRefreshMonitorTimer);
+#endif
}
ScrollAnimationKinetic::~ScrollAnimationKinetic() = default;
Modified: trunk/Source/WebKit/ChangeLog (259324 => 259325)
--- trunk/Source/WebKit/ChangeLog 2020-04-01 00:09:44 UTC (rev 259324)
+++ trunk/Source/WebKit/ChangeLog 2020-04-01 00:12:10 UTC (rev 259325)
@@ -1,3 +1,17 @@
+2020-03-31 Don Olmstead <[email protected]>
+
+ [PlayStation] Fix build breaks after r259112
+ https://bugs.webkit.org/show_bug.cgi?id=209830
+
+ Unreviewed build fix.
+
+ Replace PLATFORM(WPE) with USE(LIBWPE) within WebWheelEvent.
+
+ * Shared/WebEvent.h:
+ * Shared/WebWheelEvent.cpp:
+ (WebKit::WebWheelEvent::encode const):
+ (WebKit::WebWheelEvent::decode):
+
2020-03-31 Alex Christensen <[email protected]>
Send correct UserContentControllerIdentifier after using SPI WKWebpagePreferences._userContentController
Modified: trunk/Source/WebKit/Shared/WebEvent.h (259324 => 259325)
--- trunk/Source/WebKit/Shared/WebEvent.h 2020-04-01 00:09:44 UTC (rev 259324)
+++ trunk/Source/WebKit/Shared/WebEvent.h 2020-04-01 00:12:10 UTC (rev 259325)
@@ -205,7 +205,7 @@
WebWheelEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, const WebCore::FloatSize& delta, const WebCore::FloatSize& wheelTicks, Granularity, OptionSet<Modifier>, WallTime timestamp);
#if PLATFORM(COCOA)
WebWheelEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, const WebCore::FloatSize& delta, const WebCore::FloatSize& wheelTicks, Granularity, bool directionInvertedFromDevice, Phase, Phase momentumPhase, bool hasPreciseScrollingDeltas, uint32_t scrollCount, const WebCore::FloatSize& unacceleratedScrollingDelta, OptionSet<Modifier>, WallTime timestamp);
-#elif PLATFORM(GTK) || PLATFORM(WPE)
+#elif PLATFORM(GTK) || USE(LIBWPE)
WebWheelEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, const WebCore::FloatSize& delta, const WebCore::FloatSize& wheelTicks, Phase, Phase momentumPhase, Granularity, OptionSet<Modifier>, WallTime timestamp);
#endif
Modified: trunk/Source/WebKit/Shared/WebWheelEvent.cpp (259324 => 259325)
--- trunk/Source/WebKit/Shared/WebWheelEvent.cpp 2020-04-01 00:09:44 UTC (rev 259324)
+++ trunk/Source/WebKit/Shared/WebWheelEvent.cpp 2020-04-01 00:12:10 UTC (rev 259325)
@@ -65,7 +65,7 @@
{
ASSERT(isWheelEventType(type));
}
-#elif PLATFORM(GTK) || PLATFORM(WPE)
+#elif PLATFORM(GTK) || USE(LIBWPE)
WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Phase phase, Phase momentumPhase, Granularity granularity, OptionSet<Modifier> modifiers, WallTime timestamp)
: WebEvent(type, modifiers, timestamp)
, m_position(position)
@@ -91,7 +91,7 @@
encoder << m_wheelTicks;
encoder << m_granularity;
encoder << m_directionInvertedFromDevice;
-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
+#if PLATFORM(COCOA) || PLATFORM(GTK) || USE(LIBWPE)
encoder << m_phase;
encoder << m_momentumPhase;
#endif
@@ -118,7 +118,7 @@
return false;
if (!decoder.decode(t.m_directionInvertedFromDevice))
return false;
-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
+#if PLATFORM(COCOA) || PLATFORM(GTK) || USE(LIBWPE)
if (!decoder.decode(t.m_phase))
return false;
if (!decoder.decode(t.m_momentumPhase))
