<!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>[190965] releases/WebKitGTK/webkit-2.10/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/190965">190965</a></dd>

<dt>Author</dt> <dd>carlosgc@webkit.org</dd>

<dt>Date</dt> <dd>2015-10-13 04:02:05 -0700 (Tue, 13 Oct 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190627">r190627</a> - Remove redundant isComposited() function and replace

hasLayer() &amp;&amp; layer()-&gt;isComposited() with RenderObject::isComposited().

https://bugs.webkit.org/show_bug.cgi?id=149846

Reviewed by Simon Fraser.

No change in functionality.

* rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::requiresCompositingForPlugin):

(WebCore::RenderLayerCompositor::requiresCompositingForFrame):

* rendering/RenderObject.cpp:

(WebCore::RenderObject::repaintUsingContainer):

* rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):

* rendering/RenderView.cpp:

(WebCore::rendererObscuresBackground):

(WebCore::isComposited): Deleted.

* rendering/RenderWidget.cpp:

(WebCore::RenderWidget::setWidgetGeometry):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderLayerCompositorcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjectcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeMacmm">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.mm</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderViewcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderWidgetcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderWidget.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190964 => 190965)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-10-13 11:00:43 UTC (rev 190964)

+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-10-13 11:02:05 UTC (rev 190965)

</span><span class="lines">@@ -1,3 +1,26 @@

</span><ins>+2015-10-06  Zalan Bujtas  &lt;zalan@apple.com&gt;

+

+        Remove redundant isComposited() function and replace

+        hasLayer() &amp;&amp; layer()-&gt;isComposited() with RenderObject::isComposited().

+        https://bugs.webkit.org/show_bug.cgi?id=149846

+

+        Reviewed by Simon Fraser.

+

+        No change in functionality.

+

+        * rendering/RenderLayerCompositor.cpp:

+        (WebCore::RenderLayerCompositor::requiresCompositingForPlugin):

+        (WebCore::RenderLayerCompositor::requiresCompositingForFrame):

+        * rendering/RenderObject.cpp:

+        (WebCore::RenderObject::repaintUsingContainer):

+        * rendering/RenderThemeMac.mm:

+        (WebCore::RenderThemeMac::paintSnapshottedPluginOverlay):

+        * rendering/RenderView.cpp:

+        (WebCore::rendererObscuresBackground):

+        (WebCore::isComposited): Deleted.

+        * rendering/RenderWidget.cpp:

+        (WebCore::RenderWidget::setWidgetGeometry):

+

</ins><span class="cx"> 2015-10-06  Emanuele Aina  &lt;emanuele.aina@collabora.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Fix ENABLE_OPENGL=OFF builds

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderLayerCompositorcpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayerCompositor.cpp (190964 => 190965)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-10-13 11:00:43 UTC (rev 190964)

+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-10-13 11:02:05 UTC (rev 190965)

</span><span class="lines">@@ -2574,7 +2574,7 @@

</span><span class="cx">     RenderWidget&amp; pluginRenderer = downcast&lt;RenderWidget&gt;(renderer);

<span class="cx">     // If we can't reliably know the size of the plugin yet, don't change compositing state.

</span><span class="cx">     if (pluginRenderer.needsLayout())

</span><del>-        return pluginRenderer.hasLayer() &amp;&amp; pluginRenderer.layer()-&gt;isComposited();

</del><ins>+        return pluginRenderer.isComposited();

</ins><span class="cx"> 

<span class="cx">     // Don't go into compositing mode if height or width are zero, or size is 1x1.

</span><span class="cx">     IntRect contentBox = snappedIntRect(pluginRenderer.contentBoxRect());

</span><span class="lines">@@ -2594,7 +2594,7 @@

</span><span class="cx"> 

<span class="cx">     // If we can't reliably know the size of the iframe yet, don't change compositing state.

</span><span class="cx">     if (!frameRenderer.parent() || frameRenderer.needsLayout())

</span><del>-        return frameRenderer.hasLayer() &amp;&amp; frameRenderer.layer()-&gt;isComposited();

</del><ins>+        return frameRenderer.isComposited();

</ins><span class="cx">     

<span class="cx">     // Don't go into compositing mode if height or width are zero.

</span><span class="cx">     return !snappedIntRect(frameRenderer.contentBoxRect()).isEmpty();

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjectcpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp (190964 => 190965)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp        2015-10-13 11:00:43 UTC (rev 190964)

+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp        2015-10-13 11:02:05 UTC (rev 190965)

</span><span class="lines">@@ -900,7 +900,7 @@

</span><span class="cx">     RenderView&amp; v = view();

