<!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>[179488] 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/179488">179488</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 12:40:00 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ambiguous naming: Do not call replacedContentRect()'s return value paint rect.
https://bugs.webkit.org/show_bug.cgi?id=141125
Reviewed by Simon Fraser.
It's the content box rect with the object-fit adjustment.
No change in functionality.
* rendering/RenderHTMLCanvas.cpp:
(WebCore::RenderHTMLCanvas::paintReplaced):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::updateInnerContentRect):
(WebCore::RenderImage::paintReplaced):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::replacedContentRect):
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::splitFragmentToFitLine):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderHTMLCanvascpp">trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179487 => 179488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-02 20:29:41 UTC (rev 179487)
+++ trunk/Source/WebCore/ChangeLog 2015-02-02 20:40:00 UTC (rev 179488)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-02-02 Zalan Bujtas <zalan@apple.com>
+
+ Ambiguous naming: Do not call replacedContentRect()'s return value paint rect.
+ https://bugs.webkit.org/show_bug.cgi?id=141125
+
+ Reviewed by Simon Fraser.
+
+ It's the content box rect with the object-fit adjustment.
+
+ No change in functionality.
+
+ * rendering/RenderHTMLCanvas.cpp:
+ (WebCore::RenderHTMLCanvas::paintReplaced):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::updateInnerContentRect):
+ (WebCore::RenderImage::paintReplaced):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::replacedContentRect):
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::splitFragmentToFitLine):
+
</ins><span class="cx"> 2015-02-02 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Build fix after r179476.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderHTMLCanvascpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp (179487 => 179488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp 2015-02-02 20:29:41 UTC (rev 179487)
+++ trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp 2015-02-02 20:40:00 UTC (rev 179488)
</span><span class="lines">@@ -68,24 +68,24 @@
</span><span class="cx"> {
</span><span class="cx"> GraphicsContext* context = paintInfo.context;
</span><span class="cx">
</span><del>- LayoutRect contentRect = contentBoxRect();
- contentRect.moveBy(paintOffset);
- LayoutRect paintRect = replacedContentRect(intrinsicSize());
- paintRect.moveBy(paintOffset);
</del><ins>+ LayoutRect contentBoxRect = this->contentBoxRect();
+ contentBoxRect.moveBy(paintOffset);
+ LayoutRect replacedContentRect = this->replacedContentRect(intrinsicSize());
+ replacedContentRect.moveBy(paintOffset);
</ins><span class="cx">
</span><span class="cx"> // Not allowed to overflow the content box.
</span><del>- bool clip = !contentRect.contains(paintRect);
</del><ins>+ bool clip = !contentBoxRect.contains(replacedContentRect);
</ins><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context, clip);
</span><span class="cx"> if (clip)
</span><del>- paintInfo.context->clip(snappedIntRect(contentRect));
</del><ins>+ paintInfo.context->clip(snappedIntRect(contentBoxRect));
</ins><span class="cx">
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (paintInfo.phase == PaintPhaseForeground)
</span><del>- page->addRelevantRepaintedObject(this, intersection(paintRect, contentRect));
</del><ins>+ page->addRelevantRepaintedObject(this, intersection(replacedContentRect, contentBoxRect));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool useLowQualityScale = style().imageRendering() == ImageRenderingCrispEdges || style().imageRendering() == ImageRenderingOptimizeSpeed;
</span><del>- canvasElement().paint(context, paintRect, useLowQualityScale);
</del><ins>+ canvasElement().paint(context, replacedContentRect, useLowQualityScale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderHTMLCanvas::canvasSizeChanged()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (179487 => 179488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2015-02-02 20:29:41 UTC (rev 179487)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2015-02-02 20:40:00 UTC (rev 179488)
</span><span class="lines">@@ -277,8 +277,7 @@
</span><span class="cx"> void RenderImage::updateInnerContentRect()
</span><span class="cx"> {
</span><span class="cx"> // Propagate container size to image resource.
</span><del>- LayoutRect paintRect = replacedContentRect(intrinsicSize());
- IntSize containerSize(paintRect.width(), paintRect.height());
</del><ins>+ IntSize containerSize(replacedContentRect(intrinsicSize()).size());
</ins><span class="cx"> if (!containerSize.isEmpty())
</span><span class="cx"> imageResource().setContainerSizeForRenderer(containerSize);
</span><span class="cx"> }
</span><span class="lines">@@ -455,21 +454,21 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutRect contentRect = contentBoxRect();
- contentRect.moveBy(paintOffset);
- LayoutRect paintRect = replacedContentRect(intrinsicSize());
- paintRect.moveBy(paintOffset);
- bool clip = !contentRect.contains(paintRect);
</del><ins>+ LayoutRect contentBoxRect = this->contentBoxRect();
+ contentBoxRect.moveBy(paintOffset);
+ LayoutRect replacedContentRect = this->replacedContentRect(intrinsicSize());
+ replacedContentRect.moveBy(paintOffset);
+ bool clip = !contentBoxRect.contains(replacedContentRect);
</ins><span class="cx"> GraphicsContextStateSaver stateSaver(*context, clip);
</span><span class="cx"> if (clip)
</span><del>- context->clip(contentRect);
</del><ins>+ context->clip(contentBoxRect);
</ins><span class="cx">
</span><del>- paintIntoRect(context, snapRectToDevicePixels(paintRect, deviceScaleFactor));
</del><ins>+ paintIntoRect(context, snapRectToDevicePixels(replacedContentRect, deviceScaleFactor));
</ins><span class="cx">
</span><span class="cx"> if (cachedImage() && page && paintInfo.phase == PaintPhaseForeground) {
</span><span class="cx"> // For now, count images as unpainted if they are still progressively loading. We may want
</span><span class="cx"> // to refine this in the future to account for the portion of the image that has painted.
</span><del>- LayoutRect visibleRect = intersection(paintRect, contentRect);
</del><ins>+ LayoutRect visibleRect = intersection(replacedContentRect, contentBoxRect);
</ins><span class="cx"> if (cachedImage()->isLoading())
</span><span class="cx"> page->addRelevantUnpaintedObject(this, visibleRect);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (179487 => 179488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2015-02-02 20:29:41 UTC (rev 179487)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2015-02-02 20:40:00 UTC (rev 179488)
</span><span class="lines">@@ -324,13 +324,13 @@
</span><span class="cx"> LayoutRect RenderReplaced::replacedContentRect(const LayoutSize& intrinsicSize) const
</span><span class="cx"> {
</span><span class="cx"> LayoutRect contentRect = contentBoxRect();
</span><ins>+ if (intrinsicSize.isEmpty())
+ return contentRect;
+
</ins><span class="cx"> ObjectFit objectFit = style().objectFit();
</span><span class="cx"> if (objectFit == ObjectFitFill)
</span><span class="cx"> return contentRect;
</span><span class="cx">
</span><del>- if (!intrinsicSize.width() || !intrinsicSize.height())
- return contentRect;
-
</del><span class="cx"> LayoutRect finalRect = contentRect;
</span><span class="cx"> switch (objectFit) {
</span><span class="cx"> case ObjectFitContain:
</span></span></pre>
</div>
</div>
</body>
</html>