2009-11-10 Yaar Schnitman <yaar@chromium.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Nov 2009 19:37:39 +0000 (19:37 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Nov 2009 19:37:39 +0000 (19:37 +0000)
        Reviewed by Eric Seidel.

        Up-streaming Chromium API src files: WrapperResourceRequest and Response

        https://bugs.webkit.org/show_bug.cgi?id=31276

        * src/WrappedResourceRequest.h: Added.
        (WebKit::WrappedResourceRequest::~WrappedResourceRequest):
        (WebKit::WrappedResourceRequest::WrappedResourceRequest):
        (WebKit::WrappedResourceRequest::bind):
        (WebKit::WrappedResourceRequest::Handle::dispose):
        * src/WrappedResourceResponse.h: Added.
        (WebKit::WrappedResourceResponse::~WrappedResourceResponse):
        (WebKit::WrappedResourceResponse::WrappedResourceResponse):
        (WebKit::WrappedResourceResponse::bind):
        (WebKit::WrappedResourceResponse::Handle::dispose):

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

WebKit/chromium/ChangeLog
WebKit/chromium/src/WrappedResourceRequest.h [new file with mode: 0644]
WebKit/chromium/src/WrappedResourceResponse.h [new file with mode: 0644]

index 7843a45de00b877105f777dff2d91ea95515417b..f18ea6086e6b6aee0d6dc15ee99dc656fa57e40d 100644 (file)
@@ -1,3 +1,22 @@
+2009-11-10  Yaar Schnitman  <yaar@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Up-streaming Chromium API src files: WrapperResourceRequest and Response
+
+        https://bugs.webkit.org/show_bug.cgi?id=31276
+
+        * src/WrappedResourceRequest.h: Added.
+        (WebKit::WrappedResourceRequest::~WrappedResourceRequest):
+        (WebKit::WrappedResourceRequest::WrappedResourceRequest):
+        (WebKit::WrappedResourceRequest::bind):
+        (WebKit::WrappedResourceRequest::Handle::dispose):
+        * src/WrappedResourceResponse.h: Added.
+        (WebKit::WrappedResourceResponse::~WrappedResourceResponse):
+        (WebKit::WrappedResourceResponse::WrappedResourceResponse):
+        (WebKit::WrappedResourceResponse::bind):
+        (WebKit::WrappedResourceResponse::Handle::dispose):
+
 2009-11-10  Yaar Schnitman  <yaar@chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/WrappedResourceRequest.h b/WebKit/chromium/src/WrappedResourceRequest.h
new file mode 100644 (file)
index 0000000..97311db
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * 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 {
+
+class WrappedResourceRequest : public WebURLRequest {
+public:
+    ~WrappedResourceRequest()
+    {
+        reset(); // Need to drop reference to m_handle
+    }
+
+    WrappedResourceRequest() { }
+
+    WrappedResourceRequest(WebCore::ResourceRequest& resourceRequest)
+    {
+        bind(resourceRequest);
+    }
+
+    WrappedResourceRequest(const WebCore::ResourceRequest& resourceRequest)
+    {
+        bind(resourceRequest);
+    }
+
+    void bind(WebCore::ResourceRequest& resourceRequest)
+    {
+        m_handle.m_resourceRequest = &resourceRequest;
+        assign(&m_handle);
+    }
+
+    void bind(const WebCore::ResourceRequest& resourceRequest)
+    {
+        bind(*const_cast<WebCore::ResourceRequest*>(&resourceRequest));
+    }
+
+private:
+    class Handle : public WebURLRequestPrivate {
+    public:
+        virtual void dispose() { m_resourceRequest = 0; }
+    };
+
+    Handle m_handle;
+};
+
+} // namespace WebKit
+
+#endif
diff --git a/WebKit/chromium/src/WrappedResourceResponse.h b/WebKit/chromium/src/WrappedResourceResponse.h
new file mode 100644 (file)
index 0000000..af4f88f
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#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 {
+
+class WrappedResourceResponse : public WebURLResponse {
+public:
+    ~WrappedResourceResponse()
+    {
+        reset(); // Need to drop reference to m_handle
+    }
+
+    WrappedResourceResponse() { }
+
+    WrappedResourceResponse(WebCore::ResourceResponse& resourceResponse)
+    {
+        bind(resourceResponse);
+    }
+
+    WrappedResourceResponse(const WebCore::ResourceResponse& resourceResponse)
+    {
+        bind(resourceResponse);
+    }
+
+    void bind(WebCore::ResourceResponse& resourceResponse)
+    {
+        m_handle.m_resourceResponse = &resourceResponse;
+        assign(&m_handle);
+    }
+
+    void bind(const WebCore::ResourceResponse& resourceResponse)
+    {
+        bind(*const_cast<WebCore::ResourceResponse*>(&resourceResponse));
+    }
+
+private:
+    class Handle : public WebURLResponsePrivate {
+    public:
+        virtual void dispose() { m_resourceResponse = 0; }
+    };
+
+    Handle m_handle;
+};
+
+} // namespace WebKit
+
+#endif