Title: [90855] trunk/Source/WebKit/mac
- Revision
- 90855
- Author
- aro...@apple.com
- Date
- 2011-07-12 14:56:25 -0700 (Tue, 12 Jul 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (90854 => 90855)
--- trunk/Source/WebKit/mac/ChangeLog 2011-07-12 21:51:52 UTC (rev 90854)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-07-12 21:56:25 UTC (rev 90855)
@@ -1,3 +1,20 @@
+2011-07-12 Adam Roben <aro...@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 <ba...@chromium.org>
Let plugins participate in form submission
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (90854 => 90855)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-07-12 21:51:52 UTC (rev 90854)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-07-12 21:56:25 UTC (rev 90855)
@@ -2934,20 +2934,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
}
}
@@ -5440,26 +5426,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
