1 files changed, 10 insertions, 19 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
index 15ac158bd..a165038eb 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WKBundleAPICast_h
-#define WKBundleAPICast_h
+#pragma once
 
 #include "WKSharedAPICast.h"
 #include "WKBundlePage.h"
@@ -33,32 +32,31 @@
 #include <WebCore/EditorInsertAction.h>
 #include <WebCore/TextAffinity.h>
 
-namespace WebCore {
-    class CSSStyleDeclaration;
-}
-
 namespace WebKit {
 
 class InjectedBundle;
 class InjectedBundleBackForwardList;
 class InjectedBundleBackForwardListItem;
+class InjectedBundleCSSStyleDeclarationHandle;
 class InjectedBundleDOMWindowExtension;
+class InjectedBundleFileHandle;
 class InjectedBundleHitTestResult;
 class InjectedBundleNavigationAction;
 class InjectedBundleNodeHandle;
 class InjectedBundleRangeHandle;
 class InjectedBundleScriptWorld;
 class PageBanner;
-class PageOverlay;
 class WebFrame;
 class WebInspector;
 class WebPage;
 class WebPageGroupProxy;
+class WebPageOverlay;
 
 WK_ADD_API_MAPPING(WKBundleBackForwardListItemRef, InjectedBundleBackForwardListItem)
 WK_ADD_API_MAPPING(WKBundleBackForwardListRef, InjectedBundleBackForwardList)
-WK_ADD_API_MAPPING(WKBundleCSSStyleDeclarationRef, WebCore::CSSStyleDeclaration)
+WK_ADD_API_MAPPING(WKBundleCSSStyleDeclarationRef, InjectedBundleCSSStyleDeclarationHandle)
 WK_ADD_API_MAPPING(WKBundleDOMWindowExtensionRef, InjectedBundleDOMWindowExtension)
+WK_ADD_API_MAPPING(WKBundleFileHandleRef, InjectedBundleFileHandle)
 WK_ADD_API_MAPPING(WKBundleFrameRef, WebFrame)
 WK_ADD_API_MAPPING(WKBundleHitTestResultRef, InjectedBundleHitTestResult)
 WK_ADD_API_MAPPING(WKBundleInspectorRef, WebInspector)
@@ -66,7 +64,7 @@ WK_ADD_API_MAPPING(WKBundleNavigationActionRef, InjectedBundleNavigationAction)
 WK_ADD_API_MAPPING(WKBundleNodeHandleRef, InjectedBundleNodeHandle)
 WK_ADD_API_MAPPING(WKBundlePageBannerRef, PageBanner)
 WK_ADD_API_MAPPING(WKBundlePageGroupRef, WebPageGroupProxy)
-WK_ADD_API_MAPPING(WKBundlePageOverlayRef, PageOverlay)
+WK_ADD_API_MAPPING(WKBundlePageOverlayRef, WebPageOverlay)
 WK_ADD_API_MAPPING(WKBundlePageRef, WebPage)
 WK_ADD_API_MAPPING(WKBundleRangeHandleRef, InjectedBundleRangeHandle)
 WK_ADD_API_MAPPING(WKBundleRef, InjectedBundle)
@@ -75,15 +73,12 @@ WK_ADD_API_MAPPING(WKBundleScriptWorldRef, InjectedBundleScriptWorld)
 inline WKInsertActionType toAPI(WebCore::EditorInsertAction action)
 {
     switch (action) {
-    case WebCore::EditorInsertActionTyped:
+    case WebCore::EditorInsertAction::Typed:
         return kWKInsertActionTyped;
-        break;
-    case WebCore::EditorInsertActionPasted:
+    case WebCore::EditorInsertAction::Pasted:
         return kWKInsertActionPasted;
-        break;
-    case WebCore::EditorInsertActionDropped:
+    case WebCore::EditorInsertAction::Dropped:
         return kWKInsertActionDropped;
-        break;
     }
     ASSERT_NOT_REACHED();
     return kWKInsertActionTyped;
@@ -94,15 +89,11 @@ inline WKAffinityType toAPI(WebCore::EAffinity affinity)
     switch (affinity) {
     case WebCore::UPSTREAM:
         return kWKAffinityUpstream;
-        break;
     case WebCore::DOWNSTREAM:
         return kWKAffinityDownstream;
-        break;
     }
     ASSERT_NOT_REACHED();
     return kWKAffinityUpstream;
 }
 
 } // namespace WebKit
-
-#endif // WKBundleAPICast_h