Title: [123442] trunk/Source/WebKit2
Revision
123442
Author
[email protected]
Date
2012-07-24 02:13:23 -0700 (Tue, 24 Jul 2012)

Log Message

[WK2][EFL][GTK] Share WebCoreArgumentCoders for soup-related types
https://bugs.webkit.org/show_bug.cgi?id=92073

Patch by Christophe Dumez <[email protected]> on 2012-07-24
Reviewed by Kenneth Rohde Christiansen.

Move WebCoreArgumentCoders for soup-related types such as
ResourceRequest, ResourceResponse and ResourceError from
port specific file to Shared/soup/WebCoreArgumentCodersSoup.cpp.
This way, the different ports using libsoup can share
code and avoid duplication.

* GNUmakefile.list.am:
* PlatformEfl.cmake:
* Shared/efl/WebCoreArgumentCodersEfl.cpp: Removed.
* Shared/soup/WebCoreArgumentCodersSoup.cpp: Renamed from Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp.
(CoreIPC):
(CoreIPC::::encode):
(CoreIPC::::decode):

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (123441 => 123442)


--- trunk/Source/WebKit2/ChangeLog	2012-07-24 09:09:18 UTC (rev 123441)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-24 09:13:23 UTC (rev 123442)
@@ -1,3 +1,24 @@
+2012-07-24  Christophe Dumez  <[email protected]>
+
+        [WK2][EFL][GTK] Share WebCoreArgumentCoders for soup-related types
+        https://bugs.webkit.org/show_bug.cgi?id=92073
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Move WebCoreArgumentCoders for soup-related types such as
+        ResourceRequest, ResourceResponse and ResourceError from
+        port specific file to Shared/soup/WebCoreArgumentCodersSoup.cpp.
+        This way, the different ports using libsoup can share
+        code and avoid duplication.
+
+        * GNUmakefile.list.am:
+        * PlatformEfl.cmake:
+        * Shared/efl/WebCoreArgumentCodersEfl.cpp: Removed.
+        * Shared/soup/WebCoreArgumentCodersSoup.cpp: Renamed from Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp.
+        (CoreIPC):
+        (CoreIPC::::encode):
+        (CoreIPC::::decode):
+
 2012-07-23  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r123184, r123195, and r123197.

Modified: trunk/Source/WebKit2/GNUmakefile.list.am (123441 => 123442)


--- trunk/Source/WebKit2/GNUmakefile.list.am	2012-07-24 09:09:18 UTC (rev 123441)
+++ trunk/Source/WebKit2/GNUmakefile.list.am	2012-07-24 09:13:23 UTC (rev 123442)
@@ -374,7 +374,6 @@
 	Source/WebKit2/Shared/gtk/NativeWebWheelEventGtk.cpp \
 	Source/WebKit2/Shared/gtk/PrintInfoGtk.cpp \
 	Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp \
-	Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp \
 	Source/WebKit2/Shared/gtk/WebEventFactory.cpp \
 	Source/WebKit2/Shared/gtk/WebEventFactory.h \
 	Source/WebKit2/Shared/ImageOptions.h \
@@ -431,6 +430,7 @@
 	Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp \
 	Source/WebKit2/Shared/soup/PlatformCertificateInfo.h \
 	Source/WebKit2/Shared/soup/SoupCookiePersistentStorageType.h \
+	Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
 	Source/WebKit2/Shared/TextCheckerState.h \
 	Source/WebKit2/Shared/UserMessageCoders.h \
 	Source/WebKit2/Shared/UpdateInfo.cpp \
@@ -1242,13 +1242,13 @@
 	Source/WebKit2/Shared/WebKeyboardEvent.cpp \
 	Source/WebKit2/Shared/WebMouseEvent.cpp \
 	Source/WebKit2/Shared/WebWheelEvent.cpp \
-	Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp \
 	Source/WebKit2/Shared/gtk/NativeWebKeyboardEventGtk.cpp \
 	Source/WebKit2/Shared/gtk/NativeWebWheelEventGtk.cpp \
 	Source/WebKit2/Shared/gtk/NativeWebMouseEventGtk.cpp \
 	Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp \
 	Source/WebKit2/Shared/gtk/WebEventFactory.cpp \
 	Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp \
+	Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp \
 	Source/WebKit2/UIProcess/Plugins/gtk/PluginProcessProxyGtk.cpp \
 	Source/WebKit2/WebProcess/Plugins/Plugin.cpp \
 	Source/WebKit2/WebProcess/Plugins/Plugin.h \

