Fix use of enum in a WK2 C SPI header.
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2016 22:51:21 +0000 (22:51 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2016 22:51:21 +0000 (22:51 +0000)
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

index ca2edc4..98875c2 100644 (file)
         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.fraser@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.
index 3bf2647..8059ad5 100644 (file)
@@ -698,10 +698,10 @@ void WKBundlePageSetEventThrottlingBehaviorOverride(WKBundlePageRef page, WKEven
     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;
         }
index 22ef040..4fed6e7 100644 (file)
@@ -112,8 +112,8 @@ WK_EXPORT void WKBundlePageResetApplicationCacheOriginQuota(WKBundlePageRef page
 WK_EXPORT WKArrayRef WKBundlePageCopyOriginsWithApplicationCache(WKBundlePageRef page);
 
 enum {
-    EventThrottlingBehaviorResponsive = 0,
-    EventThrottlingBehaviorUnresponsive
+    kWKEventThrottlingBehaviorResponsive = 0,
+    kWKEventThrottlingBehaviorUnresponsive
 };
 
 typedef uint32_t WKEventThrottlingBehavior;
index 6038a19..d486304 100644 (file)
         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.fraser@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.
index 09bcf10..dd79366 100644 (file)
@@ -416,7 +416,7 @@ void InjectedBundlePage::prepare()
     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);
 }