Title: [209485] trunk
- Revision
- 209485
- Author
- simon.fra...@apple.com
- Date
- 2016-12-07 14:51:21 -0800 (Wed, 07 Dec 2016)
Log Message
Fix use of enum in a WK2 C SPI header.
rdar://problem/28725583
Followup to correctly prefix the enum values.
Source/WebKit2:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetEventThrottlingBehaviorOverride):
* WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
Tools:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::prepare):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (209484 => 209485)
--- trunk/Source/WebKit2/ChangeLog 2016-12-07 22:47:06 UTC (rev 209484)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-07 22:51:21 UTC (rev 209485)
@@ -31,6 +31,17 @@
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-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.
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (209484 => 209485)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-12-07 22:47:06 UTC (rev 209484)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-12-07 22:51:21 UTC (rev 209485)
@@ -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: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (209484 => 209485)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-12-07 22:47:06 UTC (rev 209484)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2016-12-07 22:51:21 UTC (rev 209485)
@@ -112,8 +112,8 @@
WK_EXPORT WKArrayRef WKBundlePageCopyOriginsWithApplicationCache(WKBundlePageRef page);
enum {
- EventThrottlingBehaviorResponsive = 0,
- EventThrottlingBehaviorUnresponsive
+ kWKEventThrottlingBehaviorResponsive = 0,
+ kWKEventThrottlingBehaviorUnresponsive
};
typedef uint32_t WKEventThrottlingBehavior;
Modified: trunk/Tools/ChangeLog (209484 => 209485)
--- trunk/Tools/ChangeLog 2016-12-07 22:47:06 UTC (rev 209484)
+++ trunk/Tools/ChangeLog 2016-12-07 22:51:21 UTC (rev 209485)
@@ -21,6 +21,16 @@
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-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.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (209484 => 209485)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-12-07 22:47:06 UTC (rev 209484)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-12-07 22:51:21 UTC (rev 209485)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
