<!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>[168063] 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/168063">168063</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-30 16:45:27 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Add a SPI to exclude the extended background from some areas of WKWebView
https://bugs.webkit.org/show_bug.cgi?id=132406
<rdar://problem/16762197>
Reviewed by Beth Dakin.
Move the extended background to a separate layer bellow the UIScrollView.
The geometry of that layer is then changed based on ExtendedBackgroundExclusionInsets
as needed.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
(-[WKWebView _updateScrollViewBackground]):
(-[WKWebView _frameOrBoundsChanged]):
(-[WKWebView _setExtendedBackgroundExclusionInsets:]):
(-[WKWebView _extendedBackgroundExclusionInsets]):
(-[WKWebView pageExtendedBackgroundColor]): Deleted.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168062 => 168063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-30 23:32:23 UTC (rev 168062)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-30 23:45:27 UTC (rev 168063)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-04-30 Benjamin Poulain <benjamin@webkit.org>
+
+ [iOS][WK2] Add a SPI to exclude the extended background from some areas of WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=132406
+ <rdar://problem/16762197>
+
+ Reviewed by Beth Dakin.
+
+ Move the extended background to a separate layer bellow the UIScrollView.
+
+ The geometry of that layer is then changed based on ExtendedBackgroundExclusionInsets
+ as needed.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView _updateScrollViewBackground]):
+ (-[WKWebView _frameOrBoundsChanged]):
+ (-[WKWebView _setExtendedBackgroundExclusionInsets:]):
+ (-[WKWebView _extendedBackgroundExclusionInsets]):
+ (-[WKWebView pageExtendedBackgroundColor]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
</ins><span class="cx"> 2014-04-30 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build error when building for iOS simulator.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (168062 => 168063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-30 23:32:23 UTC (rev 168062)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-30 23:45:27 UTC (rev 168063)
</span><span class="lines">@@ -103,6 +103,10 @@
</span><span class="cx">
</span><span class="cx"> UIEdgeInsets _obscuredInsets;
</span><span class="cx"> bool _isChangingObscuredInsetsInteractively;
</span><ins>+
+ UIEdgeInsets _extendedBackgroundExclusionInsets;
+ CALayer *_extendedBackgroundLayer;
+
</ins><span class="cx"> BOOL _isAnimatingResize;
</span><span class="cx"> CATransform3D _resizeAnimationTransformAdjustments;
</span><span class="cx"> RetainPtr<UIView> _resizeAnimationView;
</span><span class="lines">@@ -179,10 +183,17 @@
</span><span class="cx"> _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
</span><span class="cx"> [_scrollView setInternalDelegate:self];
</span><span class="cx"> [_scrollView setBouncesZoom:YES];
</span><del>- [_scrollView setBackgroundColor:[UIColor whiteColor]];
</del><span class="cx">
</span><span class="cx"> [self addSubview:_scrollView.get()];
</span><span class="cx">
</span><ins>+ {
+ 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]];
+ }
+
</ins><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">@@ -409,16 +420,6 @@
</span><span class="cx"> [_customContentView web_setContentProviderData:data suggestedFilename:suggestedFilename];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// This is a convenience method that will convert _page->pageExtendedBackgroundColor() from a WebCore::Color to a UIColor *.
-- (UIColor *)pageExtendedBackgroundColor
-{
- WebCore::Color color = _page->pageExtendedBackgroundColor();
- if (!color.isValid())
- return nil;
-
- return [UIColor colorWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)];
-}
-
</del><span class="cx"> static CGFloat contentZoomScale(WKWebView* webView)
</span><span class="cx"> {
</span><span class="cx"> UIView *zoomView;
</span><span class="lines">@@ -434,17 +435,17 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateScrollViewBackground
</span><span class="cx"> {
</span><del>- UIColor *pageExtendedBackgroundColor = [self pageExtendedBackgroundColor];
</del><ins>+ WebCore::Color color = _page->pageExtendedBackgroundColor();
+ RetainPtr<CGColorRef> cgColor = cachedCGColor(color, WebCore::ColorSpaceDeviceRGB);
</ins><span class="cx">
</span><span class="cx"> CGFloat zoomScale = contentZoomScale(self);
</span><span class="cx"> CGFloat minimumZoomScale = [_scrollView minimumZoomScale];
</span><span class="cx"> if (zoomScale < minimumZoomScale) {
</span><span class="cx"> CGFloat slope = 12;
</span><span class="cx"> CGFloat opacity = std::max(1 - slope * (minimumZoomScale - zoomScale), static_cast<CGFloat>(0));
</span><del>- pageExtendedBackgroundColor = [pageExtendedBackgroundColor colorWithAlphaComponent:opacity];
</del><ins>+ cgColor = adoptCF(CGColorCreateCopyWithAlpha(cgColor.get(), opacity));
</ins><span class="cx"> }
</span><del>-
- [_scrollView setBackgroundColor:pageExtendedBackgroundColor];
</del><ins>+ _extendedBackgroundLayer.backgroundColor = cgColor.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
</span><span class="lines">@@ -717,6 +718,10 @@
</span><span class="cx"> - (void)_frameOrBoundsChanged
</span><span class="cx"> {
</span><span class="cx"> CGRect bounds = self.bounds;
</span><ins>+
+ CGRect backgroundLayerRect = UIEdgeInsetsInsetRect(bounds, _extendedBackgroundExclusionInsets);
+ _extendedBackgroundLayer.frame = backgroundLayerRect;
+
</ins><span class="cx"> if (!_hasStaticMinimumLayoutSize && !_isAnimatingResize)
</span><span class="cx"> setViewportConfigurationMinimumLayoutSize(*_page, bounds.size);
</span><span class="cx"> [_scrollView setFrame:bounds];
</span><span class="lines">@@ -1302,6 +1307,20 @@
</span><span class="cx"> return _page->backgroundExtendsBeyondPage();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setExtendedBackgroundExclusionInsets:(UIEdgeInsets)extendedBackgroundExclusionInsets
+{
+ if (UIEdgeInsetsEqualToEdgeInsets(extendedBackgroundExclusionInsets, _extendedBackgroundExclusionInsets))
+ return;
+
+ _extendedBackgroundExclusionInsets = extendedBackgroundExclusionInsets;
+ _extendedBackgroundLayer.frame = UIEdgeInsetsInsetRect(self.bounds, _extendedBackgroundExclusionInsets);
+}
+
+- (UIEdgeInsets)_extendedBackgroundExclusionInsets
+{
+ return _extendedBackgroundExclusionInsets;
+}
+
</ins><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!_isChangingObscuredInsetsInteractively);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (168062 => 168063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-04-30 23:32:23 UTC (rev 168062)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-04-30 23:45:27 UTC (rev 168063)
</span><span class="lines">@@ -101,6 +101,10 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setBackgroundExtendsBeyondPage:) BOOL _backgroundExtendsBeyondPage;
</span><span class="cx">
</span><ins>+// If BackgroundExtendsBeyondPage is set, the background of a page extend to the edges of the webview.
+// The extendedBackgroundExclusionInsets defines insets where the background is not extended. The view is transparent in those areas.
+@property (nonatomic, setter=_setExtendedBackgroundExclusionInsets:) UIEdgeInsets _extendedBackgroundExclusionInsets;
+
</ins><span class="cx"> // FIXME: Remove these three properties once we expose WKWebViewContentProvider as API.
</span><span class="cx"> @property (nonatomic, readonly, getter=_isDisplayingPDF) BOOL _displayingPDF;
</span><span class="cx"> @property (nonatomic, readonly) NSData *_dataForDisplayedPDF;
</span></span></pre>
</div>
</div>
</body>
</html>