Changeset 175614 in webkit

Timestamp:

Nov 5, 2014 1:26:51 AM (9 years ago)

Author:

Antti Koivisto

Message:

Move HTTPHeaderMap encoding to the class
​https://bugs.webkit.org/show_bug.cgi?id=138412

Reviewed by Andreas Kling.

Source/WebCore:

• platform/network/HTTPHeaderMap.h:

(WebCore::HTTPHeaderMap::encode):
(WebCore::HTTPHeaderMap::decode):

Use generic encoding for the uncommon header map. Common headers still require custom code due to the enum class.

Source/WebKit2:

• PluginProcess/PluginControllerProxy.cpp:
• Shared/WebCoreArgumentCoders.cpp:

(IPC::ArgumentCoder<HTTPHeaderMap>::encode): Deleted.
(IPC::ArgumentCoder<HTTPHeaderMap>::decode): Deleted.

Make these HTTPHeaderMap members instead so they can access internals and can be used elsewhere.

• Shared/WebCoreArgumentCoders.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/HTTPHeaderMap.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/PluginProcess/PluginControllerProxy.cpp (modified) (1 diff)
• WebKit2/Shared/WebCoreArgumentCoders.cpp (modified) (1 diff)
• WebKit2/Shared/WebCoreArgumentCoders.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-05  Antti Koivisto  <antti@apple.com>
+
+        Move HTTPHeaderMap encoding to the class
+        https://bugs.webkit.org/show_bug.cgi?id=138412
+
+        Reviewed by Andreas Kling.
+
+        * platform/network/HTTPHeaderMap.h:
+        (WebCore::HTTPHeaderMap::encode):
+        (WebCore::HTTPHeaderMap::decode):
+
+            Use generic encoding for the uncommon header map. Common headers still require custom code due to the enum class.
+
 2014-11-04  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/platform/network/HTTPHeaderMap.h

@@ -171 +171 @@
     }
 
+    template <class Encoder> void encode(Encoder&) const;
+    template <class Decoder> static bool decode(Decoder&, HTTPHeaderMap&);
+
 private:
     CommonHeadersHashMap m_commonHeaders;
@@ -176 +179 @@
 };
 
+template <class Encoder>
+void HTTPHeaderMap::encode(Encoder& encoder) const
+{
+    encoder << static_cast<uint64_t>(m_commonHeaders.size());
+    for (const auto& keyValuePair : m_commonHeaders) {
+        encoder.encodeEnum(keyValuePair.key);
+        encoder << keyValuePair.value;
+    }
+
+    encoder << m_uncommonHeaders;
+}
+
+template <class Decoder>
+bool HTTPHeaderMap::decode(Decoder& decoder, HTTPHeaderMap& headerMap)
+{
+    uint64_t commonHeadersSize;
+    if (!decoder.decode(commonHeadersSize))
+        return false;
+    for (size_t i = 0; i < commonHeadersSize; ++i) {
+        HTTPHeaderName name;
+        if (!decoder.decodeEnum(name))
+            return false;
+        String value;
+        if (!decoder.decode(value))
+            return false;
+        headerMap.m_commonHeaders.add(name, value);
+    }
+
+    if (!decoder.decode(headerMap.m_uncommonHeaders))
+        return false;
+
+    return true;
+}
+
 } // namespace WebCore
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-05  Antti Koivisto  <antti@apple.com>
+
+        Move HTTPHeaderMap encoding to the class
+        https://bugs.webkit.org/show_bug.cgi?id=138412
+
+        Reviewed by Andreas Kling.
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        * Shared/WebCoreArgumentCoders.cpp:
+        (IPC::ArgumentCoder<HTTPHeaderMap>::encode): Deleted.
+        (IPC::ArgumentCoder<HTTPHeaderMap>::decode): Deleted.
+
+            Make these HTTPHeaderMap members instead so they can access internals and can be used elsewhere.
+
+        * Shared/WebCoreArgumentCoders.h:
+
 2014-11-04  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -42 +42 @@
 #include "WebProcessConnection.h"
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/HTTPHeaderMap.h>
 #include <WebCore/IdentifierRep.h>
 #include <WebCore/NotImplemented.h>

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -465 +465 @@
 }
 
-
-void ArgumentCoder<HTTPHeaderMap>::encode(ArgumentEncoder& encoder, const HTTPHeaderMap& headerMap)
-{
-    encoder << static_cast<uint64_t>(headerMap.commonHeaders().size());
-    for (const auto& keyValuePair : headerMap.commonHeaders()) {
-        encoder.encodeEnum(keyValuePair.key);
-        encoder << keyValuePair.value;
-    }
-    encoder << static_cast<uint64_t>(headerMap.uncommonHeaders().size());
-    for (const auto& keyValuePair : headerMap.uncommonHeaders()) {
-        encoder << keyValuePair.key;
-        encoder << keyValuePair.value;
-    }
-}
-
-bool ArgumentCoder<HTTPHeaderMap>::decode(ArgumentDecoder& decoder, HTTPHeaderMap& headerMap)
-{
-    uint64_t commonHeadersSize;
-    if (!decoder.decode(commonHeadersSize))
-        return false;
-
-    for (size_t i = 0; i < commonHeadersSize; ++i) {
-        HTTPHeaderName name;
-        if (!decoder.decodeEnum(name))
-            return false;
-
-        String value;
-        if (!decoder.decode(value))
-            return false;
-
-        headerMap.commonHeaders().add(name, value);
-    }
-
-    uint64_t uncommonHeadersSize;
-    if (!decoder.decode(uncommonHeadersSize))
-        return false;
-
-    for (size_t i = 0; i < uncommonHeadersSize; ++i) {
-        String name;
-        if (!decoder.decode(name))
-            return false;
-
-        String value;
-        if (!decoder.decode(value))
-            return false;
-
-        headerMap.uncommonHeaders().add(name, value);
-    }
-
-    return true;
-}
-
-
 void ArgumentCoder<AuthenticationChallenge>::encode(ArgumentEncoder& encoder, const AuthenticationChallenge& challenge)
 {

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

@@ -216 +216 @@
 };
 
-template<> struct ArgumentCoder<WebCore::HTTPHeaderMap> {
-    static void encode(ArgumentEncoder&, const WebCore::HTTPHeaderMap&);
-    static bool decode(ArgumentDecoder&, WebCore::HTTPHeaderMap&);
-};
-
 template<> struct ArgumentCoder<WebCore::AuthenticationChallenge> {
     static void encode(ArgumentEncoder&, const WebCore::AuthenticationChallenge&);