Unreviewed build fix on EFL port after r160653
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Dec 2013 00:44:37 +0000 (00:44 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Dec 2013 00:44:37 +0000 (00:44 +0000)
Rename WebData to API::Data

* CMakeLists.txt: Added APIData.cpp to include list.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::sessionStateData):
(WebKit::WebPageProxy::restoreFromSessionStateData):
* UIProcess/soup/WebSoupRequestManagerProxy.cpp:
(WebKit::WebSoupRequestManagerProxy::didHandleURIRequest):
(WebKit::WebSoupRequestManagerProxy::didReceiveURIRequestData):
(WebKit::WebSoupRequestManagerProxy::didReceiveURIRequest):
* UIProcess/soup/WebSoupRequestManagerProxy.h:

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

Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.cpp
Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h

index c13fcdc..310a66f 100644 (file)
@@ -181,6 +181,7 @@ set(WebKit2_SOURCES
     PluginProcess/WebProcessConnection.cpp
 
     Shared/APIArray.cpp
+    Shared/APIData.cpp
     Shared/APIFrameHandle.cpp
     Shared/APIGeometry.cpp
     Shared/APIPageHandle.cpp
index 15feb19..9fa7315 100644 (file)
@@ -1,3 +1,19 @@
+2013-12-16  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Unreviewed build fix on EFL port after r160653
+
+        Rename WebData to API::Data
+
+        * CMakeLists.txt: Added APIData.cpp to include list.
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::sessionStateData):
+        (WebKit::WebPageProxy::restoreFromSessionStateData):
+        * UIProcess/soup/WebSoupRequestManagerProxy.cpp:
+        (WebKit::WebSoupRequestManagerProxy::didHandleURIRequest):
+        (WebKit::WebSoupRequestManagerProxy::didReceiveURIRequestData):
+        (WebKit::WebSoupRequestManagerProxy::didReceiveURIRequest):
+        * UIProcess/soup/WebSoupRequestManagerProxy.h:
+
 2013-12-16  Tim Horton  <timothy_horton@apple.com>
 
         WKView.magnification should include magnification due to the active gesture
index d1ed226..11d3185 100644 (file)
@@ -1541,13 +1541,13 @@ void WebPageProxy::terminateProcess()
 }
 
 #if !USE(CF)
-PassRefPtr<WebData> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* /*context*/) const
+PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* /*context*/) const
 {
     // FIXME: Return session state data for saving Page state.
     return 0;
 }
 
-void WebPageProxy::restoreFromSessionStateData(WebData*)
+void WebPageProxy::restoreFromSessionStateData(API::Data*)
 {
     // FIXME: Restore the Page from the passed in session state data.
 }
index d2e7099..716019d 100644 (file)
@@ -21,8 +21,8 @@
 #include "config.h"
 #include "WebSoupRequestManagerProxy.h"
 
+#include "APIData.h"
 #include "WebContext.h"
-#include "WebData.h"
 #include "WebSoupRequestManagerMessages.h"
 #include "WebSoupRequestManagerProxyMessages.h"
 
@@ -85,7 +85,7 @@ void WebSoupRequestManagerProxy::registerURIScheme(const String& scheme)
     m_registeredURISchemes.append(scheme);
 }
 
-void WebSoupRequestManagerProxy::didHandleURIRequest(const WebData* requestData, uint64_t contentLength, const String& mimeType, uint64_t requestID)
+void WebSoupRequestManagerProxy::didHandleURIRequest(const API::Data* requestData, uint64_t contentLength, const String& mimeType, uint64_t requestID)
 {
     if (!context())
         return;
@@ -93,7 +93,7 @@ void WebSoupRequestManagerProxy::didHandleURIRequest(const WebData* requestData,
     context()->sendToAllProcesses(Messages::WebSoupRequestManager::DidHandleURIRequest(requestData->dataReference(), contentLength, mimeType, requestID));
 }
 
-void WebSoupRequestManagerProxy::didReceiveURIRequestData(const WebData* requestData, uint64_t requestID)
+void WebSoupRequestManagerProxy::didReceiveURIRequestData(const API::Data* requestData, uint64_t requestID)
 {
     if (!context())
         return;
@@ -107,7 +107,7 @@ void WebSoupRequestManagerProxy::didReceiveURIRequestData(const WebData* request
 void WebSoupRequestManagerProxy::didReceiveURIRequest(const String& uriString, WebPageProxy* initiaingPage, uint64_t requestID)
 {
     if (!m_client.didReceiveURIRequest(this, WebURL::create(uriString).get(), initiaingPage, requestID))
-        didHandleURIRequest(WebData::create(0, 0).get(), 0, String(), requestID);
+        didHandleURIRequest(API::Data::create(0, 0).get(), 0, String(), requestID);
 }
 
 void WebSoupRequestManagerProxy::didFailToLoadURIRequest(uint64_t requestID)
index 02af8c8..eb4ad39 100644 (file)
 #include <wtf/RefPtr.h>
 #include <wtf/text/WTFString.h>
 
+namespace API {
+class Data;
+}
+
 namespace WebKit {
 
 class WebContext;
-class WebData;
 
 class WebSoupRequestManagerProxy : public API::ObjectImpl<API::Object::Type::SoupRequestManager>, public WebContextSupplement, private CoreIPC::MessageReceiver {
 public:
@@ -44,8 +47,8 @@ public:
     void initializeClient(const WKSoupRequestManagerClientBase*);
 
     void registerURIScheme(const String& scheme);
-    void didHandleURIRequest(const WebData*, uint64_t contentLength, const String& mimeType, uint64_t requestID);
-    void didReceiveURIRequestData(const WebData*, uint64_t requestID);
+    void didHandleURIRequest(const API::Data*, uint64_t contentLength, const String& mimeType, uint64_t requestID);
+    void didReceiveURIRequestData(const API::Data*, uint64_t requestID);
     void didReceiveURIRequest(const String& uriString, WebPageProxy*, uint64_t requestID);
     void didFailURIRequest(const WebCore::ResourceError&, uint64_t requestID);