<!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>[165573] 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/165573">165573</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-13 15:45:03 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not show extended background during a pinch gesture on iOS
https://bugs.webkit.org/show_bug.cgi?id=130152
-and corresponding-
<rdar://problem/16303819>
Reviewed by Simon Fraser.
This patch refactors the backgroundColor-setting logic into its own method so that
it can be called from both _didCommitLayerTree and scrollViewDidZoom.
Only set the UIScrollView’s background color when the zoomScale is greater than or
equal to the minimumZoomScale. Also do not set it during the zoom bounce
animation. Otherwise, clear the background color by setting it to nil.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView updateScrollViewBackground]):
(-[WKWebView _didCommitLayerTree:WebKit::]):
(-[WKWebView scrollViewDidZoom:]):</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 (165572 => 165573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-13 22:36:57 UTC (rev 165572)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-13 22:45:03 UTC (rev 165573)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-13 Beth Dakin <bdakin@apple.com>
+
+ Do not show extended background during a pinch gesture on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=130152
+ -and corresponding-
+ <rdar://problem/16303819>
+
+ Reviewed by Simon Fraser.
+
+ This patch refactors the backgroundColor-setting logic into its own method so that
+ it can be called from both _didCommitLayerTree and scrollViewDidZoom.
+
+ Only set the UIScrollView’s background color when the zoomScale is greater than or
+ equal to the minimumZoomScale. Also do not set it during the zoom bounce
+ animation. Otherwise, clear the background color by setting it to nil.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView updateScrollViewBackground]):
+ (-[WKWebView _didCommitLayerTree:WebKit::]):
+ (-[WKWebView scrollViewDidZoom:]):
+
</ins><span class="cx"> 2014-03-13 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] block selection should avoid large blocks.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (165572 => 165573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-13 22:36:57 UTC (rev 165572)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-13 22:45:03 UTC (rev 165573)
</span><span class="lines">@@ -385,6 +385,15 @@
</span><span class="cx"> return [UIColor colorWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_updateScrollViewBackground
+{
+ UIColor *pageExtendedBackgroundColor = [self pageExtendedBackgroundColor];
+ if (pageExtendedBackgroundColor && [self _backgroundExtendsBeyondPage] && [_scrollView zoomScale] >= [_scrollView minimumZoomScale] && ![_scrollView isZoomBouncing])
+ [_scrollView setBackgroundColor:pageExtendedBackgroundColor];
+ else
+ [_scrollView setBackgroundColor:nil];
+}
+
</ins><span class="cx"> - (void)_didCommitLayerTree:(const WebKit::RemoteLayerTreeTransaction&)layerTreeTransaction
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!_customContentView);
</span><span class="lines">@@ -395,12 +404,9 @@
</span><span class="cx"> [_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
</span><span class="cx"> if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom])
</span><span class="cx"> [_scrollView setZoomScale:layerTreeTransaction.pageScaleFactor()];
</span><ins>+
+ [self _updateScrollViewBackground];
</ins><span class="cx">
</span><del>- if (UIColor *pageExtendedBackgroundColor = [self pageExtendedBackgroundColor]) {
- if ([self _backgroundExtendsBeyondPage])
- [_scrollView setBackgroundColor:pageExtendedBackgroundColor];
- }
-
</del><span class="cx"> if (_gestureController)
</span><span class="cx"> _gestureController->setRenderTreeSize(layerTreeTransaction.renderTreeSize());
</span><span class="cx">
</span><span class="lines">@@ -600,6 +606,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewDidZoom:(UIScrollView *)scrollView
</span><span class="cx"> {
</span><ins>+ [self _updateScrollViewBackground];
</ins><span class="cx"> [self _updateVisibleContentRects];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>