Changeset 150532 in webkit

Timestamp:

May 22, 2013 12:48:26 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

[wk2] Should be able to make tiled WKViews clip to the view's exposed rect without using autolayout
​https://bugs.webkit.org/show_bug.cgi?id=116625
<rdar://problem/13962816>

Reviewed by Anders Carlsson.

The two modes are not dependent; it should be possible to enable
clips-to-exposed-rect without using autolayout. This enables apps to
make very large tiled WKViews that don't create tiles for the whole
area of the view (and also disables scrolling, since that is currently
incompatible with clipping to the exposed rect).

• UIProcess/API/mac/WKView.mm:

(-[WKView setFrameSize:]):
(-[WKView _updateWindowAndViewFrames]):
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
(-[WKView enableFrameSizeUpdates]):
(-[WKView forceAsyncDrawingAreaSizeUpdate:]):
Rename _expandsToFitContentViaAutoLayout to _clipsToVisibleRect for accuracy.

(-[WKView setMinimumWidthForAutoLayout:]):
Factor clips-to-sisible-rect toggle out into setShouldClipToVisibleRect.

(-[WKView shouldClipToVisibleRect]):
(-[WKView setShouldClipToVisibleRect:]):
Allow setting clips-to-visible-rect without autolayout.

• UIProcess/API/mac/WKViewPrivate.h:

Add shouldClipToVisibleRect property.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-22  Tim Horton  <timothy_horton@apple.com>
+
+        [wk2] Should be able to make tiled WKViews clip to the view's exposed rect without using autolayout
+        https://bugs.webkit.org/show_bug.cgi?id=116625
+        <rdar://problem/13962816>
+
+        Reviewed by Anders Carlsson.
+
+        The two modes are not dependent; it should be possible to enable
+        clips-to-exposed-rect without using autolayout. This enables apps to
+        make very large tiled WKViews that don't create tiles for the whole
+        area of the view (and also disables scrolling, since that is currently
+        incompatible with clipping to the exposed rect).
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView setFrameSize:]):
+        (-[WKView _updateWindowAndViewFrames]):
+        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+        (-[WKView enableFrameSizeUpdates]):
+        (-[WKView forceAsyncDrawingAreaSizeUpdate:]):
+        Rename _expandsToFitContentViaAutoLayout to _clipsToVisibleRect for accuracy.
+
+        (-[WKView setMinimumWidthForAutoLayout:]):
+        Factor clips-to-sisible-rect toggle out into setShouldClipToVisibleRect.
+
+        (-[WKView shouldClipToVisibleRect]):
+        (-[WKView setShouldClipToVisibleRect:]):
+        Allow setting clips-to-visible-rect without autolayout.
+
+        * UIProcess/API/mac/WKViewPrivate.h:
+        Add shouldClipToVisibleRect property.
+
 2013-05-22  Alexey Proskuryakov  <ap@apple.com>
 

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

@@ -236 +236 @@
     
     NSSize _intrinsicContentSize;
-    BOOL _expandsToFitContentViaAutoLayout;
+    BOOL _clipsToVisibleRect;
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
@@ -427 +427 @@
 
     if (frameSizeUpdatesEnabled) {
-        if (_data->_expandsToFitContentViaAutoLayout)
+        if (_data->_clipsToVisibleRect)
             _data->_page->viewExposedRectChanged([self visibleRect]);
         [self _setDrawingAreaSize:size];
@@ -439 +439 @@
     
     _data->_page->windowAndViewFramesChanged(viewFrameInWindowCoordinates, accessibilityPosition);
-    if (_data->_expandsToFitContentViaAutoLayout)
+    if (_data->_clipsToVisibleRect)
         _data->_page->viewExposedRectChanged([self visibleRect]);
 }
@@ -3067 +3067 @@
     _data->_mouseDownEvent = nil;
     _data->_ignoringMouseDraggedEvents = NO;
-    _data->_expandsToFitContentViaAutoLayout = NO;
+    _data->_clipsToVisibleRect = NO;
 
     _data->_intrinsicContentSize = NSMakeSize(NSViewNoInstrinsicMetric, NSViewNoInstrinsicMetric);
@@ -3172 +3172 @@
     
     if (!(--_data->_frameSizeUpdatesDisabledCount)) {
-        if (_data->_expandsToFitContentViaAutoLayout)
+        if (_data->_clipsToVisibleRect)
             _data->_page->viewExposedRectChanged([self visibleRect]);
         [self _setDrawingAreaSize:[self frame].size];
@@ -3230 +3230 @@
     BOOL expandsToFit = minimumLayoutWidth > 0;
 
-    _data->_expandsToFitContentViaAutoLayout = expandsToFit;
     _data->_page->setMinimumLayoutWidth(minimumLayoutWidth);
 
-    if (expandsToFit)
+    [self setShouldClipToVisibleRect:expandsToFit];
+}
+
+- (BOOL)shouldClipToVisibleRect
+{
+    return _data->_clipsToVisibleRect;
+}
+
+- (void)setShouldClipToVisibleRect:(BOOL)clipsToVisibleRect
+{
+    _data->_clipsToVisibleRect = clipsToVisibleRect;
+
+    if (clipsToVisibleRect)
         _data->_page->viewExposedRectChanged([self visibleRect]);
 
-    _data->_page->setMainFrameIsScrollable(!expandsToFit);
+    _data->_page->setMainFrameIsScrollable(!clipsToVisibleRect);
 }
 
@@ -3354 +3365 @@
 - (void)forceAsyncDrawingAreaSizeUpdate:(NSSize)size
 {
-    if (_data->_expandsToFitContentViaAutoLayout)
+    if (_data->_clipsToVisibleRect)
         _data->_page->viewExposedRectChanged([self visibleRect]);
     [self _setDrawingAreaSize:size];

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

@@ -61 +61 @@
 @property (readwrite) CGFloat minimumLayoutWidth;
 @property (readwrite) CGFloat minimumWidthForAutoLayout;
+@property (readwrite) BOOL shouldClipToVisibleRect;
 
 @property(copy, nonatomic) NSColor *underlayColor;