<!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>[180048] branches/safari-600.1.4.15-branch</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/180048">180048</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 09:02:20 -0800 (Fri, 13 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179771">r179771</a>. rdar://problem/19395131</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderLayerCompositorh">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestscompositinglayercreationsubpixeladjacentlayersoverlapexpectedtxt">branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap-expected.txt</a></li>
<li><a href="#branchessafari6001415branchLayoutTestscompositinglayercreationsubpixeladjacentlayersoverlaphtml">branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (180047 => 180048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog        2015-02-13 17:02:15 UTC (rev 180047)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog        2015-02-13 17:02:20 UTC (rev 180048)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-02-13  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r179771. rdar://problem/19395131
+
+    2015-02-06  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+            Convert the compositing overlap map to use LayoutRects
+            https://bugs.webkit.org/show_bug.cgi?id=141346
+
+            Reviewed by Zalan Bujtas.
+
+            Test with adjacent layers on non-pixel boundaries.
+
+            * compositing/layer-creation/subpixel-adjacent-layers-overlap-expected.txt: Added.
+            * compositing/layer-creation/subpixel-adjacent-layers-overlap.html: Added.
+
+2015-02-13  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r179706. rdar://problem/19719085
</span><span class="cx"> 
</span><span class="cx">     2015-02-05  Maciej Stachowiak  &lt;mjs@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestscompositinglayercreationsubpixeladjacentlayersoverlapexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap-expected.txt (0 => 180048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap-expected.txt                                (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap-expected.txt        2015-02-13 17:02:20 UTC (rev 180048)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Here is some text
+
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 600.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 600.00)
+      (contentsOpaque 1)
+      (children 1
+        (GraphicsLayer
+          (position 0.00 44.00)
+          (anchor 0.50 0.50)
+          (bounds 200.00 201.00)
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestscompositinglayercreationsubpixeladjacentlayersoverlaphtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap.html (0 => 180048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap.html                                (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/compositing/layer-creation/subpixel-adjacent-layers-overlap.html        2015-02-13 17:02:20 UTC (rev 180048)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        body {
+            margin: 0;
+        }
+        .box {
+            height: 200px;
+            width: 200px;
+            background-color: silver;
+            position: relative;
+        }
+        .composited {
+            -webkit-transform: translateZ(0);
+        }
+        
+        p {
+            height: 12.345px; /* Subpixel height */
+        }
+    &lt;/style&gt;
+    &lt;script&gt;
+        if (window.testRunner)
+            testRunner.dumpAsText();
+
+        function runTest()
+        {
+            if (window.testRunner)
+              document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
+        }
+        window.addEventListener('load', runTest, false);
+    &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;p&gt;Here is some text&lt;/p&gt;
+&lt;div class=&quot;composited box&quot;&gt;
+&lt;/div&gt;
+&lt;div class=&quot;box&quot;&gt;
+&lt;/div&gt;
+&lt;pre id=&quot;layers&quot;&gt;&lt;/pre&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (180047 => 180048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog        2015-02-13 17:02:15 UTC (rev 180047)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog        2015-02-13 17:02:20 UTC (rev 180048)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-02-13  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r179771. rdar://problem/19395131
+
+    2015-02-06  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+            Convert the compositing overlap map to use LayoutRects
+            https://bugs.webkit.org/show_bug.cgi?id=141346
+            rdar://problem/18206365
+
+            Reviewed by Zalan Bujtas.
+
+            If two compositing layers were adjoining but not overlapping, but happened to
+            have non-integral offsets, then using enclosing IntRects in the overlap map
+            would cause us to think they are overlapping, and create unnecessary backing store.
+
+            Fix by converting the overlap map to use LayoutRects.
+
+            Test: compositing/layer-creation/subpixel-adjacent-layers-overlap.html
+
+            * rendering/RenderLayerCompositor.cpp:
+            (WebCore::OverlapMapContainer::add):
+            (WebCore::OverlapMapContainer::overlapsLayers):
+            (WebCore::RenderLayerCompositor::OverlapMap::add):
+            (WebCore::RenderLayerCompositor::OverlapMap::overlapsLayers):
+            (WebCore::RenderLayerCompositor::OverlapMap::RectList::append):
+            (WebCore::RenderLayerCompositor::OverlapMap::RectList::intersects):
+            (WebCore::RenderLayerCompositor::logLayerInfo):
+            (WebCore::RenderLayerCompositor::addToOverlapMap):
+            (WebCore::RenderLayerCompositor::addToOverlapMapRecursive):
+            (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+            * rendering/RenderLayerCompositor.h:
+
+2015-02-13  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r179750. rdar://problem/19719085
</span><span class="cx"> 
</span><span class="cx">     2015-02-06  Maciej Stachowiak  &lt;mjs@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (180047 => 180048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-02-13 17:02:15 UTC (rev 180047)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-02-13 17:02:20 UTC (rev 180048)
</span><span class="lines">@@ -67,8 +67,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include &quot;LegacyTileCache.h&quot;
</span><del>-#include &quot;MainFrame.h&quot;
-#include &quot;Region.h&quot;
</del><span class="cx"> #include &quot;RenderScrollbar.h&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -101,13 +99,13 @@
</span><span class="cx"> 
</span><span class="cx"> class OverlapMapContainer {
</span><span class="cx"> public:
</span><del>-    void add(const IntRect&amp; bounds)
</del><ins>+    void add(const LayoutRect&amp; bounds)
</ins><span class="cx">     {
</span><span class="cx">         m_layerRects.append(bounds);
</span><span class="cx">         m_boundingBox.unite(bounds);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    bool overlapsLayers(const IntRect&amp; bounds) const
</del><ins>+    bool overlapsLayers(const LayoutRect&amp; bounds) const
</ins><span class="cx">     {
</span><span class="cx">         // Checking with the bounding box will quickly reject cases when
</span><span class="cx">         // layers are created for lists of items going in one direction and
</span><span class="lines">@@ -127,8 +125,8 @@
</span><span class="cx">         m_boundingBox.unite(otherContainer.m_boundingBox);
</span><span class="cx">     }
</span><span class="cx"> private:
</span><del>-    Vector&lt;IntRect&gt; m_layerRects;
-    IntRect m_boundingBox;
</del><ins>+    Vector&lt;LayoutRect&gt; m_layerRects;
+    LayoutRect m_boundingBox;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> class RenderLayerCompositor::OverlapMap {
</span><span class="lines">@@ -143,7 +141,7 @@
</span><span class="cx">         pushCompositingContainer();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void add(const RenderLayer* layer, const IntRect&amp; bounds)
</del><ins>+    void add(const RenderLayer* layer, const LayoutRect&amp; bounds)
</ins><span class="cx">     {
</span><span class="cx">         // Layers do not contribute to overlap immediately--instead, they will
</span><span class="cx">         // contribute to overlap as soon as their composited ancestor has been
</span><span class="lines">@@ -158,7 +156,7 @@
</span><span class="cx">         return m_layers.contains(layer);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    bool overlapsLayers(const IntRect&amp; bounds) const
</del><ins>+    bool overlapsLayers(const LayoutRect&amp; bounds) const
</ins><span class="cx">     {
</span><span class="cx">         return m_overlapStack.last().overlapsLayers(bounds);
</span><span class="cx">     }
</span><span class="lines">@@ -183,10 +181,10 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     struct RectList {
</span><del>-        Vector&lt;IntRect&gt; rects;
-        IntRect boundingRect;
</del><ins>+        Vector&lt;LayoutRect&gt; rects;
+        LayoutRect boundingRect;
</ins><span class="cx">         
</span><del>-        void append(const IntRect&amp; rect)
</del><ins>+        void append(const LayoutRect&amp; rect)
</ins><span class="cx">         {
</span><span class="cx">             rects.append(rect);
</span><span class="cx">             boundingRect.unite(rect);
</span><span class="lines">@@ -198,7 +196,7 @@
</span><span class="cx">             boundingRect.unite(rectList.boundingRect);
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        bool intersects(const IntRect&amp; rect) const
</del><ins>+        bool intersects(const LayoutRect&amp; rect) const
</ins><span class="cx">         {
</span><span class="cx">             if (!rects.size() || !boundingRect.intersects(rect))
</span><span class="cx">                 return false;
</span><span class="lines">@@ -814,9 +812,12 @@
</span><span class="cx">         m_secondaryBackingStoreBytes += backing-&gt;backingStoreMemoryEstimate();
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    LayoutRect absoluteBounds = backing-&gt;compositedBounds();
+    absoluteBounds.move(layer.offsetFromAncestor(m_renderView.layer()));
+    
</ins><span class="cx">     StringBuilder logString;
</span><del>-    logString.append(String::format(&quot;%*p %dx%d %.2fKB&quot;, 12 + depth * 2, &amp;layer,
-        backing-&gt;compositedBounds().width().round(), backing-&gt;compositedBounds().height().round(),
</del><ins>+    logString.append(String::format(&quot;%*p (%.6f,%.6f-%.6f,%.6f) %.2fKB&quot;, 12 + depth * 2, &amp;layer,
+        absoluteBounds.x().toFloat(), absoluteBounds.y().toFloat(), absoluteBounds.maxX().toFloat(), absoluteBounds.maxY().toFloat(),
</ins><span class="cx">         backing-&gt;backingStoreMemoryEstimate() / 1024));
</span><span class="cx">     
</span><span class="cx">     logString.append(&quot; (&quot;);
</span><span class="lines">@@ -1083,7 +1084,7 @@
</span><span class="cx">     return nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderLayerCompositor::addToOverlapMap(OverlapMap&amp; overlapMap, RenderLayer&amp; layer, IntRect&amp; layerBounds, bool&amp; boundsComputed)
</del><ins>+void RenderLayerCompositor::addToOverlapMap(OverlapMap&amp; overlapMap, RenderLayer&amp; layer, LayoutRect&amp; layerBounds, bool&amp; boundsComputed)
</ins><span class="cx"> {
</span><span class="cx">     if (layer.isRootLayer())
</span><span class="cx">         return;
</span><span class="lines">@@ -1091,14 +1092,14 @@
</span><span class="cx">     if (!boundsComputed) {
</span><span class="cx">         // FIXME: If this layer's overlap bounds include its children, we don't need to add its
</span><span class="cx">         // children's bounds to the overlap map.
</span><del>-        layerBounds = enclosingIntRect(overlapMap.geometryMap().absoluteRect(layer.overlapBounds()));
</del><ins>+        layerBounds = enclosingLayoutRect(overlapMap.geometryMap().absoluteRect(layer.overlapBounds()));
</ins><span class="cx">         // Empty rects never intersect, but we need them to for the purposes of overlap testing.
</span><span class="cx">         if (layerBounds.isEmpty())
</span><del>-            layerBounds.setSize(IntSize(1, 1));
</del><ins>+            layerBounds.setSize(LayoutSize(1, 1));
</ins><span class="cx">         boundsComputed = true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    IntRect clipRect = pixelSnappedIntRect(layer.backgroundClipRect(RenderLayer::ClipRectsContext(&amp;rootRenderLayer(), AbsoluteClipRects)).rect()); // FIXME: Incorrect for CSS regions.
</del><ins>+    LayoutRect clipRect = layer.backgroundClipRect(RenderLayer::ClipRectsContext(&amp;rootRenderLayer(), AbsoluteClipRects)).rect(); // FIXME: Incorrect for CSS regions.
</ins><span class="cx"> 
</span><span class="cx">     // On iOS, pageScaleFactor() is not applied by RenderView, so we should not scale here.
</span><span class="cx">     // FIXME: Set Settings::delegatesPageScaling to true for iOS.
</span><span class="lines">@@ -1120,7 +1121,7 @@
</span><span class="cx">     if (ancestorLayer)
</span><span class="cx">         overlapMap.geometryMap().pushMappingsToAncestor(&amp;layer, ancestorLayer);
</span><span class="cx">     
</span><del>-    IntRect bounds;
</del><ins>+    LayoutRect bounds;
</ins><span class="cx">     bool haveComputedBounds = false;
</span><span class="cx">     addToOverlapMap(overlapMap, layer, bounds, haveComputedBounds);
</span><span class="cx"> 
</span><span class="lines">@@ -1208,16 +1209,16 @@
</span><span class="cx"> 
</span><span class="cx">     RenderLayer::IndirectCompositingReason compositingReason = compositingState.m_subtreeIsCompositing ? RenderLayer::IndirectCompositingReason::Stacking : RenderLayer::IndirectCompositingReason::None;
</span><span class="cx">     bool haveComputedBounds = false;
</span><del>-    IntRect absBounds;
</del><ins>+    LayoutRect absBounds;
</ins><span class="cx"> 
</span><span class="cx">     // If we know for sure the layer is going to be composited, don't bother looking it up in the overlap map
</span><span class="cx">     if (!willBeComposited &amp;&amp; overlapMap &amp;&amp; !overlapMap-&gt;isEmpty() &amp;&amp; compositingState.m_testingOverlap) {
</span><span class="cx">         // If we're testing for overlap, we only need to composite if we overlap something that is already composited.
</span><del>-        absBounds = enclosingIntRect(overlapMap-&gt;geometryMap().absoluteRect(layer.overlapBounds()));
</del><ins>+        absBounds = enclosingLayoutRect(overlapMap-&gt;geometryMap().absoluteRect(layer.overlapBounds()));
</ins><span class="cx"> 
</span><span class="cx">         // Empty rects never intersect, but we need them to for the purposes of overlap testing.
</span><span class="cx">         if (absBounds.isEmpty())
</span><del>-            absBounds.setSize(IntSize(1, 1));
</del><ins>+            absBounds.setSize(LayoutSize(1, 1));
</ins><span class="cx">         haveComputedBounds = true;
</span><span class="cx">         compositingReason = overlapMap-&gt;overlapsLayers(absBounds) ? RenderLayer::IndirectCompositingReason::Overlap : RenderLayer::IndirectCompositingReason::None;
</span><span class="cx">     }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.h (180047 => 180048)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.h        2015-02-13 17:02:15 UTC (rev 180047)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayerCompositor.h        2015-02-13 17:02:20 UTC (rev 180048)
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">     // Repaint this and its child layers.
</span><span class="cx">     void recursiveRepaintLayer(RenderLayer&amp;);
</span><span class="cx"> 
</span><del>-    void addToOverlapMap(OverlapMap&amp;, RenderLayer&amp;, IntRect&amp; layerBounds, bool&amp; boundsComputed);
</del><ins>+    void addToOverlapMap(OverlapMap&amp;, RenderLayer&amp;, LayoutRect&amp; layerBounds, bool&amp; boundsComputed);
</ins><span class="cx">     void addToOverlapMapRecursive(OverlapMap&amp;, RenderLayer&amp;, RenderLayer* ancestorLayer = nullptr);
</span><span class="cx"> 
</span><span class="cx">     void updateCompositingLayersTimerFired(Timer&lt;RenderLayerCompositor&gt;&amp;);
</span></span></pre>
</div>
</div>

</body>
</html>