</span><span class="cx">     if (repaintContainer-&gt;isRenderView()) {

</span><span class="cx">         ASSERT(repaintContainer == &amp;v);

</span><del>-        bool viewHasCompositedLayer = v.hasLayer() &amp;&amp; v.layer()-&gt;isComposited();

</del><ins>+        bool viewHasCompositedLayer = v.isComposited();

</ins><span class="cx">         if (!viewHasCompositedLayer || v.layer()-&gt;backing()-&gt;paintsIntoWindow()) {

</span><span class="cx">             v.repaintViewRectangle(viewHasCompositedLayer &amp;&amp; v.layer()-&gt;transform() ? LayoutRect(v.layer()-&gt;transform()-&gt;mapRect(snapRectToDevicePixels(r, document().deviceScaleFactor()))) : r);

</span><span class="cx">             return;

</span><span class="lines">@@ -908,7 +908,7 @@

</span><span class="cx">     }

</span><span class="cx">     

</span><span class="cx">     if (v.usesCompositing()) {

</span><del>-        ASSERT(repaintContainer-&gt;hasLayer() &amp;&amp; repaintContainer-&gt;layer()-&gt;isComposited());

</del><ins>+        ASSERT(repaintContainer-&gt;isComposited());

</ins><span class="cx">         repaintContainer-&gt;layer()-&gt;setBackingNeedsRepaintInRect(r, shouldClipToLayer ? GraphicsLayer::ClipToLayer : GraphicsLayer::DoNotClipToLayer);

</span><span class="cx">     }

</span><span class="cx"> }

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeMacmm"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.mm (190964 => 190965)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.mm        2015-10-13 11:00:43 UTC (rev 190964)

+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.mm        2015-10-13 11:02:05 UTC (rev 190965)

</span><span class="lines">@@ -1896,7 +1896,7 @@

</span><span class="cx">     // We could draw the snapshot with that coordinates, but we need to make sure there

<span class="cx">     // isn't a composited layer between us and the plugInRenderer.

</span><span class="cx">     for (auto* renderBox = &amp;downcast&lt;RenderBox&gt;(renderer); renderBox != &amp;plugInRenderer; renderBox = renderBox-&gt;parentBox()) {

</span><del>-        if (renderBox-&gt;hasLayer() &amp;&amp; renderBox-&gt;layer() &amp;&amp; renderBox-&gt;layer()-&gt;isComposited()) {

</del><ins>+        if (renderBox-&gt;isComposited()) {

</ins><span class="cx">             snapshotAbsPos = -renderBox-&gt;location();

</span><span class="cx">             break;

</span><span class="cx">         }

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderViewcpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp (190964 => 190965)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp        2015-10-13 11:00:43 UTC (rev 190964)

+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderView.cpp        2015-10-13 11:02:05 UTC (rev 190965)

</span><span class="lines">@@ -523,11 +523,6 @@

</span><span class="cx">     paintObject(paintInfo, paintOffset);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-static inline bool isComposited(RenderElement* object)

-{

-    return object-&gt;hasLayer() &amp;&amp; downcast&lt;RenderLayerModelObject&gt;(*object).layer()-&gt;isComposited();

-}

-

</del><span class="cx"> static inline bool rendererObscuresBackground(RenderElement* rootObject)

</span><span class="cx"> {

</span><span class="cx">     if (!rootObject)

</span><span class="lines">@@ -539,7 +534,7 @@

</span><span class="cx">         || style.hasTransform())

</span><span class="cx">         return false;

</span><span class="cx">     

</span><del>-    if (isComposited(rootObject))

</del><ins>+    if (rootObject-&gt;isComposited())

</ins><span class="cx">         return false;

</span><span class="cx"> 

</span><span class="cx">     if (rootObject-&gt;rendererForRootBackground().style().backgroundClip() == TextFillBox)

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderWidgetcpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderWidget.cpp (190964 => 190965)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderWidget.cpp        2015-10-13 11:00:43 UTC (rev 190964)

+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderWidget.cpp        2015-10-13 11:02:05 UTC (rev 190965)

</span><span class="lines">@@ -140,7 +140,7 @@

</span><span class="cx">     if (!weakThis)

</span><span class="cx">         return true;

</span><span class="cx"> 

</span><del>-    if (boundsChanged &amp;&amp; hasLayer() &amp;&amp; layer()-&gt;isComposited())

</del><ins>+    if (boundsChanged &amp;&amp; isComposited())

</ins><span class="cx">         layer()-&gt;backing()-&gt;updateAfterWidgetResize();

</span><span class="cx"> 

</span><span class="cx">     return oldFrameRect.size() != newFrameRect.size();

</span></span></pre>

</div>

</div>

</body>

</html>