API::Object::Type should be a strongly typed enum
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Nov 2013 16:19:55 +0000 (16:19 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Nov 2013 16:19:55 +0000 (16:19 +0000)
https://bugs.webkit.org/show_bug.cgi?id=124258

Reviewed by Tim Horton.

* Shared/API/Cocoa/WKRemoteObjectRegistry.mm:
(-[WKRemoteObjectRegistry _handleMessageWithName:body:]):
* Shared/APIObject.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
* Shared/ImmutableArray.h:
* Shared/ImmutableDictionary.h:
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebArchive.h:
* Shared/WebArchiveResource.h:
* Shared/WebBackForwardListItem.h:
* Shared/WebCertificateInfo.h:
* Shared/WebConnection.h:
* Shared/WebContextMenuItem.h:
* Shared/WebData.h:
* Shared/WebError.h:
* Shared/WebGeolocationPosition.h:
* Shared/WebGeometry.h:
* Shared/WebGraphicsContext.h:
* Shared/WebHitTestResult.h:
* Shared/WebImage.h:
* Shared/WebNumber.h:
* Shared/WebOpenPanelParameters.h:
* Shared/WebRenderLayer.h:
* Shared/WebRenderObject.h:
* Shared/WebSecurityOrigin.h:
* Shared/WebSerializedScriptValue.h:
* Shared/WebString.h:
* Shared/WebURL.h:
* Shared/WebURLRequest.h:
* Shared/WebURLResponse.h:
* Shared/WebUserContentURLPattern.h:
* Shared/mac/ObjCObjectGraph.h:
* UIProcess/Authentication/AuthenticationChallengeProxy.h:
* UIProcess/Authentication/AuthenticationDecisionListener.h:
* UIProcess/Authentication/WebCredential.h:
* UIProcess/Authentication/WebProtectionSpace.h:
* UIProcess/Downloads/DownloadProxy.h:
* UIProcess/GeolocationPermissionRequestProxy.h:
* UIProcess/Notifications/NotificationPermissionRequest.h:
* UIProcess/Notifications/WebNotification.h:
* UIProcess/Notifications/WebNotificationManagerProxy.h:
* UIProcess/Plugins/WebPluginSiteDataManager.h:
* UIProcess/WebApplicationCacheManagerProxy.h:
* UIProcess/WebBackForwardList.h:
* UIProcess/WebColorPickerResultListenerProxy.h:
* UIProcess/WebContext.h:
* UIProcess/WebContextUserMessageCoders.h:
(WebKit::WebContextUserMessageEncoder::encode):
(WebKit::WebContextUserMessageDecoder::decode):
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebEditCommandProxy.h:
* UIProcess/WebFormSubmissionListenerProxy.h:
* UIProcess/WebFramePolicyListenerProxy.h:
* UIProcess/WebFrameProxy.h:
* UIProcess/WebGeolocationManagerProxy.h:
* UIProcess/WebGrammarDetail.h:
* UIProcess/WebIconDatabase.h:
* UIProcess/WebInspectorProxy.h:
* UIProcess/WebKeyValueStorageManager.h:
* UIProcess/WebMediaCacheManagerProxy.h:
* UIProcess/WebNavigationData.h:
* UIProcess/WebOpenPanelResultListenerProxy.h:
* UIProcess/WebOriginDataManagerProxy.h:
* UIProcess/WebPageGroup.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPreferences.h:
* UIProcess/WebResourceCacheManagerProxy.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
* WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/InjectedBundle/InjectedBundleBackForwardList.h:
* WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h:
* WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h:
* WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
* WebProcess/InjectedBundle/InjectedBundleNavigationAction.h:
* WebProcess/InjectedBundle/InjectedBundleScriptWorld.h:
* WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
(WebKit::InjectedBundleUserMessageEncoder::encode):
(WebKit::InjectedBundleUserMessageDecoder::decode):
* WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
(WebKit::InjectedBundle::load):
* WebProcess/WebPage/PageBanner.h:
* WebProcess/WebPage/PageOverlay.h:
* WebProcess/WebPage/WebFrame.h:
* WebProcess/WebPage/WebInspector.h:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPageGroupProxy.h:
* WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
(-[WKAccessibilityWebPageObject accessibilityParameterizedAttributeNames]):
(-[WKAccessibilityWebPageObject accessibilityAttributeValue:forParameter:]):

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

84 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.mm
Source/WebKit2/Shared/APIObject.h
Source/WebKit2/Shared/Cocoa/APIObject.mm
Source/WebKit2/Shared/ImmutableArray.h
Source/WebKit2/Shared/ImmutableDictionary.h
Source/WebKit2/Shared/UserMessageCoders.h
Source/WebKit2/Shared/WebArchive.h
Source/WebKit2/Shared/WebArchiveResource.h
Source/WebKit2/Shared/WebBackForwardListItem.h
Source/WebKit2/Shared/WebCertificateInfo.h
Source/WebKit2/Shared/WebConnection.h
Source/WebKit2/Shared/WebContextMenuItem.h
Source/WebKit2/Shared/WebData.h
Source/WebKit2/Shared/WebError.h
Source/WebKit2/Shared/WebGeolocationPosition.h
Source/WebKit2/Shared/WebGeometry.h
Source/WebKit2/Shared/WebGraphicsContext.h
Source/WebKit2/Shared/WebHitTestResult.h
Source/WebKit2/Shared/WebImage.h
Source/WebKit2/Shared/WebNumber.h
Source/WebKit2/Shared/WebOpenPanelParameters.h
Source/WebKit2/Shared/WebRenderLayer.h
Source/WebKit2/Shared/WebRenderObject.h
Source/WebKit2/Shared/WebSecurityOrigin.h
Source/WebKit2/Shared/WebSerializedScriptValue.h
Source/WebKit2/Shared/WebString.h
Source/WebKit2/Shared/WebURL.h
Source/WebKit2/Shared/WebURLRequest.h
Source/WebKit2/Shared/WebURLResponse.h
Source/WebKit2/Shared/WebUserContentURLPattern.h
Source/WebKit2/Shared/mac/ObjCObjectGraph.h
Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h
Source/WebKit2/UIProcess/Authentication/AuthenticationDecisionListener.h
Source/WebKit2/UIProcess/Authentication/WebCredential.h
Source/WebKit2/UIProcess/Authentication/WebProtectionSpace.h
Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
Source/WebKit2/UIProcess/GeolocationPermissionRequestProxy.h
Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h
Source/WebKit2/UIProcess/Notifications/WebNotification.h
Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
Source/WebKit2/UIProcess/WebBackForwardList.h
Source/WebKit2/UIProcess/WebColorPickerResultListenerProxy.h
Source/WebKit2/UIProcess/WebContext.h
Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
Source/WebKit2/UIProcess/WebCookieManagerProxy.h
Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
Source/WebKit2/UIProcess/WebEditCommandProxy.h
Source/WebKit2/UIProcess/WebFormSubmissionListenerProxy.h
Source/WebKit2/UIProcess/WebFramePolicyListenerProxy.h
Source/WebKit2/UIProcess/WebFrameProxy.h
Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h
Source/WebKit2/UIProcess/WebGrammarDetail.h
Source/WebKit2/UIProcess/WebIconDatabase.h
Source/WebKit2/UIProcess/WebInspectorProxy.h
Source/WebKit2/UIProcess/WebKeyValueStorageManager.h
Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
Source/WebKit2/UIProcess/WebNavigationData.h
Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h
Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
Source/WebKit2/UIProcess/WebPageGroup.h
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/UIProcess/WebPreferences.h
Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h
Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardList.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm
Source/WebKit2/WebProcess/WebPage/PageBanner.h
Source/WebKit2/WebProcess/WebPage/PageOverlay.h
Source/WebKit2/WebProcess/WebPage/WebFrame.h
Source/WebKit2/WebProcess/WebPage/WebInspector.h
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm

index f09cdbd..a44bf94 100644 (file)
@@ -1,3 +1,105 @@
+2013-11-12  Anders Carlsson  <andersca@apple.com>
+
+        API::Object::Type should be a strongly typed enum
+        https://bugs.webkit.org/show_bug.cgi?id=124258
+
+        Reviewed by Tim Horton.
+
+        * Shared/API/Cocoa/WKRemoteObjectRegistry.mm:
+        (-[WKRemoteObjectRegistry _handleMessageWithName:body:]):
+        * Shared/APIObject.h:
+        * Shared/Cocoa/APIObject.mm:
+        (API::Object::newObject):
+        * Shared/ImmutableArray.h:
+        * Shared/ImmutableDictionary.h:
+        * Shared/UserMessageCoders.h:
+        (WebKit::UserMessageEncoder::baseEncode):
+        (WebKit::UserMessageDecoder::baseDecode):
+        * Shared/WebArchive.h:
+        * Shared/WebArchiveResource.h:
+        * Shared/WebBackForwardListItem.h:
+        * Shared/WebCertificateInfo.h:
+        * Shared/WebConnection.h:
+        * Shared/WebContextMenuItem.h:
+        * Shared/WebData.h:
+        * Shared/WebError.h:
+        * Shared/WebGeolocationPosition.h:
+        * Shared/WebGeometry.h:
+        * Shared/WebGraphicsContext.h:
+        * Shared/WebHitTestResult.h:
+        * Shared/WebImage.h:
+        * Shared/WebNumber.h:
+        * Shared/WebOpenPanelParameters.h:
+        * Shared/WebRenderLayer.h:
+        * Shared/WebRenderObject.h:
+        * Shared/WebSecurityOrigin.h:
+        * Shared/WebSerializedScriptValue.h:
+        * Shared/WebString.h:
+        * Shared/WebURL.h:
+        * Shared/WebURLRequest.h:
+        * Shared/WebURLResponse.h:
+        * Shared/WebUserContentURLPattern.h:
+        * Shared/mac/ObjCObjectGraph.h:
+        * UIProcess/Authentication/AuthenticationChallengeProxy.h:
+        * UIProcess/Authentication/AuthenticationDecisionListener.h:
+        * UIProcess/Authentication/WebCredential.h:
+        * UIProcess/Authentication/WebProtectionSpace.h:
+        * UIProcess/Downloads/DownloadProxy.h:
+        * UIProcess/GeolocationPermissionRequestProxy.h:
+        * UIProcess/Notifications/NotificationPermissionRequest.h:
+        * UIProcess/Notifications/WebNotification.h:
+        * UIProcess/Notifications/WebNotificationManagerProxy.h:
+        * UIProcess/Plugins/WebPluginSiteDataManager.h:
+        * UIProcess/WebApplicationCacheManagerProxy.h:
+        * UIProcess/WebBackForwardList.h:
+        * UIProcess/WebColorPickerResultListenerProxy.h:
+        * UIProcess/WebContext.h:
+        * UIProcess/WebContextUserMessageCoders.h:
+        (WebKit::WebContextUserMessageEncoder::encode):
+        (WebKit::WebContextUserMessageDecoder::decode):
+        * UIProcess/WebCookieManagerProxy.h:
+        * UIProcess/WebDatabaseManagerProxy.h:
+        * UIProcess/WebEditCommandProxy.h:
+        * UIProcess/WebFormSubmissionListenerProxy.h:
+        * UIProcess/WebFramePolicyListenerProxy.h:
+        * UIProcess/WebFrameProxy.h:
+        * UIProcess/WebGeolocationManagerProxy.h:
+        * UIProcess/WebGrammarDetail.h:
+        * UIProcess/WebIconDatabase.h:
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/WebKeyValueStorageManager.h:
+        * UIProcess/WebMediaCacheManagerProxy.h:
+        * UIProcess/WebNavigationData.h:
+        * UIProcess/WebOpenPanelResultListenerProxy.h:
+        * UIProcess/WebOriginDataManagerProxy.h:
+        * UIProcess/WebPageGroup.h:
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPreferences.h:
+        * UIProcess/WebResourceCacheManagerProxy.h:
+        * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h:
+        * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        * WebProcess/InjectedBundle/InjectedBundleBackForwardList.h:
+        * WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h:
+        * WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.h:
+        * WebProcess/InjectedBundle/InjectedBundleHitTestResult.h:
+        * WebProcess/InjectedBundle/InjectedBundleNavigationAction.h:
+        * WebProcess/InjectedBundle/InjectedBundleScriptWorld.h:
+        * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
+        (WebKit::InjectedBundleUserMessageEncoder::encode):
+        (WebKit::InjectedBundleUserMessageDecoder::decode):
+        * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WebKit::InjectedBundle::load):
+        * WebProcess/WebPage/PageBanner.h:
+        * WebProcess/WebPage/PageOverlay.h:
+        * WebProcess/WebPage/WebFrame.h:
+        * WebProcess/WebPage/WebInspector.h:
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPageGroupProxy.h:
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
+        (-[WKAccessibilityWebPageObject accessibilityParameterizedAttributeNames]):
+        (-[WKAccessibilityWebPageObject accessibilityAttributeValue:forParameter:]):
+
 2013-11-13  Anders Carlsson  <andersca@apple.com>
 
         Remove custom overhang area painting code
