<!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>[190641] 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/190641">190641</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-10-06 13:40:52 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor TokenPreloadScanner::StartTagScanner::processAttribute()
https://bugs.webkit.org/show_bug.cgi?id=149847
Reviewed by Antti Koivisto.
Refactor TokenPreloadScanner::StartTagScanner::processAttribute() to only
process attributes that make sense given the current tagId. In particular,
- We only process the charset parameter if the tag is a link or a script.
- We only process the sizes / srcset attributes if the tag is an img.
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
(WebCore::TokenPreloadScanner::StartTagScanner::setUrlToLoad): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLPreloadScannercpp">trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190640 => 190641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-06 20:28:25 UTC (rev 190640)
+++ trunk/Source/WebCore/ChangeLog 2015-10-06 20:40:52 UTC (rev 190641)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-06 Chris Dumez <cdumez@apple.com>
+
+ Refactor TokenPreloadScanner::StartTagScanner::processAttribute()
+ https://bugs.webkit.org/show_bug.cgi?id=149847
+
+ Reviewed by Antti Koivisto.
+
+ Refactor TokenPreloadScanner::StartTagScanner::processAttribute() to only
+ process attributes that make sense given the current tagId. In particular,
+ - We only process the charset parameter if the tag is a link or a script.
+ - We only process the sizes / srcset attributes if the tag is an img.
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
+ (WebCore::TokenPreloadScanner::StartTagScanner::setUrlToLoad): Deleted.
+
</ins><span class="cx"> 2015-10-06 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Binding generator XXConstructor::finishCreation should take references as parameters
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (190640 => 190641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-10-06 20:28:25 UTC (rev 190640)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-10-06 20:40:52 UTC (rev 190641)
</span><span class="lines">@@ -140,38 +140,60 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- template<typename NameType>
- void processAttribute(const NameType& attributeName, const String& attributeValue)
</del><ins>+ void processImageAndScriptAttribute(const AtomicString& attributeName, const String& attributeValue)
</ins><span class="cx"> {
</span><del>- if (match(attributeName, charsetAttr))
</del><ins>+ if (match(attributeName, srcAttr))
+ setUrlToLoad(attributeValue);
+ else if (match(attributeName, crossoriginAttr) && !attributeValue.isNull())
+ m_crossOriginMode = stripLeadingAndTrailingHTMLSpaces(attributeValue);
+ else if (match(attributeName, charsetAttr))
</ins><span class="cx"> m_charset = attributeValue;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (m_tagId == TagId::Script || m_tagId == TagId::Img) {
- if (match(attributeName, srcAttr))
- setUrlToLoad(attributeValue);
- else if (match(attributeName, srcsetAttr) && m_srcSetAttribute.isNull())
</del><ins>+ void processAttribute(const AtomicString& attributeName, const String& attributeValue)
+ {
+ switch (m_tagId) {
+ case TagId::Img:
+ if (match(attributeName, srcsetAttr) && m_srcSetAttribute.isNull()) {
</ins><span class="cx"> m_srcSetAttribute = attributeValue;
</span><del>- else if (match(attributeName, sizesAttr) && m_sizesAttribute.isNull())
</del><ins>+ break;
+ }
+ if (match(attributeName, sizesAttr) && m_sizesAttribute.isNull()) {
</ins><span class="cx"> m_sizesAttribute = attributeValue;
</span><del>- else if (match(attributeName, crossoriginAttr) && !attributeValue.isNull())
- m_crossOriginMode = stripLeadingAndTrailingHTMLSpaces(attributeValue);
- } else if (m_tagId == TagId::Link) {
</del><ins>+ break;
+ }
+ processImageAndScriptAttribute(attributeName, attributeValue);
+ break;
+ case TagId::Script:
+ processImageAndScriptAttribute(attributeName, attributeValue);
+ break;
+ case TagId::Link:
</ins><span class="cx"> if (match(attributeName, hrefAttr))
</span><span class="cx"> setUrlToLoad(attributeValue);
</span><span class="cx"> else if (match(attributeName, relAttr))
</span><span class="cx"> m_linkIsStyleSheet = relAttributeIsStyleSheet(attributeValue);
</span><span class="cx"> else if (match(attributeName, mediaAttr))
</span><span class="cx"> m_mediaAttribute = attributeValue;
</span><del>- } else if (m_tagId == TagId::Input) {
</del><ins>+ else if (match(attributeName, charsetAttr))
+ m_charset = attributeValue;
+ break;
+ case TagId::Input:
</ins><span class="cx"> if (match(attributeName, srcAttr))
</span><span class="cx"> setUrlToLoad(attributeValue);
</span><span class="cx"> else if (match(attributeName, typeAttr))
</span><span class="cx"> m_inputIsImage = equalIgnoringCase(attributeValue, InputTypeNames::image());
</span><del>- } else if (m_tagId == TagId::Meta) {
</del><ins>+ break;
+ case TagId::Meta:
</ins><span class="cx"> if (match(attributeName, contentAttr))
</span><span class="cx"> m_metaContent = attributeValue;
</span><span class="cx"> else if (match(attributeName, nameAttr))
</span><span class="cx"> m_metaIsViewport = equalIgnoringCase(attributeValue, "viewport");
</span><ins>+ break;
+ case TagId::Base:
+ case TagId::Style:
+ case TagId::Template:
+ case TagId::Unknown:
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -195,9 +217,6 @@
</span><span class="cx">
</span><span class="cx"> const String& charset() const
</span><span class="cx"> {
</span><del>- // FIXME: Its not clear that this if is needed, the loader probably ignores charset for image requests anyway.
- if (m_tagId == TagId::Img)
- return emptyString();
</del><span class="cx"> return m_charset;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>