Delete files from webkit/glue that have been made obsolete by corresponding

files in webkit/api.

Here's the mapping:
  webkit/glue/webdatasource.h  ->  webkit/api/public/WebDataSource.h
  webkit/glue/weberror.h       ->  webkit/api/public/WebURLError.h
  webkit/glue/weburlrequest.h  ->  webkit/api/public/WebURLRequest.h
  webkit/glue/webresponse.h    ->  webkit/api/public/WebURLResponse.h

I kept the implementation of WebDataSource in webkit/glue for now because it
helps to have it close to WebFrameImpl and WebFrameLoaderClient.

To facilitate this change, I needed to make use of WrappedResourceRequest and
WrappedResourceResponse from webkit/api/src within the implementation files of
webkit/glue.  This is only a temporary usage of webkit/api/src from the
outside.  It will go away when WebFrame, etc. get moved into webkit/api.

I modified these wrapper classes to expose the 'bind' function so that I can
re-bind a wrapper.  This is used in WebDataSourceImpl::request() and related
methods to allow the interface to return a const reference to a WebURLRequest
and WebURLResponse.

The changes here are fairly mechanical.  I'm not too happy about the way
WebDataSource::redirectChain now works.  I would prefer a solution that didn't
involve so much copying, but I'm not going to worry about optimizing that now.

R=brettw
BUG=10041
TEST=none

Review URL: http://codereview.chromium.org/126286

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18747 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 49 insertions, 12 deletions

diff --git a/webkit/api/src/WebURLRequest.cpp b/webkit/api/src/WebURLRequest.cpp
index 66483f9..b62206c 100644
--- a/webkit/api/src/WebURLRequest.cpp
+++ b/webkit/api/src/WebURLRequest.cpp
@@ -238,6 +238,8 @@ const ResourceRequest& WebURLRequest::toResourceRequest() const
 
 void WebURLRequest::assign(WebURLRequestPrivate* p)
 {
+    if (m_private == p)
+        return;
     if (m_private)
         m_private->dispose();
     m_private = p;
diff --git a/webkit/api/src/WebURLRequestPrivate.h b/webkit/api/src/WebURLRequestPrivate.h
index 57ef3d1..a2b0187 100644
--- a/webkit/api/src/WebURLRequestPrivate.h
+++ b/webkit/api/src/WebURLRequestPrivate.h
@@ -31,7 +31,9 @@
 #ifndef WebURLRequestPrivate_h
 #define WebURLRequestPrivate_h
 
-#include "WebHTTPBody.h"
+// FIXME: This relative path is a temporary hack to support using this
+// header from webkit/glue.
+#include "../public/WebHTTPBody.h"
 
 namespace WebCore { struct ResourceRequest; }
 
diff --git a/webkit/api/src/WebURLResponse.cpp b/webkit/api/src/WebURLResponse.cpp
index 8b6f604..066000d 100644
--- a/webkit/api/src/WebURLResponse.cpp
+++ b/webkit/api/src/WebURLResponse.cpp
@@ -241,6 +241,8 @@ const ResourceResponse& WebURLResponse::toResourceResponse() const
 
 void WebURLResponse::assign(WebURLResponsePrivate* p)
 {
+    if (m_private == p)
+        return;
     if (m_private)
         m_private->dispose();
     m_private = p;
diff --git a/webkit/api/src/WrappedResourceRequest.h b/webkit/api/src/WrappedResourceRequest.h
index 58188c1..f232375 100644
--- a/webkit/api/src/WrappedResourceRequest.h
+++ b/webkit/api/src/WrappedResourceRequest.h
@@ -28,6 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef WrappedResourceRequest_h
+#define WrappedResourceRequest_h
+
+// FIXME: This relative path is a temporary hack to support using this
+// header from webkit/glue.
+#include "../public/WebURLRequest.h"
 #include "WebURLRequestPrivate.h"
 
 namespace WebKit {
@@ -39,23 +45,31 @@ namespace WebKit {
             reset(); // Need to drop reference to m_handle
         }
 
+        WrappedResourceRequest() { }
+
         WrappedResourceRequest(WebCore::ResourceRequest& resourceRequest)
         {
-            bind(&resourceRequest);
+            bind(resourceRequest);
         }
 
         WrappedResourceRequest(const WebCore::ResourceRequest& resourceRequest)
         {
-            bind(const_cast<WebCore::ResourceRequest*>(&resourceRequest));
+            bind(resourceRequest);
         }
 
-    private:
-        void bind(WebCore::ResourceRequest* resourceRequest)
+        void bind(WebCore::ResourceRequest& resourceRequest)
         {
-            m_handle.m_resourceRequest = resourceRequest;
+            m_handle.m_resourceRequest = &resourceRequest;
             assign(&m_handle);
         }
 
+        void bind(const WebCore::ResourceRequest& resourceRequest)
+        {
+            m_handle.m_resourceRequest = const_cast<WebCore::ResourceRequest*>(&resourceRequest);
+            assign(&m_handle);
+        }
+
+    private:
         class Handle : public WebURLRequestPrivate {
         public:
             virtual void dispose() { m_resourceRequest = 0; }
@@ -65,3 +79,5 @@ namespace WebKit {
     };
 
 } // namespace WebKit
+
+#endif
diff --git a/webkit/api/src/WrappedResourceResponse.h b/webkit/api/src/WrappedResourceResponse.h
index fe7bb99..8c44315 100644
--- a/webkit/api/src/WrappedResourceResponse.h
+++ b/webkit/api/src/WrappedResourceResponse.h
@@ -28,7 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebURLResponse.h"
+#ifndef WrappedResourceResponse_h
+#define WrappedResourceResponse_h
+
+// FIXME: This relative path is a temporary hack to support using this
+// header from webkit/glue.
+#include "../public/WebURLResponse.h"
 #include "WebURLResponsePrivate.h"
 
 namespace WebKit {
@@ -40,23 +45,31 @@ namespace WebKit {
             reset(); // Need to drop reference to m_handle
         }
 
+        WrappedResourceResponse() { }
+
         WrappedResourceResponse(WebCore::ResourceResponse& resourceResponse)
         {
-            bind(&resourceResponse);
+            bind(resourceResponse);
         }
 
         WrappedResourceResponse(const WebCore::ResourceResponse& resourceResponse)
         {
-            bind(const_cast<WebCore::ResourceResponse*>(&resourceResponse));
+            bind(resourceResponse);
         }
 
-    private:
-        void bind(WebCore::ResourceResponse* resourceResponse)
+        void bind(WebCore::ResourceResponse& resourceResponse)
         {
-            m_handle.m_resourceResponse = resourceResponse;
+            m_handle.m_resourceResponse = &resourceResponse;
             assign(&m_handle);
         }
 
+        void bind(const WebCore::ResourceResponse& resourceResponse)
+        {
+            m_handle.m_resourceResponse = const_cast<WebCore::ResourceResponse*>(&resourceResponse);
+            assign(&m_handle);
+        }
+
+    private:
         class Handle : public WebURLResponsePrivate {
         public:
             virtual void dispose() { m_resourceResponse = 0; }
@@ -66,3 +79,5 @@ namespace WebKit {
     };
 
 } // namespace WebKit
+
+#endif