<!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>[173464] 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/173464">173464</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-09-10 08:54:40 -0700 (Wed, 10 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up some ENABLE(PICTURE_SIZES) stuff, don't change function signatures inside #ifdefs
https://bugs.webkit.org/show_bug.cgi?id=136654
Reviewed by Darin Adler.
Adding parameters inside an #ifdef makes for unreadable code, so remove some
#if ENABLE(PICTURE_SIZES) related to the preload scanner and always pass the arguments.
Reduced the argument count on some functions by just passing a Document&.
Also fix a couple of uses of #if ENABLE_PICTURE_SIZES.
* html/HTMLImageElement.h:
* html/parser/HTMLDocumentParser.cpp:
(WebCore::HTMLDocumentParser::pumpTokenizer):
(WebCore::HTMLDocumentParser::insert):
(WebCore::HTMLDocumentParser::append):
(WebCore::HTMLDocumentParser::appendCurrentInputStreamToPreloadScannerAndScan):
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::scan):
(WebCore::HTMLPreloadScanner::scan):
* html/parser/HTMLPreloadScanner.h:
* html/parser/HTMLSrcsetParser.cpp:
(WebCore::pickBestImageCandidate):
(WebCore::bestFitSourceForImageAttributes):
* html/parser/HTMLSrcsetParser.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementh">trunk/Source/WebCore/html/HTMLImageElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLDocumentParsercpp">trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLPreloadScannercpp">trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLPreloadScannerh">trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLSrcsetParsercpp">trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLSrcsetParserh">trunk/Source/WebCore/html/parser/HTMLSrcsetParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173463 => 173464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-10 15:51:19 UTC (rev 173463)
+++ trunk/Source/WebCore/ChangeLog 2014-09-10 15:54:40 UTC (rev 173464)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-09-10 Simon Fraser <simon.fraser@apple.com>
+
+ Clean up some ENABLE(PICTURE_SIZES) stuff, don't change function signatures inside #ifdefs
+ https://bugs.webkit.org/show_bug.cgi?id=136654
+
+ Reviewed by Darin Adler.
+
+ Adding parameters inside an #ifdef makes for unreadable code, so remove some
+ #if ENABLE(PICTURE_SIZES) related to the preload scanner and always pass the arguments.
+ Reduced the argument count on some functions by just passing a Document&.
+
+ Also fix a couple of uses of #if ENABLE_PICTURE_SIZES.
+
+ * html/HTMLImageElement.h:
+ * html/parser/HTMLDocumentParser.cpp:
+ (WebCore::HTMLDocumentParser::pumpTokenizer):
+ (WebCore::HTMLDocumentParser::insert):
+ (WebCore::HTMLDocumentParser::append):
+ (WebCore::HTMLDocumentParser::appendCurrentInputStreamToPreloadScannerAndScan):
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::scan):
+ (WebCore::HTMLPreloadScanner::scan):
+ * html/parser/HTMLPreloadScanner.h:
+ * html/parser/HTMLSrcsetParser.cpp:
+ (WebCore::pickBestImageCandidate):
+ (WebCore::bestFitSourceForImageAttributes):
+ * html/parser/HTMLSrcsetParser.h:
+
</ins><span class="cx"> 2014-09-10 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: aria-labelledby is not honoring sub-node text
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.h (173463 => 173464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.h 2014-09-10 15:51:19 UTC (rev 173463)
+++ trunk/Source/WebCore/html/HTMLImageElement.h 2014-09-10 15:54:40 UTC (rev 173464)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> int naturalWidth() const;
</span><span class="cx"> int naturalHeight() const;
</span><del>-#if ENABLE_PICTURE_SIZES
</del><ins>+#if ENABLE(PICTURE_SIZES)
</ins><span class="cx"> const AtomicString& currentSrc() const { return m_currentSrc; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> HTMLFormElement* m_form;
</span><span class="cx"> CompositeOperator m_compositeOperator;
</span><span class="cx"> AtomicString m_bestFitImageURL;
</span><del>-#if ENABLE_PICTURE_SIZES
</del><ins>+#if ENABLE(PICTURE_SIZES)
</ins><span class="cx"> AtomicString m_currentSrc;
</span><span class="cx"> #endif
</span><span class="cx"> AtomicString m_lowercasedUsemap;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLDocumentParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp (173463 => 173464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2014-09-10 15:51:19 UTC (rev 173463)
+++ trunk/Source/WebCore/html/parser/HTMLDocumentParser.cpp 2014-09-10 15:54:40 UTC (rev 173464)
</span><span class="lines">@@ -326,11 +326,7 @@
</span><span class="cx"> m_preloadScanner = std::make_unique<HTMLPreloadScanner>(m_options, document()->url(), document()->deviceScaleFactor());
</span><span class="cx"> m_preloadScanner->appendToEnd(m_input.current());
</span><span class="cx"> }
</span><del>- m_preloadScanner->scan(m_preloader.get(), document()->baseElementURL()
-#if ENABLE(PICTURE_SIZES)
- , document()->renderView(), document()->frame()
-#endif
- );
</del><ins>+ m_preloadScanner->scan(m_preloader.get(), *document());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didWriteHTML(cookie, m_input.current().currentLine().zeroBasedInt());
</span><span class="lines">@@ -392,11 +388,7 @@
</span><span class="cx"> m_insertionPreloadScanner = std::make_unique<HTMLPreloadScanner>(m_options, document()->url(), document()->deviceScaleFactor());
</span><span class="cx"> }
</span><span class="cx"> m_insertionPreloadScanner->appendToEnd(source);
</span><del>- m_insertionPreloadScanner->scan(m_preloader.get(), document()->baseElementURL()
-#if ENABLE(PICTURE_SIZES)
- , document()->renderView(), document()->frame()
-#endif
- );
</del><ins>+ m_insertionPreloadScanner->scan(m_preloader.get(), *document());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> endIfDelayed();
</span><span class="lines">@@ -420,11 +412,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> m_preloadScanner->appendToEnd(source);
</span><span class="cx"> if (isWaitingForScripts())
</span><del>- m_preloadScanner->scan(m_preloader.get(), document()->baseElementURL()
-#if ENABLE(PICTURE_SIZES)
- , document()->renderView(), document()->frame()
-#endif
- );
</del><ins>+ m_preloadScanner->scan(m_preloader.get(), *document());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -562,11 +550,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_preloadScanner);
</span><span class="cx"> m_preloadScanner->appendToEnd(m_input.current());
</span><del>- m_preloadScanner->scan(m_preloader.get(), document()->baseElementURL()
-#if ENABLE(PICTURE_SIZES)
- , document()->renderView(), document()->frame()
-#endif
- );
</del><ins>+ m_preloadScanner->scan(m_preloader.get(), *document());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLDocumentParser::notifyFinished(CachedResource* cachedResource)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (173463 => 173464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2014-09-10 15:51:19 UTC (rev 173463)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2014-09-10 15:54:40 UTC (rev 173464)
</span><span class="lines">@@ -93,15 +93,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void processAttributes(const HTMLToken::AttributeList& attributes
-#if ENABLE(PICTURE_SIZES)
- , RenderView* view, Frame* frame
-#endif
- )
</del><ins>+ void processAttributes(const HTMLToken::AttributeList& attributes, Document& document)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (m_tagId >= TagId::Unknown)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> for (HTMLToken::AttributeList::const_iterator iter = attributes.begin(); iter != attributes.end(); ++iter) {
</span><span class="cx"> AtomicString attributeName(iter->name);
</span><span class="cx"> String attributeValue = StringImpl::create8BitIfPossible(iter->value);
</span><span class="lines">@@ -110,11 +107,11 @@
</span><span class="cx">
</span><span class="cx"> // Resolve between src and srcSet if we have them.
</span><span class="cx"> if (!m_srcSetAttribute.isEmpty()) {
</span><del>- ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute
</del><ins>+ unsigned sourceSize = 0;
</ins><span class="cx"> #if ENABLE(PICTURE_SIZES)
</span><del>- , SourceSizeList::parseSizesAttribute(m_sizesAttribute, view, frame)
</del><ins>+ sourceSize = SourceSizeList::parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());
</ins><span class="cx"> #endif
</span><del>- );
</del><ins>+ ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute, sourceSize);
</ins><span class="cx"> setUrlToLoad(imageCandidate.string.toString(), true);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -279,11 +276,7 @@
</span><span class="cx"> m_checkpoints.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TokenPreloadScanner::scan(const HTMLToken& token, Vector<std::unique_ptr<PreloadRequest>>& requests
-#if ENABLE(PICTURE_SIZES)
- , RenderView* view, Frame* frame
-#endif
- )
</del><ins>+void TokenPreloadScanner::scan(const HTMLToken& token, Vector<std::unique_ptr<PreloadRequest>>& requests, Document& document)
</ins><span class="cx"> {
</span><span class="cx"> switch (token.type()) {
</span><span class="cx"> case HTMLToken::Character:
</span><span class="lines">@@ -334,11 +327,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StartTagScanner scanner(tagId, m_deviceScaleFactor);
</span><del>- scanner.processAttributes(token.attributes()
-#if ENABLE(PICTURE_SIZES)
- , view, frame
-#endif
- );
</del><ins>+ scanner.processAttributes(token.attributes(), document);
</ins><span class="cx"> if (auto request = scanner.createPreloadRequest(m_predictedBaseElementURL))
</span><span class="cx"> requests.append(WTF::move(request));
</span><span class="cx"> return;
</span><span class="lines">@@ -372,14 +361,12 @@
</span><span class="cx"> m_source.append(source);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPreloadScanner::scan(HTMLResourcePreloader* preloader, const URL& startingBaseElementURL
-#if ENABLE(PICTURE_SIZES)
- , RenderView* view, Frame* frame
-#endif
- )
</del><ins>+void HTMLPreloadScanner::scan(HTMLResourcePreloader* preloader, Document& document)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread()); // HTMLTokenizer::updateStateFor only works on the main thread.
</span><span class="cx">
</span><ins>+ const URL& startingBaseElementURL = document.baseElementURL();
+
</ins><span class="cx"> // When we start scanning, our best prediction of the baseElementURL is the real one!
</span><span class="cx"> if (!startingBaseElementURL.isEmpty())
</span><span class="cx"> m_scanner.setPredictedBaseElementURL(startingBaseElementURL);
</span><span class="lines">@@ -389,11 +376,7 @@
</span><span class="cx"> while (m_tokenizer->nextToken(m_source, m_token)) {
</span><span class="cx"> if (m_token.type() == HTMLToken::StartTag)
</span><span class="cx"> m_tokenizer->updateStateFor(AtomicString(m_token.name()));
</span><del>- m_scanner.scan(m_token, requests
-#if ENABLE(PICTURE_SIZES)
- , view, frame
-#endif
- );
</del><ins>+ m_scanner.scan(m_token, requests, document);
</ins><span class="cx"> m_token.clear();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h (173463 => 173464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h 2014-09-10 15:51:19 UTC (rev 173463)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h 2014-09-10 15:54:40 UTC (rev 173464)
</span><span class="lines">@@ -47,11 +47,7 @@
</span><span class="cx"> explicit TokenPreloadScanner(const URL& documentURL, float deviceScaleFactor = 1.0);
</span><span class="cx"> ~TokenPreloadScanner();
</span><span class="cx">
</span><del>- void scan(const HTMLToken&, PreloadRequestStream& requests
-#if ENABLE_PICTURE_SIZES
- , RenderView*, Frame*
-#endif
- );
</del><ins>+ void scan(const HTMLToken&, PreloadRequestStream& requests, Document&);
</ins><span class="cx">
</span><span class="cx"> void setPredictedBaseElementURL(const URL& url) { m_predictedBaseElementURL = url; }
</span><span class="cx">
</span><span class="lines">@@ -131,11 +127,7 @@
</span><span class="cx"> ~HTMLPreloadScanner();
</span><span class="cx">
</span><span class="cx"> void appendToEnd(const SegmentedString&);
</span><del>- void scan(HTMLResourcePreloader*, const URL& documentBaseElementURL
-#if ENABLE_PICTURE_SIZES
- , RenderView*, Frame*
-#endif
- );
</del><ins>+ void scan(HTMLResourcePreloader*, Document&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> TokenPreloadScanner m_scanner;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLSrcsetParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp (173463 => 173464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp 2014-09-10 15:51:19 UTC (rev 173463)
+++ trunk/Source/WebCore/html/parser/HTMLSrcsetParser.cpp 2014-09-10 15:54:40 UTC (rev 173464)
</span><span class="lines">@@ -229,12 +229,12 @@
</span><span class="cx"> return parseImageCandidatesFromSrcsetAttribute<UChar>(attribute.characters16(), attribute.length());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ImageCandidate pickBestImageCandidate(float deviceScaleFactor, Vector<ImageCandidate>& imageCandidates
-#if ENABLE(PICTURE_SIZES)
- , unsigned sourceSize
-#endif
- )
</del><ins>+static ImageCandidate pickBestImageCandidate(float deviceScaleFactor, Vector<ImageCandidate>& imageCandidates, unsigned sourceSize)
</ins><span class="cx"> {
</span><ins>+#if !ENABLE(PICTURE_SIZES)
+ UNUSED_PARAM(sourceSize);
+#endif
+
</ins><span class="cx"> bool ignoreSrc = false;
</span><span class="cx"> if (imageCandidates.isEmpty())
</span><span class="cx"> return ImageCandidate();
</span><span class="lines">@@ -274,11 +274,7 @@
</span><span class="cx"> return imageCandidates[winner];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute
-#if ENABLE(PICTURE_SIZES)
- , unsigned sourceSize
-#endif
- )
</del><ins>+ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, unsigned sourceSize)
</ins><span class="cx"> {
</span><span class="cx"> if (srcsetAttribute.isNull()) {
</span><span class="cx"> if (srcAttribute.isNull())
</span><span class="lines">@@ -291,11 +287,7 @@
</span><span class="cx"> if (!srcAttribute.isEmpty())
</span><span class="cx"> imageCandidates.append(ImageCandidate(StringView(srcAttribute), DescriptorParsingResult(), ImageCandidate::SrcOrigin));
</span><span class="cx">
</span><del>- return pickBestImageCandidate(deviceScaleFactor, imageCandidates
-#if ENABLE(PICTURE_SIZES)
- , sourceSize
-#endif
- );
</del><ins>+ return pickBestImageCandidate(deviceScaleFactor, imageCandidates, sourceSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLSrcsetParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLSrcsetParser.h (173463 => 173464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLSrcsetParser.h 2014-09-10 15:51:19 UTC (rev 173463)
+++ trunk/Source/WebCore/html/parser/HTMLSrcsetParser.h 2014-09-10 15:54:40 UTC (rev 173464)
</span><span class="lines">@@ -98,11 +98,7 @@
</span><span class="cx"> OriginAttribute originAttribute;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute
-#if ENABLE(PICTURE_SIZES)
- , unsigned sourceSize
-#endif
- );
</del><ins>+ImageCandidate bestFitSourceForImageAttributes(float deviceScaleFactor, const AtomicString& srcAttribute, const AtomicString& srcsetAttribute, unsigned sourceSize);
</ins><span class="cx">
</span><span class="cx"> Vector<ImageCandidate> parseImageCandidatesFromSrcsetAttribute(StringView attribute);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>