Unreviewed GTK build fix attempt after r160395
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Dec 2013 04:16:37 +0000 (04:16 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Dec 2013 04:16:37 +0000 (04:16 +0000)
Renamed WebUInt64 to API::UInt64, WebDouble to API::Double, WebBoolean
to API::Boolean.

* UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
(didReceiveWebViewMessageFromInjectedBundle):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_get_snapshot):
* UIProcess/API/gtk/WebKitWindowProperties.cpp: Included APINumber.h instead of WebNumber.h
(webkitWindowPropertiesUpdateFromWebWindowFeatures):
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(didInitiateLoadForResource):
(willSendRequestForFrame):
(didReceiveResponseForResource):
(didReceiveContentLengthForResource):
(didFinishLoadForResource):
(didFailLoadForResource):
(webkitWebPageDidReceiveMessage):

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp
Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

index 7ffeac3..67421f4 100644 (file)
@@ -1,3 +1,25 @@
+2013-12-10  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Unreviewed GTK build fix attempt after r160395
+
+        Renamed WebUInt64 to API::UInt64, WebDouble to API::Double, WebBoolean
+        to API::Boolean.
+
+        * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+        (didReceiveWebViewMessageFromInjectedBundle):
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkit_web_view_get_snapshot):
+        * UIProcess/API/gtk/WebKitWindowProperties.cpp: Included APINumber.h instead of WebNumber.h
+        (webkitWindowPropertiesUpdateFromWebWindowFeatures):
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+        (didInitiateLoadForResource):
+        (willSendRequestForFrame):
+        (didReceiveResponseForResource):
+        (didReceiveContentLengthForResource):
+        (didFinishLoadForResource):
+        (didFailLoadForResource):
+        (webkitWebPageDidReceiveMessage):
+
 2013-12-10  Dan Bernstein  <mitz@apple.com>
 
         All observable PageLoadState properties should change in an atomic fashion, with properly nested change notifications
