Diff
Modified: trunk/Source/WebKit2/ChangeLog (159203 => 159204)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 17:43:13 UTC (rev 159204)
@@ -1,3 +1,27 @@
+2013-11-13 Brendan Long <[email protected]>
+
+ [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 <[email protected]>
Remove prefixed template class processing from message receiver generator.
Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp (159203 => 159204)
--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp 2013-11-13 17:43:13 UTC (rev 159204)
@@ -44,7 +44,7 @@
#if ENABLE(CONTEXT_MENUS)
return toAPI(WebContextMenuItem::APIType);
#else
- return toAPI(API::Object::TypeNull);
+ return toAPI(API::Object::Type::Null);
#endif
}
Modified: trunk/Source/WebKit2/Shared/WebBatteryStatus.h (159203 => 159204)
--- trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/Shared/WebBatteryStatus.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -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;
Modified: trunk/Source/WebKit2/Shared/WebNetworkInfo.h (159203 => 159204)
--- trunk/Source/WebKit2/Shared/WebNetworkInfo.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/Shared/WebNetworkInfo.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -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;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp 2013-11-13 17:43:13 UTC (rev 159204)
@@ -35,7 +35,7 @@
WKTypeID WKGrammarDetailGetTypeID()
{
- return toAPI(API::Object::TypeGrammarDetail);
+ return toAPI(API::Object::Type::GrammarDetail);
}
WKGrammarDetailRef WKGrammarDetailCreate(int location, int length, WKArrayRef guesses, WKStringRef userDescription)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2013-11-13 17:43:13 UTC (rev 159204)
@@ -41,7 +41,7 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
return toAPI(WebPluginSiteDataManager::APIType);
#else
- return API::Object::TypeNull;
+ return API::Object::Type::Null;
#endif
}
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -46,7 +46,7 @@
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();
Modified: trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/WebBatteryManagerProxy.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -39,7 +39,7 @@
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();
Modified: trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/WebNetworkInfoManagerProxy.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -39,7 +39,7 @@
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();
Modified: trunk/Source/WebKit2/UIProcess/WebTextChecker.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/WebTextChecker.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/WebTextChecker.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -35,7 +35,7 @@
class WebPageProxy;
-class WebTextChecker : public API::TypedObject<API::Object::TypeTextChecker> {
+class WebTextChecker : public API::TypedObject<API::Object::Type::TextChecker> {
public:
static WebTextChecker* shared();
Modified: trunk/Source/WebKit2/UIProcess/WebVibrationProxy.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/WebVibrationProxy.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/WebVibrationProxy.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -37,7 +37,7 @@
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();
Modified: trunk/Source/WebKit2/UIProcess/WebViewportAttributes.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/WebViewportAttributes.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/WebViewportAttributes.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -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)
{
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPopupItemEfl.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -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)
{
Modified: trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h (159203 => 159204)
--- trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h 2013-11-13 17:39:43 UTC (rev 159203)
+++ trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h 2013-11-13 17:43:13 UTC (rev 159204)
@@ -34,7 +34,7 @@
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();
