<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198106] releases/WebKitGTK/webkit-2.12/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198106">198106</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-14 03:19:08 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197706">r197706</a> - Cleanup: Add convenience function URL::procotolIsBlob()
https://bugs.webkit.org/show_bug.cgi?id=155127
<rdar://problem/25016829>
Reviewed by Brent Fulgham.
Source/WebCore:
Similar to the class member function URL::protocolIsData(), add a class member function to
class URL to determine if a URL is a blob URL.
No functionality was changed. So, no new tests.
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::shouldUseInnerURL): Modified to use URL::protocolIsBlob().
(WebCore::getCachedOrigin): Ditto.
* platform/URL.h:
(WebCore::URL::protocolIsBlob): Added.
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcStart): Modified to use URL::protocolIsBlob().
(urlHasSupportedProtocol): Ditto.
* workers/Worker.cpp:
(WebCore::Worker::didReceiveResponse): Ditto.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest): Ditto.
Source/WebKit2:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::NetworkLoad): Modified to use URL::protocolIsBlob().
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader): Ditto.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::canHandleRequest): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorepageSecurityOrigincpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreplatformURLh">releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/URL.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreworkersWorkercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/workers/Worker.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorexmlXMLHttpRequestcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2NetworkProcessNetworkLoadcpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2NetworkProcessNetworkResourceLoadercpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebKit2WebProcessWebPageWebPagecpp">releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-03-07 Daniel Bates <dabates@apple.com>
+
+ Cleanup: Add convenience function URL::procotolIsBlob()
+ https://bugs.webkit.org/show_bug.cgi?id=155127
+ <rdar://problem/25016829>
+
+ Reviewed by Brent Fulgham.
+
+ Similar to the class member function URL::protocolIsData(), add a class member function to
+ class URL to determine if a URL is a blob URL.
+
+ No functionality was changed. So, no new tests.
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::shouldUseInnerURL): Modified to use URL::protocolIsBlob().
+ (WebCore::getCachedOrigin): Ditto.
+ * platform/URL.h:
+ (WebCore::URL::protocolIsBlob): Added.
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcStart): Modified to use URL::protocolIsBlob().
+ (urlHasSupportedProtocol): Ditto.
+ * workers/Worker.cpp:
+ (WebCore::Worker::didReceiveResponse): Ditto.
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest): Ditto.
+
</ins><span class="cx"> 2016-03-07 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in WebCore::RenderElement::containingBlockForObjectInFlow
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> bool SecurityOrigin::shouldUseInnerURL(const URL& url)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Blob URLs don't have inner URLs. Their form is "blob:<inner-origin>/<UUID>", so treating the part after "blob:" as a URL is incorrect.
</span><del>- if (url.protocolIs("blob"))
</del><ins>+ if (url.protocolIsBlob())
</ins><span class="cx"> return true;
</span><span class="cx"> UNUSED_PARAM(url);
</span><span class="cx"> return false;
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<SecurityOrigin> getCachedOrigin(const URL& url)
</span><span class="cx"> {
</span><del>- if (url.protocolIs("blob"))
</del><ins>+ if (url.protocolIsBlob())
</ins><span class="cx"> return ThreadableBlobRegistry::getCachedOrigin(url);
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/URL.h (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/URL.h 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/URL.h 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> // Returns true if the current URL's protocol is the same as the null-
</span><span class="cx"> // terminated ASCII argument. The argument must be lower-case.
</span><span class="cx"> WEBCORE_EXPORT bool protocolIs(const char*) const;
</span><ins>+ bool protocolIsBlob() const { return protocolIs("blob"); }
</ins><span class="cx"> bool protocolIsData() const { return protocolIs("data"); }
</span><span class="cx"> bool protocolIsInHTTPFamily() const;
</span><span class="cx"> WEBCORE_EXPORT bool isLocalFile() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx">
</span><span class="cx"> if (priv->loader) {
</span><span class="cx"> PlatformMediaResourceLoader::LoadOptions loadOptions = 0;
</span><del>- if (request.url().protocolIs("blob"))
</del><ins>+ if (request.url().protocolIsBlob())
</ins><span class="cx"> loadOptions |= PlatformMediaResourceLoader::LoadOption::BufferData;
</span><span class="cx"> priv->resource = priv->loader->requestResource(request, loadOptions);
</span><span class="cx"> loadFailed = !priv->resource;
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx">
</span><span class="cx"> static bool urlHasSupportedProtocol(const URL& url)
</span><span class="cx"> {
</span><del>- return url.isValid() && (url.protocolIsInHTTPFamily() || url.protocolIs("blob"));
</del><ins>+ return url.isValid() && (url.protocolIsInHTTPFamily() || url.protocolIsBlob());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // uri handler interface
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreworkersWorkercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/workers/Worker.cpp (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/workers/Worker.cpp 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/workers/Worker.cpp 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> void Worker::didReceiveResponse(unsigned long identifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> const URL& responseURL = response.url();
</span><del>- if (!responseURL.protocolIs("blob") && !responseURL.protocolIs("file") && !SecurityOrigin::create(responseURL)->isUnique())
</del><ins>+ if (!responseURL.protocolIsBlob() && !responseURL.protocolIs("file") && !SecurityOrigin::create(responseURL)->isUnique())
</ins><span class="cx"> m_contentSecurityPolicyResponseHeaders = ContentSecurityPolicyResponseHeaders(response);
</span><span class="cx"> InspectorInstrumentation::didReceiveScriptResponse(scriptExecutionContext(), identifier);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/xml/XMLHttpRequest.cpp (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/xml/XMLHttpRequest.cpp 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/xml/XMLHttpRequest.cpp 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> void XMLHttpRequest::createRequest(ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> // Only GET request is supported for blob URL.
</span><del>- if (m_url.protocolIs("blob") && m_method != "GET") {
</del><ins>+ if (m_url.protocolIsBlob() && m_method != "GET") {
</ins><span class="cx"> ec = NETWORK_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-07 Daniel Bates <dabates@apple.com>
+
+ Cleanup: Add convenience function URL::procotolIsBlob()
+ https://bugs.webkit.org/show_bug.cgi?id=155127
+ <rdar://problem/25016829>
+
+ Reviewed by Brent Fulgham.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::NetworkLoad): Modified to use URL::protocolIsBlob().
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::NetworkResourceLoader): Ditto.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::canHandleRequest): Ditto.
+
</ins><span class="cx"> 2016-03-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r197062): [GTK] Transparent backgrounds no longer work after r197062
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> , m_currentRequest(parameters.request)
</span><span class="cx"> {
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- if (parameters.request.url().protocolIs("blob")) {
</del><ins>+ if (parameters.request.url().protocolIsBlob()) {
</ins><span class="cx"> m_handle = ResourceHandle::create(nullptr, parameters.request, this, parameters.defersLoading, parameters.contentSniffingPolicy == SniffContent);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (originalRequest().url().protocolIs("blob")) {
</del><ins>+ if (originalRequest().url().protocolIsBlob()) {
</ins><span class="cx"> ASSERT(!m_parameters.resourceSandboxExtension);
</span><span class="cx"> m_fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(connection, originalRequest().url()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (198105 => 198106)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-14 09:57:07 UTC (rev 198105)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-14 10:19:08 UTC (rev 198106)
</span><span class="lines">@@ -4156,7 +4156,7 @@
</span><span class="cx"> if (SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(request.url().protocol()))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (request.url().protocolIs("blob"))
</del><ins>+ if (request.url().protocolIsBlob())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return platformCanHandleRequest(request);
</span></span></pre>
</div>
</div>
</body>
</html>