Modified: trunk/Source/WebKit2/PlatformEfl.cmake (123441 => 123442)


--- trunk/Source/WebKit2/PlatformEfl.cmake	2012-07-24 09:09:18 UTC (rev 123441)
+++ trunk/Source/WebKit2/PlatformEfl.cmake	2012-07-24 09:13:23 UTC (rev 123442)
@@ -27,9 +27,9 @@
     Shared/efl/NativeWebMouseEventEfl.cpp
     Shared/efl/ProcessExecutablePathEfl.cpp
     Shared/efl/WebEventFactory.cpp
-    Shared/efl/WebCoreArgumentCodersEfl.cpp
 
     Shared/soup/PlatformCertificateInfo.cpp
+    Shared/soup/WebCoreArgumentCodersSoup.cpp
 
     UIProcess/API/C/efl/WKView.cpp
 

Deleted: trunk/Source/WebKit2/Shared/efl/WebCoreArgumentCodersEfl.cpp (123441 => 123442)


--- trunk/Source/WebKit2/Shared/efl/WebCoreArgumentCodersEfl.cpp	2012-07-24 09:09:18 UTC (rev 123441)
+++ trunk/Source/WebKit2/Shared/efl/WebCoreArgumentCodersEfl.cpp	2012-07-24 09:13:23 UTC (rev 123442)
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include "config.h"
-#include "WebCoreArgumentCoders.h"
-
-#include <WebCore/ResourceError.h>
-#include <WebCore/ResourceRequest.h>
-#include <WebCore/ResourceResponse.h>
-
-using namespace WebCore;
-
-namespace CoreIPC {
-
-void ArgumentCoder<ResourceRequest>::encode(ArgumentEncoder* encoder, const ResourceRequest& resourceRequest)
-{
-    encoder->encode(resourceRequest.url().string());
-    encoder->encode(resourceRequest.httpHeaderField("Cookie"));
-}
-
-bool ArgumentCoder<ResourceRequest>::decode(ArgumentDecoder* decoder, ResourceRequest& resourceRequest)
-{
-    ResourceRequest request;
-
-    String url;
-    if (!decoder->decode(url))
-        return false;
-    request.setURL(KURL(KURL(), url));
-
-    String cookie;
-    if (!decoder->decode(cookie))
-        return false;
-    request.setHTTPHeaderField("Cookie", cookie);
-
-    resourceRequest = request;
-    return true;
-}
-
-
-void ArgumentCoder<ResourceResponse>::encode(ArgumentEncoder* encoder, const ResourceResponse& resourceResponse)
-{
-    encoder->encode(resourceResponse.mimeType());
-}
-
-bool ArgumentCoder<ResourceResponse>::decode(ArgumentDecoder* decoder, ResourceResponse& resourceResponse)
-{
-    ResourceResponse response;
-
-    String mimeType;
-    if (!decoder->decode(mimeType))
-        return false;
-    response.setMimeType(mimeType);
-
-    resourceResponse = response;
-    return true;
-}
-
-
-void ArgumentCoder<ResourceError>::encode(ArgumentEncoder* encoder, const ResourceError& resourceError)
-{
-    encoder->encode(resourceError.domain());
-    encoder->encode(resourceError.errorCode());
-    encoder->encode(resourceError.failingURL());
-    encoder->encode(resourceError.localizedDescription());
-}
-
-bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder* decoder, ResourceError& resourceError)
-{
-    String domain;
-    if (!decoder->decode(domain))
-        return false;
-
-    int errorCode;
-    if (!decoder->decode(errorCode))
-        return false;
-
-    String failingURL;
-    if (!decoder->decode(failingURL))
-        return false;
-
-    String localizedDescription;
-    if (!decoder->decode(localizedDescription))
-        return false;
-
-    resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
-    return true;
-}
-
-} // namespace CoreIPC

Deleted: trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp (123441 => 123442)


--- trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp	2012-07-24 09:09:18 UTC (rev 123441)
+++ trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp	2012-07-24 09:13:23 UTC (rev 123442)
@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-#include "config.h"
-#include "WebCoreArgumentCoders.h"
-
-#include <wtf/text/CString.h>
-#include <WebCore/ResourceError.h>
-#include <WebCore/ResourceRequest.h>
-#include <WebCore/ResourceResponse.h>
-
-using namespace WebCore;
-
-namespace CoreIPC {
-
-void ArgumentCoder<ResourceRequest>::encode(ArgumentEncoder* encoder, const ResourceRequest& resourceRequest)
-{
-    encoder->encode(resourceRequest.url().string());
-    encoder->encode(resourceRequest.httpMethod());
-
-    const HTTPHeaderMap& headers = resourceRequest.httpHeaderFields();
-    encoder->encode(headers);
-
-    FormData* httpBody = resourceRequest.httpBody();
-    encoder->encode(static_cast<bool>(httpBody));
-    if (httpBody)
-        encoder->encode(httpBody->flattenToString());
-
-    encoder->encode(resourceRequest.firstPartyForCookies().string());
-    encoder->encode(static_cast<uint32_t>(resourceRequest.soupMessageFlags()));
-}
-
-bool ArgumentCoder<ResourceRequest>::decode(ArgumentDecoder* decoder, ResourceRequest& resourceRequest)
-{
-    ResourceRequest request;
-
-    String url;
-    if (!decoder->decode(url))
-        return false;
-    request.setURL(KURL(KURL(), url));
-
-    String httpMethod;
-    if (!decoder->decode(httpMethod))
-        return false;
-    request.setHTTPMethod(httpMethod);
-
-    HTTPHeaderMap headers;
-    if (!decoder->decode(headers))
-        return false;
-    request.addHTTPHeaderFields(headers);
-
-    bool hasHTTPBody;
-    if (!decoder->decode(hasHTTPBody))
-        return false;
-    if (hasHTTPBody) {
-        String httpBody;
-        if (!decoder->decode(httpBody))
-            return false;
-        request.setHTTPBody(FormData::create(httpBody.utf8()));
-    }
-
-    String firstPartyForCookies;
-    if (!decoder->decode(firstPartyForCookies))
-        return false;
-    request.setFirstPartyForCookies(KURL(KURL(), firstPartyForCookies));
-
-    uint32_t soupMessageFlags;
-    if (!decoder->decode(soupMessageFlags))
-        return false;
-    request.setSoupMessageFlags(static_cast<SoupMessageFlags>(soupMessageFlags));
-
-    resourceRequest = request;
-    return true;
-}
-
-
-void ArgumentCoder<ResourceResponse>::encode(ArgumentEncoder* encoder, const ResourceResponse& resourceResponse)
-{
-    bool responseIsNull = resourceResponse.isNull();
-    encoder->encode(responseIsNull);
-    if (responseIsNull)
-        return;
-
-    encoder->encode(resourceResponse.url().string());
-    encoder->encode(static_cast<int32_t>(resourceResponse.httpStatusCode()));
-
-    const HTTPHeaderMap& headers = resourceResponse.httpHeaderFields();
-    encoder->encode(headers);
-
-    encoder->encode(static_cast<uint32_t>(resourceResponse.soupMessageFlags()));
-    encoder->encode(resourceResponse.mimeType());
-    encoder->encode(resourceResponse.textEncodingName());
-    encoder->encode(static_cast<int64_t>(resourceResponse.expectedContentLength()));
-    encoder->encode(resourceResponse.httpStatusText());
-    encoder->encode(resourceResponse.suggestedFilename());
-}
-
-bool ArgumentCoder<ResourceResponse>::decode(ArgumentDecoder* decoder, ResourceResponse& resourceResponse)
-{
-    bool responseIsNull;
-    if (!decoder->decode(responseIsNull))
-        return false;
-    if (responseIsNull) {
-        resourceResponse = ResourceResponse();
-        return true;
-    }
-
-    ResourceResponse response;
-
-    String url;
-    if (!decoder->decode(url))
-        return false;
-    response.setURL(KURL(KURL(), url));
-
-    int32_t httpStatusCode;
-    if (!decoder->decode(httpStatusCode))
-        return false;
-    response.setHTTPStatusCode(httpStatusCode);
-
-    HTTPHeaderMap headers;
-    if (!decoder->decode(headers))
-        return false;
-    for (HTTPHeaderMap::const_iterator it = headers.begin(), end = headers.end(); it != end; ++it)
-        response.setHTTPHeaderField(it->first, it->second);
-
-    uint32_t soupMessageFlags;
-    if (!decoder->decode(soupMessageFlags))
-        return false;
-    response.setSoupMessageFlags(static_cast<SoupMessageFlags>(soupMessageFlags));
-
-    String mimeType;
-    if (!decoder->decode(mimeType))
-        return false;
-    response.setMimeType(mimeType);
-
-    String textEncodingName;
-    if (!decoder->decode(textEncodingName))
-        return false;
-    response.setTextEncodingName(textEncodingName);
-
-    int64_t contentLength;
-    if (!decoder->decode(contentLength))
-        return false;
-    response.setExpectedContentLength(contentLength);
-
-    String httpStatusText;
-    if (!decoder->decode(httpStatusText))
-        return false;
-    response.setHTTPStatusText(httpStatusText);
-
-    String suggestedFilename;
-    if (!decoder->decode(suggestedFilename))
-        return false;
-    response.setSuggestedFilename(suggestedFilename);
-
-    resourceResponse = response;
-    return true;
-}
-
-
-void ArgumentCoder<ResourceError>::encode(ArgumentEncoder* encoder, const ResourceError& resourceError)
-{
-    bool errorIsNull = resourceError.isNull();
-    encoder->encode(errorIsNull);
-    if (errorIsNull)
-        return;
-
-    encoder->encode(resourceError.domain());
-    encoder->encode(resourceError.errorCode());
-    encoder->encode(resourceError.failingURL()); 
-    encoder->encode(resourceError.localizedDescription());
-}
-
-bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder* decoder, ResourceError& resourceError)
-{
-    bool errorIsNull;
-    if (!decoder->decode(errorIsNull))
-        return false;
-    if (errorIsNull) {
-        resourceError = ResourceError();
-        return true;
-    }
-
-    String domain;
-    if (!decoder->decode(domain))
-        return false;
-
-    int errorCode;
-    if (!decoder->decode(errorCode))
-        return false;
-
-    String failingURL;
-    if (!decoder->decode(failingURL))
-        return false;
-
-    String localizedDescription;
-    if (!decoder->decode(localizedDescription))
-        return false;
-    
-    resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
-    return true;
-}
-
-}

