Title: [209743] tags/Safari-603.1.15.1
- Revision
- 209743
- Author
- [email protected]
- Date
- 2016-12-12 16:23:42 -0800 (Mon, 12 Dec 2016)
Log Message
Merge r209485. rdar://problem/29502055
Modified Paths
Diff
Modified: tags/Safari-603.1.15.1/Source/WebKit2/ChangeLog (209742 => 209743)
--- tags/Safari-603.1.15.1/Source/WebKit2/ChangeLog 2016-12-13 00:23:38 UTC (rev 209742)
+++ tags/Safari-603.1.15.1/Source/WebKit2/ChangeLog 2016-12-13 00:23:42 UTC (rev 209743)
@@ -1,5 +1,20 @@
2016-12-12 Matthew Hanson <[email protected]>
+ Merge r209485. rdar://problem/29502055
+
+ 2016-12-07 Simon Fraser <[email protected]>
+
+ Fix use of enum in a WK2 C SPI header.
+ rdar://problem/28725583
+
+ Followup to correctly prefix the enum values.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetEventThrottlingBehaviorOverride):
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+
+2016-12-12 Matthew Hanson <[email protected]>
+
Merge r209479. rdar://problem/29502055
2016-12-07 Simon Fraser <[email protected]>
Modified: tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (209742 => 209743)
--- tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-12-13 00:23:38 UTC (rev 209742)
+++ tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-12-13 00:23:42 UTC (rev 209743)
@@ -698,10 +698,10 @@
std::optional<WebCore::EventThrottlingBehavior> behaviorValue;
if (behavior) {
switch (*behavior) {
- case EventThrottlingBehaviorResponsive:
+ case kWKEventThrottlingBehaviorResponsive:
behaviorValue = WebCore::EventThrottlingBehavior::Responsive;
break;
- case EventThrottlingBehaviorUnresponsive:
+ case kWKEventThrottlingBehaviorUnresponsive:
behaviorValue = WebCore::EventThrottlingBehavior::Unresponsive;
break;
}
Modified: tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (209742 => 209743)
--- tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-12-13 00:23:38 UTC (rev 209742)
+++ tags/Safari-603.1.15.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-12-13 00:23:42 UTC (rev 209743)
@@ -112,8 +112,8 @@
WK_EXPORT WKArrayRef WKBundlePageCopyOriginsWithApplicationCache(WKBundlePageRef page);
enum {
- EventThrottlingBehaviorResponsive = 0,
- EventThrottlingBehaviorUnresponsive
+ kWKEventThrottlingBehaviorResponsive = 0,
+ kWKEventThrottlingBehaviorUnresponsive
};
typedef uint32_t WKEventThrottlingBehavior;
Modified: tags/Safari-603.1.15.1/Tools/ChangeLog (209742 => 209743)
--- tags/Safari-603.1.15.1/Tools/ChangeLog 2016-12-13 00:23:38 UTC (rev 209742)
+++ tags/Safari-603.1.15.1/Tools/ChangeLog 2016-12-13 00:23:42 UTC (rev 209743)
@@ -1,5 +1,19 @@
2016-12-12 Matthew Hanson <[email protected]>
+ Merge r209485. rdar://problem/29502055
+
+ 2016-12-07 Simon Fraser <[email protected]>
+
+ Fix use of enum in a WK2 C SPI header.
+ rdar://problem/28725583
+
+ Followup to correctly prefix the enum values.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::prepare):
+
+2016-12-12 Matthew Hanson <[email protected]>
+
Merge r209479. rdar://problem/29502055
2016-12-07 Simon Fraser <[email protected]>
Modified: tags/Safari-603.1.15.1/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (209742 => 209743)
--- tags/Safari-603.1.15.1/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-12-13 00:23:38 UTC (rev 209742)
+++ tags/Safari-603.1.15.1/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-12-13 00:23:42 UTC (rev 209743)
@@ -416,7 +416,7 @@
WKBundlePageSetTracksRepaints(m_page, false);
// Force consistent "responsive" behavior for WebPage::eventThrottlingDelay() for testing. Tests can override via internals.
- WKEventThrottlingBehavior behavior = EventThrottlingBehaviorResponsive;
+ WKEventThrottlingBehavior behavior = kWKEventThrottlingBehaviorResponsive;
WKBundlePageSetEventThrottlingBehaviorOverride(m_page, &behavior);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
