Changeset 150135 in webkit

Timestamp:

May 15, 2013 12:12:21 PM (11 years ago)

Author:

Simon Fraser

Message:

Revert ​http://trac.webkit.org/changeset/150047

It introduced unwanted behavioral differences between
Retina and non-Retina Mac hardware.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::requiresTiledLayer):
(WebCore::GraphicsLayerCA::computePixelAlignment):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Revert http://trac.webkit.org/changeset/150047
+        
+        It introduced unwanted behavioral differences between
+        Retina and non-Retina Mac hardware.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::requiresTiledLayer):
+        (WebCore::GraphicsLayerCA::computePixelAlignment):
+
 2013-05-15  Darin Adler  <darin@apple.com>
 

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

@@ -2677 +2677 @@
         return false;
 
-    float effectiveScale = pageScaleFactor * deviceScaleFactor();
-
     // FIXME: catch zero-size height or width here (or earlier)?
-    return m_size.width() * effectiveScale > cMaxPixelDimension || m_size.height() * effectiveScale > cMaxPixelDimension;
+    return m_size.width() * pageScaleFactor > cMaxPixelDimension || m_size.height() * pageScaleFactor > cMaxPixelDimension;
 }
 
@@ -3011 +3009 @@
     FloatPoint& position, FloatSize& size, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const
 {
-    float effectiveScale = pageScaleFactor * deviceScaleFactor();
-    if (!m_maintainsPixelAlignment || isIntegral(effectiveScale) || !m_drawsContent || m_masksToBounds) {
+    if (!m_maintainsPixelAlignment || isIntegral(pageScaleFactor) || !m_drawsContent || m_masksToBounds) {
         position = m_position;
         size = m_size;
@@ -3023 +3020 @@
     FloatRect scaledBounds = baseRelativeBounds;
     // Scale by the page scale factor to compute the screen-relative bounds.
-    scaledBounds.scale(effectiveScale);
+    scaledBounds.scale(pageScaleFactor);
     // Round to integer boundaries.
     FloatRect alignedBounds = enclosingIntRect(scaledBounds);
     
     // Convert back to layer coordinates.
-    alignedBounds.scale(1 / effectiveScale);
+    alignedBounds.scale(1 / pageScaleFactor);
     
     // Epsilon is necessary to ensure that backing store size computation in CA, which involves integer truncation,