Title: [168800] branches/safari-538.34-branch/Source
Diff
Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168799 => 168800)
--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 07:26:15 UTC (rev 168799)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 07:36:43 UTC (rev 168800)
@@ -1,5 +1,21 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168513
+
+ 2014-05-08 Simon Fraser <[email protected]>
+
+ [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:
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168536
2014-05-09 Jer Noble <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in (168799 => 168800)
--- branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in 2014-05-14 07:26:15 UTC (rev 168799)
+++ branches/safari-538.34-branch/Source/WebCore/WebCore.exp.in 2014-05-14 07:36:43 UTC (rev 168800)
@@ -716,6 +716,7 @@
__ZN7WebCore16createFullMarkupERKNS_4NodeE
__ZN7WebCore16createFullMarkupERKNS_5RangeE
__ZN7WebCore16enclosingIntRectERK6CGRect
+__ZN7WebCore16enclosingIntRectERKNS_10LayoutRectE
__ZN7WebCore16enclosingIntRectERKNS_9FloatRectE
__ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
__ZN7WebCore16isUserVisibleURLEP8NSString
@@ -2293,9 +2294,9 @@
_wkDrawBezeledTextArea
_wkDrawBezeledTextFieldCell
_wkDrawCapsLockIndicator
+_wkDrawCellFocusRingWithFrameAtTime
_wkDrawFocusRing
_wkDrawFocusRingAtTime
-_wkDrawCellFocusRingWithFrameAtTime
_wkDrawMediaSliderTrack
_wkDrawMediaUIPart
_wkDrawTextFieldCellFocusRing
@@ -2712,6 +2713,7 @@
__ZNK7WebCore9FloatRectcv6CGRectEv
__ZNK7WebCore9FloatSizecv6CGSizeEv
__ZNK7WebCore9FrameView17wasScrolledByUserEv
+__ZNK7WebCore9FrameView30viewportConstrainedObjectsRectEv
__ZNK7WebCore9RenderBox11borderRadiiEv
_webThreadShouldYield
_wkExecutableWasLinkedOnOrAfterIOSVersion
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168799 => 168800)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 07:26:15 UTC (rev 168799)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 07:36:43 UTC (rev 168800)
@@ -1,5 +1,23 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168513
+
+ 2014-05-08 Simon Fraser <[email protected]>
+
+ [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):
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168568
2014-05-09 Benjamin Poulain <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (168799 => 168800)
--- branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-14 07:26:15 UTC (rev 168799)
+++ branches/safari-538.34-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-14 07:36:43 UTC (rev 168800)
@@ -2087,6 +2087,11 @@
m_drawingArea->setExposedContentRect(unobscuredContentRect);
}
scalePage(scale, scrollPosition);
+
+ if (!m_hasReceivedVisibleContentRectsAfterDidCommitLoad) {
+ // This takes scale into account, so do after the scale change.
+ frameView.setCustomFixedPositionLayoutRect(enclosingIntRect(frameView.viewportConstrainedObjectsRect()));
+ }
}
void WebPage::applicationWillResignActive()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes