[Gtk][EFL] Fix builds by updating Object::TypeX to Object::Type::X
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Nov 2013 17:43:13 +0000 (17:43 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Nov 2013 17:43:13 +0000 (17:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=124289

Patch by Brendan Long <b.long@cablelabs.com> on 2013-11-13
Reviewed by Alexey Proskuryakov.

* Shared/API/c/WKContextMenuItem.cpp:
(WKContextMenuItemGetTypeID):
* Shared/WebBatteryStatus.h:
* Shared/WebNetworkInfo.h:
* UIProcess/API/C/WKGrammarDetail.cpp:
(WKGrammarDetailGetTypeID):
* UIProcess/API/C/WKPluginSiteDataManager.cpp:
(WKPluginSiteDataManagerGetTypeID):
* UIProcess/CoordinatedGraphics/WebView.h:
* UIProcess/WebBatteryManagerProxy.h:
* UIProcess/WebNetworkInfoManagerProxy.h:
* UIProcess/WebTextChecker.h:
* UIProcess/WebVibrationProxy.h:
* UIProcess/WebViewportAttributes.h:
* UIProcess/efl/WebPopupItemEfl.h:
* UIProcess/soup/WebSoupRequestManagerProxy.h:

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

14 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp
Source/WebKit2/Shared/WebBatteryStatus.h
Source/WebKit2/Shared/WebNetworkInfo.h
Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp
Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp
Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h
Source/WebKit2/UIProcess/WebBatteryManagerProxy.h
Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h
Source/WebKit2/UIProcess/WebTextChecker.h
Source/WebKit2/UIProcess/WebVibrationProxy.h
Source/WebKit2/UIProcess/WebViewportAttributes.h
Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h
Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h

index 7c936e6..f95b36e 100644 (file)
@@ -1,3 +1,27 @@
+2013-11-13  Brendan Long  <b.long@cablelabs.com>
+
+        [Gtk][EFL] Fix builds by updating Object::TypeX to Object::Type::X
+        https://bugs.webkit.org/show_bug.cgi?id=124289
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Shared/API/c/WKContextMenuItem.cpp:
+        (WKContextMenuItemGetTypeID):
+        * Shared/WebBatteryStatus.h:
+        * Shared/WebNetworkInfo.h:
+        * UIProcess/API/C/WKGrammarDetail.cpp:
+        (WKGrammarDetailGetTypeID):
+        * UIProcess/API/C/WKPluginSiteDataManager.cpp:
+        (WKPluginSiteDataManagerGetTypeID):
+        * UIProcess/CoordinatedGraphics/WebView.h:
+        * UIProcess/WebBatteryManagerProxy.h:
+        * UIProcess/WebNetworkInfoManagerProxy.h:
+        * UIProcess/WebTextChecker.h:
+        * UIProcess/WebVibrationProxy.h:
+        * UIProcess/WebViewportAttributes.h:
+        * UIProcess/efl/WebPopupItemEfl.h:
+        * UIProcess/soup/WebSoupRequestManagerProxy.h:
+
 2013-11-13  Tamas Gergely  <gertom@inf.u-szeged.hu>
 
         Remove prefixed template class processing from message receiver generator.
index 0b40eb5..869d47a 100644 (file)
@@ -44,7 +44,7 @@ WKTypeID WKContextMenuItemGetTypeID()
 #if ENABLE(CONTEXT_MENUS)
     return toAPI(WebContextMenuItem::APIType);
 #else
-    return toAPI(API::Object::TypeNull);
+    return toAPI(API::Object::Type::Null);
 #endif
 }
 
index aab727f..6dcf93c 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace WebKit {
 
-class WebBatteryStatus : public API::TypedObject<API::Object::TypeBatteryStatus> {
+class WebBatteryStatus : public API::TypedObject<API::Object::Type::BatteryStatus> {
 public:
     struct Data {
         void encode(CoreIPC::ArgumentEncoder&) const;
index fd985a4..c1b618a 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace WebKit {
 
-class WebNetworkInfo : public API::TypedObject<API::Object::TypeNetworkInfo> {
+class WebNetworkInfo : public API::TypedObject<API::Object::Type::NetworkInfo> {
 public:
     struct Data {
         void encode(CoreIPC::ArgumentEncoder&) const;
index 852c521..22b7bd7 100644 (file)
@@ -35,7 +35,7 @@ using namespace WebKit;
 
 WKTypeID WKGrammarDetailGetTypeID()
 {
-    return toAPI(API::Object::TypeGrammarDetail);
+    return toAPI(API::Object::Type::GrammarDetail);
 }
 
 WKGrammarDetailRef WKGrammarDetailCreate(int location, int length, WKArrayRef guesses, WKStringRef userDescription)
index 5980451..ac1bae5 100644 (file)
@@ -41,7 +41,7 @@ WKTypeID WKPluginSiteDataManagerGetTypeID()
 #if ENABLE(NETSCAPE_PLUGIN_API)
     return toAPI(WebPluginSiteDataManager::APIType);
 #else
-    return API::Object::TypeNull;
+    return API::Object::Type::Null;
 #endif
 }
 
index 46baf81..b84fc88 100644 (file)
@@ -46,7 +46,7 @@ class CoordinatedGraphicsScene;
 
 namespace WebKit {
 
-class WebView : public API::TypedObject<API::Object::TypeView>, public PageClient {
+class WebView : public API::TypedObject<API::Object::Type::View>, public PageClient {
 public:
     virtual ~WebView();
 
index 8b9c0c4..d256e9e 100644 (file)
@@ -39,7 +39,7 @@ namespace WebKit {
 class WebContext;
 class WebBatteryStatus;
 
-class WebBatteryManagerProxy : public API::TypedObject<API::Object::TypeBatteryManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebBatteryManagerProxy : public API::TypedObject<API::Object::Type::BatteryManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index 032c517..4eb53ef 100644 (file)
@@ -39,7 +39,7 @@ namespace WebKit {
 class WebContext;
 class WebNetworkInfo;
 
-class WebNetworkInfoManagerProxy : public API::TypedObject<API::Object::TypeNetworkInfoManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebNetworkInfoManagerProxy : public API::TypedObject<API::Object::Type::NetworkInfoManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();
 
index a60f155..12aaeec 100644 (file)
@@ -35,7 +35,7 @@ namespace WebKit {
 
 class WebPageProxy;
 
-class WebTextChecker : public API::TypedObject<API::Object::TypeTextChecker> {
+class WebTextChecker : public API::TypedObject<API::Object::Type::TextChecker> {
 public:
     static WebTextChecker* shared();
 
index f5fe2f6..c364b33 100644 (file)
@@ -37,7 +37,7 @@ namespace WebKit {
 
 class WebPageProxy;
 
-class WebVibrationProxy : public API::TypedObject<API::Object::TypeVibration>, private CoreIPC::MessageReceiver {
+class WebVibrationProxy : public API::TypedObject<API::Object::Type::Vibration>, private CoreIPC::MessageReceiver {
 public:
     static PassRefPtr<WebVibrationProxy> create(WebPageProxy*);
     virtual ~WebVibrationProxy();
index d8a5894..8571995 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebKit {
 
-class WebViewportAttributes : public API::TypedObject<API::Object::TypeViewportAttributes> {
+class WebViewportAttributes : public API::TypedObject<API::Object::Type::ViewportAttributes> {
 public:
     static PassRefPtr<WebViewportAttributes> create(const WebCore::ViewportAttributes& attributes)
     {
index 1cdad9a..690ae88 100644 (file)
@@ -32,7 +32,7 @@
 
 namespace WebKit {
 
-class WebPopupItemEfl : public API::TypedObject<API::Object::TypePopupMenuItem> {
+class WebPopupItemEfl : public API::TypedObject<API::Object::Type::PopupMenuItem> {
 public:
     static PassRefPtr<WebPopupItemEfl> create(const WebPopupItem& data)
     {
index be5c90e..ac28555 100644 (file)
@@ -34,7 +34,7 @@ namespace WebKit {
 class WebContext;
 class WebData;
 
-class WebSoupRequestManagerProxy : public API::TypedObject<API::Object::TypeSoupRequestManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
+class WebSoupRequestManagerProxy : public API::TypedObject<API::Object::Type::SoupRequestManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
     static const char* supplementName();