<!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>[175764] 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/175764">175764</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-07 14:14:50 -0800 (Fri, 07 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename HTMLInputElement::imageLoader() to ensureImageLoader()
https://bugs.webkit.org/show_bug.cgi?id=138508
Reviewed by Andreas Kling.
Rename HTMLInputElement::imageLoader() to ensureImageLoader() and have
it return a reference to make it clear that it constructs an
ImageLoader if missing.
Also introduce a lightweight imageLoader() getter which just returns
the imageLoader or null if missing.
No new tests, no behavior change.
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::ensureImageLoader):
(WebCore::HTMLInputElement::didMoveToNewDocument):
(WebCore::HTMLInputElement::imageLoader): Deleted.
* html/HTMLInputElement.h:
(WebCore::HTMLInputElement::imageLoader):
(WebCore::HTMLInputElement::hasImageLoader): Deleted.
* html/ImageInputType.cpp:
(WebCore::ImageInputType::srcAttributeChanged):
(WebCore::ImageInputType::attach):
(WebCore::ImageInputType::height):
(WebCore::ImageInputType::width):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlImageInputTypecpp">trunk/Source/WebCore/html/ImageInputType.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175763 => 175764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-07 22:01:59 UTC (rev 175763)
+++ trunk/Source/WebCore/ChangeLog 2014-11-07 22:14:50 UTC (rev 175764)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-11-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Rename HTMLInputElement::imageLoader() to ensureImageLoader()
+ https://bugs.webkit.org/show_bug.cgi?id=138508
+
+ Reviewed by Andreas Kling.
+
+ Rename HTMLInputElement::imageLoader() to ensureImageLoader() and have
+ it return a reference to make it clear that it constructs an
+ ImageLoader if missing.
+ Also introduce a lightweight imageLoader() getter which just returns
+ the imageLoader or null if missing.
+
+ No new tests, no behavior change.
+
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::ensureImageLoader):
+ (WebCore::HTMLInputElement::didMoveToNewDocument):
+ (WebCore::HTMLInputElement::imageLoader): Deleted.
+ * html/HTMLInputElement.h:
+ (WebCore::HTMLInputElement::imageLoader):
+ (WebCore::HTMLInputElement::hasImageLoader): Deleted.
+ * html/ImageInputType.cpp:
+ (WebCore::ImageInputType::srcAttributeChanged):
+ (WebCore::ImageInputType::attach):
+ (WebCore::ImageInputType::height):
+ (WebCore::ImageInputType::width):
+
+2014-11-07 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Move 'webkit-clip-path' CSS property to the new StyleBuilder
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138452
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (175763 => 175764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-11-07 22:01:59 UTC (rev 175763)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-11-07 22:14:50 UTC (rev 175764)
</span><span class="lines">@@ -134,11 +134,11 @@
</span><span class="cx"> return inputElement.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HTMLImageLoader* HTMLInputElement::imageLoader()
</del><ins>+HTMLImageLoader& HTMLInputElement::ensureImageLoader()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_imageLoader)
</span><span class="cx"> m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
</span><del>- return m_imageLoader.get();
</del><ins>+ return *m_imageLoader;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::didAddUserAgentShadowRoot(ShadowRoot*)
</span><span class="lines">@@ -1436,7 +1436,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::didMoveToNewDocument(Document* oldDocument)
</span><span class="cx"> {
</span><del>- if (hasImageLoader())
</del><ins>+ if (imageLoader())
</ins><span class="cx"> imageLoader()->elementDidMoveToNewDocument();
</span><span class="cx">
</span><span class="cx"> bool needsSuspensionCallback = this->needsSuspensionCallback();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (175763 => 175764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2014-11-07 22:01:59 UTC (rev 175763)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2014-11-07 22:14:50 UTC (rev 175764)
</span><span class="lines">@@ -310,8 +310,8 @@
</span><span class="cx"> virtual void setRangeText(const String& replacement, ExceptionCode&) override;
</span><span class="cx"> virtual void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode&) override;
</span><span class="cx">
</span><del>- bool hasImageLoader() const { return !!m_imageLoader; }
- HTMLImageLoader* imageLoader();
</del><ins>+ HTMLImageLoader* imageLoader() { return m_imageLoader.get(); }
+ HTMLImageLoader& ensureImageLoader();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATE_AND_TIME_INPUT_TYPES)
</span><span class="cx"> bool setupDateTimeChooserParameters(DateTimeChooserParameters&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageInputType.cpp (175763 => 175764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageInputType.cpp 2014-11-07 22:01:59 UTC (rev 175763)
+++ trunk/Source/WebCore/html/ImageInputType.cpp 2014-11-07 22:14:50 UTC (rev 175764)
</span><span class="lines">@@ -118,29 +118,29 @@
</span><span class="cx"> {
</span><span class="cx"> if (!element().renderer())
</span><span class="cx"> return;
</span><del>- element().imageLoader()->updateFromElementIgnoringPreviousError();
</del><ins>+ element().ensureImageLoader().updateFromElementIgnoringPreviousError();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ImageInputType::attach()
</span><span class="cx"> {
</span><span class="cx"> BaseButtonInputType::attach();
</span><span class="cx">
</span><del>- HTMLImageLoader* imageLoader = element().imageLoader();
- imageLoader->updateFromElement();
</del><ins>+ HTMLImageLoader& imageLoader = element().ensureImageLoader();
+ imageLoader.updateFromElement();
</ins><span class="cx">
</span><span class="cx"> auto* renderer = downcast<RenderImage>(element().renderer());
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (imageLoader->hasPendingBeforeLoadEvent())
</del><ins>+ if (imageLoader.hasPendingBeforeLoadEvent())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto& imageResource = renderer->imageResource();
</span><del>- imageResource.setCachedImage(imageLoader->image());
</del><ins>+ imageResource.setCachedImage(imageLoader.image());
</ins><span class="cx">
</span><span class="cx"> // If we have no image at all because we have no src attribute, set
</span><span class="cx"> // image height and width for the alt text instead.
</span><del>- if (!imageLoader->image() && !imageResource.cachedImage())
</del><ins>+ if (!imageLoader.image() && !imageResource.cachedImage())
</ins><span class="cx"> renderer->setImageSizeForAltText();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -180,11 +180,9 @@
</span><span class="cx"> return height;
</span><span class="cx">
</span><span class="cx"> // If the image is available, use its height.
</span><del>- if (element->hasImageLoader()) {
- HTMLImageLoader* imageLoader = element->imageLoader();
- if (imageLoader->image())
- return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).height();
- }
</del><ins>+ HTMLImageLoader* imageLoader = element->imageLoader();
+ if (imageLoader && imageLoader->image())
+ return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).height();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> element->document().updateLayout();
</span><span class="lines">@@ -204,11 +202,9 @@
</span><span class="cx"> return width;
</span><span class="cx">
</span><span class="cx"> // If the image is available, use its width.
</span><del>- if (element->hasImageLoader()) {
- HTMLImageLoader* imageLoader = element->imageLoader();
- if (imageLoader->image())
- return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).width();
- }
</del><ins>+ HTMLImageLoader* imageLoader = element->imageLoader();
+ if (imageLoader && imageLoader->image())
+ return imageLoader->image()->imageSizeForRenderer(element->renderer(), 1).width();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> element->document().updateLayout();
</span></span></pre>
</div>
</div>
</body>
</html>