<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202120] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202120">202120</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-06-15 19:20:04 -0700 (Wed, 15 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose _shouldExpandContentToViewHeightForAutoLayout SPI on WKWebView
https://bugs.webkit.org/show_bug.cgi?id=158824
<rdar://problem/23713857>
Reviewed by Simon Fraser.
Test: TestWebKitAPI/WebKit2.AutoLayoutIntegration
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _shouldExpandContentToViewHeightForAutoLayout]):
(-[WKWebView _setShouldExpandContentToViewHeightForAutoLayout:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
This property exists on WKView; expose it on WKWebView.
* TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm:
(-[AutoLayoutWKWebView load:withWidth:expectingContentSize:]):
(-[AutoLayoutWKWebView load:withWidth:expectingContentSize:resettingWidth:]):
(-[AutoLayoutWKWebView layoutAtMinimumWidth:andExpectContentSizeChange:resettingWidth:]):
(TEST):
Add a test for _shouldExpandContentToViewHeightForAutoLayout.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaAutoLayoutIntegrationmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202119 => 202120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-16 01:28:54 UTC (rev 202119)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-16 02:20:04 UTC (rev 202120)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-15 Tim Horton <timothy_horton@apple.com>
+
+ Expose _shouldExpandContentToViewHeightForAutoLayout SPI on WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=158824
+ <rdar://problem/23713857>
+
+ Reviewed by Simon Fraser.
+
+ Test: TestWebKitAPI/WebKit2.AutoLayoutIntegration
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _shouldExpandContentToViewHeightForAutoLayout]):
+ (-[WKWebView _setShouldExpandContentToViewHeightForAutoLayout:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ This property exists on WKView; expose it on WKWebView.
+
</ins><span class="cx"> 2016-06-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Revert part of r196034
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202119 => 202120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-16 01:28:54 UTC (rev 202119)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-16 02:20:04 UTC (rev 202120)
</span><span class="lines">@@ -4400,6 +4400,16 @@
</span><span class="cx"> _impl->setClipsToVisibleRect(expandsToFit);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_shouldExpandContentToViewHeightForAutoLayout
+{
+ return _impl->shouldExpandToViewHeightForAutoLayout();
+}
+
+- (void)_setShouldExpandContentToViewHeightForAutoLayout:(BOOL)shouldExpand
+{
+ return _impl->setShouldExpandToViewHeightForAutoLayout(shouldExpand);
+}
+
</ins><span class="cx"> - (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo
</span><span class="cx"> {
</span><span class="cx"> if (auto webFrameProxy = _page->mainFrame())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (202119 => 202120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-06-16 01:28:54 UTC (rev 202119)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2016-06-16 02:20:04 UTC (rev 202120)
</span><span class="lines">@@ -190,6 +190,10 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setMinimumLayoutWidth:) CGFloat _minimumLayoutWidth WK_AVAILABLE(WK_MAC_TBA, NA);
</span><span class="cx">
</span><ins>+// When using _minimumLayoutWidth, the web content will lay out to the intrinsic height
+// of the content; use this property to force it to lay out to the height of the view instead.
+@property (nonatomic, setter=_setShouldExpandContentToViewHeightForAutoLayout:) BOOL _shouldExpandContentToViewHeightForAutoLayout WK_AVAILABLE(WK_MAC_TBA, NA);
+
</ins><span class="cx"> - (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo;
</span><span class="cx"> - (NSPrintOperation *)_printOperationWithPrintInfo:(NSPrintInfo *)printInfo forFrame:(_WKFrameHandle *)frameHandle WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202119 => 202120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-16 01:28:54 UTC (rev 202119)
+++ trunk/Tools/ChangeLog 2016-06-16 02:20:04 UTC (rev 202120)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-15 Tim Horton <timothy_horton@apple.com>
+
+ Expose _shouldExpandContentToViewHeightForAutoLayout SPI on WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=158824
+ <rdar://problem/23713857>
+
+ Reviewed by Simon Fraser.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm:
+ (-[AutoLayoutWKWebView load:withWidth:expectingContentSize:]):
+ (-[AutoLayoutWKWebView load:withWidth:expectingContentSize:resettingWidth:]):
+ (-[AutoLayoutWKWebView layoutAtMinimumWidth:andExpectContentSizeChange:resettingWidth:]):
+ (TEST):
+ Add a test for _shouldExpandContentToViewHeightForAutoLayout.
+
</ins><span class="cx"> 2016-06-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Make it possible to test the Next/Previous buttons in the keyboard accessory bar
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaAutoLayoutIntegrationmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm (202119 => 202120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm 2016-06-16 01:28:54 UTC (rev 202119)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm 2016-06-16 02:20:04 UTC (rev 202120)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> static bool didFinishNavigation;
</span><span class="cx"> static bool didInvalidateIntrinsicContentSize;
</span><ins>+static bool didEvaluateJavaScript;
</ins><span class="cx">
</span><span class="cx"> @interface AutoLayoutNavigationDelegate : NSObject <WKNavigationDelegate>
</span><span class="cx"> @end
</span><span class="lines">@@ -56,6 +57,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)load:(NSString *)HTMLString withWidth:(CGFloat)width expectingContentSize:(NSSize)size
</span><span class="cx"> {
</span><ins>+ [self load:HTMLString withWidth:width expectingContentSize:size resettingWidth:YES];
+}
+
+- (void)load:(NSString *)HTMLString withWidth:(CGFloat)width expectingContentSize:(NSSize)size resettingWidth:(BOOL)resetAfter
+{
</ins><span class="cx"> EXPECT_FALSE(_expectingIntrinsicContentSizeChange);
</span><span class="cx">
</span><span class="cx"> NSString *baseHTML = @"<style>"
</span><span class="lines">@@ -71,10 +77,10 @@
</span><span class="cx"> [self loadHTMLString:[baseHTML stringByAppendingString:HTMLString] baseURL:nil];
</span><span class="cx"> TestWebKitAPI::Util::run(&didFinishNavigation);
</span><span class="cx">
</span><del>- [self layoutAtMinimumWidth:width andExpectContentSizeChange:size];
</del><ins>+ [self layoutAtMinimumWidth:width andExpectContentSizeChange:size resettingWidth:resetAfter];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)layoutAtMinimumWidth:(CGFloat)width andExpectContentSizeChange:(NSSize)size
</del><ins>+- (void)layoutAtMinimumWidth:(CGFloat)width andExpectContentSizeChange:(NSSize)size resettingWidth:(BOOL)resetAfter
</ins><span class="cx"> {
</span><span class="cx"> [self _setMinimumLayoutWidth:width];
</span><span class="cx">
</span><span class="lines">@@ -86,7 +92,8 @@
</span><span class="cx"> didInvalidateIntrinsicContentSize = false;
</span><span class="cx"> TestWebKitAPI::Util::run(&didInvalidateIntrinsicContentSize);
</span><span class="cx">
</span><del>- [self _setMinimumLayoutWidth:0];
</del><ins>+ if (resetAfter)
+ [self _setMinimumLayoutWidth:0];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)invalidateIntrinsicContentSize
</span><span class="lines">@@ -125,13 +132,37 @@
</span><span class="cx"> [webView load:@"<div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div>" withWidth:50 expectingContentSize:NSMakeSize(50, 20)];
</span><span class="cx">
</span><span class="cx"> // Changing the width to 10 should result in ten rows of one; with the constraint (width >= 10) -> 10x100
</span><del>- [webView layoutAtMinimumWidth:10 andExpectContentSizeChange:NSMakeSize(10, 100)];
</del><ins>+ [webView layoutAtMinimumWidth:10 andExpectContentSizeChange:NSMakeSize(10, 100) resettingWidth:YES];
</ins><span class="cx">
</span><span class="cx"> // Changing the width to 100 should result in one rows of ten; with the constraint (width >= 100) -> 100x10
</span><del>- [webView layoutAtMinimumWidth:100 andExpectContentSizeChange:NSMakeSize(100, 10)];
</del><ins>+ [webView layoutAtMinimumWidth:100 andExpectContentSizeChange:NSMakeSize(100, 10) resettingWidth:YES];
</ins><span class="cx">
</span><span class="cx"> // One 100x100 rect and ten 10x10 rects, inline; with the constraint (width >= 20) -> 100x110
</span><span class="cx"> [webView load:@"<div class='large'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div><div class='small inline'></div>" withWidth:20 expectingContentSize:NSMakeSize(100, 110)];
</span><ins>+
+ // With _shouldExpandContentToViewHeightForAutoLayout off (the default), the page should lay out to the intrinsic height
+ // of the content.
+ [webView load:@"<div class='small'></div>" withWidth:50 expectingContentSize:NSMakeSize(50, 10) resettingWidth:NO];
+ [webView evaluateJavaScript:@"window.innerHeight" completionHandler:^(id value, NSError *error) {
+ EXPECT_TRUE([value isKindOfClass:[NSNumber class]]);
+ EXPECT_EQ(10, [value integerValue]);
+ didEvaluateJavaScript = true;
+ }];
+ TestWebKitAPI::Util::run(&didEvaluateJavaScript);
+ didEvaluateJavaScript = false;
+
+ // Enabling _shouldExpandContentToViewHeightForAutoLayout should make the page lay out to the view height, regardless
+ // of the intrinsic height of the content. We have to load differently-sized content so that we can wait for
+ // the intrinsic size change callback.
+ [webView _setShouldExpandContentToViewHeightForAutoLayout:YES];
+ [webView load:@"<div class='large'></div>" withWidth:50 expectingContentSize:NSMakeSize(100, 100) resettingWidth:NO];
+ [webView evaluateJavaScript:@"window.innerHeight" completionHandler:^(id value, NSError *error) {
+ EXPECT_TRUE([value isKindOfClass:[NSNumber class]]);
+ EXPECT_EQ(1000, [value integerValue]);
+ didEvaluateJavaScript = true;
+ }];
+ TestWebKitAPI::Util::run(&didEvaluateJavaScript);
+ didEvaluateJavaScript = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>