<!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>[168135] 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/168135">168135</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-01 16:59:06 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Tweak the extended background exclusion for MobileSafari
https://bugs.webkit.org/show_bug.cgi?id=132449
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-05-01
Reviewed by Beth Dakin.
Some tweaks for Mobile:
-Use UIViews instead of CALayers to have the same animation timing as the top views.
-The left extended background insets should not exclude the top and bottom insets.
Since this code is in the middle of 2 hot paths, also added some performance tweaks.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
In the normal case, we do not have extended background exclusion. To avoid creating a background view, we use
the scrollview to render the background.
The separate background view is created lazily if needed.
(-[WKWebView _updateScrollViewBackground]):
(-[WKWebView _frameOrBoundsChanged]):
(updateTopAndBottomExtendedBackgroundExclusionIfNecessary):
This create the top and bottom extended background view as needed and update their frames for the current insets.
(-[WKWebView _setObscuredInsets:]):
(-[WKWebView _setExtendedBackgroundExclusionInsets:]):
When an exclusion inset is needed, create a view for it, transfer the color from the ScrollView, and reset the color
of the scrollview.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168134 => 168135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-01 23:55:05 UTC (rev 168134)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-01 23:59:06 UTC (rev 168135)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-05-01 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Tweak the extended background exclusion for MobileSafari
+ https://bugs.webkit.org/show_bug.cgi?id=132449
+
+ Reviewed by Beth Dakin.
+
+ Some tweaks for Mobile:
+ -Use UIViews instead of CALayers to have the same animation timing as the top views.
+ -The left extended background insets should not exclude the top and bottom insets.
+
+ Since this code is in the middle of 2 hot paths, also added some performance tweaks.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ In the normal case, we do not have extended background exclusion. To avoid creating a background view, we use
+ the scrollview to render the background.
+ The separate background view is created lazily if needed.
+
+ (-[WKWebView _updateScrollViewBackground]):
+ (-[WKWebView _frameOrBoundsChanged]):
+ (updateTopAndBottomExtendedBackgroundExclusionIfNecessary):
+ This create the top and bottom extended background view as needed and update their frames for the current insets.
+
+ (-[WKWebView _setObscuredInsets:]):
+ (-[WKWebView _setExtendedBackgroundExclusionInsets:]):
+ When an exclusion inset is needed, create a view for it, transfer the color from the ScrollView, and reset the color
+ of the scrollview.
+
</ins><span class="cx"> 2014-05-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Move size computation for Blob constructor into BlobRegistryImpl
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (168134 => 168135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-01 23:55:05 UTC (rev 168134)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-01 23:59:06 UTC (rev 168135)
</span><span class="lines">@@ -105,7 +105,9 @@
</span><span class="cx"> bool _isChangingObscuredInsetsInteractively;
</span><span class="cx">
</span><span class="cx"> UIEdgeInsets _extendedBackgroundExclusionInsets;
</span><del>- CALayer *_extendedBackgroundLayer;
</del><ins>+ UIView *_mainExtendedBackgroundView;
+ UIView *_extendedBackgroundLayerTopInset;
+ UIView *_extendedBackgroundLayerBottomInset;
</ins><span class="cx">
</span><span class="cx"> BOOL _isAnimatingResize;
</span><span class="cx"> CATransform3D _resizeAnimationTransformAdjustments;
</span><span class="lines">@@ -185,15 +187,9 @@
</span><span class="cx"> [_scrollView setBouncesZoom:YES];
</span><span class="cx">
</span><span class="cx"> [self addSubview:_scrollView.get()];
</span><ins>+ _mainExtendedBackgroundView = _scrollView.get();
+ _mainExtendedBackgroundView.backgroundColor = [UIColor whiteColor];
</ins><span class="cx">
</span><del>- {
- RetainPtr<CALayer> backgroundLayer = [[CALayer alloc] init];
- _extendedBackgroundLayer = backgroundLayer.get();
- _extendedBackgroundLayer.frame = bounds;
- _extendedBackgroundLayer.backgroundColor = cachedCGColor(WebCore::Color(WebCore::Color::white), WebCore::ColorSpaceDeviceRGB);
- [[self layer] insertSublayer:_extendedBackgroundLayer below:[_scrollView layer]];
- }
-
</del><span class="cx"> _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds context:context configuration:std::move(webPageConfiguration) webView:self]);
</span><span class="cx"> _page = [_contentView page];
</span><span class="cx"> [_contentView layer].anchorPoint = CGPointZero;
</span><span class="lines">@@ -445,7 +441,10 @@
</span><span class="cx"> CGFloat opacity = std::max(1 - slope * (minimumZoomScale - zoomScale), static_cast<CGFloat>(0));
</span><span class="cx"> cgColor = adoptCF(CGColorCreateCopyWithAlpha(cgColor.get(), opacity));
</span><span class="cx"> }
</span><del>- _extendedBackgroundLayer.backgroundColor = cgColor.get();
</del><ins>+ RetainPtr<UIColor*> uiBackgroundColor = adoptNS([[UIColor alloc] initWithCGColor:cgColor.get()]);
+ _mainExtendedBackgroundView.backgroundColor = uiBackgroundColor.get();
+ _extendedBackgroundLayerTopInset.backgroundColor = uiBackgroundColor.get();
+ _extendedBackgroundLayerBottomInset.backgroundColor = uiBackgroundColor.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
</span><span class="lines">@@ -720,7 +719,11 @@
</span><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><span class="cx"> CGRect backgroundLayerRect = UIEdgeInsetsInsetRect(bounds, _extendedBackgroundExclusionInsets);
</span><del>- _extendedBackgroundLayer.frame = backgroundLayerRect;
</del><ins>+ _mainExtendedBackgroundView.frame = backgroundLayerRect;
+ if (!_extendedBackgroundExclusionInsets.top && _obscuredInsets.top)
+ _extendedBackgroundLayerTopInset.frame = CGRectMake(0, 0, bounds.size.width, _obscuredInsets.top);
+ if (!_extendedBackgroundExclusionInsets.bottom && _obscuredInsets.bottom)
+ _extendedBackgroundLayerBottomInset.frame = CGRectMake(0, bounds.size.height - _obscuredInsets.bottom, bounds.size.width, _obscuredInsets.bottom);
</ins><span class="cx">
</span><span class="cx"> if (!_hasStaticMinimumLayoutSize && !_isAnimatingResize)
</span><span class="cx"> setViewportConfigurationMinimumLayoutSize(*_page, bounds.size);
</span><span class="lines">@@ -1293,6 +1296,32 @@
</span><span class="cx"> return _obscuredInsets;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void updateTopAndBottomExtendedBackgroundExclusionIfNecessary(WKWebView* webView)
+{
+ if (!webView->_extendedBackgroundExclusionInsets.left)
+ return;
+
+ if (webView->_obscuredInsets.top && !webView->_extendedBackgroundExclusionInsets.top) {
+ if (!webView->_extendedBackgroundLayerTopInset) {
+ RetainPtr<UIView> backgroundView = adoptNS([[UIView alloc] init]);
+ [backgroundView setBackgroundColor:webView->_mainExtendedBackgroundView.backgroundColor];
+ [webView insertSubview:backgroundView.get() belowSubview:webView->_scrollView.get()];
+ webView->_extendedBackgroundLayerTopInset = backgroundView.get();
+ }
+
+ [webView->_extendedBackgroundLayerTopInset setFrame:CGRectMake(0, 0, webView->_extendedBackgroundExclusionInsets.left, webView->_obscuredInsets.top)];
+ }
+ if (webView->_obscuredInsets.bottom && !webView->_extendedBackgroundExclusionInsets.bottom) {
+ if (!webView->_extendedBackgroundLayerBottomInset) {
+ RetainPtr<UIView> backgroundView = adoptNS([[UIView alloc] init]);
+ [backgroundView setBackgroundColor:webView->_mainExtendedBackgroundView.backgroundColor];
+ [webView insertSubview:backgroundView.get() belowSubview:webView->_scrollView.get()];
+ webView->_extendedBackgroundLayerBottomInset = backgroundView.get();
+ }
+ [webView->_extendedBackgroundLayerBottomInset setFrame:CGRectMake(0, webView.bounds.size.height - webView->_obscuredInsets.bottom, webView->_extendedBackgroundExclusionInsets.left, webView->_obscuredInsets.bottom)];
+ }
+}
+
</ins><span class="cx"> - (void)_setObscuredInsets:(UIEdgeInsets)obscuredInsets
</span><span class="cx"> {
</span><span class="cx"> ASSERT(obscuredInsets.top >= 0);
</span><span class="lines">@@ -1304,6 +1333,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _obscuredInsets = obscuredInsets;
</span><ins>+
+ updateTopAndBottomExtendedBackgroundExclusionIfNecessary(self);
+
</ins><span class="cx"> [self _updateVisibleContentRects];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1322,8 +1354,19 @@
</span><span class="cx"> if (UIEdgeInsetsEqualToEdgeInsets(extendedBackgroundExclusionInsets, _extendedBackgroundExclusionInsets))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (_mainExtendedBackgroundView == _scrollView) {
+ RetainPtr<UIView> backgroundView = adoptNS([[UIView alloc] init]);
+ _mainExtendedBackgroundView = backgroundView.get();
+ _mainExtendedBackgroundView.backgroundColor = [_scrollView backgroundColor];
+ [self insertSubview:_mainExtendedBackgroundView belowSubview:_scrollView.get()];
+ [_scrollView setBackgroundColor:nil];
+ }
+
+ CGRect bounds = self.bounds;
</ins><span class="cx"> _extendedBackgroundExclusionInsets = extendedBackgroundExclusionInsets;
</span><del>- _extendedBackgroundLayer.frame = UIEdgeInsetsInsetRect(self.bounds, _extendedBackgroundExclusionInsets);
</del><ins>+ _mainExtendedBackgroundView.frame = UIEdgeInsetsInsetRect(bounds, _extendedBackgroundExclusionInsets);
+
+ updateTopAndBottomExtendedBackgroundExclusionIfNecessary(self);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (UIEdgeInsets)_extendedBackgroundExclusionInsets
</span></span></pre>
</div>
</div>
</body>
</html>