Changeset 90855 in webkit

Timestamp:

Jul 12, 2011, 2:56:25 PM (14 years ago)

Author:

Adam Roben

Message:

Delete some redundant code in WebHTMLView

This code had no user-visible effect, as we were just duplicating work that AppKit would do
for us at a slightly different time.

Fixes <​http://webkit.org/b/64390> WebHTMLView sets its root layer's transform unnecessarily

Reviewed by Simon Fraser.

• WebView/WebHTMLView.mm:

(-[WebHTMLView viewDidMoveToWindow]):
(-[WebHTMLView attachRootLayer:]):
Don't bother setting the root layer's transform to account for the scale factor. AppKit
takes care of this for us nowadays.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-07-12  Adam Roben  <aroben@apple.com>
+
+        Delete some redundant code in WebHTMLView
+
+        This code had no user-visible effect, as we were just duplicating work that AppKit would do
+        for us at a slightly different time.
+
+        Fixes <http://webkit.org/b/64390> WebHTMLView sets its root layer's transform unnecessarily
+
+        Reviewed by Simon Fraser.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView viewDidMoveToWindow]):
+        (-[WebHTMLView attachRootLayer:]):
+        Don't bother setting the root layer's transform to account for the scale factor. AppKit
+        takes care of this for us nowadays.
+
 2011-07-10  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

@@ -2935 +2935 @@
 
         _private->lastScrollPosition = NSZeroPoint;
-        
-#if USE(ACCELERATED_COMPOSITING) && !defined(BUILDING_ON_LEOPARD)
-        // We may have created the layer hosting view while outside the window. Update the scale factor
-        // now that we have a window to get it from.
-        if (_private->layerHostingView) {
-            CGFloat scaleFactor;
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
-            scaleFactor = [[self window] backingScaleFactor];
-#else
-            scaleFactor = [[self window] userSpaceScaleFactor];
-#endif
-            [[_private->layerHostingView layer] setTransform:CATransform3DMakeScale(scaleFactor, scaleFactor, 1)];
-        }
-#endif
     }
 }
@@ -5441 +5427 @@
 #endif
 
-#ifndef BUILDING_ON_LEOPARD
-    // If we aren't in the window yet, we'll use the screen's scale factor now, and reset the scale 
-    // via -viewDidMoveToWindow.
-    NSWindow *window = [self window];
-    CGFloat scaleFactor;
-#ifndef BUILDING_ON_SNOW_LEOPARD
-    if (window)
-        scaleFactor = [window backingScaleFactor];
-    else
-        scaleFactor = [[NSScreen mainScreen] backingScaleFactor];
-#else
-    if (window)
-        scaleFactor = [window userSpaceScaleFactor];
-    else
-        scaleFactor = [[NSScreen mainScreen] userSpaceScaleFactor];
-#endif
-
-    [viewLayer setTransform:CATransform3DMakeScale(scaleFactor, scaleFactor, 1)];
-#endif
-
     if ([self layer]) {
         // If we are in a layer-backed view, we need to manually initialize the geometry for our layer.