Changeset 160692 in webkit

Timestamp:

Dec 16, 2013 7:48:05 PM (10 years ago)

Author:

weinig@apple.com

Message:

[Cocoa] Remove unused contentAnchor SPI from WKView
​https://bugs.webkit.org/show_bug.cgi?id=125826

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKViewPrivate.h:
• UIProcess/API/mac/WKView.mm:

(-[WKView setFrameSize:]):
(-[WKView _setDrawingAreaSize:]):
(-[WKView _setAcceleratedCompositingModeRootLayer:]):
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (2 diffs)
• UIProcess/API/mac/WKView.mm (modified) (8 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-16  Sam Weinig  <sam@webkit.org>
+
+        [Cocoa] Remove unused contentAnchor SPI from WKView
+        https://bugs.webkit.org/show_bug.cgi?id=125826
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView setFrameSize:]):
+        (-[WKView _setDrawingAreaSize:]):
+        (-[WKView _setAcceleratedCompositingModeRootLayer:]):
+        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+
 2013-12-16  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h

@@ -27 +27 @@
 #import <WebKit2/WKView.h>
 
-#if !TARGET_OS_IPHONE
-
-typedef enum {
-    WKContentAnchorTopLeft,
-    WKContentAnchorTopRight,
-    WKContentAnchorBottomLeft,
-    WKContentAnchorBottomRight,
-} WKContentAnchor;
-
-#endif
-
 @interface WKView (Private)
 
@@ -53 +42 @@
 
 #if !TARGET_OS_IPHONE
-
-@property WKContentAnchor contentAnchor;
 
 - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(WKFrameRef)frameRef;

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -98 +98 @@
 #import "WKProcessGroupPrivate.h"
 
-inline bool isWKContentAnchorRight(WKContentAnchor x)
-{
-    return x == WKContentAnchorTopRight || x == WKContentAnchorBottomRight;
-}
-
-inline bool isWKContentAnchorBottom(WKContentAnchor x)
-{
-    return x == WKContentAnchorBottomLeft || x == WKContentAnchorBottomRight;
-}
-
 @interface NSApplication (WKNSApplicationDetails)
 - (void)speakString:(NSString *)string;
@@ -220 +210 @@
     String _promisedFilename;
     String _promisedURL;
-
-    // The frame origin can be seen as a position within the layer of painted page content where the
-    // top left corner of the frame will be positioned. This is usually 0,0 - but if the content
-    // anchor is set to a corner other than the top left, the origin will implicitly move as the
-    // the frame size is modified.
-    NSPoint _frameOrigin;
-    WKContentAnchor _contentAnchor;
     
     NSSize _intrinsicContentSize;
@@ -416 +399 @@
         _data->_windowHasValidBackingStore = NO;
 
-    bool frameSizeUpdatesEnabled = ![self frameSizeUpdatesDisabled];
-    NSPoint newFrameOrigin;
-
-    // If frame updates are enabled we'll synchronously wait on the repaint, so we can reposition
-    // the layers back to the origin. If frame updates are disabled then shift the layer position
-    // so that the currently painted contents remain anchored appropriately.
-    if (frameSizeUpdatesEnabled)
-        newFrameOrigin = NSZeroPoint;
-    else {
-        newFrameOrigin = _data->_frameOrigin;
-        if (isWKContentAnchorRight(_data->_contentAnchor))
-            newFrameOrigin.x += [self frame].size.width - size.width;
-        if (isWKContentAnchorBottom(_data->_contentAnchor))
-            newFrameOrigin.y += [self frame].size.height - size.height;
-    }
-    
-    // If the frame origin has changed then update the layer position.
-    if (_data->_layerHostingView && !NSEqualPoints(_data->_frameOrigin, newFrameOrigin)) {
-        _data->_frameOrigin = newFrameOrigin;
-        CALayer *rootLayer = [[_data->_layerHostingView layer].sublayers objectAtIndex:0];
-        [CATransaction begin];
-        [CATransaction setDisableActions:YES];
-        rootLayer.position = CGPointMake(-newFrameOrigin.x, -newFrameOrigin.y);
-        [CATransaction commit];
-    }
-
     [super setFrameSize:size];
 
-    if (frameSizeUpdatesEnabled) {
+    if (![self frameSizeUpdatesDisabled]) {
         if (_data->_clipsToVisibleRect)
             [self _updateViewExposedRect];
@@ -2202 +2159 @@
         return;
     
-    NSSize layerOffset = NSMakeSize(_data->_frameOrigin.x, _data->_frameOrigin.y);
-    if (isWKContentAnchorRight(_data->_contentAnchor))
-        layerOffset.width += [self frame].size.width - size.width;
-    if (isWKContentAnchorBottom(_data->_contentAnchor))
-        layerOffset.height += [self frame].size.height - size.height;
-
-    _data->_page->drawingArea()->setSize(IntSize(size), IntSize(layerOffset), IntSize(_data->_resizeScrollOffset));
+    _data->_page->drawingArea()->setSize(IntSize(size), IntSize(0, 0), IntSize(_data->_resizeScrollOffset));
     _data->_resizeScrollOffset = NSZeroSize;
 }
@@ -2517 +2468 @@
 }
 
-
 - (void)_setAcceleratedCompositingModeRootLayer:(CALayer *)rootLayer
 {
@@ -2550 +2500 @@
 
             _data->_layerHostingView = nullptr;
-            _data->_frameOrigin = NSZeroPoint;
         }
     }
@@ -2926 +2875 @@
 
     _data->_needsViewFrameInWindowCoordinates = _data->_page->pageGroup().preferences()->pluginsEnabled();
-    _data->_frameOrigin = NSZeroPoint;
-    _data->_contentAnchor = WKContentAnchorTopLeft;
     
     [self _registerDraggedTypes];
@@ -3209 +3156 @@
 }
 
-- (void)setContentAnchor:(WKContentAnchor)contentAnchor
-{
-    _data->_contentAnchor = contentAnchor;
-}
-
-- (WKContentAnchor)contentAnchor
-{
-    return _data->_contentAnchor;
-}
-
 // This method forces a drawing area geometry update, even if frame size updates are disabled.
 // The updated is performed asynchronously; we don't wait for the geometry update before returning.