Changeset 168219 in webkit

Timestamp:

May 2, 2014 6:16:00 PM (10 years ago)

Author:

Alan Bujtas

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• platform/graphics/GraphicsLayer.h (modified) (2 diffs)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)
• platform/graphics/ca/GraphicsLayerCA.h (modified) (2 diffs)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-02  Zalan Bujtas  <zalan@apple.com>
+
+        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:
+
 2014-05-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -578 +578 @@
 __ZN7WebCore15GraphicsLayerCA23setContentsToSolidColorERKNS_5ColorE
 __ZN7WebCore15GraphicsLayerCA23setDebugBackgroundColorERKNS_5ColorE
-__ZN7WebCore15GraphicsLayerCA26setMaintainsPixelAlignmentEb
 __ZN7WebCore15GraphicsLayerCA28platformCALayerPaintContentsEPNS_15PlatformCALayerERNS_15GraphicsContextERKNS_9FloatRectE
 __ZN7WebCore15GraphicsLayerCA30deviceOrPageScaleFactorChangedEv

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -88 +88 @@
     , m_contentsVisible(true)
     , m_acceleratesDrawing(false)
-    , m_maintainsPixelAlignment(false)
     , m_appliesPageScale(false)
     , m_showDebugBorder(false)

trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

@@ -455 +455 @@
     virtual float accumulatedOpacity() const;
 
-    virtual void setMaintainsPixelAlignment(bool maintainsAlignment) { m_maintainsPixelAlignment = maintainsAlignment; }
-    virtual bool maintainsPixelAlignment() const { return m_maintainsPixelAlignment; }
 #if PLATFORM(IOS)
-    virtual FloatSize pixelAlignmentOffset() const { return FloatSize(); }
     bool hasFlattenedPerspectiveTransform() const { return !preserves3D() && m_childrenTransform.hasPerspective(); }
 #endif
@@ -591 +588 @@
     bool m_contentsVisible : 1;
     bool m_acceleratesDrawing : 1;
-    bool m_maintainsPixelAlignment : 1;
     bool m_appliesPageScale : 1; // Set for the layer which has the page scale applied to it.
     bool m_showDebugBorder : 1;

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1540 +1540 @@
     computePixelAlignment(pageScaleFactor, positionRelativeToBase, scaledPosition, scaledSize, scaledAnchorPoint, pixelAlignmentOffset);
 
-#if PLATFORM(IOS)
-    m_pixelAlignmentOffset = pixelAlignmentOffset;
-#endif
-
     FloatRect adjustedBounds(m_boundsOrigin - pixelAlignmentOffset, scaledSize);
 
@@ -3429 +3425 @@
 }
 
-void GraphicsLayerCA::setMaintainsPixelAlignment(bool maintainsAlignment)
-{
-    if (maintainsAlignment == m_maintainsPixelAlignment)
-        return;
-
-    GraphicsLayer::setMaintainsPixelAlignment(maintainsAlignment);
-    noteChangesForScaleSensitiveProperties();
-}
-
 void GraphicsLayerCA::deviceOrPageScaleFactorChanged()
 {
@@ -3451 +3438 @@
     FloatPoint& position, FloatSize& size, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const
 {
-    if (!m_maintainsPixelAlignment || isIntegral(pageScaleFactor) || !m_drawsContent || m_masksToBounds) {
+    if (isIntegral(pageScaleFactor) || !m_drawsContent || m_masksToBounds) {
         position = m_position;
         size = m_size;

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

@@ -147 +147 @@
     virtual void layerDidDisplay(PlatformLayer*) override;
 
-    virtual void setMaintainsPixelAlignment(bool) override;
-#if PLATFORM(IOS)
-    virtual FloatSize pixelAlignmentOffset() const override { return m_pixelAlignmentOffset; }
-#endif
     virtual void deviceOrPageScaleFactorChanged() override;
 
@@ -544 +540 @@
 
     Vector<FloatRect> m_dirtyRects;
-    FloatSize m_pixelAlignmentOffset;
-    
+
     LayerChangeFlags m_uncommittedChanges;
     bool m_isCommittingChanges;

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -177 +177 @@
     UNUSED_PARAM(name);
 #endif
-    graphicsLayer->setMaintainsPixelAlignment(compositor().keepLayersPixelAligned());
-
 #if PLATFORM(COCOA) && USE(CA)
     graphicsLayer->setAcceleratesDrawing(compositor().acceleratedDrawingEnabled());

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2782 +2782 @@
 }
 
-bool RenderLayerCompositor::keepLayersPixelAligned() const
-{
-    // When scaling, attempt to align compositing layers to pixel boundaries.
-    return true;
-}
-
 bool RenderLayerCompositor::mainFrameBackingIsTiled() const
 {

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -250 +250 @@
     void layerTiledBackingUsageChanged(const GraphicsLayer*, bool /*usingTiledBacking*/);
     
-    bool keepLayersPixelAligned() const;
     bool acceleratedDrawingEnabled() const { return m_acceleratedDrawingEnabled; }