<!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>[190734] 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/190734">190734</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-10-08 11:46:20 -0700 (Thu, 08 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fallback to the RenderView when repaint container is null.
https://bugs.webkit.org/show_bug.cgi?id=149903
Reviewed by Simon Fraser.
Reduces code complexity at the calling sites.
No change in functionality.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::repaintUsingContainer):
(WebCore::RenderObject::repaint):
(WebCore::RenderObject::repaintRectangle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190733 => 190734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-08 17:44:18 UTC (rev 190733)
+++ trunk/Source/WebCore/ChangeLog 2015-10-08 18:46:20 UTC (rev 190734)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-08 Zalan Bujtas <zalan@apple.com>
+
+ Fallback to the RenderView when repaint container is null.
+ https://bugs.webkit.org/show_bug.cgi?id=149903
+
+ Reviewed by Simon Fraser.
+
+ Reduces code complexity at the calling sites.
+
+ No change in functionality.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::repaintUsingContainer):
+ (WebCore::RenderObject::repaint):
+ (WebCore::RenderObject::repaintRectangle):
+
</ins><span class="cx"> 2015-10-08 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add NULL check for renderBox::layer() on applying zoom level change
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (190733 => 190734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-10-08 17:44:18 UTC (rev 190733)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-10-08 18:46:20 UTC (rev 190734)
</span><span class="lines">@@ -882,10 +882,8 @@
</span><span class="cx"> if (r.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!repaintContainer) {
- view().repaintViewRectangle(r);
- return;
- }
</del><ins>+ if (!repaintContainer)
+ repaintContainer = &view();
</ins><span class="cx">
</span><span class="cx"> if (is<RenderFlowThread>(*repaintContainer)) {
</span><span class="cx"> downcast<RenderFlowThread>(*repaintContainer).repaintRectangleInRegions(r);
</span><span class="lines">@@ -897,17 +895,21 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderView& v = view();
</del><span class="cx"> if (repaintContainer->isRenderView()) {
</span><del>- ASSERT(repaintContainer == &v);
- bool viewHasCompositedLayer = v.isComposited();
- if (!viewHasCompositedLayer || v.layer()->backing()->paintsIntoWindow()) {
- v.repaintViewRectangle(viewHasCompositedLayer && v.layer()->transform() ? LayoutRect(v.layer()->transform()->mapRect(snapRectToDevicePixels(r, document().deviceScaleFactor()))) : r);
</del><ins>+ RenderView& view = this->view();
+ ASSERT(repaintContainer == &view);
+ bool viewHasCompositedLayer = view.isComposited();
+ if (!viewHasCompositedLayer || view.layer()->backing()->paintsIntoWindow()) {
+ LayoutRect rect = r;
+ if (viewHasCompositedLayer && view.layer()->transform())
+ rect = LayoutRect(view.layer()->transform()->mapRect(snapRectToDevicePixels(rect, document().deviceScaleFactor())));
+ view.repaintViewRectangle(rect);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (v.usesCompositing()) {
</del><ins>+
+ if (view().usesCompositing()) {
</ins><span class="cx"> ASSERT(repaintContainer->isComposited());
</span><span class="cx"> repaintContainer->layer()->setBackingNeedsRepaintInRect(r, shouldClipToLayer ? GraphicsLayer::ClipToLayer : GraphicsLayer::DoNotClipToLayer);
</span><span class="cx"> }
</span><span class="lines">@@ -924,7 +926,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RenderLayerModelObject* repaintContainer = containerForRepaint();
</span><del>- repaintUsingContainer(repaintContainer ? repaintContainer : &view, clippedOverflowRectForRepaint(repaintContainer));
</del><ins>+ repaintUsingContainer(repaintContainer, clippedOverflowRectForRepaint(repaintContainer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::repaintRectangle(const LayoutRect& r, bool shouldClipToLayer) const
</span><span class="lines">@@ -943,7 +945,7 @@
</span><span class="cx"> dirtyRect.move(view.layoutDelta());
</span><span class="cx">
</span><span class="cx"> RenderLayerModelObject* repaintContainer = containerForRepaint();
</span><del>- repaintUsingContainer(repaintContainer ? repaintContainer : &view, computeRectForRepaint(dirtyRect, repaintContainer), shouldClipToLayer);
</del><ins>+ repaintUsingContainer(repaintContainer, computeRectForRepaint(dirtyRect, repaintContainer), shouldClipToLayer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderObject::repaintSlowRepaintObject() const
</span></span></pre>
</div>
</div>
</body>
</html>