<!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>[168746] 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/168746">168746</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-13 15:34:21 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Remove the _extendedBackgroundExclusionInsets SPI
https://bugs.webkit.org/show_bug.cgi?id=132848
<rdar://problem/16875093>
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-05-13
Reviewed by Darin Adler.
The SPI is no longer needed by Safari.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
(-[WKWebView _updateScrollViewBackground]):
(-[WKWebView _frameOrBoundsChanged]):
(-[WKWebView _setObscuredInsets:]):
(-[WKWebView _endAnimatedResize]):
(updateTopAndBottomExtendedBackgroundExclusionIfNecessary): Deleted.
(-[WKWebView _setExtendedBackgroundExclusionInsets:]): Deleted.
(-[WKWebView _extendedBackgroundExclusionInsets]): 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 (168745 => 168746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-13 22:26:43 UTC (rev 168745)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-13 22:34:21 UTC (rev 168746)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-13 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Remove the _extendedBackgroundExclusionInsets SPI
+ https://bugs.webkit.org/show_bug.cgi?id=132848
+ <rdar://problem/16875093>
+
+ Reviewed by Darin Adler.
+
+ The SPI is no longer needed by Safari.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView _updateScrollViewBackground]):
+ (-[WKWebView _frameOrBoundsChanged]):
+ (-[WKWebView _setObscuredInsets:]):
+ (-[WKWebView _endAnimatedResize]):
+ (updateTopAndBottomExtendedBackgroundExclusionIfNecessary): Deleted.
+ (-[WKWebView _setExtendedBackgroundExclusionInsets:]): Deleted.
+ (-[WKWebView _extendedBackgroundExclusionInsets]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
</ins><span class="cx"> 2014-05-13 Samuel White <samuel_white@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Hit testing not accounting for top content inset.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (168745 => 168746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-13 22:26:43 UTC (rev 168745)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-13 22:34:21 UTC (rev 168746)
</span><span class="lines">@@ -123,11 +123,6 @@
</span><span class="cx"> UIEdgeInsets _obscuredInsets;
</span><span class="cx"> bool _isChangingObscuredInsetsInteractively;
</span><span class="cx">
</span><del>- UIEdgeInsets _extendedBackgroundExclusionInsets;
- UIView *_mainExtendedBackgroundView;
- UIView *_extendedBackgroundLayerTopInset;
- UIView *_extendedBackgroundLayerBottomInset;
-
</del><span class="cx"> BOOL _needsResetViewStateAfterCommitLoadForMainFrame;
</span><span class="cx"> BOOL _isAnimatingResize;
</span><span class="cx"> CATransform3D _resizeAnimationTransformAdjustments;
</span><span class="lines">@@ -194,8 +189,7 @@
</span><span class="cx"> [_scrollView setBouncesZoom:YES];
</span><span class="cx">
</span><span class="cx"> [self addSubview:_scrollView.get()];
</span><del>- _mainExtendedBackgroundView = _scrollView.get();
- _mainExtendedBackgroundView.backgroundColor = [UIColor whiteColor];
</del><ins>+ [_scrollView setBackgroundColor:[UIColor whiteColor]];
</ins><span class="cx">
</span><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="lines">@@ -455,9 +449,7 @@
</span><span class="cx"> _scrollViewBackgroundColor = color;
</span><span class="cx">
</span><span class="cx"> RetainPtr<UIColor*> uiBackgroundColor = adoptNS([[UIColor alloc] initWithCGColor:cachedCGColor(color, WebCore::ColorSpaceDeviceRGB)]);
</span><del>- _mainExtendedBackgroundView.backgroundColor = uiBackgroundColor.get();
- _extendedBackgroundLayerTopInset.backgroundColor = uiBackgroundColor.get();
- _extendedBackgroundLayerBottomInset.backgroundColor = uiBackgroundColor.get();
</del><ins>+ [_scrollView setBackgroundColor:uiBackgroundColor.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didCommitLoadForMainFrame
</span><span class="lines">@@ -868,13 +860,6 @@
</span><span class="cx"> {
</span><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><del>- CGRect backgroundLayerRect = UIEdgeInsetsInsetRect(bounds, _extendedBackgroundExclusionInsets);
- _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);
-
</del><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">@@ -1461,35 +1446,6 @@
</span><span class="cx"> return _obscuredInsets;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void updateTopAndBottomExtendedBackgroundExclusionIfNecessary(WKWebView* webView)
-{
- 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();
- [UIView performWithoutAnimation: ^{
- [webView->_extendedBackgroundLayerTopInset setFrame:CGRectMake(0, 0, 0, webView->_obscuredInsets.top)];
- }];
- }
-
- [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();
- [UIView performWithoutAnimation: ^{
- [webView->_extendedBackgroundLayerBottomInset setFrame:CGRectMake(0, webView.bounds.size.height - webView->_obscuredInsets.bottom, 0, webView->_obscuredInsets.bottom)];
- }];
- }
- [webView->_extendedBackgroundLayerBottomInset setFrame:CGRectMake(0, webView.bounds.size.height - webView->_obscuredInsets.bottom, webView->_extendedBackgroundExclusionInsets.left, webView->_obscuredInsets.bottom)];
- }
-}
-
</del><span class="cx"> - (void)_setObscuredInsets:(UIEdgeInsets)obscuredInsets
</span><span class="cx"> {
</span><span class="cx"> ASSERT(obscuredInsets.top >= 0);
</span><span class="lines">@@ -1502,8 +1458,6 @@
</span><span class="cx">
</span><span class="cx"> _obscuredInsets = obscuredInsets;
</span><span class="cx">
</span><del>- updateTopAndBottomExtendedBackgroundExclusionIfNecessary(self);
-
</del><span class="cx"> [self _updateVisibleContentRects];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1517,33 +1471,6 @@
</span><span class="cx"> return _page->backgroundExtendsBeyondPage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setExtendedBackgroundExclusionInsets:(UIEdgeInsets)extendedBackgroundExclusionInsets
-{
- if (UIEdgeInsetsEqualToEdgeInsets(extendedBackgroundExclusionInsets, _extendedBackgroundExclusionInsets))
- return;
-
- CGRect bounds = self.bounds;
- if (_mainExtendedBackgroundView == _scrollView) {
- [UIView performWithoutAnimation: ^{
- RetainPtr<UIView> backgroundView = adoptNS([[UIView alloc] initWithFrame:bounds]);
- _mainExtendedBackgroundView = backgroundView.get();
- _mainExtendedBackgroundView.backgroundColor = [_scrollView backgroundColor];
- [self insertSubview:_mainExtendedBackgroundView belowSubview:_scrollView.get()];
- [_scrollView setBackgroundColor:nil];
- }];
- }
-
- _extendedBackgroundExclusionInsets = extendedBackgroundExclusionInsets;
- _mainExtendedBackgroundView.frame = UIEdgeInsetsInsetRect(bounds, _extendedBackgroundExclusionInsets);
-
- updateTopAndBottomExtendedBackgroundExclusionIfNecessary(self);
-}
-
-- (UIEdgeInsets)_extendedBackgroundExclusionInsets
-{
- return _extendedBackgroundExclusionInsets;
-}
-
</del><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!_isChangingObscuredInsetsInteractively);
</span><span class="lines">@@ -1664,13 +1591,6 @@
</span><span class="cx"> _isAnimatingResize = NO;
</span><span class="cx"> _resizeAnimationTransformAdjustments = CATransform3DIdentity;
</span><span class="cx">
</span><del>- if (!_extendedBackgroundExclusionInsets.left) {
- [_extendedBackgroundLayerTopInset removeFromSuperview];
- _extendedBackgroundLayerTopInset = nil;
- [_extendedBackgroundLayerBottomInset removeFromSuperview];
- _extendedBackgroundLayerBottomInset = nil;
- }
-
</del><span class="cx"> [self _updateVisibleContentRects];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (168745 => 168746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-05-13 22:26:43 UTC (rev 168745)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-05-13 22:34:21 UTC (rev 168746)
</span><span class="lines">@@ -103,10 +103,6 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setBackgroundExtendsBeyondPage:) BOOL _backgroundExtendsBeyondPage;
</span><span class="cx">
</span><del>-// 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;
-
</del><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>