Copied: trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp (from rev 123441, trunk/Source/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp) (0 => 123442)


--- trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp	                        (rev 0)
+++ trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp	2012-07-24 09:13:23 UTC (rev 123442)
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#include "config.h"
+#include "WebCoreArgumentCoders.h"
+
+#include <WebCore/ResourceError.h>
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/ResourceResponse.h>
+#include <wtf/text/CString.h>
+
+using namespace WebCore;
+
+namespace CoreIPC {
+
+void ArgumentCoder<ResourceRequest>::encode(ArgumentEncoder* encoder, const ResourceRequest& resourceRequest)
+{
+    encoder->encode(resourceRequest.url().string());
+    encoder->encode(resourceRequest.httpMethod());
+
+    const HTTPHeaderMap& headers = resourceRequest.httpHeaderFields();
+    encoder->encode(headers);
+
+    FormData* httpBody = resourceRequest.httpBody();
+    encoder->encode(static_cast<bool>(httpBody));
+    if (httpBody)
+        encoder->encode(httpBody->flattenToString());
+
+    encoder->encode(resourceRequest.firstPartyForCookies().string());
+    encoder->encode(static_cast<uint32_t>(resourceRequest.soupMessageFlags()));
+}
+
+bool ArgumentCoder<ResourceRequest>::decode(ArgumentDecoder* decoder, ResourceRequest& resourceRequest)
+{
+    ResourceRequest request;
+
+    String url;
+    if (!decoder->decode(url))
+        return false;
+    request.setURL(KURL(KURL(), url));
+
+    String httpMethod;
+    if (!decoder->decode(httpMethod))
+        return false;
+    request.setHTTPMethod(httpMethod);
+
+    HTTPHeaderMap headers;
+    if (!decoder->decode(headers))
+        return false;
+    request.addHTTPHeaderFields(headers);
+
+    bool hasHTTPBody;
+    if (!decoder->decode(hasHTTPBody))
+        return false;
+    if (hasHTTPBody) {
+        String httpBody;
+        if (!decoder->decode(httpBody))
+            return false;
+        request.setHTTPBody(FormData::create(httpBody.utf8()));
+    }
+
+    String firstPartyForCookies;
+    if (!decoder->decode(firstPartyForCookies))
+        return false;
+    request.setFirstPartyForCookies(KURL(KURL(), firstPartyForCookies));
+
+    uint32_t soupMessageFlags;
+    if (!decoder->decode(soupMessageFlags))
+        return false;
+    request.setSoupMessageFlags(static_cast<SoupMessageFlags>(soupMessageFlags));
+
+    resourceRequest = request;
+    return true;
+}
+
+
+void ArgumentCoder<ResourceResponse>::encode(ArgumentEncoder* encoder, const ResourceResponse& resourceResponse)
+{
+    bool responseIsNull = resourceResponse.isNull();
+    encoder->encode(responseIsNull);
+    if (responseIsNull)
+        return;
+
+    encoder->encode(resourceResponse.url().string());
+    encoder->encode(static_cast<int32_t>(resourceResponse.httpStatusCode()));
+
+    const HTTPHeaderMap& headers = resourceResponse.httpHeaderFields();
+    encoder->encode(headers);
+
+    encoder->encode(static_cast<uint32_t>(resourceResponse.soupMessageFlags()));
+    encoder->encode(resourceResponse.mimeType());
+    encoder->encode(resourceResponse.textEncodingName());
+    encoder->encode(static_cast<int64_t>(resourceResponse.expectedContentLength()));
+    encoder->encode(resourceResponse.httpStatusText());
+    encoder->encode(resourceResponse.suggestedFilename());
+}
+
+bool ArgumentCoder<ResourceResponse>::decode(ArgumentDecoder* decoder, ResourceResponse& resourceResponse)
+{
+    bool responseIsNull;
+    if (!decoder->decode(responseIsNull))
+        return false;
+    if (responseIsNull) {
+        resourceResponse = ResourceResponse();
+        return true;
+    }
+
+    ResourceResponse response;
+
+    String url;
+    if (!decoder->decode(url))
+        return false;
+    response.setURL(KURL(KURL(), url));
+
+    int32_t httpStatusCode;
+    if (!decoder->decode(httpStatusCode))
+        return false;
+    response.setHTTPStatusCode(httpStatusCode);
+
+    HTTPHeaderMap headers;
+    if (!decoder->decode(headers))
+        return false;
+    for (HTTPHeaderMap::const_iterator it = headers.begin(), end = headers.end(); it != end; ++it)
+        response.setHTTPHeaderField(it->first, it->second);
+
+    uint32_t soupMessageFlags;
+    if (!decoder->decode(soupMessageFlags))
+        return false;
+    response.setSoupMessageFlags(static_cast<SoupMessageFlags>(soupMessageFlags));
+
+    String mimeType;
+    if (!decoder->decode(mimeType))
+        return false;
+    response.setMimeType(mimeType);
+
+    String textEncodingName;
+    if (!decoder->decode(textEncodingName))
+        return false;
+    response.setTextEncodingName(textEncodingName);
+
+    int64_t contentLength;
+    if (!decoder->decode(contentLength))
+        return false;
+    response.setExpectedContentLength(contentLength);
+
+    String httpStatusText;
+    if (!decoder->decode(httpStatusText))
+        return false;
+    response.setHTTPStatusText(httpStatusText);
+
+    String suggestedFilename;
+    if (!decoder->decode(suggestedFilename))
+        return false;
+    response.setSuggestedFilename(suggestedFilename);
+
+    resourceResponse = response;
+    return true;
+}
+
+
+void ArgumentCoder<ResourceError>::encode(ArgumentEncoder* encoder, const ResourceError& resourceError)
+{
+    bool errorIsNull = resourceError.isNull();
+    encoder->encode(errorIsNull);
+    if (errorIsNull)
+        return;
+
+    encoder->encode(resourceError.domain());
+    encoder->encode(resourceError.errorCode());
+    encoder->encode(resourceError.failingURL());
+    encoder->encode(resourceError.localizedDescription());
+}
+
+bool ArgumentCoder<ResourceError>::decode(ArgumentDecoder* decoder, ResourceError& resourceError)
+{
+    bool errorIsNull;
+    if (!decoder->decode(errorIsNull))
+        return false;
+    if (errorIsNull) {
+        resourceError = ResourceError();
+        return true;
+    }
+
+    String domain;
+    if (!decoder->decode(domain))
+        return false;
+
+    int errorCode;
+    if (!decoder->decode(errorCode))
+        return false;
+
+    String failingURL;
+    if (!decoder->decode(failingURL))
+        return false;
+
+    String localizedDescription;
+    if (!decoder->decode(localizedDescription))
+        return false;
+
+    resourceError = ResourceError(domain, errorCode, failingURL, localizedDescription);
+    return true;
+}
+
+}
+
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to