Changeset 219288 in webkit

Timestamp:

Jul 10, 2017 3:13:47 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] http/tests/media/video-redirect.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=174260

Patch by Charlie Turner <​cturner@igalia.com> on 2017-07-10
Reviewed by Carlos Garcia Campos.

Make sure we're testing new URLs within the same security origin.

Covered by existing tests.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::convertToInternalProtocol): Factor out setting our
internal URL schema.
(WebCore::MediaPlayerPrivateGStreamer::setPlaybinURL): Use the
refactored helper.
(WebCore::MediaPlayerPrivateGStreamer::loadNextLocation): Use
refactored helper to ensure both URLs have the same origin.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-10  Charlie Turner  <cturner@igalia.com>
+
+        [GTK] http/tests/media/video-redirect.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=174260
+
+        Reviewed by Carlos Garcia Campos.
+
+        Make sure we're testing new URLs within the same security origin.
+
+        Covered by existing tests.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::convertToInternalProtocol): Factor out setting our
+        internal URL schema.
+        (WebCore::MediaPlayerPrivateGStreamer::setPlaybinURL): Use the
+        refactored helper.
+        (WebCore::MediaPlayerPrivateGStreamer::loadNextLocation): Use
+        refactored helper to ensure both URLs have the same origin.
+
 2017-07-08  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -211 +211 @@
 }
 
+static void convertToInternalProtocol(URL& url)
+{
+    if (url.protocolIsInHTTPFamily())
+        url.setProtocol("webkit+" + url.protocol());
+}
+
 void MediaPlayerPrivateGStreamer::setPlaybinURL(const URL& url)
 {
@@ -219 +225 @@
 
     m_url = URL(URL(), cleanURLString);
-
-    if (m_url.protocolIsInHTTPFamily())
-        m_url.setProtocol("webkit+" + url.protocol());
+    convertToInternalProtocol(m_url);
 
     GST_INFO("Load %s", m_url.string().utf8().data());
@@ -1669 +1673 @@
         URL baseUrl = gst_uri_is_valid(newLocation) ? URL() : m_url;
         URL newUrl = URL(baseUrl, newLocation);
+        convertToInternalProtocol(newUrl);
 
         RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(m_url);