index b4d9cc7..a3588c6 100644 (file)
@@ -118,7 +118,7 @@ using namespace WebKit;
     if (toImpl(name)->string() != messageName)
         return NO;
 
-    if (!toImpl(body) || toImpl(body)->type() != API::Object::TypeDictionary)
+    if (!toImpl(body) || toImpl(body)->type() != API::Object::Type::Dictionary)
         return NO;
 
     const ImmutableDictionary* dictionary = toImpl(static_cast<WKDictionaryRef>(body));
index 4d1bfe5..7db3372 100644 (file)
@@ -46,115 +46,115 @@ class Object
 #endif
 {
 public:
-    enum Type {
+    enum class Type {
         // Base types
-        TypeNull = 0,
-        TypeArray,
-        TypeAuthenticationChallenge,
-        TypeAuthenticationDecisionListener,
-        TypeCertificateInfo,
-        TypeConnection,
-        TypeContextMenuItem,
-        TypeCredential,
-        TypeData,
-        TypeDictionary,
-        TypeError,
-        TypeGraphicsContext,
-        TypeImage,
-        TypeProtectionSpace,
-        TypeRenderLayer,
-        TypeRenderObject,
-        TypeSecurityOrigin,
-        TypeSerializedScriptValue,
-        TypeString,
-        TypeURL,
-        TypeURLRequest,
-        TypeURLResponse,
-        TypeUserContentURLPattern,
-        TypeWebArchive,
-        TypeWebArchiveResource,
+        Null = 0,
+        Array,
+        AuthenticationChallenge,
+        AuthenticationDecisionListener,
+        CertificateInfo,
+        Connection,
+        ContextMenuItem,
+        Credential,
+        Data,
+        Dictionary,
+        Error,
+        GraphicsContext,
+        Image,
+        ProtectionSpace,
+        RenderLayer,
+        RenderObject,
+        SecurityOrigin,
+        SerializedScriptValue,
+        String,
+        URL,
+        URLRequest,
+        URLResponse,
+        UserContentURLPattern,
+        WebArchive,
+        WebArchiveResource,
 
         // Base numeric types
-        TypeBoolean,
-        TypeDouble,
-        TypeUInt64,
+        Boolean,
+        Double,
+        UInt64,
         
         // Geometry types
-        TypePoint,
-        TypeSize,
-        TypeRect,
+        Point,
+        Size,
+        Rect,
         
         // UIProcess types
-        TypeApplicationCacheManager,
-        TypeBackForwardList,
-        TypeBackForwardListItem,
-        TypeBatteryManager,
-        TypeBatteryStatus,
-        TypeCacheManager,
-        TypeColorPickerResultListener,
-        TypeContext,
-        TypeCookieManager,
-        TypeDatabaseManager,
-        TypeDownload,
-        TypeFormSubmissionListener,
-        TypeFrame,
-        TypeFramePolicyListener,
-        TypeFullScreenManager,
-        TypeGeolocationManager,
-        TypeGeolocationPermissionRequest,
-        TypeHitTestResult,
-        TypeGeolocationPosition,
-        TypeGrammarDetail,
-        TypeIconDatabase,
-        TypeInspector,
-        TypeKeyValueStorageManager,
-        TypeMediaCacheManager,
-        TypeNavigationData,
-        TypeNetworkInfo,
-        TypeNetworkInfoManager,
-        TypeNotification,
-        TypeNotificationManager,
-        TypeNotificationPermissionRequest,
-        TypeOpenPanelParameters,
-        TypeOpenPanelResultListener,
-        TypeOriginDataManager,
-        TypePage,
-        TypePageGroup,
-        TypePluginSiteDataManager,
-        TypePreferences,
-        TypeTextChecker,
-        TypeVibration,
-        TypeViewportAttributes,
+        ApplicationCacheManager,
+        BackForwardList,
+        BackForwardListItem,
+        BatteryManager,
+        BatteryStatus,
+        CacheManager,
+        ColorPickerResultListener,
+        Context,
+        CookieManager,
+        DatabaseManager,
+        Download,
+        FormSubmissionListener,
+        Frame,
+        FramePolicyListener,
+        FullScreenManager,
+        GeolocationManager,
+        GeolocationPermissionRequest,
+        HitTestResult,
+        GeolocationPosition,
+        GrammarDetail,
+        IconDatabase,
+        Inspector,
+        KeyValueStorageManager,
+        MediaCacheManager,
+        NavigationData,
+        NetworkInfo,
+        NetworkInfoManager,
+        Notification,
+        NotificationManager,
+        NotificationPermissionRequest,
+        OpenPanelParameters,
+        OpenPanelResultListener,
+        OriginDataManager,
+        Page,
+        PageGroup,
+        PluginSiteDataManager,
+        Preferences,
+        TextChecker,
+        Vibration,
+        ViewportAttributes,
 
         // Bundle types
-        TypeBundle,
-        TypeBundleBackForwardList,
-        TypeBundleBackForwardListItem,
-        TypeBundleDOMWindowExtension,
-        TypeBundleFrame,
-        TypeBundleHitTestResult,
-        TypeBundleInspector,
-        TypeBundleNavigationAction,
-        TypeBundleNodeHandle,
-        TypeBundlePage,
-        TypeBundlePageBanner,
-        TypeBundlePageGroup,
-        TypeBundlePageOverlay,
-        TypeBundleRangeHandle,
-        TypeBundleScriptWorld,
+        Bundle,
+        BundleBackForwardList,
+        BundleBackForwardListItem,
+        BundleDOMWindowExtension,
+        BundleFrame,
+        BundleHitTestResult,
+        BundleInspector,
+        BundleNavigationAction,
+        BundleNodeHandle,
+        BundlePage,
+        BundlePageBanner,
+        BundlePageGroup,
+        BundlePageOverlay,
+        BundleRangeHandle,
+        BundleScriptWorld,
 
         // Platform specific
-        TypeEditCommandProxy,
-        TypeObjCObjectGraph,
-        TypeView,
+        EditCommandProxy,
+        ObjCObjectGraph,
+        View,
 #if USE(SOUP)
-        TypeSoupRequestManager,
+        SoupRequestManager,
 #endif
 #if PLATFORM(EFL)
-        TypePopupMenuItem,
+        PopupMenuItem,
 #if ENABLE(TOUCH_EVENTS)
-        TypeTouchPoint,
-        TypeTouchEvent,
+        TouchPoint,
+        TouchEvent,
 #endif
 #endif
     };
index 1cefa10..9f94b18 100644 (file)
@@ -57,31 +57,31 @@ void* Object::newObject(size_t size, Type type)
     // API::Object, so they are allocated using +alloc.
 
     switch (type) {
-    case TypeArray:
+    case Type::Array:
         wrapper = [WKNSArray alloc];
         break;
 
-    case TypeBackForwardList:
+    case Type::BackForwardList:
         wrapper = [WKBackForwardList alloc];
         break;
 
-    case TypeBackForwardListItem:
+    case Type::BackForwardListItem:
         wrapper = [WKBackForwardListItem alloc];
         break;
 
-    case TypeDictionary:
+    case Type::Dictionary:
         wrapper = [WKNSDictionary alloc];
         break;
 
-    case TypeNavigationData:
+    case Type::NavigationData:
         wrapper = [WKNavigationData alloc];
         break;
 
-    case TypeString:
+    case Type::String:
         wrapper = NSAllocateObject([WKNSString class], size, nullptr);
         break;
 
-    case TypeURL:
+    case Type::URL:
         wrapper = NSAllocateObject([WKNSURL class], size, nullptr);
         break;
 
index 91624f8..5782033 100644 (file)
@@ -35,7 +35,7 @@ namespace WebKit {
 
 // ImmutableArray - An immutable array type suitable for vending to an API.
 
-class ImmutableArray FINAL : public API::TypedObject<API::Object::TypeArray> {
+class ImmutableArray FINAL : public API::TypedObject<API::Object::Type::Array> {
 public:
     static PassRefPtr<ImmutableArray> create();
     static PassRefPtr<ImmutableArray> create(Vector<RefPtr<API::Object>> elements);
index 8924702..2ea7d3f 100644 (file)
@@ -38,7 +38,7 @@ class ImmutableArray;
 
 // ImmutableDictionary - An immutable dictionary type suitable for vending to an API.
 
-class ImmutableDictionary : public API::TypedObject<API::Object::TypeDictionary> {
+class ImmutableDictionary : public API::TypedObject<API::Object::Type::Dictionary> {
 public:
     typedef HashMap<String, RefPtr<API::Object>> MapType;
 
index 6e58c9f..113aa7a 100644 (file)
@@ -74,7 +74,7 @@ public:
     bool baseEncode(CoreIPC::ArgumentEncoder& encoder, API::Object::Type& type) const
     {
         if (!m_root) {
-            encoder << static_cast<uint32_t>(API::Object::TypeNull);
+            encoder << static_cast<uint32_t>(API::Object::Type::Null);
             return true;
         }
 
@@ -82,14 +82,14 @@ public:
         encoder << static_cast<uint32_t>(type);
 
         switch (type) {
-        case API::Object::TypeArray: {
+        case API::Object::Type::Array: {
             ImmutableArray* array = static_cast<ImmutableArray*>(m_root);
             encoder << static_cast<uint64_t>(array->size());
             for (size_t i = 0; i < array->size(); ++i)
                 encoder << Owner(array->at(i));
             return true;
         }
-        case API::Object::TypeDictionary: {
+        case API::Object::Type::Dictionary: {
             ImmutableDictionary* dictionary = static_cast<ImmutableDictionary*>(m_root);
             const ImmutableDictionary::MapType& map = dictionary->map();
             encoder << static_cast<uint64_t>(map.size());
@@ -102,44 +102,44 @@ public:
             }
             return true;
         }
-        case API::Object::TypeString: {
+        case API::Object::Type::String: {
             WebString* string = static_cast<WebString*>(m_root);
             encoder << string->string();
             return true;
         }
-        case API::Object::TypeSerializedScriptValue: {
+        case API::Object::Type::SerializedScriptValue: {
             WebSerializedScriptValue* scriptValue = static_cast<WebSerializedScriptValue*>(m_root);
             encoder << scriptValue->dataReference();
             return true;
         }
-        case API::Object::TypeBoolean: {
+        case API::Object::Type::Boolean: {
             WebBoolean* booleanObject = static_cast<WebBoolean*>(m_root);
             encoder << booleanObject->value();
             return true;
         }
-        case API::Object::TypeDouble: {
+        case API::Object::Type::Double: {
             WebDouble* doubleObject = static_cast<WebDouble*>(m_root);
             encoder << doubleObject->value();
             return true;
         }
-        case API::Object::TypeUInt64: {
+        case API::Object::Type::UInt64: {
             WebUInt64* uint64Object = static_cast<WebUInt64*>(m_root);
             encoder << uint64Object->value();
             return true;
         }
-        case API::Object::TypePoint: {
+        case API::Object::Type::Point: {
             WebPoint* pointObject = static_cast<WebPoint*>(m_root);
             encoder << pointObject->point().x;
             encoder << pointObject->point().y;
             return true;
         }
-        case API::Object::TypeSize: {
+        case API::Object::Type::Size: {
             WebSize* sizeObject = static_cast<WebSize*>(m_root);
             encoder << sizeObject->size().width;
             encoder << sizeObject->size().height;
             return true;
         }
-        case API::Object::TypeRect: {
+        case API::Object::Type::Rect: {
             WebRect* rectObject = static_cast<WebRect*>(m_root);
             encoder << rectObject->rect().origin.x;
             encoder << rectObject->rect().origin.y;
@@ -147,7 +147,7 @@ public:
             encoder << rectObject->rect().size.height;
             return true;
         }
-        case API::Object::TypeRenderLayer: {
+        case API::Object::Type::RenderLayer: {
             WebRenderLayer* renderLayer = static_cast<WebRenderLayer*>(m_root);
             encoder << Owner(renderLayer->renderer());
             encoder << renderLayer->isReflection();
@@ -160,7 +160,7 @@ public:
             encoder << Owner(renderLayer->positiveZOrderList());
             return true;
         }
-        case API::Object::TypeRenderObject: {
+        case API::Object::Type::RenderObject: {
             WebRenderObject* renderObject = static_cast<WebRenderObject*>(m_root);
             encoder << renderObject->name();
             encoder << renderObject->elementTagName();
@@ -171,27 +171,27 @@ public:
             encoder << Owner(renderObject->children().get());
             return true;
         }
-        case API::Object::TypeURL: {
+        case API::Object::Type::URL: {
             WebURL* urlObject = static_cast<WebURL*>(m_root);
             encoder << urlObject->string();
             return true;
         }
-        case API::Object::TypeURLRequest: {
+        case API::Object::Type::URLRequest: {
             WebURLRequest* urlRequestObject = static_cast<WebURLRequest*>(m_root);
             encoder << urlRequestObject->resourceRequest();
             return true;
         }
-        case API::Object::TypeURLResponse: {
+        case API::Object::Type::URLResponse: {
             WebURLResponse* urlResponseObject = static_cast<WebURLResponse*>(m_root);
             encoder << urlResponseObject->resourceResponse();
             return true;
         }
-        case API::Object::TypeUserContentURLPattern: {
+        case API::Object::Type::UserContentURLPattern: {
             WebUserContentURLPattern* urlPattern = static_cast<WebUserContentURLPattern*>(m_root);
             encoder << urlPattern->patternString();
             return true;
         }
-        case API::Object::TypeImage: {
+        case API::Object::Type::Image: {
             WebImage* image = static_cast<WebImage*>(m_root);
 
             ShareableBitmap::Handle handle;
@@ -208,17 +208,17 @@ public:
             encoder << handle;
             return true;
         }
-        case API::Object::TypeData: {
+        case API::Object::Type::Data: {
             WebData* data = static_cast<WebData*>(m_root);
             encoder << data->dataReference();
             return true;
         }
-        case API::Object::TypeCertificateInfo: {
+        case API::Object::Type::CertificateInfo: {
             WebCertificateInfo* certificateInfo = static_cast<WebCertificateInfo*>(m_root);
             encoder << certificateInfo->platformCertificateInfo();
             return true;
         }
-        case API::Object::TypeError: {
+        case API::Object::Type::Error: {
             WebError* errorObject = static_cast<WebError*>(m_root);
             encoder << errorObject->platformError();
             return true;
@@ -269,7 +269,7 @@ public:
         type = static_cast<API::Object::Type>(typeAsUInt32);
 
         switch (type) {
-        case API::Object::TypeArray: {
+        case API::Object::Type::Array: {
             uint64_t size;
             if (!decoder.decode(size))
                 return false;
@@ -286,7 +286,7 @@ public:
             coder.m_root = ImmutableArray::create(std::move(vector));
             break;
         }
-        case API::Object::TypeDictionary: {
+        case API::Object::Type::Dictionary: {
             uint64_t size;
             if (!decoder.decode(size))
                 return false;
@@ -310,14 +310,14 @@ public:
             coder.m_root = ImmutableDictionary::adopt(map);
             break;
         }
-        case API::Object::TypeString: {
+        case API::Object::Type::String: {
             String string;
             if (!decoder.decode(string))
                 return false;
             coder.m_root = WebString::create(string);
             break;
         }
-        case API::Object::TypeSerializedScriptValue: {
+        case API::Object::Type::SerializedScriptValue: {
             CoreIPC::DataReference dataReference;
             if (!decoder.decode(dataReference))
                 return false;
@@ -326,28 +326,28 @@ public:
             coder.m_root = WebSerializedScriptValue::adopt(vector);
             break;
         }
-        case API::Object::TypeDouble: {
+        case API::Object::Type::Double: {
             double value;
             if (!decoder.decode(value))
                 return false;
             coder.m_root = WebDouble::create(value);
             break;
         }
-        case API::Object::TypeUInt64: {
+        case API::Object::Type::UInt64: {
             uint64_t value;
             if (!decoder.decode(value))
                 return false;
             coder.m_root = WebUInt64::create(value);
             break;
         }
-        case API::Object::TypeBoolean: {
+        case API::Object::Type::Boolean: {
             bool value;
             if (!decoder.decode(value))
                 return false;
             coder.m_root = WebBoolean::create(value);
             break;
         }
-        case API::Object::TypeSize: {
+        case API::Object::Type::Size: {
             double width;
             double height;
             if (!decoder.decode(width))
@@ -357,7 +357,7 @@ public:
             coder.m_root = WebSize::create(WKSizeMake(width, height));
             break;
         }
-        case API::Object::TypePoint: {
+        case API::Object::Type::Point: {
             double x;
             double y;
             if (!decoder.decode(x))
@@ -367,7 +367,7 @@ public:
             coder.m_root = WebPoint::create(WKPointMake(x, y));
             break;
         }
-        case API::Object::TypeRect: {
+        case API::Object::Type::Rect: {
             double x;
             double y;
             double width;
@@ -383,7 +383,7 @@ public:
             coder.m_root = WebRect::create(WKRectMake(x, y, width, height));
             break;
         }
-        case API::Object::TypeRenderLayer: {
+        case API::Object::Type::RenderLayer: {
             RefPtr<API::Object> renderer;
             bool isReflection;
             bool isClipping;
@@ -397,7 +397,7 @@ public:
             Owner rendererCoder(coder, renderer);
             if (!decoder.decode(rendererCoder))
                 return false;
-            if (renderer->type() != API::Object::TypeRenderObject)
+            if (renderer->type() != API::Object::Type::RenderObject)
                 return false;
             if (!decoder.decode(isReflection))
                 return false;
@@ -423,7 +423,7 @@ public:
                 static_pointer_cast<ImmutableArray>(positiveZOrderList));
             break;
         }
-        case API::Object::TypeRenderObject: {
+        case API::Object::Type::RenderObject: {
             String name;
             String elementTagName;
             String elementID;
@@ -448,40 +448,40 @@ public:
             Owner messageCoder(coder, children);
             if (!decoder.decode(messageCoder))
                 return false;
-            if (children && children->type() != API::Object::TypeArray)
+            if (children && children->type() != API::Object::Type::Array)
                 return false;
             coder.m_root = WebRenderObject::create(name, elementTagName, elementID, static_pointer_cast<ImmutableArray>(elementClassNames), absolutePosition, frameRect, static_pointer_cast<ImmutableArray>(children));
             break;
         }
-        case API::Object::TypeURL: {
+        case API::Object::Type::URL: {
             String string;
             if (!decoder.decode(string))
                 return false;
             coder.m_root = WebURL::create(string);
             break;
         }
-        case API::Object::TypeURLRequest: {
+        case API::Object::Type::URLRequest: {
             WebCore::ResourceRequest request;
             if (!decoder.decode(request))
                 return false;
             coder.m_root = WebURLRequest::create(request);
             break;
         }
-        case API::Object::TypeURLResponse: {
+        case API::Object::Type::URLResponse: {
             WebCore::ResourceResponse response;
             if (!decoder.decode(response))
                 return false;
             coder.m_root = WebURLResponse::create(response);
             break;
         }
-        case API::Object::TypeUserContentURLPattern: {
+        case API::Object::Type::UserContentURLPattern: {
             String string;
             if (!decoder.decode(string))
                 return false;
             coder.m_root = WebUserContentURLPattern::create(string);
             break;
         }
-        case API::Object::TypeImage: {
+        case API::Object::Type::Image: {
             bool didEncode = false;
             if (!decoder.decode(didEncode))
                 return false;
@@ -496,21 +496,21 @@ public:
             coder.m_root = WebImage::create(ShareableBitmap::create(handle));
             return true;
         }
-        case API::Object::TypeData: {
+        case API::Object::Type::Data: {
             CoreIPC::DataReference dataReference;
             if (!decoder.decode(dataReference))
                 return false;
             coder.m_root = WebData::create(dataReference.data(), dataReference.size());
             break;
         }
-        case API::Object::TypeCertificateInfo: {
+        case API::Object::Type::CertificateInfo: {
             PlatformCertificateInfo platformCertificateInfo;
             if (!decoder.decode(platformCertificateInfo))
                 return false;
             coder.m_root = WebCertificateInfo::create(platformCertificateInfo);
             break;
         }
-        case API::Object::TypeError: {
+        case API::Object::Type::Error: {
             WebCore::ResourceError resourceError;
             if (!decoder.decode(resourceError))
                 return false;
index 902ebda..76207d4 100644 (file)
@@ -43,7 +43,7 @@ class ImmutableArray;
 class WebArchiveResource;
 class WebData;
 
-class WebArchive : public API::TypedObject<API::Object::TypeWebArchive> {
+class WebArchive : public API::TypedObject<API::Object::Type::WebArchive> {
 public:
     virtual ~WebArchive();
 
index d9a13d6..34c7c73 100644 (file)
@@ -43,7 +43,7 @@ class WebData;
 class WebString;
 class WebURL;
 
-class WebArchiveResource : public API::TypedObject<API::Object::TypeWebArchiveResource> {
+class WebArchiveResource : public API::TypedObject<API::Object::Type::WebArchiveResource> {
 public:
     virtual ~WebArchiveResource();
 
index 5c303c3..c2ebf74 100644 (file)
@@ -37,7 +37,7 @@ namespace CoreIPC {
 
 namespace WebKit {
 
-class WebBackForwardListItem : public API::TypedObject<API::Object::TypeBackForwardListItem> {
+class WebBackForwardListItem : public API::TypedObject<API::Object::Type::BackForwardListItem> {
 public:
     static PassRefPtr<WebBackForwardListItem> create(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
     {
index 6d7d8fa..d3d35c7 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebKit {
 
-class WebCertificateInfo : public API::TypedObject<API::Object::TypeCertificateInfo> {
+class WebCertificateInfo : public API::TypedObject<API::Object::Type::CertificateInfo> {
 public:
     static PassRefPtr<WebCertificateInfo> create(const PlatformCertificateInfo& info)
     {
index 92d225f..3e25d8f 100644 (file)
@@ -34,7 +34,7 @@
 
 namespace WebKit {
 
-class WebConnection : public API::TypedObject<API::Object::TypeConnection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
+class WebConnection : public API::TypedObject<API::Object::Type::Connection>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
 public:
     virtual ~WebConnection();
 
index 2957bd1..9f73ab4 100644 (file)
@@ -35,7 +35,7 @@ namespace WebKit {
 
 class ImmutableArray;
 
-class WebContextMenuItem : public API::TypedObject<API::Object::TypeContextMenuItem> {
+class WebContextMenuItem : public API::TypedObject<API::Object::Type::ContextMenuItem> {
 public:
     static PassRefPtr<WebContextMenuItem> create(const WebContextMenuItemData& data)
     {
index 0106631..43f07a4 100644 (file)
@@ -35,7 +35,7 @@ namespace WebKit {
 
 // WebData - A data buffer type suitable for vending to an API.
 
-class WebData : public API::TypedObject<API::Object::TypeData> {
+class WebData : public API::TypedObject<API::Object::Type::Data> {
 public:
     typedef void (*FreeDataFunction)(unsigned char*, const void* context);
 
index f0351bf..fe4e442 100644 (file)
@@ -34,7 +34,7 @@ namespace WebKit {
 
 // WebError - An error type suitable for vending to an API.
 
-class WebError : public API::TypedObject<API::Object::TypeError> {
+class WebError : public API::TypedObject<API::Object::Type::Error> {
 public:
     static PassRefPtr<WebError> create()
     {
index 4fa927f..03515a0 100644 (file)
@@ -33,7 +33,7 @@
 
 namespace WebKit {
 
-class WebGeolocationPosition : public API::TypedObject<API::Object::TypeGeolocationPosition> {
+class WebGeolocationPosition : public API::TypedObject<API::Object::Type::GeolocationPosition> {
 public:
     struct Data {
         void encode(CoreIPC::ArgumentEncoder&) const;
index 901d9aa..3593829 100644 (file)
@@ -38,7 +38,7 @@ namespace CoreIPC {
 
 namespace WebKit {
 
-class WebSize : public API::TypedObject<API::Object::TypeSize> {
+class WebSize : public API::TypedObject<API::Object::Type::Size> {
 public:
     static PassRefPtr<WebSize> create(const WKSize& size)
     {
@@ -55,7 +55,7 @@ private:
     WKSize m_size;
 };
 
-class WebPoint : public API::TypedObject<API::Object::TypePoint> {
+class WebPoint : public API::TypedObject<API::Object::Type::Point> {
 public:
     static PassRefPtr<WebPoint> create(const WKPoint& point)
     {
@@ -72,7 +72,7 @@ private:
     WKPoint m_point;
 };
 
-class WebRect : public API::TypedObject<API::Object::TypeRect> {
+class WebRect : public API::TypedObject<API::Object::Type::Rect> {
 public:
     static PassRefPtr<WebRect> create(const WKRect& rect)
     {
index 1a3d721..f3ce0dd 100644 (file)
@@ -38,7 +38,7 @@
 
 namespace WebKit {
 
-class WebGraphicsContext : public API::TypedObject<API::Object::TypeGraphicsContext> {
+class WebGraphicsContext : public API::TypedObject<API::Object::Type::GraphicsContext> {
 public:
     static PassRefPtr<WebGraphicsContext> create(WebCore::GraphicsContext* graphicsContext)
     {
index 8837780..a8708d4 100644 (file)
@@ -40,7 +40,7 @@ namespace WebKit {
 
 class WebFrame;
 
-class WebHitTestResult : public API::TypedObject<API::Object::TypeHitTestResult> {
+class WebHitTestResult : public API::TypedObject<API::Object::Type::HitTestResult> {
 public:
     struct Data {
         String absoluteImageURL;
index c16d734..17e2a37 100644 (file)
@@ -40,7 +40,7 @@ class ShareableBitmap;
 
 // WebImage - An image type suitable for vending to an API.
 
-class WebImage : public API::TypedObject<API::Object::TypeImage> {
+class WebImage : public API::TypedObject<API::Object::Type::Image> {
 public:
     static PassRefPtr<WebImage> create(const WebCore::IntSize&, ImageOptions);
     static PassRefPtr<WebImage> create(PassRefPtr<ShareableBitmap>);
index b1206d6..11cd00a 100644 (file)
@@ -50,9 +50,9 @@ private:
     const NumberType m_value;
 };
 
-typedef WebNumber<bool, API::Object::TypeBoolean> WebBoolean;
-typedef WebNumber<double, API::Object::TypeDouble> WebDouble;
-typedef WebNumber<uint64_t, API::Object::TypeUInt64> WebUInt64;
+typedef WebNumber<bool, API::Object::Type::Boolean> WebBoolean;
+typedef WebNumber<double, API::Object::Type::Double> WebDouble;
+typedef WebNumber<uint64_t, API::Object::Type::UInt64> WebUInt64;
 
 } // namespace WebKit
 
index bc1526f..bd85b7b 100644 (file)
@@ -36,7 +36,7 @@ namespace WebKit {
 
 class ImmutableArray;
 
-class WebOpenPanelParameters : public API::TypedObject<API::Object::TypeOpenPanelParameters> {
+class WebOpenPanelParameters : public API::TypedObject<API::Object::Type::OpenPanelParameters> {
 public:
     static PassRefPtr<WebOpenPanelParameters> create(const WebCore::FileChooserSettings&);
     ~WebOpenPanelParameters();
index 82fd74f..865c10b 100644 (file)
@@ -36,7 +36,7 @@ namespace WebKit {
 
 class WebPage;
 
-class WebRenderLayer : public API::TypedObject<API::Object::TypeRenderLayer> {
+class WebRenderLayer : public API::TypedObject<API::Object::Type::RenderLayer> {
 public:
     enum CompositingLayerType { None, Normal, Tiled, Media, Container };
 
index f6c905d..5a7be07 100644 (file)
@@ -39,7 +39,7 @@ namespace WebKit {
 
 class WebPage;
 
-class WebRenderObject : public API::TypedObject<API::Object::TypeRenderObject> {
+class WebRenderObject : public API::TypedObject<API::Object::Type::RenderObject> {
 public:
     static PassRefPtr<WebRenderObject> create(WebPage*);
     static PassRefPtr<WebRenderObject> create(WebCore::RenderObject* renderer)
index b229934..5e11d93 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebKit {
 
-class WebSecurityOrigin : public API::TypedObject<API::Object::TypeSecurityOrigin> {
+class WebSecurityOrigin : public API::TypedObject<API::Object::Type::SecurityOrigin> {
 public:
     static PassRefPtr<WebSecurityOrigin> createFromString(const String& string)
     {
index 034364c..418bcd0 100644 (file)
@@ -34,7 +34,7 @@
 
 namespace WebKit {
 
-class WebSerializedScriptValue : public API::TypedObject<API::Object::TypeSerializedScriptValue> {
+class WebSerializedScriptValue : public API::TypedObject<API::Object::Type::SerializedScriptValue> {
 public:
     static PassRefPtr<WebSerializedScriptValue> create(PassRefPtr<WebCore::SerializedScriptValue> serializedValue)
     {
index fd8ae6f..c5f2c7b 100644 (file)
@@ -38,7 +38,7 @@ namespace WebKit {
 
 // WebString - A string type suitable for vending to an API.
 
-class WebString : public API::TypedObject<API::Object::TypeString> {
+class WebString : public API::TypedObject<API::Object::Type::String> {
 public:
     static PassRefPtr<WebString> createNull()
     {
index cd04bdf..f516eeb 100644 (file)
@@ -37,7 +37,7 @@ namespace WebKit {
 
 // WebURL - A URL type suitable for vending to an API.
 
-class WebURL : public API::TypedObject<API::Object::TypeURL> {
+class WebURL : public API::TypedObject<API::Object::Type::URL> {
 public:
     static PassRefPtr<WebURL> create(const String& string)
     {
index f2ee445..a4c6ff7 100644 (file)
@@ -38,7 +38,7 @@ typedef void* PlatformRequest;
 
 namespace WebKit {
 
-class WebURLRequest : public API::TypedObject<API::Object::TypeURLRequest> {
+class WebURLRequest : public API::TypedObject<API::Object::Type::URLRequest> {
 public:
     static PassRefPtr<WebURLRequest> create(const WebCore::URL&);
 
index d4acf38..c3f2567 100644 (file)
@@ -38,7 +38,7 @@ typedef void* PlatformResponse;
 
 namespace WebKit {
 
-class WebURLResponse : public API::TypedObject<API::Object::TypeURLResponse> {
+class WebURLResponse : public API::TypedObject<API::Object::Type::URLResponse> {
 public:
     static PassRefPtr<WebURLResponse> create(const WebCore::ResourceResponse& response)
     {
index 311e699..2e8bac8 100644 (file)
@@ -34,7 +34,7 @@
 
 namespace WebKit {
 
-class WebUserContentURLPattern : public API::TypedObject<API::Object::TypeUserContentURLPattern> {
+class WebUserContentURLPattern : public API::TypedObject<API::Object::Type::UserContentURLPattern> {
 public:
     static PassRefPtr<WebUserContentURLPattern> create(const String& pattern)
     {
index e3f862f..d2d6e94 100644 (file)
@@ -31,7 +31,7 @@
 
 namespace WebKit {
 
-class ObjCObjectGraph : public API::TypedObject<API::Object::TypeObjCObjectGraph> {
+class ObjCObjectGraph : public API::TypedObject<API::Object::Type::ObjCObjectGraph> {
 public:
     static PassRefPtr<ObjCObjectGraph> create(id rootObject)
     {
index dcd7c47..ba5cabb 100644 (file)
@@ -41,7 +41,7 @@ class ChildProcessProxy;
 class WebCredential;
 class WebProtectionSpace;
 
-class AuthenticationChallengeProxy : public API::TypedObject<API::Object::TypeAuthenticationChallenge> {
+class AuthenticationChallengeProxy : public API::TypedObject<API::Object::Type::AuthenticationChallenge> {
 public:
     static PassRefPtr<AuthenticationChallengeProxy> create(const WebCore::AuthenticationChallenge& authenticationChallenge, uint64_t challengeID, CoreIPC::Connection* connection)
     {
index c0fd249..23d980a 100644 (file)
@@ -35,7 +35,7 @@ namespace WebKit {
 class AuthenticationChallengeProxy;
 class WebCredential;
 
-class AuthenticationDecisionListener : public API::TypedObject<API::Object::TypeAuthenticationDecisionListener> {
+class AuthenticationDecisionListener : public API::TypedObject<API::Object::Type::AuthenticationDecisionListener> {
 public:
     static PassRefPtr<AuthenticationDecisionListener> create(AuthenticationChallengeProxy* authenticationChallenge)
     {
index 30244ad..5b3dc8b 100644 (file)
@@ -37,7 +37,7 @@ namespace WebKit {
 
 class WebCertificateInfo;
 
-class WebCredential : public API::TypedObject<API::Object::TypeCredential> {
+class WebCredential : public API::TypedObject<API::Object::Type::Credential> {
 public:
     ~WebCredential();
 
index 3872e00..2cb78f0 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebKit {
 
-class WebProtectionSpace : public API::TypedObject<API::Object::TypeProtectionSpace> {
+class WebProtectionSpace : public API::TypedObject<API::Object::Type::ProtectionSpace> {
 public:
     static PassRefPtr<WebProtectionSpace> create(const WebCore::ProtectionSpace& protectionSpace)
     {
index 1781184..affd1d8 100644 (file)
@@ -46,7 +46,7 @@ class WebContext;
 class WebData;
 class WebPageProxy;
 
-class DownloadProxy : public API::TypedObject<API::Object::TypeDownload>, public CoreIPC::MessageReceiver {
+class DownloadProxy : public API::TypedObject<API::Object::Type::Download>, public CoreIPC::MessageReceiver {
 public:
     static PassRefPtr<DownloadProxy> create(DownloadProxyMap&, WebContext*);
     ~DownloadProxy();
index 9ffe793..6b55633 100644 (file)
@@ -33,7 +33,7 @@ namespace WebKit {
 
 class GeolocationPermissionRequestManagerProxy;
 
-class GeolocationPermissionRequestProxy : public API::TypedObject<API::Object::TypeGeolocationPermissionRequest> {
+class GeolocationPermissionRequestProxy : public API::TypedObject<API::Object::Type::GeolocationPermissionRequest> {
 public:
     static PassRefPtr<GeolocationPermissionRequestProxy> create(GeolocationPermissionRequestManagerProxy* manager, uint64_t geolocationID)
     {
index 4c5da08..3e6b8a5 100644 (file)
@@ -33,7 +33,7 @@ namespace WebKit {
 
 class NotificationPermissionRequestManagerProxy;
 
-class NotificationPermissionRequest : public API::TypedObject<API::Object::TypeNotificationPermissionRequest> {
+class NotificationPermissionRequest : public API::TypedObject<API::Object::Type::NotificationPermissionRequest> {
 public:
     static PassRefPtr<NotificationPermissionRequest> create(NotificationPermissionRequestManagerProxy*, uint64_t notificationID);
 
index 76b3574..44885e3 100644 (file)
@@ -41,7 +41,7 @@ class ArgumentEncoder;
 
 namespace WebKit {
 
-class WebNotification : public API::TypedObject<API::Object::TypeNotification> {
+class WebNotification : public API::TypedObject<API::Object::Type::Notification> {
 public:
     static PassRefPtr<WebNotification> create(const String& title, const String& body, const String& iconURL, const String& tag, const String& lang, const String& dir, const String& originString, uint64_t notificationID)
     {
index b607bae..d800a50 100644 (file)
@@ -43,7 +43,7 @@ class WebContext;
 class WebPageProxy;
 class WebSecurityOrigin;
 
-class WebNotificationManagerProxy : public API::TypedObject<API::Object::TypeNotificationManager>, public WebContextSupplement {
+class WebNotificationManagerProxy : public API::TypedObject<API::Object::Type::NotificationManager>, public WebContextSupplement {
 public:
 
     static const char* supplementName();
index f55d6d1..068740a 100644 (file)
@@ -41,7 +41,7 @@ class WebProcessProxy;
 
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebPluginSiteDataManager : public API::TypedObject<API::Object::TypePluginSiteDataManager> {
+class WebPluginSiteDataManager : public API::TypedObject<API::Object::Type::PluginSiteDataManager> {
 public:
     static PassRefPtr<WebPluginSiteDataManager> create(WebContext*);
     virtual ~WebPluginSiteDataManager();
index 8447d98..04bd2b9 100644 (file)
@@ -46,7 +46,7 @@ struct SecurityOriginData;
 
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebApplicationCacheManagerProxy : public API::TypedObject<API::Object::TypeApplicationCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebApplicationCacheManagerProxy : public API::TypedObject<API::Object::Type::ApplicationCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index f1fb195..10826d9 100644 (file)
@@ -45,7 +45,7 @@ namespace WebKit {
  *      Back        Forward
  */
 
-class WebBackForwardList : public API::TypedObject<API::Object::TypeBackForwardList> {
+class WebBackForwardList : public API::TypedObject<API::Object::Type::BackForwardList> {
 public:
     static PassRefPtr<WebBackForwardList> create(WebPageProxy* page)
     {
index 47768ab..2a6f8fe 100644 (file)
@@ -37,7 +37,7 @@ namespace WebKit {
 
 class WebPageProxy;
 
-class WebColorPickerResultListenerProxy : public API::TypedObject<API::Object::TypeColorPickerResultListener> {
+class WebColorPickerResultListenerProxy : public API::TypedObject<API::Object::Type::ColorPickerResultListener> {
 public:
     static PassRefPtr<WebColorPickerResultListenerProxy> create(WebPageProxy* page)
     {
index d6326f2..6c1fb0c 100644 (file)
@@ -91,7 +91,7 @@ extern NSString *SchemeForCustomProtocolRegisteredNotificationName;
 extern NSString *SchemeForCustomProtocolUnregisteredNotificationName;
 #endif
 
-class WebContext : public API::TypedObject<API::Object::TypeContext>, private CoreIPC::MessageReceiver
+class WebContext : public API::TypedObject<API::Object::Type::Context>, private CoreIPC::MessageReceiver
 #if ENABLE(NETSCAPE_PLUGIN_API)
     , private PluginInfoStoreClient
 #endif
index d756779..79bef0f 100644 (file)
@@ -52,28 +52,28 @@ public:
 
     void encode(CoreIPC::ArgumentEncoder& encoder) const
     {
-        API::Object::Type type = API::Object::TypeNull;
+        API::Object::Type type = API::Object::Type::Null;
         if (baseEncode(encoder, type))
             return;
 
         switch (type) {
-        case API::Object::TypePage: {
+        case API::Object::Type::Page: {
             WebPageProxy* page = static_cast<WebPageProxy*>(m_root);
             encoder << page->pageID();
             break;
         }
-        case API::Object::TypeFrame: {
+        case API::Object::Type::Frame: {
             WebFrameProxy* frame = static_cast<WebFrameProxy*>(m_root);
             encoder << frame->frameID();
             break;
         }
-        case API::Object::TypePageGroup: {
+        case API::Object::Type::PageGroup: {
             WebPageGroup* pageGroup = static_cast<WebPageGroup*>(m_root);
             encoder << pageGroup->data();
             break;
         }
 #if PLATFORM(MAC)
-        case API::Object::TypeObjCObjectGraph: {
+        case API::Object::Type::ObjCObjectGraph: {
             ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
             encoder << WebContextObjCObjectGraphEncoder(objectGraph);
             break;
@@ -109,29 +109,29 @@ public:
 
     static bool decode(CoreIPC::ArgumentDecoder& decoder, WebContextUserMessageDecoder& coder)
     {
-        API::Object::Type type = API::Object::TypeNull;
+        API::Object::Type type = API::Object::Type::Null;
         if (!Base::baseDecode(decoder, coder, type))
             return false;
 
-        if (coder.m_root || type == API::Object::TypeNull)
+        if (coder.m_root || type == API::Object::Type::Null)
             return true;
 
         switch (type) {
-        case API::Object::TypeBundlePage: {
+        case API::Object::Type::BundlePage: {
             uint64_t pageID;
             if (!decoder.decode(pageID))
                 return false;
             coder.m_root = coder.m_process->webPage(pageID);
             break;
         }
-        case API::Object::TypeBundleFrame: {
+        case API::Object::Type::BundleFrame: {
             uint64_t frameID;
             if (!decoder.decode(frameID))
                 return false;
             coder.m_root = coder.m_process->webFrame(frameID);
             break;
         }
-        case API::Object::TypeBundlePageGroup: {
+        case API::Object::Type::BundlePageGroup: {
             uint64_t pageGroupID;
             if (!decoder.decode(pageGroupID))
                 return false;
@@ -139,7 +139,7 @@ public:
             break;
         }
 #if PLATFORM(MAC)
-        case API::Object::TypeObjCObjectGraph: {
+        case API::Object::Type::ObjCObjectGraph: {
             RefPtr<ObjCObjectGraph> objectGraph;
             WebContextObjCObjectGraphDecoder objectGraphDecoder(objectGraph, coder.m_process);
             if (!decoder.decode(objectGraphDecoder))
index fa012b9..ee5bbcb 100644 (file)
@@ -48,7 +48,7 @@ class WebProcessProxy;
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 typedef GenericCallback<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy> HTTPCookieAcceptPolicyCallback;
 
-class WebCookieManagerProxy : public API::TypedObject<API::Object::TypeCookieManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebCookieManagerProxy : public API::TypedObject<API::Object::Type::CookieManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index a9414ed..88dfdf5 100644 (file)
@@ -46,7 +46,7 @@ class WebSecurityOrigin;
 
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebDatabaseManagerProxy : public API::TypedObject<API::Object::TypeDatabaseManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebDatabaseManagerProxy : public API::TypedObject<API::Object::Type::DatabaseManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index 51b216c..140a94a 100644 (file)
@@ -36,7 +36,7 @@ namespace WebKit {
 
 class WebPageProxy;
 
-class WebEditCommandProxy : public API::TypedObject<API::Object::TypeEditCommandProxy> {
+class WebEditCommandProxy : public API::TypedObject<API::Object::Type::EditCommandProxy> {
 public:
     static PassRefPtr<WebEditCommandProxy> create(uint64_t commandID, WebCore::EditAction editAction, WebPageProxy* page)
     {
index d84cca8..48420b2 100644 (file)
@@ -40,7 +40,7 @@ class WebFrameProxy;
 
 class WebFormSubmissionListenerProxy : public WebFrameListenerProxy {
 public:
-    static const Type APIType = TypeFormSubmissionListener;
+    static const Type APIType = Type::FormSubmissionListener;
 
     static PassRefPtr<WebFormSubmissionListenerProxy> create(WebFrameProxy* frame, uint64_t listenerID)
     {
index ae88984..6f13673 100644 (file)
@@ -38,7 +38,7 @@ namespace WebKit {
 
 class WebFramePolicyListenerProxy : public WebFrameListenerProxy {
 public:
-    static const Type APIType = TypeFramePolicyListener;
+    static const Type APIType = Type::FramePolicyListener;
 
     static PassRefPtr<WebFramePolicyListenerProxy> create(WebFrameProxy* frame, uint64_t listenerID)
     {
index bbd0f41..7d0c99a 100644 (file)
@@ -52,7 +52,7 @@ class WebPageProxy;
 
 typedef GenericCallback<WKDataRef> DataCallback;
 
-class WebFrameProxy : public API::TypedObject<API::Object::TypeFrame> {
+class WebFrameProxy : public API::TypedObject<API::Object::Type::Frame> {
 public:
     static PassRefPtr<WebFrameProxy> create(WebPageProxy* page, uint64_t frameID)
     {
index 215fd1b..4d6548d 100644 (file)
@@ -39,7 +39,7 @@ namespace WebKit {
 class WebContext;
 class WebGeolocationPosition;
 
-class WebGeolocationManagerProxy : public API::TypedObject<API::Object::TypeGeolocationManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebGeolocationManagerProxy : public API::TypedObject<API::Object::Type::GeolocationManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index b9df056..5ca1f95 100644 (file)
@@ -35,7 +35,7 @@ namespace WebKit {
 
 class ImmutableArray;
 
-class WebGrammarDetail : public API::TypedObject<API::Object::TypeGrammarDetail> {
+class WebGrammarDetail : public API::TypedObject<API::Object::Type::GrammarDetail> {
 public:
     static PassRefPtr<WebGrammarDetail> create(int location, int length, ImmutableArray* guesses, const String& userDescription);
     static PassRefPtr<WebGrammarDetail> create(const WebCore::GrammarDetail&);
index 5b20fa0..8044d76 100644 (file)
@@ -53,7 +53,7 @@ namespace WebKit {
 
 class WebContext;
 
-class WebIconDatabase : public API::TypedObject<API::Object::TypeIconDatabase>, public WebCore::IconDatabaseClient, private CoreIPC::MessageReceiver {
+class WebIconDatabase : public API::TypedObject<API::Object::Type::IconDatabase>, public WebCore::IconDatabaseClient, private CoreIPC::MessageReceiver {
 public:
     static PassRefPtr<WebIconDatabase> create(WebContext*);
     virtual ~WebIconDatabase();
index 7cf00f4..5508b1e 100644 (file)
@@ -69,7 +69,7 @@ enum AttachmentSide {
     AttachmentSideRight
 };
 
-class WebInspectorProxy : public API::TypedObject<API::Object::TypeInspector>, public CoreIPC::MessageReceiver {
+class WebInspectorProxy : public API::TypedObject<API::Object::Type::Inspector>, public CoreIPC::MessageReceiver {
 public:
     static PassRefPtr<WebInspectorProxy> create(WebPageProxy* page)
     {
index 995b204..31d3434 100644 (file)
@@ -39,7 +39,7 @@ namespace WebKit {
 
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebKeyValueStorageManager : public API::TypedObject<API::Object::TypeKeyValueStorageManager>, public WebContextSupplement {
+class WebKeyValueStorageManager : public API::TypedObject<API::Object::Type::KeyValueStorageManager>, public WebContextSupplement {
 public:
     static const char* supplementName();
 
index 09c742c..233b2b4 100644 (file)
@@ -42,7 +42,7 @@ class WebProcessProxy;
 
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebMediaCacheManagerProxy : public API::TypedObject<API::Object::TypeMediaCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebMediaCacheManagerProxy : public API::TypedObject<API::Object::Type::MediaCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index 3f6e839..d45fa4c 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebKit {
 
-class WebNavigationData : public API::TypedObject<API::Object::TypeNavigationData> {
+class WebNavigationData : public API::TypedObject<API::Object::Type::NavigationData> {
 public:
     static PassRefPtr<WebNavigationData> create(const WebNavigationDataStore& store)
     {
index 9cb63f1..238363d 100644 (file)
@@ -35,7 +35,7 @@ namespace WebKit {
 class ImmutableArray;
 class WebPageProxy;
 
-class WebOpenPanelResultListenerProxy : public API::TypedObject<API::Object::TypeFramePolicyListener> {
+class WebOpenPanelResultListenerProxy : public API::TypedObject<API::Object::Type::FramePolicyListener> {
 public:
     static PassRefPtr<WebOpenPanelResultListenerProxy> create(WebPageProxy* page)
     {
index 97ff83a..c630ab3 100644 (file)
@@ -48,7 +48,7 @@ struct SecurityOriginData;
 
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebOriginDataManagerProxy : public API::TypedObject<API::Object::TypeOriginDataManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebOriginDataManagerProxy : public API::TypedObject<API::Object::Type::OriginDataManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index 9518934..5e9bf46 100644 (file)
@@ -38,7 +38,7 @@ namespace WebKit {
 class WebPreferences;
 class WebPageProxy;
 
-class WebPageGroup : public API::TypedObject<API::Object::TypePageGroup> {
+class WebPageGroup : public API::TypedObject<API::Object::Type::PageGroup> {
 public:
     static PassRefPtr<WebPageGroup> create(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
     static WebPageGroup* get(uint64_t pageGroupID);
index 90421ee..94532ac 100644 (file)
@@ -219,7 +219,7 @@ private:
 };
 
 class WebPageProxy
-    : public API::TypedObject<API::Object::TypePage>
+    : public API::TypedObject<API::Object::Type::Page>
 #if ENABLE(INPUT_TYPE_COLOR)
     , public WebColorPicker::Client
 #endif
index 53610be..cfba0a8 100644 (file)
@@ -41,7 +41,7 @@ namespace WebKit {
 
 class WebPageGroup;
 
-class WebPreferences : public API::TypedObject<API::Object::TypePreferences> {
+class WebPreferences : public API::TypedObject<API::Object::Type::Preferences> {
 public:
     static PassRefPtr<WebPreferences> create()
     {
index 8e50f6b..a66ef39 100644 (file)
@@ -44,7 +44,7 @@ class WebSecurityOrigin;
 
 typedef GenericCallback<WKArrayRef> ArrayCallback;
 
-class WebResourceCacheManagerProxy : public API::TypedObject<API::Object::TypeCacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebResourceCacheManagerProxy : public API::TypedObject<API::Object::Type::CacheManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index ca965ba..4e59aa2 100644 (file)
@@ -44,7 +44,7 @@ class InjectedBundleScriptWorld;
 class WebFrame;
 class WebImage;
 
-class InjectedBundleNodeHandle : public API::TypedObject<API::Object::TypeBundleNodeHandle> {
+class InjectedBundleNodeHandle : public API::TypedObject<API::Object::Type::BundleNodeHandle> {
 public:
     static PassRefPtr<InjectedBundleNodeHandle> getOrCreate(JSContextRef, JSObjectRef);
     static PassRefPtr<InjectedBundleNodeHandle> getOrCreate(WebCore::Node*);
index 846e75d..1d642f9 100644 (file)
@@ -39,7 +39,7 @@ namespace WebKit {
 
 class InjectedBundleScriptWorld;
 
-class InjectedBundleRangeHandle : public API::TypedObject<API::Object::TypeBundleRangeHandle> {
+class InjectedBundleRangeHandle : public API::TypedObject<API::Object::Type::BundleRangeHandle> {
 public:
     static PassRefPtr<InjectedBundleRangeHandle> getOrCreate(JSContextRef, JSObjectRef);
     static PassRefPtr<InjectedBundleRangeHandle> getOrCreate(WebCore::Range*);
index 6be6b03..cc8368b 100644 (file)
@@ -71,7 +71,7 @@ class WebFrame;
 class WebPage;
 class WebPageGroupProxy;
 
-class InjectedBundle : public API::TypedObject<API::Object::TypeBundle> {
+class InjectedBundle : public API::TypedObject<API::Object::Type::Bundle> {
 public:
     static PassRefPtr<InjectedBundle> create(const String& path)
     {
index 1943b1a..bb3d6db 100644 (file)
@@ -35,7 +35,7 @@ class WebPage;
 
 class InjectedBundleBackForwardListItem;
 
-class InjectedBundleBackForwardList : public API::TypedObject<API::Object::TypeBundleBackForwardList> {
+class InjectedBundleBackForwardList : public API::TypedObject<API::Object::Type::BundleBackForwardList> {
 public:
     static PassRefPtr<InjectedBundleBackForwardList> create(WebPage* page)
     {
index 9dcfdbd..9ec5828 100644 (file)
@@ -34,7 +34,7 @@ namespace WebKit {
 class ImmutableArray;
 class WebPageProxy;
 
-class InjectedBundleBackForwardListItem : public API::TypedObject<API::Object::TypeBundleBackForwardListItem> {
+class InjectedBundleBackForwardListItem : public API::TypedObject<API::Object::Type::BundleBackForwardListItem> {
 public:
     static PassRefPtr<InjectedBundleBackForwardListItem> create(PassRefPtr<WebCore::HistoryItem> item)
     {
index 1d9ae78..5a223bf 100644 (file)
@@ -40,7 +40,7 @@ namespace WebKit {
 class InjectedBundleScriptWorld;
 class WebFrame;
 
-class InjectedBundleDOMWindowExtension : public API::TypedObject<API::Object::TypeBundleDOMWindowExtension> {
+class InjectedBundleDOMWindowExtension : public API::TypedObject<API::Object::Type::BundleDOMWindowExtension> {
 public:
     static PassRefPtr<InjectedBundleDOMWindowExtension> create(WebFrame*, InjectedBundleScriptWorld*);
     static InjectedBundleDOMWindowExtension* get(WebCore::DOMWindowExtension*);
index 7c2fa04..c2f5827 100644 (file)
@@ -38,7 +38,7 @@ namespace WebKit {
 class InjectedBundleNodeHandle;
 class WebFrame;
 
-class InjectedBundleHitTestResult : public API::TypedObject<API::Object::TypeBundleHitTestResult> {
+class InjectedBundleHitTestResult : public API::TypedObject<API::Object::Type::BundleHitTestResult> {
 public:
     static PassRefPtr<InjectedBundleHitTestResult> create(const WebCore::HitTestResult&);
 
index 85ef036..9c828b3 100644 (file)
@@ -43,7 +43,7 @@ namespace WebKit {
 
 class WebFrame;
 
-class InjectedBundleNavigationAction : public API::TypedObject<API::Object::TypeBundleNavigationAction> {
+class InjectedBundleNavigationAction : public API::TypedObject<API::Object::Type::BundleNavigationAction> {
 public:
     static PassRefPtr<InjectedBundleNavigationAction> create(WebFrame*, const WebCore::NavigationAction&, PassRefPtr<WebCore::FormState>);
 
index 7efea45..00aa19c 100644 (file)
@@ -36,7 +36,7 @@ namespace WebCore {
 
 namespace WebKit {
 
-class InjectedBundleScriptWorld : public API::TypedObject<API::Object::TypeBundleScriptWorld> {
+class InjectedBundleScriptWorld : public API::TypedObject<API::Object::Type::BundleScriptWorld> {
 public:
     static PassRefPtr<InjectedBundleScriptWorld> create();
     static PassRefPtr<InjectedBundleScriptWorld> getOrCreate(WebCore::DOMWrapperWorld&);
index e933333..72ebfbc 100644 (file)
@@ -55,28 +55,28 @@ public:
 
     void encode(CoreIPC::ArgumentEncoder& encoder) const
     {
-        API::Object::Type type = API::Object::TypeNull;
+        API::Object::Type type = API::Object::Type::Null;
         if (baseEncode(encoder, type))
             return;
 
         switch (type) {
-        case API::Object::TypeBundlePage: {
+        case API::Object::Type::BundlePage: {
             WebPage* page = static_cast<WebPage*>(m_root);
             encoder << page->pageID();
             break;
         }
-        case API::Object::TypeBundleFrame: {
+        case API::Object::Type::BundleFrame: {
             WebFrame* frame = static_cast<WebFrame*>(m_root);
             encoder << frame->frameID();
             break;
         }
-        case API::Object::TypeBundlePageGroup: {
+        case API::Object::Type::BundlePageGroup: {
             WebPageGroupProxy* pageGroup = static_cast<WebPageGroupProxy*>(m_root);
             encoder << pageGroup->pageGroupID();
             break;
         }
 #if PLATFORM(MAC)
-        case API::Object::TypeObjCObjectGraph: {
+        case API::Object::Type::ObjCObjectGraph: {
             ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
             encoder << InjectedBundleObjCObjectGraphEncoder(objectGraph);
             break;
@@ -110,29 +110,29 @@ public:
 
     static bool decode(CoreIPC::ArgumentDecoder& decoder, InjectedBundleUserMessageDecoder& coder)
     {
-        API::Object::Type type = API::Object::TypeNull;
+        API::Object::Type type = API::Object::Type::Null;
         if (!Base::baseDecode(decoder, coder, type))
             return false;
 
-        if (coder.m_root || type == API::Object::TypeNull)
+        if (coder.m_root || type == API::Object::Type::Null)
             return true;
 
         switch (type) {
-        case API::Object::TypePage: {
+        case API::Object::Type::Page: {
             uint64_t pageID;
             if (!decoder.decode(pageID))
                 return false;
             coder.m_root = WebProcess::shared().webPage(pageID);
             break;
         }
-        case API::Object::TypeFrame: {
+        case API::Object::Type::Frame: {
             uint64_t frameID;
             if (!decoder.decode(frameID))
                 return false;
             coder.m_root = WebProcess::shared().webFrame(frameID);
             break;
         }
-        case API::Object::TypePageGroup: {
+        case API::Object::Type::PageGroup: {
             WebPageGroupData pageGroupData;
             if (!decoder.decode(pageGroupData))
                 return false;
@@ -140,7 +140,7 @@ public:
             break;
         }
 #if PLATFORM(MAC)
-        case API::Object::TypeObjCObjectGraph: {
+        case API::Object::Type::ObjCObjectGraph: {
             RefPtr<ObjCObjectGraph> objectGraph;
             InjectedBundleObjCObjectGraphDecoder objectGraphDecoder(objectGraph, &WebProcess::shared());
             if (!decoder.decode(objectGraphDecoder))
index cc28351..fc1cf34 100644 (file)
@@ -109,7 +109,7 @@ bool InjectedBundle::load(API::Object* initializationUserData)
 
     if ([instance respondsToSelector:@selector(webProcessPlugIn:initializeWithObject:)]) {
         RetainPtr<id> objCInitializationUserData;
-        if (initializationUserData && initializationUserData->type() == API::Object::TypeObjCObjectGraph)
+        if (initializationUserData && initializationUserData->type() == API::Object::Type::ObjCObjectGraph)
             objCInitializationUserData = static_cast<ObjCObjectGraph*>(initializationUserData)->rootObject();
         [instance webProcessPlugIn:[WKWebProcessPlugInController _shared] initializeWithObject:objCInitializationUserData.get()];
     } else if ([instance respondsToSelector:@selector(webProcessPlugInInitialize:)]) {
index d4860be..6b9a26d 100644 (file)
@@ -43,7 +43,7 @@ namespace WebKit {
 
 class WebPage;
 
-class PageBanner : public API::TypedObject<API::Object::TypeBundlePageBanner> {
+class PageBanner : public API::TypedObject<API::Object::Type::BundlePageBanner> {
 public:
     enum Type {
         NotSet,
index 32be7cf..aa0608f 100644 (file)
@@ -42,7 +42,7 @@ namespace WebKit {
 class WebMouseEvent;
 class WebPage;
 
-class PageOverlay : public API::TypedObject<API::Object::TypeBundlePageOverlay> {
+class PageOverlay : public API::TypedObject<API::Object::Type::BundlePageOverlay> {
 public:
     class Client {
     protected:
index 83bf2de..a5d70a7 100644 (file)
@@ -55,7 +55,7 @@ class InjectedBundleRangeHandle;
 class InjectedBundleScriptWorld;
 class WebPage;
 
-class WebFrame : public API::TypedObject<API::Object::TypeBundleFrame> {
+class WebFrame : public API::TypedObject<API::Object::Type::BundleFrame> {
 public:
     static PassRefPtr<WebFrame> createWithCoreMainFrame(WebPage*, WebCore::Frame*);
     static PassRefPtr<WebFrame> createSubframe(WebPage*, const String& frameName, WebCore::HTMLFrameOwnerElement*);
index 0ef4d28..e64f6d3 100644 (file)
@@ -43,7 +43,7 @@ class WebInspectorFrontendClient;
 class WebPage;
 struct WebPageCreationParameters;
 
-class WebInspector : public API::TypedObject<API::Object::TypeBundleInspector> {
+class WebInspector : public API::TypedObject<API::Object::Type::BundleInspector> {
 public:
     static PassRefPtr<WebInspector> create(WebPage*, WebCore::InspectorFrontendChannel*);
 
index 4e8d246..98fd404 100644 (file)
@@ -154,7 +154,7 @@ class WebTouchEvent;
 
 typedef Vector<RefPtr<PageOverlay>> PageOverlayList;
 
-class WebPage : public API::TypedObject<API::Object::TypeBundlePage>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
+class WebPage : public API::TypedObject<API::Object::Type::BundlePage>, public CoreIPC::MessageReceiver, public CoreIPC::MessageSender {
 public:
     static PassRefPtr<WebPage> create(uint64_t pageID, const WebPageCreationParameters&);
     virtual ~WebPage();
index d1d744b..5052593 100644 (file)
@@ -41,7 +41,7 @@ class PageGroup;
 
 namespace WebKit {
 
-class WebPageGroupProxy : public API::TypedObject<API::Object::TypeBundlePageGroup> {
+class WebPageGroupProxy : public API::TypedObject<API::Object::Type::BundlePageGroup> {
 public:
     static PassRefPtr<WebPageGroupProxy> create(const WebPageGroupData&);
     virtual ~WebPageGroupProxy();
index 3fc492c..87adac2 100644 (file)
@@ -120,7 +120,7 @@ using namespace WebKit;
     size_t count = WKArrayGetSize(result.get());
     for (size_t k = 0; k < count; k++) {
         WKTypeRef item = WKArrayGetItemAtIndex(result.get(), k);
-        if (toImpl(item)->type() == WKStringGetTypeID()) {
+        if (toImpl(item)->type() == WebString::APIType) {
             RetainPtr<CFStringRef> name = adoptCF(WKStringCopyCFString(kCFAllocatorDefault, (WKStringRef)item));
             [names addObject:(NSString *)name.get()];
         }
@@ -207,9 +207,9 @@ using namespace WebKit;
     if (!result)
         return nil;
     
-    if (toImpl(result.get())->type() == WKStringGetTypeID())
+    if (toImpl(result.get())->type() == WebString::APIType)
         return CFBridgingRelease(WKStringCopyCFString(kCFAllocatorDefault, (WKStringRef)result.get()));
-    else if (toImpl(result.get())->type() == WKBooleanGetTypeID())
+    else if (toImpl(result.get())->type() == WebBoolean::APIType)
         return [NSNumber numberWithBool:WKBooleanGetValue(static_cast<WKBooleanRef>(result.get()))];
 
     return nil;