<!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>[201311] trunk/Source/WebCore</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/201311">201311</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-23 18:50:42 -0700 (Mon, 23 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Avoid unnecessary call to Document::completeURL() in HTMLLinkElement::process()
https://bugs.webkit.org/show_bug.cgi?id=157993

Reviewed by Ryosuke Niwa.

Avoid unnecessary call to Document::completeURL() in HTMLLinkElement::process().
The call to getNonEmptyURLAttribute() already calls Document::completeURL()
internally so we can just reuse the returned URL.

* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::process):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201310 => 201311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-05-24 01:03:13 UTC (rev 201310)
+++ trunk/Source/WebCore/ChangeLog        2016-05-24 01:50:42 UTC (rev 201311)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-23  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        Avoid unnecessary call to Document::completeURL() in HTMLLinkElement::process()
+        https://bugs.webkit.org/show_bug.cgi?id=157993
+
+        Reviewed by Ryosuke Niwa.
+
+        Avoid unnecessary call to Document::completeURL() in HTMLLinkElement::process().
+        The call to getNonEmptyURLAttribute() already calls Document::completeURL()
+        internally so we can just reuse the returned URL.
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::process):
+
</ins><span class="cx"> 2016-05-23  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Null popstate event fired when navigating back to a cached page with a stateless history entry
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (201310 => 201311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp        2016-05-24 01:03:13 UTC (rev 201310)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp        2016-05-24 01:50:42 UTC (rev 201311)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">         if (m_cachedSheet) {
</span><span class="cx">             removePendingSheet();
</span><span class="cx">             m_cachedSheet-&gt;removeClient(this);
</span><del>-            m_cachedSheet = 0;
</del><ins>+            m_cachedSheet = nullptr;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!shouldLoadLink())
</span><span class="lines">@@ -240,9 +240,9 @@
</span><span class="cx">             Optional&lt;RenderStyle&gt; documentStyle;
</span><span class="cx">             if (document().hasLivingRenderTree())
</span><span class="cx">                 documentStyle = Style::resolveForDocument(document());
</span><del>-            RefPtr&lt;MediaQuerySet&gt; media = MediaQuerySet::createAllowingDescriptionSyntax(m_media);
</del><ins>+            auto media = MediaQuerySet::createAllowingDescriptionSyntax(m_media);
</ins><span class="cx">             MediaQueryEvaluator evaluator(document().frame()-&gt;view()-&gt;mediaType(), document().frame(), documentStyle ? &amp;*documentStyle : nullptr);
</span><del>-            mediaQueryMatches = evaluator.eval(media.get());
</del><ins>+            mediaQueryMatches = evaluator.eval(media.ptr());
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Don't hold up render tree construction and script execution on stylesheets
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx">         Optional&lt;ResourceLoadPriority&gt; priority;
</span><span class="cx">         if (!isActive)
</span><span class="cx">             priority = ResourceLoadPriority::VeryLow;
</span><del>-        CachedResourceRequest request(ResourceRequest(document().completeURL(url)), charset, priority);
</del><ins>+        CachedResourceRequest request(url, charset, priority);
</ins><span class="cx">         request.setInitiator(this);
</span><span class="cx"> 
</span><span class="cx">         if (document().contentSecurityPolicy()-&gt;allowStyleWithNonce(fastGetAttribute(HTMLNames::nonceAttr))) {
</span></span></pre>
</div>
</div>

</body>
</html>