Title: [92015] branches/safari-534.51-branch/Source/WebKit/mac
Diff
Modified: branches/safari-534.51-branch/Source/WebKit/mac/ChangeLog (92014 => 92015)
--- branches/safari-534.51-branch/Source/WebKit/mac/ChangeLog 2011-07-29 21:54:50 UTC (rev 92014)
+++ branches/safari-534.51-branch/Source/WebKit/mac/ChangeLog 2011-07-29 21:57:15 UTC (rev 92015)
@@ -1,3 +1,24 @@
+2011-07-29 Lucas Forschler <[email protected]>
+
+ Merged 90855.
+
+ 2011-07-12 Adam Roben <[email protected]>
+
+ 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-21 Lucas Forschler <[email protected]>
Merged 91146.
Modified: branches/safari-534.51-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (92014 => 92015)
--- branches/safari-534.51-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-07-29 21:54:50 UTC (rev 92014)
+++ branches/safari-534.51-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-07-29 21:57:15 UTC (rev 92015)
@@ -2929,20 +2929,6 @@
[[self _pluginController] startAllPlugins];
_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
}
}
@@ -5435,26 +5421,6 @@
[viewLayer setStyle:[NSDictionary dictionaryWithObject:actions forKey:@"actions"]];
#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.
[viewLayer setBounds:NSRectToCGRect([_private->layerHostingView bounds])];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
