<!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>[168933] branches/safari-538.34.5-branch/Source</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/168933">168933</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 00:12:37 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168513">r168513</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchSourceWebCoreChangeLog">branches/safari-538.34.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWebCoreWebCoreexpin">branches/safari-538.34.5-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2ChangeLog">branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/ChangeLog (168932 => 168933)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/ChangeLog 2014-05-16 07:08:52 UTC (rev 168932)
+++ branches/safari-538.34.5-branch/Source/WebCore/ChangeLog 2014-05-16 07:12:37 UTC (rev 168933)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-16 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168513
+
+ 2014-05-08 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Bottom-relative position:fixed elements are misplaced on page load
+ https://bugs.webkit.org/show_bug.cgi?id=132719
+ <rdar://problem/16860837>
+
+ Reviewed by Benjamin Poulain.
+
+ Add a couple of functions, and sort.
+
+ * WebCore.exp.in:
+
</ins><span class="cx"> 2014-05-15 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168452
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/WebCore.exp.in (168932 => 168933)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/WebCore.exp.in 2014-05-16 07:08:52 UTC (rev 168932)
+++ branches/safari-538.34.5-branch/Source/WebCore/WebCore.exp.in 2014-05-16 07:12:37 UTC (rev 168933)
</span><span class="lines">@@ -716,6 +716,7 @@
</span><span class="cx"> __ZN7WebCore16createFullMarkupERKNS_4NodeE
</span><span class="cx"> __ZN7WebCore16createFullMarkupERKNS_5RangeE
</span><span class="cx"> __ZN7WebCore16enclosingIntRectERK6CGRect
</span><ins>+__ZN7WebCore16enclosingIntRectERKNS_10LayoutRectE
</ins><span class="cx"> __ZN7WebCore16enclosingIntRectERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
</span><span class="cx"> __ZN7WebCore16isUserVisibleURLEP8NSString
</span><span class="lines">@@ -2293,9 +2294,9 @@
</span><span class="cx"> _wkDrawBezeledTextArea
</span><span class="cx"> _wkDrawBezeledTextFieldCell
</span><span class="cx"> _wkDrawCapsLockIndicator
</span><ins>+_wkDrawCellFocusRingWithFrameAtTime
</ins><span class="cx"> _wkDrawFocusRing
</span><span class="cx"> _wkDrawFocusRingAtTime
</span><del>-_wkDrawCellFocusRingWithFrameAtTime
</del><span class="cx"> _wkDrawMediaSliderTrack
</span><span class="cx"> _wkDrawMediaUIPart
</span><span class="cx"> _wkDrawTextFieldCellFocusRing
</span><span class="lines">@@ -2712,6 +2713,7 @@
</span><span class="cx"> __ZNK7WebCore9FloatRectcv6CGRectEv
</span><span class="cx"> __ZNK7WebCore9FloatSizecv6CGSizeEv
</span><span class="cx"> __ZNK7WebCore9FrameView17wasScrolledByUserEv
</span><ins>+__ZNK7WebCore9FrameView30viewportConstrainedObjectsRectEv
</ins><span class="cx"> __ZNK7WebCore9RenderBox11borderRadiiEv
</span><span class="cx"> _webThreadShouldYield
</span><span class="cx"> _wkExecutableWasLinkedOnOrAfterIOSVersion
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog (168932 => 168933)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-16 07:08:52 UTC (rev 168932)
+++ branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog 2014-05-16 07:12:37 UTC (rev 168933)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-16 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168513
+
+ 2014-05-08 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Bottom-relative position:fixed elements are misplaced on page load
+ https://bugs.webkit.org/show_bug.cgi?id=132719
+ <rdar://problem/16860837>
+
+ Reviewed by Benjamin Poulain.
+
+ If we haven't received visible rects from the web process, compute the
+ fixed position rect, but only after scale has been set.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::viewportConfigurationChanged):
+
</ins><span class="cx"> 2014-05-15 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168447
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (168932 => 168933)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-16 07:08:52 UTC (rev 168932)
+++ branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-16 07:12:37 UTC (rev 168933)
</span><span class="lines">@@ -2051,6 +2051,11 @@
</span><span class="cx"> m_drawingArea->setExposedContentRect(unobscuredContentRect);
</span><span class="cx"> }
</span><span class="cx"> scalePage(scale, scrollPosition);
</span><ins>+
+ if (!m_hasReceivedVisibleContentRectsAfterDidCommitLoad) {
+ // This takes scale into account, so do after the scale change.
+ frameView.setCustomFixedPositionLayoutRect(enclosingIntRect(frameView.viewportConstrainedObjectsRect()));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::applicationWillResignActive()
</span></span></pre>
</div>
</div>
</body>
</html>