<!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>[168219] 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/168219">168219</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-05-02 18:16:00 -0700 (Fri, 02 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>CodeCleanup: Remove *MaintainsPixelAlignment from GraphicsLayer*.
https://bugs.webkit.org/show_bug.cgi?id=132501

Reviewed by Simon Fraser.

* WebCore.exp.in:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::GraphicsLayer):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::setMaintainsPixelAlignment): Deleted.
(WebCore::GraphicsLayer::maintainsPixelAlignment): Deleted.
(WebCore::GraphicsLayer::pixelAlignmentOffset): Deleted.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateGeometry):
(WebCore::GraphicsLayerCA::computePixelAlignment):
(WebCore::GraphicsLayerCA::setMaintainsPixelAlignment): Deleted.
* platform/graphics/ca/GraphicsLayerCA.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createGraphicsLayer):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::keepLayersPixelAligned): Deleted.
* rendering/RenderLayerCompositor.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/ChangeLog        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-05-02  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        CodeCleanup: Remove *MaintainsPixelAlignment from GraphicsLayer*.
+        https://bugs.webkit.org/show_bug.cgi?id=132501
+
+        Reviewed by Simon Fraser.
+
+        * WebCore.exp.in:
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::GraphicsLayer):
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::setMaintainsPixelAlignment): Deleted.
+        (WebCore::GraphicsLayer::maintainsPixelAlignment): Deleted.
+        (WebCore::GraphicsLayer::pixelAlignmentOffset): Deleted.
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::updateGeometry):
+        (WebCore::GraphicsLayerCA::computePixelAlignment):
+        (WebCore::GraphicsLayerCA::setMaintainsPixelAlignment): Deleted.
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::createGraphicsLayer):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::keepLayersPixelAligned): Deleted.
+        * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2014-05-02  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS WK2] Tiled layer content missing on pages with animated tiled layers
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/WebCore.exp.in        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -577,7 +577,6 @@
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA23setContentsNeedsDisplayEv
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA23setContentsToSolidColorERKNS_5ColorE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA23setDebugBackgroundColorERKNS_5ColorE
</span><del>-__ZN7WebCore15GraphicsLayerCA26setMaintainsPixelAlignmentEb
</del><span class="cx"> __ZN7WebCore15GraphicsLayerCA28platformCALayerPaintContentsEPNS_15PlatformCALayerERNS_15GraphicsContextERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA30deviceOrPageScaleFactorChangedEv
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA31platformCALayerAnimationStartedEd
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx">     , m_drawsContent(false)
</span><span class="cx">     , m_contentsVisible(true)
</span><span class="cx">     , m_acceleratesDrawing(false)
</span><del>-    , m_maintainsPixelAlignment(false)
</del><span class="cx">     , m_appliesPageScale(false)
</span><span class="cx">     , m_showDebugBorder(false)
</span><span class="cx">     , m_showRepaintCounter(false)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -454,10 +454,7 @@
</span><span class="cx">     virtual void distributeOpacity(float);
</span><span class="cx">     virtual float accumulatedOpacity() const;
</span><span class="cx"> 
</span><del>-    virtual void setMaintainsPixelAlignment(bool maintainsAlignment) { m_maintainsPixelAlignment = maintainsAlignment; }
-    virtual bool maintainsPixelAlignment() const { return m_maintainsPixelAlignment; }
</del><span class="cx"> #if PLATFORM(IOS)
</span><del>-    virtual FloatSize pixelAlignmentOffset() const { return FloatSize(); }
</del><span class="cx">     bool hasFlattenedPerspectiveTransform() const { return !preserves3D() &amp;&amp; m_childrenTransform.hasPerspective(); }
</span><span class="cx"> #endif
</span><span class="cx">     
</span><span class="lines">@@ -590,7 +587,6 @@
</span><span class="cx">     bool m_drawsContent : 1;
</span><span class="cx">     bool m_contentsVisible : 1;
</span><span class="cx">     bool m_acceleratesDrawing : 1;
</span><del>-    bool m_maintainsPixelAlignment : 1;
</del><span class="cx">     bool m_appliesPageScale : 1; // Set for the layer which has the page scale applied to it.
</span><span class="cx">     bool m_showDebugBorder : 1;
</span><span class="cx">     bool m_showRepaintCounter : 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -1539,10 +1539,6 @@
</span><span class="cx">     FloatSize pixelAlignmentOffset;
</span><span class="cx">     computePixelAlignment(pageScaleFactor, positionRelativeToBase, scaledPosition, scaledSize, scaledAnchorPoint, pixelAlignmentOffset);
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS)
-    m_pixelAlignmentOffset = pixelAlignmentOffset;
-#endif
-
</del><span class="cx">     FloatRect adjustedBounds(m_boundsOrigin - pixelAlignmentOffset, scaledSize);
</span><span class="cx"> 
</span><span class="cx">     // Update position.
</span><span class="lines">@@ -3428,15 +3424,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GraphicsLayerCA::setMaintainsPixelAlignment(bool maintainsAlignment)
-{
-    if (maintainsAlignment == m_maintainsPixelAlignment)
-        return;
-
-    GraphicsLayer::setMaintainsPixelAlignment(maintainsAlignment);
-    noteChangesForScaleSensitiveProperties();
-}
-
</del><span class="cx"> void GraphicsLayerCA::deviceOrPageScaleFactorChanged()
</span><span class="cx"> {
</span><span class="cx">     noteChangesForScaleSensitiveProperties();
</span><span class="lines">@@ -3450,7 +3437,7 @@
</span><span class="cx"> void GraphicsLayerCA::computePixelAlignment(float pageScaleFactor, const FloatPoint&amp; positionRelativeToBase,
</span><span class="cx">     FloatPoint&amp; position, FloatSize&amp; size, FloatPoint3D&amp; anchorPoint, FloatSize&amp; alignmentOffset) const
</span><span class="cx"> {
</span><del>-    if (!m_maintainsPixelAlignment || isIntegral(pageScaleFactor) || !m_drawsContent || m_masksToBounds) {
</del><ins>+    if (isIntegral(pageScaleFactor) || !m_drawsContent || m_masksToBounds) {
</ins><span class="cx">         position = m_position;
</span><span class="cx">         size = m_size;
</span><span class="cx">         anchorPoint = m_anchorPoint;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -146,10 +146,6 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void layerDidDisplay(PlatformLayer*) override;
</span><span class="cx"> 
</span><del>-    virtual void setMaintainsPixelAlignment(bool) override;
-#if PLATFORM(IOS)
-    virtual FloatSize pixelAlignmentOffset() const override { return m_pixelAlignmentOffset; }
-#endif
</del><span class="cx">     virtual void deviceOrPageScaleFactorChanged() override;
</span><span class="cx"> 
</span><span class="cx">     struct CommitState {
</span><span class="lines">@@ -543,8 +539,7 @@
</span><span class="cx">     TransformsMap m_animationTransforms;
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;FloatRect&gt; m_dirtyRects;
</span><del>-    FloatSize m_pixelAlignmentOffset;
-    
</del><ins>+
</ins><span class="cx">     LayerChangeFlags m_uncommittedChanges;
</span><span class="cx">     bool m_isCommittingChanges;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -176,8 +176,6 @@
</span><span class="cx"> #else
</span><span class="cx">     UNUSED_PARAM(name);
</span><span class="cx"> #endif
</span><del>-    graphicsLayer-&gt;setMaintainsPixelAlignment(compositor().keepLayersPixelAligned());
-
</del><span class="cx"> #if PLATFORM(COCOA) &amp;&amp; USE(CA)
</span><span class="cx">     graphicsLayer-&gt;setAcceleratesDrawing(compositor().acceleratedDrawingEnabled());
</span><span class="cx"> #endif    
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -2781,12 +2781,6 @@
</span><span class="cx">     // Nothing to do here yet.
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool RenderLayerCompositor::keepLayersPixelAligned() const
-{
-    // When scaling, attempt to align compositing layers to pixel boundaries.
-    return true;
-}
-
</del><span class="cx"> bool RenderLayerCompositor::mainFrameBackingIsTiled() const
</span><span class="cx"> {
</span><span class="cx">     RenderLayer* layer = m_renderView.layer();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (168218 => 168219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2014-05-03 01:15:47 UTC (rev 168218)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2014-05-03 01:16:00 UTC (rev 168219)
</span><span class="lines">@@ -249,7 +249,6 @@
</span><span class="cx"> 
</span><span class="cx">     void layerTiledBackingUsageChanged(const GraphicsLayer*, bool /*usingTiledBacking*/);
</span><span class="cx">     
</span><del>-    bool keepLayersPixelAligned() const;
</del><span class="cx">     bool acceleratedDrawingEnabled() const { return m_acceleratedDrawingEnabled; }
</span><span class="cx"> 
</span><span class="cx">     void deviceOrPageScaleFactorChanged();
</span></span></pre>
</div>
</div>

</body>
</html>