Changeset 162590 in webkit

Timestamp:

Jan 22, 2014 9:04:43 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

Add a minimalistic SPI to control the layout size outside of WKView
​https://bugs.webkit.org/show_bug.cgi?id=127403

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-01-22
Reviewed by Sam Weinig.

The API lets a client of WKView force the layout size. Once the size
is set this way, default update is disabled and the client needs to
update the size systematically as needed. This is done to avoid double
layout or flickering.

• UIProcess/API/Cocoa/WKViewPrivate.h:
• UIProcess/API/ios/WKViewIOS.mm:

(-[WKView _frameOrBoundsChanged]):
(-[WKView overrideMinimumLayoutSize:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKViewPrivate.h (modified) (2 diffs)
• UIProcess/API/ios/WKViewIOS.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-22  Benjamin Poulain  <bpoulain@apple.com>
+
+        Add a minimalistic SPI to control the layout size outside of WKView
+        https://bugs.webkit.org/show_bug.cgi?id=127403
+
+        Reviewed by Sam Weinig.
+
+        The API lets a client of WKView force the layout size. Once the size
+        is set this way, default update is disabled and the client needs to
+        update the size systematically as needed. This is done to avoid double
+        layout or flickering.
+
+        * UIProcess/API/Cocoa/WKViewPrivate.h:
+        * UIProcess/API/ios/WKViewIOS.mm:
+        (-[WKView _frameOrBoundsChanged]):
+        (-[WKView overrideMinimumLayoutSize:]):
+
 2014-01-22  Jinwoo Song  <jinwoo7.song@samsung.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41 +41 @@
 #endif
 
-#if !TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE
+
+@property (nonatomic) CGSize minimumLayoutSizeOverride;
+
+#else
 
 - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(WKFrameRef)frameRef;

trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50 +50 @@
     BOOL _userHasChangedPageScale;
     RetainPtr<_UIWebViewportHandler> _viewportHandler;
+    BOOL _hasStaticMinimumLayoutSize;
 }
 
@@ -258 +259 @@
 {
     CGRect bounds = [self bounds];
-    [_viewportHandler update:^{
-        [_viewportHandler setAvailableViewSize:bounds.size];
-    }];
+    if (!_hasStaticMinimumLayoutSize) {
+        [_viewportHandler update:^{
+            [_viewportHandler setAvailableViewSize:bounds.size];
+        }];
+    }
     [_scrollView setFrame:bounds];
     [_contentView setMinimumSize:bounds.size];
@@ -299 +302 @@
 }
 
+- (CGSize)minimumLayoutSizeOverride
+{
+    ASSERT(_hasStaticMinimumLayoutSize);
+    return [_viewportHandler availableViewSize];
+}
+
+- (void)setMinimumLayoutSizeOverride:(CGSize)minimumLayoutSizeOverride
+{
+    _hasStaticMinimumLayoutSize = YES;
+    [_viewportHandler update:^{
+        [_viewportHandler setAvailableViewSize:minimumLayoutSizeOverride];
+    }];
+}
+
 @end