index 2a4fdea..26b93a3 100644 (file)
@@ -35,13 +35,13 @@ static void didReceiveWebViewMessageFromInjectedBundle(WebKitWebView* webView, c
 {
     if (g_str_equal(messageName, "DidInitiateLoadForResource")) {
         WebFrameProxy* frame = static_cast<WebFrameProxy*>(message.get(String::fromUTF8("Frame")));
-        WebUInt64* resourceIdentifier = static_cast<WebUInt64*>(message.get(String::fromUTF8("Identifier")));
+        API::UInt64* resourceIdentifier = static_cast<API::UInt64*>(message.get(String::fromUTF8("Identifier")));
         WebURLRequest* webRequest = static_cast<WebURLRequest*>(message.get(String::fromUTF8("Request")));
         GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(webRequest->resourceRequest()));
 
         webkitWebViewResourceLoadStarted(webView, frame, resourceIdentifier->value(), request.get());
     } else if (g_str_equal(messageName, "DidSendRequestForResource")) {
-        WebUInt64* resourceIdentifier = static_cast<WebUInt64*>(message.get(String::fromUTF8("Identifier")));
+        API::UInt64* resourceIdentifier = static_cast<API::UInt64*>(message.get(String::fromUTF8("Identifier")));
         GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(webView, resourceIdentifier->value());
         if (!resource)
             return;
@@ -53,7 +53,7 @@ static void didReceiveWebViewMessageFromInjectedBundle(WebKitWebView* webView, c
 
         webkitWebResourceSentRequest(resource.get(), request.get(), redirectResponse.get());
     } else if (g_str_equal(messageName, "DidReceiveResponseForResource")) {
-        WebUInt64* resourceIdentifier = static_cast<WebUInt64*>(message.get(String::fromUTF8("Identifier")));
+        API::UInt64* resourceIdentifier = static_cast<API::UInt64*>(message.get(String::fromUTF8("Identifier")));
         GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(webView, resourceIdentifier->value());
         if (!resource)
             return;
@@ -63,15 +63,15 @@ static void didReceiveWebViewMessageFromInjectedBundle(WebKitWebView* webView, c
 
         webkitWebResourceSetResponse(resource.get(), response.get());
     } else if (g_str_equal(messageName, "DidReceiveContentLengthForResource")) {
-        WebUInt64* resourceIdentifier = static_cast<WebUInt64*>(message.get(String::fromUTF8("Identifier")));
+        API::UInt64* resourceIdentifier = static_cast<API::UInt64*>(message.get(String::fromUTF8("Identifier")));
         GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(webView, resourceIdentifier->value());
         if (!resource)
             return;
 
-        WebUInt64* contentLength = static_cast<WebUInt64*>(message.get(String::fromUTF8("ContentLength")));
+        API::UInt64* contentLength = static_cast<API::UInt64*>(message.get(String::fromUTF8("ContentLength")));
         webkitWebResourceNotifyProgress(resource.get(), contentLength->value());
     } else if (g_str_equal(messageName, "DidFinishLoadForResource")) {
-        WebUInt64* resourceIdentifier = static_cast<WebUInt64*>(message.get(String::fromUTF8("Identifier")));
+        API::UInt64* resourceIdentifier = static_cast<API::UInt64*>(message.get(String::fromUTF8("Identifier")));
         GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(webView, resourceIdentifier->value());
         if (!resource)
             return;
@@ -79,7 +79,7 @@ static void didReceiveWebViewMessageFromInjectedBundle(WebKitWebView* webView, c
         webkitWebResourceFinished(resource.get());
         webkitWebViewRemoveLoadingWebResource(webView, resourceIdentifier->value());
     } else if (g_str_equal(messageName, "DidFailLoadForResource")) {
-        WebUInt64* resourceIdentifier = static_cast<WebUInt64*>(message.get(String::fromUTF8("Identifier")));
+        API::UInt64* resourceIdentifier = static_cast<API::UInt64*>(message.get(String::fromUTF8("Identifier")));
         GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(webView, resourceIdentifier->value());
         if (!resource)
             return;
@@ -92,7 +92,7 @@ static void didReceiveWebViewMessageFromInjectedBundle(WebKitWebView* webView, c
         webkitWebResourceFailed(resource.get(), resourceError.get());
         webkitWebViewRemoveLoadingWebResource(webView, resourceIdentifier->value());
     } else if (g_str_equal(messageName, "DidGetSnapshot")) {
-        WebUInt64* callbackID = static_cast<WebUInt64*>(message.get("CallbackID"));
+        API::UInt64* callbackID = static_cast<API::UInt64*>(message.get("CallbackID"));
         WebImage* image = static_cast<WebImage*>(message.get("Snapshot"));
         webKitWebViewDidReceiveSnapshot(webView, callbackID->value(), image);
     } else
index dfa1ab1..efc2121 100644 (file)
@@ -3096,9 +3096,9 @@ void webkit_web_view_get_snapshot(WebKitWebView* webView, WebKitSnapshotRegion r
 
     ImmutableDictionary::MapType message;
     uint64_t callbackID = generateSnapshotCallbackID();
-    message.set(String::fromUTF8("SnapshotOptions"), WebUInt64::create(static_cast<uint64_t>(webKitSnapshotOptionsToSnapshotOptions(options))));
-    message.set(String::fromUTF8("SnapshotRegion"), WebUInt64::create(static_cast<uint64_t>(region)));
-    message.set(String::fromUTF8("CallbackID"), WebUInt64::create(callbackID));
+    message.set(String::fromUTF8("SnapshotOptions"), API::UInt64::create(static_cast<uint64_t>(webKitSnapshotOptionsToSnapshotOptions(options))));
+    message.set(String::fromUTF8("SnapshotRegion"), API::UInt64::create(static_cast<uint64_t>(region)));
+    message.set(String::fromUTF8("CallbackID"), API::UInt64::create(callbackID));
 
     webView->priv->snapshotResultsMap.set(callbackID, adoptGRef(g_task_new(webView, cancellable, callback, userData)));
     getPage(webView)->postMessageToInjectedBundle(String::fromUTF8("GetSnapshot"), ImmutableDictionary::adopt(message).get());
index bdfc725..fa93179 100644 (file)
 #include "config.h"
 #include "WebKitWindowProperties.h"
 
+#include "APINumber.h"
 #include "ImmutableDictionary.h"
 #include "WebKitPrivate.h"
 #include "WebKitWindowPropertiesPrivate.h"
-#include "WebNumber.h"
 #include "WebURLRequest.h"
 #include <WebCore/IntRect.h>
 #include <glib/gi18n-lib.h>
@@ -378,48 +378,48 @@ void webkitWindowPropertiesUpdateFromWebWindowFeatures(WebKitWindowProperties* w
 {
     GdkRectangle geometry = windowProperties->priv->geometry;
 
-    WebDouble* doubleValue = static_cast<WebDouble*>(features->get("x"));
+    API::Double* doubleValue = static_cast<API::Double*>(features->get("x"));
     if (doubleValue)
         geometry.x = doubleValue->value();
 
-    doubleValue = static_cast<WebDouble*>(features->get("y"));
+    doubleValue = static_cast<API::Double*>(features->get("y"));
     if (doubleValue)
         geometry.y = doubleValue->value();
 
-    doubleValue = static_cast<WebDouble*>(features->get("width"));
+    doubleValue = static_cast<API::Double*>(features->get("width"));
     if (doubleValue)
         geometry.width = doubleValue->value();
 
-    doubleValue = static_cast<WebDouble*>(features->get("height"));
+    doubleValue = static_cast<API::Double*>(features->get("height"));
     if (doubleValue)
         geometry.height = doubleValue->value();
     webkitWindowPropertiesSetGeometry(windowProperties, &geometry);
 
-    WebBoolean* booleanValue = static_cast<WebBoolean*>(features->get("menuBarVisible"));
+    API::Boolean* booleanValue = static_cast<API::Boolean*>(features->get("menuBarVisible"));
     if (booleanValue)
         webkitWindowPropertiesSetMenubarVisible(windowProperties, booleanValue->value());
 
-    booleanValue = static_cast<WebBoolean*>(features->get("statusBarVisible"));
+    booleanValue = static_cast<API::Boolean*>(features->get("statusBarVisible"));
     if (booleanValue)
         webkitWindowPropertiesSetStatusbarVisible(windowProperties, booleanValue->value());
 
-    booleanValue = static_cast<WebBoolean*>(features->get("toolBarVisible"));
+    booleanValue = static_cast<API::Boolean*>(features->get("toolBarVisible"));
     if (booleanValue)
         webkitWindowPropertiesSetToolbarVisible(windowProperties, booleanValue->value());
 
-    booleanValue = static_cast<WebBoolean*>(features->get("locationBarVisible"));
+    booleanValue = static_cast<API::Boolean*>(features->get("locationBarVisible"));
     if (booleanValue)
         webkitWindowPropertiesSetLocationbarVisible(windowProperties, booleanValue->value());
 
-    booleanValue = static_cast<WebBoolean*>(features->get("scrollbarsVisible"));
+    booleanValue = static_cast<API::Boolean*>(features->get("scrollbarsVisible"));
     if (booleanValue)
         webkitWindowPropertiesSetScrollbarsVisible(windowProperties, booleanValue->value());
 
-    booleanValue = static_cast<WebBoolean*>(features->get("resizable"));
+    booleanValue = static_cast<API::Boolean*>(features->get("resizable"));
     if (booleanValue)
         webkitWindowPropertiesSetResizable(windowProperties, booleanValue->value());
 
-    booleanValue = static_cast<WebBoolean*>(features->get("fullscreen"));
+    booleanValue = static_cast<API::Boolean*>(features->get("fullscreen"));
     if (booleanValue)
         webkitWindowPropertiesSetFullscreen(windowProperties, booleanValue->value());
 }
index 474a708..b8c427b 100644 (file)
@@ -155,7 +155,7 @@ static void didInitiateLoadForResource(WKBundlePageRef page, WKBundleFrameRef fr
     ImmutableDictionary::MapType message;
     message.set(String::fromUTF8("Page"), toImpl(page));
     message.set(String::fromUTF8("Frame"), toImpl(frame));
-    message.set(String::fromUTF8("Identifier"), WebUInt64::create(identifier));
+    message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
     message.set(String::fromUTF8("Request"), toImpl(request));
     WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidInitiateLoadForResource"), ImmutableDictionary::adopt(message).get());
 }
@@ -176,7 +176,7 @@ static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef page, WKBundleFra
 
     ImmutableDictionary::MapType message;
     message.set(String::fromUTF8("Page"), toImpl(page));
-    message.set(String::fromUTF8("Identifier"), WebUInt64::create(identifier));
+    message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
     message.set(String::fromUTF8("Request"), newRequest.get());
     if (!toImpl(wkRedirectResponse)->resourceResponse().isNull())
         message.set(String::fromUTF8("RedirectResponse"), toImpl(wkRedirectResponse));
@@ -189,7 +189,7 @@ static void didReceiveResponseForResource(WKBundlePageRef page, WKBundleFrameRef
 {
     ImmutableDictionary::MapType message;
     message.set(String::fromUTF8("Page"), toImpl(page));
-    message.set(String::fromUTF8("Identifier"), WebUInt64::create(identifier));
+    message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
     message.set(String::fromUTF8("Response"), toImpl(response));
     WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveResponseForResource"), ImmutableDictionary::adopt(message).get());
 }
@@ -198,8 +198,8 @@ static void didReceiveContentLengthForResource(WKBundlePageRef page, WKBundleFra
 {
     ImmutableDictionary::MapType message;
     message.set(String::fromUTF8("Page"), toImpl(page));
-    message.set(String::fromUTF8("Identifier"), WebUInt64::create(identifier));
-    message.set(String::fromUTF8("ContentLength"), WebUInt64::create(length));
+    message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
+    message.set(String::fromUTF8("ContentLength"), API::UInt64::create(length));
     WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveContentLengthForResource"), ImmutableDictionary::adopt(message).get());
 }
 
@@ -207,7 +207,7 @@ static void didFinishLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uin
 {
     ImmutableDictionary::MapType message;
     message.set(String::fromUTF8("Page"), toImpl(page));
-    message.set(String::fromUTF8("Identifier"), WebUInt64::create(identifier));
+    message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
     WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFinishLoadForResource"), ImmutableDictionary::adopt(message).get());
 }
 
@@ -215,7 +215,7 @@ static void didFailLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint6
 {
     ImmutableDictionary::MapType message;
     message.set(String::fromUTF8("Page"), toImpl(page));
-    message.set(String::fromUTF8("Identifier"), WebUInt64::create(identifier));
+    message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
     message.set(String::fromUTF8("Error"), toImpl(error));
     WebProcess::shared().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFailLoadForResource"), ImmutableDictionary::adopt(message).get());
 }
@@ -374,9 +374,9 @@ WebKitWebPage* webkitWebPageCreate(WebPage* webPage)
 void webkitWebPageDidReceiveMessage(WebKitWebPage* page, const String& messageName, ImmutableDictionary& message)
 {
     if (messageName == String("GetSnapshot")) {
-        SnapshotOptions snapshotOptions = static_cast<SnapshotOptions>(static_cast<WebUInt64*>(message.get("SnapshotOptions"))->value());
-        uint64_t callbackID = static_cast<WebUInt64*>(message.get("CallbackID"))->value();
-        SnapshotRegion region = static_cast<SnapshotRegion>(static_cast<WebUInt64*>(message.get("SnapshotRegion"))->value());
+        SnapshotOptions snapshotOptions = static_cast<SnapshotOptions>(static_cast<API::UInt64*>(message.get("SnapshotOptions"))->value());
+        uint64_t callbackID = static_cast<API::UInt64*>(message.get("CallbackID"))->value();
+        SnapshotRegion region = static_cast<SnapshotRegion>(static_cast<API::UInt64*>(message.get("SnapshotRegion"))->value());
 
         RefPtr<WebImage> snapshotImage;
         WebPage* webPage = page->priv->webPage;
@@ -398,7 +398,7 @@ void webkitWebPageDidReceiveMessage(WebKitWebPage* page, const String& messageNa
 
         ImmutableDictionary::MapType messageReply;
         messageReply.set("Page", webPage);
-        messageReply.set("CallbackID", WebUInt64::create(callbackID));
+        messageReply.set("CallbackID", API::UInt64::create(callbackID));
         messageReply.set("Snapshot", snapshotImage);
         WebProcess::shared().injectedBundle()->postMessage("WebPage.DidGetSnapshot", ImmutableDictionary::adopt(messageReply).get());
     } else