<!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>[209867] trunk</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/209867">209867</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-12-15 11:19:51 -0800 (Thu, 15 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] Don't disable position:fixed when a form element has focus
https://bugs.webkit.org/show_bug.cgi?id=165891
rdar://problem/29271694
Reviewed by Wenson Hsieh.
Source/WebKit2:
Before visual viewports, we had to lay out position:fixed relative to the document rect (effectively
disabling position:fixed) when a form element was focused, to ensure that we could scroll to inputs
inside position:Fixed.
When visual viewports are enabled, we can do a better job of this, and keep position:fixed active.
Test: fast/visual-viewport/ios/zoomed-focus-in-fixed.html
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]): Soon this will use
insideFixed to have better scroll-into-view behavior.
(-[WKWebView _zoomToFocusRect:selectionRect:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewInternal.h:
* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
(-[WKContentView _zoomToFocusRect:selectionRect:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]): Deleted.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _displayFormNodeInputView]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::computeCustomFixedPositionRect): Don't fall back to using the documentRect as the fixed
position rect if visual viewports are enabled.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getAssistedNodeInformation): Don't reset the customtFixedPositionRect around computing element
coordinates if visual viewports are enabled.
LayoutTests:
* TestExpectations:
* fast/visual-viewport/ios/zoomed-focus-in-fixed-expected.txt: Added.
* fast/visual-viewport/ios/zoomed-focus-in-fixed.html: Added.
* platform/ios-simulator-wk2/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<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="#trunkSourceWebKit2UIProcessiosWKContentViewh">trunk/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/visual-viewport/ios/</li>
<li><a href="#trunkLayoutTestsfastvisualviewportioszoomedfocusinfixedexpectedtxt">trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastvisualviewportioszoomedfocusinfixedhtml">trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/LayoutTests/ChangeLog 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-15 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Don't disable position:fixed when a form element has focus
+ https://bugs.webkit.org/show_bug.cgi?id=165891
+ rdar://problem/29271694
+
+ Reviewed by Wenson Hsieh.
+
+ * TestExpectations:
+ * fast/visual-viewport/ios/zoomed-focus-in-fixed-expected.txt: Added.
+ * fast/visual-viewport/ios/zoomed-focus-in-fixed.html: Added.
+ * platform/ios-simulator-wk2/TestExpectations:
+
</ins><span class="cx"> 2016-12-15 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove custom binding for MediaDevices
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/LayoutTests/TestExpectations 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> fast/zooming/ios [ Skip ]
</span><span class="cx"> fast/forms/ios [ Skip ]
</span><span class="cx"> fast/viewport/ios [ Skip ]
</span><ins>+fast/visual-viewport/ios/ [ Skip ]
</ins><span class="cx"> fast/events/ios [ Skip ]
</span><span class="cx"> fast/events/touch/ios [ Skip ]
</span><span class="cx"> fast/scrolling/ios [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsfastvisualviewportioszoomedfocusinfixedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed-expected.txt (0 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed-expected.txt 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Layout viewport: {"top":746.703125,"right":320,"bottom":1314.703125,"left":0,"width":320,"height":568}
+Visual viewport: {"top":747,"right":220,"bottom":1138,"left":0,"width":220,"height":391}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastvisualviewportioszoomedfocusinfixedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed.html (0 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed.html (rev 0)
+++ trunk/LayoutTests/fast/visual-viewport/ios/zoomed-focus-in-fixed.html 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1.0">
+ <style>
+ body {
+ width: 1000px;
+ height: 2000px;
+ }
+ .fixed {
+ position: fixed;
+ background-color: silver;
+ top: 10px;
+ padding: 10px;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ function getScrollDownUIScript()
+ {
+ return `(function() {
+ uiController.immediateScrollToOffset(0, 800);
+ })();`;
+ }
+
+ function getFocusInputUIScript(x, y)
+ {
+ return `(function() {
+ uiController.didShowKeyboardCallback = function() {
+ uiController.uiScriptComplete();
+ }
+
+ uiController.singleTapAtPoint(${x}, ${y}, function() {});
+ })();`;
+ }
+
+ function runTest()
+ {
+ if (!window.testRunner || !testRunner.runUIScript)
+ return;
+
+ testRunner.runUIScript(getScrollDownUIScript(), function() {
+ window.setTimeout(function() {
+ var rect = document.getElementById('input').getBoundingClientRect();
+ // singleTapAtPoint takes document coordinates, so add scrollTop to clientRect.top.
+ testRunner.runUIScript(getFocusInputUIScript(rect.left, rect.top + document.scrollingElement.scrollTop), function() {
+
+ if (window.internals) {
+ var output = 'Layout viewport: ' + JSON.stringify(internals.layoutViewportRect()) + '\nVisual viewport: ' + JSON.stringify(internals.visualViewportRect()) + '\n';
+ document.getElementById('results').innerText = output;
+ }
+
+ testRunner.notifyDone();
+ });
+ }, 0);
+ });
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+</head>
+<body>
+<pre id="results"></pre>
+<div class="fixed">
+ <input id="input" type="text">
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx">
</span><span class="cx"> fast/scrolling/ios [ Pass ]
</span><span class="cx"> fast/viewport/ios [ Pass ]
</span><ins>+fast/visual-viewport/ios/ [ Pass ]
</ins><span class="cx"> scrollingcoordinator/ios [ Pass ]
</span><span class="cx"> editing/selection/character-granularity-rect.html [ Pass ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-12-15 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Don't disable position:fixed when a form element has focus
+ https://bugs.webkit.org/show_bug.cgi?id=165891
+ rdar://problem/29271694
+
+ Reviewed by Wenson Hsieh.
+
+ Before visual viewports, we had to lay out position:fixed relative to the document rect (effectively
+ disabling position:fixed) when a form element was focused, to ensure that we could scroll to inputs
+ inside position:Fixed.
+
+ When visual viewports are enabled, we can do a better job of this, and keep position:fixed active.
+
+ Test: fast/visual-viewport/ios/zoomed-focus-in-fixed.html
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]): Soon this will use
+ insideFixed to have better scroll-into-view behavior.
+ (-[WKWebView _zoomToFocusRect:selectionRect:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewInternal.h:
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _zoomToFocusRect:selectionRect:insideFixed:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]):
+ (-[WKContentView _zoomToFocusRect:selectionRect:fontSize:minimumScale:maximumScale:allowScaling:forceScroll:]): Deleted.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _displayFormNodeInputView]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::computeCustomFixedPositionRect): Don't fall back to using the documentRect as the fixed
+ position rect if visual viewports are enabled.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getAssistedNodeInformation): Don't reset the customtFixedPositionRect around computing element
+ coordinates if visual viewports are enabled.
+
</ins><span class="cx"> 2016-12-15 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Always clear RenderLayer backing stores when going into page cache.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -1619,8 +1619,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // focusedElementRect and selectionRect are both in document coordinates.
</span><del>-- (void)_zoomToFocusRect:(WebCore::FloatRect)focusedElementRectInDocumentCoordinates selectionRect:(WebCore::FloatRect)selectionRectInDocumentCoordinates fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll
</del><ins>+- (void)_zoomToFocusRect:(WebCore::FloatRect)focusedElementRectInDocumentCoordinates selectionRect:(WebCore::FloatRect)selectionRectInDocumentCoordinates insideFixed:(BOOL)insideFixed
+ fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll
</ins><span class="cx"> {
</span><ins>+ LOG_WITH_STREAM(VisibleRects, stream << "_zoomToFocusRect:" << focusedElementRectInDocumentCoordinates << " selectionRect:" << selectionRectInDocumentCoordinates);
+ UNUSED_PARAM(insideFixed);
+
</ins><span class="cx"> const double WKWebViewStandardFontSize = 16;
</span><span class="cx"> const double kMinimumHeightToShowContentAboveKeyboard = 106;
</span><span class="cx"> const CFTimeInterval UIWebFormAnimationDuration = 0.25;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> - (void)_scrollToContentScrollPosition:(WebCore::FloatPoint)scrollPosition scrollOrigin:(WebCore::IntPoint)scrollOrigin;
</span><span class="cx"> - (BOOL)_scrollToRect:(WebCore::FloatRect)targetRect origin:(WebCore::FloatPoint)origin minimumScrollDistance:(float)minimumScrollDistance;
</span><span class="cx"> - (void)_scrollByContentOffset:(WebCore::FloatPoint)offset;
</span><del>-- (void)_zoomToFocusRect:(WebCore::FloatRect)focusedElementRect selectionRect:(WebCore::FloatRect)selectionRectInDocumentCoordinates fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll;
</del><ins>+- (void)_zoomToFocusRect:(WebCore::FloatRect)focusedElementRect selectionRect:(WebCore::FloatRect)selectionRectInDocumentCoordinates insideFixed:(BOOL)insideFixed fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll;
</ins><span class="cx"> - (BOOL)_zoomToRect:(WebCore::FloatRect)targetRect withOrigin:(WebCore::FloatPoint)origin fitEntireRect:(BOOL)fitEntireRect minimumScale:(double)minimumScale maximumScale:(double)maximumScale minimumScrollDistance:(float)minimumScrollDistance;
</span><span class="cx"> - (void)_zoomOutWithOrigin:(WebCore::FloatPoint)origin animated:(BOOL)animated;
</span><span class="cx"> - (void)_zoomToInitialScaleWithOrigin:(WebCore::FloatPoint)origin animated:(BOOL)animated;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> - (void)_setAccessibilityWebProcessToken:(NSData *)data;
</span><span class="cx">
</span><span class="cx"> - (BOOL)_scrollToRect:(CGRect)targetRect withOrigin:(CGPoint)origin minimumScrollDistance:(CGFloat)minimumScrollDistance;
</span><del>-- (void)_zoomToFocusRect:(CGRect)rectToFocus selectionRect:(CGRect)selectionRect fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll;
</del><ins>+- (void)_zoomToFocusRect:(CGRect)rectToFocus selectionRect:(CGRect)selectionRect insideFixed:(BOOL)insideFixed fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll;
</ins><span class="cx"> - (BOOL)_zoomToRect:(CGRect)targetRect withOrigin:(CGPoint)origin fitEntireRect:(BOOL)fitEntireRect minimumScale:(double)minimumScale maximumScale:(double)maximumScale minimumScrollDistance:(CGFloat)minimumScrollDistance;
</span><span class="cx"> - (void)_zoomOutWithOrigin:(CGPoint)origin;
</span><span class="cx"> - (void)_zoomToInitialScaleWithOrigin:(CGPoint)origin;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -577,10 +577,11 @@
</span><span class="cx"> return [_webView _scrollToRect:targetRect origin:origin minimumScrollDistance:minimumScrollDistance];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_zoomToFocusRect:(CGRect)rectToFocus selectionRect:(CGRect)selectionRect fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll
</del><ins>+- (void)_zoomToFocusRect:(CGRect)rectToFocus selectionRect:(CGRect)selectionRect insideFixed:(BOOL)insideFixed fontSize:(float)fontSize minimumScale:(double)minimumScale maximumScale:(double)maximumScale allowScaling:(BOOL)allowScaling forceScroll:(BOOL)forceScroll
</ins><span class="cx"> {
</span><span class="cx"> [_webView _zoomToFocusRect:rectToFocus
</span><span class="cx"> selectionRect:selectionRect
</span><ins>+ insideFixed:insideFixed
</ins><span class="cx"> fontSize:fontSize
</span><span class="cx"> minimumScale:minimumScale
</span><span class="cx"> maximumScale:maximumScale
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -1100,6 +1100,7 @@
</span><span class="cx"> // Zooming above the page's default scale factor should only happen when the user performs it.
</span><span class="cx"> [self _zoomToFocusRect:_assistedNodeInformation.elementRect
</span><span class="cx"> selectionRect: _didAccessoryTabInitiateFocus ? IntRect() : _assistedNodeInformation.selectionRect
</span><ins>+ insideFixed:_assistedNodeInformation.insideFixedPosition
</ins><span class="cx"> fontSize:_assistedNodeInformation.nodeFontSize
</span><span class="cx"> minimumScale:_assistedNodeInformation.minimumScaleFactor
</span><span class="cx"> maximumScale:_assistedNodeInformation.maximumScaleFactorIgnoringAlwaysScalable
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> FloatRect constrainedUnobscuredRect = unobscuredContentRect;
</span><span class="cx"> FloatRect documentRect = m_pageClient.documentRect();
</span><span class="cx">
</span><del>- if (m_pageClient.isAssistingNode())
</del><ins>+ if (!visualViewportEnabled && m_pageClient.isAssistingNode())
</ins><span class="cx"> return documentRect;
</span><span class="cx">
</span><span class="cx"> if (constraint == UnobscuredRectConstraint::ConstrainedToDocumentRect)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (209866 => 209867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-12-15 19:17:00 UTC (rev 209866)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-12-15 19:19:51 UTC (rev 209867)
</span><span class="lines">@@ -2553,9 +2553,9 @@
</span><span class="cx"> renderer->localToContainerPoint(FloatPoint(), nullptr, UseTransforms, &inFixed);
</span><span class="cx"> information.insideFixedPosition = inFixed;
</span><span class="cx"> information.isRTL = renderer->style().direction() == RTL;
</span><del>-
- if (inFixed && elementFrame.isMainFrame()) {
- FrameView* frameView = elementFrame.view();
</del><ins>+
+ FrameView* frameView = elementFrame.view();
+ if (inFixed && elementFrame.isMainFrame() && !frameView->frame().settings().visualViewportEnabled()) {
</ins><span class="cx"> IntRect currentFixedPositionRect = frameView->customFixedPositionLayoutRect();
</span><span class="cx"> frameView->setCustomFixedPositionLayoutRect(frameView->renderView()->documentRect());
</span><span class="cx"> information.elementRect = frameView->contentsToRootView(renderer->absoluteBoundingBoxRect());
</span></span></pre>
</div>
</div>
</body>
</html>