Title: [169976] trunk/Source/WebCore
Revision
169976
Author
[email protected]
Date
2014-06-14 12:13:46 -0700 (Sat, 14 Jun 2014)

Log Message

Generate HTTP header names that are required by WebKitWebSrc
https://bugs.webkit.org/show_bug.cgi?id=133906

Reviewed by Anders Carlsson.

WebKitWebSrc implementation sets icy-metadata and transferMode.dlna HTTP headers
on ResourceRequest objects. The two headers are added to HTTPHeaderNames.in, and
a small tweak is added to the generator script to avoid the dot in the second
header's name (which would otherwise generate invalid C++).

* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcStart):
* platform/network/HTTPHeaderNames.in:
* platform/network/create-http-header-name-table:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (169975 => 169976)


--- trunk/Source/WebCore/ChangeLog	2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/ChangeLog	2014-06-14 19:13:46 UTC (rev 169976)
@@ -1,3 +1,20 @@
+2014-06-14  Zan Dobersek  <[email protected]>
+
+        Generate HTTP header names that are required by WebKitWebSrc
+        https://bugs.webkit.org/show_bug.cgi?id=133906
+
+        Reviewed by Anders Carlsson.
+
+        WebKitWebSrc implementation sets icy-metadata and transferMode.dlna HTTP headers
+        on ResourceRequest objects. The two headers are added to HTTPHeaderNames.in, and
+        a small tweak is added to the generator script to avoid the dot in the second
+        header's name (which would otherwise generate invalid C++).
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcStart):
+        * platform/network/HTTPHeaderNames.in:
+        * platform/network/create-http-header-name-table:
+
 2014-06-14  Anders Carlsson  <[email protected]>
 
         Replace some uses of ResourceRequestBase::addHTTPHeaderField with setHTTPHeaderField

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (169975 => 169976)


--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2014-06-14 19:13:46 UTC (rev 169976)
@@ -30,6 +30,7 @@
 #include "CrossOriginAccessControl.h"
 #include "GRefPtrGStreamer.h"
 #include "GStreamerUtilities.h"
+#include "HTTPHeaderNames.h"
 #include "MediaPlayer.h"
 #include "NotImplemented.h"
 #include "ResourceHandle.h"
@@ -484,15 +485,15 @@
 
     if (priv->requestedOffset) {
         GUniquePtr<gchar> val(g_strdup_printf("bytes=%" G_GUINT64_FORMAT "-", priv->requestedOffset));
-        request.setHTTPHeaderField("Range", val.get());
+        request.setHTTPHeaderField(HTTPHeaderName::Range, val.get());
     }
     priv->offset = priv->requestedOffset;
 
     // We always request Icecast/Shoutcast metadata, just in case ...
-    request.setHTTPHeaderField("icy-metadata", "1");
+    request.setHTTPHeaderField(HTTPHeaderName::IcyMetadata, "1");
 
     // Needed to use DLNA streaming servers
-    request.setHTTPHeaderField("transferMode.dlna", "Streaming");
+    request.setHTTPHeaderField(HTTPHeaderName::TransferModeDLNA, "Streaming");
 
     if (priv->player) {
         if (CachedResourceLoader* loader = priv->player->cachedResourceLoader())

Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169975 => 169976)


--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in	2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in	2014-06-14 19:13:46 UTC (rev 169976)
@@ -57,3 +57,7 @@
 Upgrade
 User-Agent
 X-Frame-Options
+
+// These headers are specific to GStreamer.
+Icy-Metadata
+TransferMode.DLNA

Modified: trunk/Source/WebCore/platform/network/create-http-header-name-table (169975 => 169976)


--- trunk/Source/WebCore/platform/network/create-http-header-name-table	2014-06-14 19:10:39 UTC (rev 169975)
+++ trunk/Source/WebCore/platform/network/create-http-header-name-table	2014-06-14 19:13:46 UTC (rev 169976)
@@ -46,7 +46,7 @@
     if not http_header_name or http_header_name[:2] == '//':
         continue
     
-    http_header_name_to_id[http_header_name] = http_header_name.replace('-', '')
+    http_header_name_to_id[http_header_name] = http_header_name.replace('-', '').replace('.', '')
     
     http_header_names.append(http_header_name)
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to