<!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>[202612] trunk/Source/WebKit2</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/202612">202612</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-06-28 22:04:28 -0700 (Tue, 28 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/202586">r202586</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/202595">r202595</a>.
https://bugs.webkit.org/show_bug.cgi?id=159247
These changes broke the iOS build (Requested by ryanhaddad on
#webkit).
Reverted changesets:
"Keep track of when a WKWebView is blank before the initial
non-empty layout"
https://bugs.webkit.org/show_bug.cgi?id=159217
http://trac.webkit.org/changeset/202586
"Try to fix the build."
http://trac.webkit.org/changeset/202595
Patch by Commit Queue <commit-queue@webkit.org> on 2016-06-28</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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202611 => 202612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-29 05:04:28 UTC (rev 202612)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-06-28 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r202586 and r202595.
+ https://bugs.webkit.org/show_bug.cgi?id=159247
+
+ These changes broke the iOS build (Requested by ryanhaddad on
+ #webkit).
+
+ Reverted changesets:
+
+ "Keep track of when a WKWebView is blank before the initial
+ non-empty layout"
+ https://bugs.webkit.org/show_bug.cgi?id=159217
+ http://trac.webkit.org/changeset/202586
+
+ "Try to fix the build."
+ http://trac.webkit.org/changeset/202595
+
+2016-06-28 Commit Queue <commit-queue@webkit.org>
+
</ins><span class="cx"> Unreviewed, rolling out r202580.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159245
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202611 => 202612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-29 05:04:28 UTC (rev 202612)
</span><span class="lines">@@ -490,8 +490,6 @@
</span><span class="cx"> [_scrollView setInternalDelegate:self];
</span><span class="cx"> [_scrollView setBouncesZoom:YES];
</span><span class="cx">
</span><del>- [self _setIsBlankBeforeFirstNonEmptyLayout:YES];
-
</del><span class="cx"> [self addSubview:_scrollView.get()];
</span><span class="cx">
</span><span class="cx"> static uint32_t programSDKVersion = dyld_get_program_sdk_version();
</span><span class="lines">@@ -1752,12 +1750,6 @@
</span><span class="cx"> return !areEssentiallyEqualAsFloat(contentZoomScale(self), 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(APPLE_INTERNAL_SDK)
-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank
-{
-}
-#endif
-
</del><span class="cx"> #pragma mark - UIScrollViewDelegate
</span><span class="cx">
</span><span class="cx"> - (BOOL)usesStandardContentView
</span><span class="lines">@@ -2084,11 +2076,6 @@
</span><span class="cx"> enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame
-{
- [self _setIsBlankBeforeFirstNonEmptyLayout:NO];
-}
-
</del><span class="cx"> - (void)_didFinishLoadForMainFrame
</span><span class="cx"> {
</span><span class="cx"> if (_gestureController)
</span><span class="lines">@@ -4632,8 +4619,12 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
</del><ins>+#if PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WKWebViewAdditions.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewAdditionsMac.mm>
+#endif
+
</ins><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (202611 => 202612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-06-29 05:04:28 UTC (rev 202612)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> - (void)_updateVisibleContentRectAfterScrollInView:(UIScrollView *)scrollView;
</span><span class="cx"> - (void)_updateContentRectsWithState:(BOOL)inStableState;
</span><span class="cx">
</span><del>-- (void)_didFirstVisuallyNonEmptyLayoutForMainFrame;
</del><span class="cx"> - (void)_didFinishLoadForMainFrame;
</span><span class="cx"> - (void)_didFailLoadForMainFrame;
</span><span class="cx"> - (void)_didSameDocumentNavigationForMainFrame:(WebKit::SameDocumentNavigationType)navigationType;
</span><span class="lines">@@ -118,8 +117,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateForceAlwaysUserScalable;
</span><span class="cx">
</span><del>-- (void)_setIsBlankBeforeFirstNonEmptyLayout:(BOOL)isBlank;
-
</del><span class="cx"> @property (nonatomic, readonly) BOOL _isBackground;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) WKWebViewContentProviderRegistry *_contentProviderRegistry;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (202611 => 202612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2016-06-29 04:49:27 UTC (rev 202611)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2016-06-29 05:04:28 UTC (rev 202612)
</span><span class="lines">@@ -702,7 +702,6 @@
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didFirstVisuallyNonEmptyLayoutForMainFrame()
</span><span class="cx"> {
</span><del>- [m_webView _didFirstVisuallyNonEmptyLayoutForMainFrame];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::didFinishLoadForMainFrame()
</span></span></pre>
</div>
</div>
</body>
</html>