Changeset 200465 in webkit

Timestamp:

May 5, 2016 11:36:22 AM (8 years ago)

Author:

Simon Fraser

Message:

Comments on wired.com are blurry
​https://bugs.webkit.org/show_bug.cgi?id=148630
Source/WebCore:

rdar://problem/22499655

Reviewed by Tim Horton.

Make sure to set -rasterizationScale on TileGrid container layers to avoid blurry layers
with some configurations of transforms, perspective and clipping.

Test: compositing/contents-scale/rasterization-scale.html

• platform/graphics/ca/TileController.cpp:

(WebCore::TileController::TileController): Initialize m_deviceScaleFactor before m_tileGrid,
because TileGrid's constructor needs to read the device scale.

• platform/graphics/ca/TileController.h:
• platform/graphics/ca/TileGrid.cpp:

(WebCore::TileGrid::TileGrid): Push a contentsScale (which also sets rasterizationScale) onto
the tile grid container layer on constructions, and in setScale().
(WebCore::TileGrid::setScale):

LayoutTests:

Reviewed by Tim Horton.

This testcase does not fail without the patch because of how WTR does snapshotting,
but some future improvement may fix that.

• compositing/contents-scale/rasterization-scale-expected.html: Added.
• compositing/contents-scale/rasterization-scale.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/contents-scale/rasterization-scale-expected.html (added)
• LayoutTests/compositing/contents-scale/rasterization-scale.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/TileController.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/TileController.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/ca/TileGrid.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Comments on wired.com are blurry
+        https://bugs.webkit.org/show_bug.cgi?id=148630
+
+        Reviewed by Tim Horton.
+
+        This testcase does not fail without the patch because of how WTR does snapshotting,
+        but some future improvement may fix that.
+
+        * compositing/contents-scale/rasterization-scale-expected.html: Added.
+        * compositing/contents-scale/rasterization-scale.html: Added.
+
 2016-05-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Comments on wired.com are blurry
+        https://bugs.webkit.org/show_bug.cgi?id=148630
+        rdar://problem/22499655
+
+        Reviewed by Tim Horton.
+
+        Make sure to set -rasterizationScale on TileGrid container layers to avoid blurry layers
+        with some configurations of transforms, perspective and clipping.
+
+        Test: compositing/contents-scale/rasterization-scale.html
+
+        * platform/graphics/ca/TileController.cpp:
+        (WebCore::TileController::TileController): Initialize m_deviceScaleFactor before m_tileGrid,
+        because TileGrid's constructor needs to read the device scale.
+        * platform/graphics/ca/TileController.h:
+        * platform/graphics/ca/TileGrid.cpp:
+        (WebCore::TileGrid::TileGrid): Push a contentsScale (which also sets rasterizationScale) onto 
+        the tile grid container layer on constructions, and in setScale().
+        (WebCore::TileGrid::setScale):
+
 2016-05-05  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -62 +62 @@
 TileController::TileController(PlatformCALayer* rootPlatformLayer)
     : m_tileCacheLayer(rootPlatformLayer)
+    , m_deviceScaleFactor(owningGraphicsLayer()->platformCALayerDeviceScaleFactor())
     , m_tileGrid(std::make_unique<TileGrid>(*this))
     , m_tileRevalidationTimer(*this, &TileController::tileRevalidationTimerFired)
     , m_tileSizeChangeTimer(*this, &TileController::tileSizeChangeTimerFired, tileSizeUpdateDelay)
-    , m_deviceScaleFactor(owningGraphicsLayer()->platformCALayerDeviceScaleFactor())
     , m_marginEdges(false, false, false, false)
 {

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

@@ -183 +183 @@
     PlatformCALayer* m_tileCacheLayer;
 
+    float m_zoomedOutContentsScale { 0 };
+    float m_deviceScaleFactor;
+
     std::unique_ptr<TileCoverageMap> m_coverageMap;
 
@@ -194 +197 @@
     Timer m_tileRevalidationTimer;
     DeferrableOneShotTimer m_tileSizeChangeTimer;
-
-    float m_zoomedOutContentsScale { 0 };
-    float m_deviceScaleFactor;
 
     TileCoverage m_tileCoverage { CoverageForVisibleArea };

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

@@ -49 +49 @@
 {
     m_containerLayer.get().setName(TileController::tileGridContainerLayerName());
+    m_containerLayer.get().setContentsScale(m_controller.deviceScaleFactor());
 }
 
@@ -77 +78 @@
     // FIXME: we may revalidateTiles twice in this commit.
     revalidateTiles(PruneSecondaryTiles);
+
+    m_containerLayer.get().setContentsScale(m_controller.deviceScaleFactor());
 
     for (auto& tile : m_tiles.values())