Title: [209742] tags/Safari-603.1.15.1
- Revision
- 209742
- Author
- matthew_han...@apple.com
- Date
- 2016-12-12 16:23:38 -0800 (Mon, 12 Dec 2016)
Log Message
Merge r209479. rdar://problem/29502055
Modified Paths
Diff
Modified: tags/Safari-603.1.15.1/Source/WebKit2/ChangeLog (209741 => 209742)
--- tags/Safari-603.1.15.1/Source/WebKit2/ChangeLog 2016-12-13 00:21:40 UTC (rev 209741)
+++ tags/Safari-603.1.15.1/Source/WebKit2/ChangeLog 2016-12-13 00:23:38 UTC (rev 209742)
@@ -1,3 +1,20 @@
+2016-12-12 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r209479. rdar://problem/29502055
+
+ 2016-12-07 Simon Fraser <simon.fra...@apple.com>
+
+ Fix use of enum in a WK2 C SPI header.
+ rdar://problem/28725583
+
+ Reviewed by Dan Bernstein.
+
+ Use correct enum style for a C SPI header and fix the callers.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetEventThrottlingBehaviorOverride):
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+
2016-12-07 Philippe Normand <pnorm...@igalia.com>
Unreviewed, GTK build fix after r209407.
Modified: tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (209741 => 209742)
--- tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-12-13 00:21:40 UTC (rev 209741)
+++ tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-12-13 00:23:38 UTC (rev 209742)
@@ -693,7 +693,7 @@
return toAPI(&API::Array::create(WTFMove(originIdentifiers)).leakRef());
}
-void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef page, EventThrottlingBehavior* behavior)
+void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef page, WKEventThrottlingBehavior* behavior)
{
std::optional<WebCore::EventThrottlingBehavior> behaviorValue;
if (behavior) {
Modified: tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (209741 => 209742)
--- tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-12-13 00:21:40 UTC (rev 209741)
+++ tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-12-13 00:23:38 UTC (rev 209742)
@@ -111,13 +111,16 @@
WK_EXPORT void WKBundlePageResetApplicationCacheOriginQuota(WKBundlePageRef page, WKStringRef origin);
WK_EXPORT WKArrayRef WKBundlePageCopyOriginsWithApplicationCache(WKBundlePageRef page);
-enum EventThrottlingBehavior {
- EventThrottlingBehaviorResponsive,
+enum {
+ EventThrottlingBehaviorResponsive = 0,
EventThrottlingBehaviorUnresponsive
};
-WK_EXPORT void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef, EventThrottlingBehavior*);
+typedef uint32_t WKEventThrottlingBehavior;
+// Passing null in the second parameter clears the override.
+WK_EXPORT void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef, WKEventThrottlingBehavior*);
+
#if TARGET_OS_IPHONE
WK_EXPORT void WKBundlePageSetUseTestingViewportConfiguration(WKBundlePageRef, bool);
#endif
Modified: tags/Safari-603.1.15.1/Tools/ChangeLog (209741 => 209742)
--- tags/Safari-603.1.15.1/Tools/ChangeLog 2016-12-13 00:21:40 UTC (rev 209741)
+++ tags/Safari-603.1.15.1/Tools/ChangeLog 2016-12-13 00:23:38 UTC (rev 209742)
@@ -1,3 +1,19 @@
+2016-12-12 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r209479. rdar://problem/29502055
+
+ 2016-12-07 Simon Fraser <simon.fra...@apple.com>
+
+ Fix use of enum in a WK2 C SPI header.
+ rdar://problem/28725583
+
+ Reviewed by Dan Bernstein.
+
+ Use correct enum style for a C SPI header and fix the callers.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::prepare):
+
2016-12-07 Philippe Normand <pnorm...@igalia.com>
[GTK][jhbuild] missing dependency on libvpx in gst-plugins-good
Modified: tags/Safari-603.1.15.1/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (209741 => 209742)
--- tags/Safari-603.1.15.1/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-12-13 00:21:40 UTC (rev 209741)
+++ tags/Safari-603.1.15.1/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-12-13 00:23:38 UTC (rev 209742)
@@ -416,7 +416,7 @@
WKBundlePageSetTracksRepaints(m_page, false);
// Force consistent "responsive" behavior for WebPage::eventThrottlingDelay() for testing. Tests can override via internals.
- EventThrottlingBehavior behavior = EventThrottlingBehaviorResponsive;
+ WKEventThrottlingBehavior behavior = EventThrottlingBehaviorResponsive;
WKBundlePageSetEventThrottlingBehaviorOverride(m_page, &behavior);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
