Changeset 163514 in webkit

Timestamp:

Feb 5, 2014 10:19:16 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

[WK2] Add the minimumLayoutSizeOverride SPI to WKWebView
​https://bugs.webkit.org/show_bug.cgi?id=128295

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-02-05
Reviewed by Anders Carlsson.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView minimumLayoutSizeOverride]):
(-[WKWebView setMinimumLayoutSizeOverride:]):

• UIProcess/API/Cocoa/WKWebViewPrivate.h: Added.
• WebKit2.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (added)
• WebKit2.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-05  Benjamin Poulain  <bpoulain@apple.com>
+
+        [WK2] Add the minimumLayoutSizeOverride SPI to WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=128295
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView minimumLayoutSizeOverride]):
+        (-[WKWebView setMinimumLayoutSizeOverride:]):
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h: Added.
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2014-02-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -364 +364 @@
 }
 
+#pragma mark Private API
+
+- (CGSize)_minimumLayoutSizeOverride
+{
+    ASSERT(_hasStaticMinimumLayoutSize);
+    return [_viewportHandler availableViewSize];
+}
+
+- (void)_setMinimumLayoutSizeOverride:(CGSize)minimumLayoutSizeOverride
+{
+    _hasStaticMinimumLayoutSize = YES;
+    [_viewportHandler update:^{
+        [_viewportHandler setAvailableViewSize:minimumLayoutSizeOverride];
+    }];
+}
+
 #endif
 

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -401 +401 @@
                 1QQ417CB12C00CCA002BE67B /* TextCheckerCompletion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */; };
                 1ZZ417EF12C00D87002BE67B /* TextCheckerCompletion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BB417C912C00CCA002BE67B /* TextCheckerCompletion.cpp */; };
+                26F9A83B18A3468100AEB88A /* WKWebViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26F9A83A18A3463F00AEB88A /* WKWebViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 290F4272172A0C7400939FF0 /* ChildProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = 290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */; };
                 293EBEAB1627D9C9005F89F1 /* WKDOMText.h in Headers */ = {isa = PBXBuildFile; fileRef = 293EBEA91627D9C9005F89F1 /* WKDOMText.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2073 +2074 @@
                 1FB00AC6185F76460019142E /* WKWebProcessPlugInPageGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInPageGroupInternal.h; sourceTree = "<group>"; };
                 26659AA0185FAAED004303DD /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
+                26F9A83A18A3463F00AEB88A /* WKWebViewPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKWebViewPrivate.h; sourceTree = "<group>"; };
                 290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; };
                 293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
@@ -4317 +4319 @@
                                 1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */,
                                 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */,
+                                26F9A83A18A3463F00AEB88A /* WKWebViewPrivate.h */,
                         );
                         path = Cocoa;
@@ -6240 +6243 @@
                                 2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */,
                                 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */,
+                                26F9A83B18A3468100AEB88A /* WKWebViewPrivate.h in Headers */,
                                 1A64229A12DD029200CAAE2C /* DrawingAreaMessages.h in Headers */,
                                 1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */,