Title: [172347] branches/safari-600.1-branch
Diff
Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172346 => 172347)
--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-08 18:13:54 UTC (rev 172346)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-08 18:28:55 UTC (rev 172347)
@@ -1,3 +1,21 @@
+2014-08-08 Lucas Forschler <[email protected]>
+
+ Merge r172332
+
+ 2014-08-07 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r172291.
+ https://bugs.webkit.org/show_bug.cgi?id=135748
+
+ broke background-attachment-fixed with backround-size-contain
+ (e.g. iCloud.com) (Requested by thorton on #webkit).
+
+ Reverted changeset:
+
+ "Fixed backgrounds don't paint in blurred inset areas"
+ https://bugs.webkit.org/show_bug.cgi?id=135712
+ http://trac.webkit.org/changeset/172291
+
2014-08-07 Dana Burkart <[email protected]>
Merge r172291
Modified: branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations (172346 => 172347)
--- branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2014-08-08 18:13:54 UTC (rev 172346)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2014-08-08 18:28:55 UTC (rev 172347)
@@ -52,7 +52,6 @@
# Mavericks and prior do not support contentInset
[ MountainLion Mavericks ] platform/mac/fast/events/content-inset-hit-testing.html [ Skip ]
[ MountainLion Mavericks ] platform/mac/fast/events/content-inset-hit-testing-in-frame.html [ Skip ]
-[ MountainLion Mavericks ] platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html [ Skip ]
### END OF (2) Failures without bug reports
########################################
Deleted: branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png
(Binary files differ)
Deleted: branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html (172346 => 172347)
--- branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html 2014-08-08 18:13:54 UTC (rev 172346)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html 2014-08-08 18:28:55 UTC (rev 172347)
@@ -1,26 +0,0 @@
-<html>
-<head>
-<style>
-
-body {
- height:2000px;
- margin:0;
- overflow:hidden;
-}
-
-#fixed-background-box {
- width:400px;
- height:600px;
- background-image:url(resources/green.png);
- background-attachment:fixed;
-}
-
-</style>
-</head>
-
-<body>
-
-<div id="fixed-background-box"></div>
-
-</body>
-<html>
Deleted: branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html (172346 => 172347)
--- branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html 2014-08-08 18:13:54 UTC (rev 172346)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html 2014-08-08 18:28:55 UTC (rev 172347)
@@ -1,36 +0,0 @@
-<html>
-<head>
-<style>
-
-body {
- height:2000px;
- margin:0;
- overflow:hidden;
-}
-
-#fixed-background-box {
- width:400px;
- height:600px;
- background-image:url(resources/green.png);
- background-attachment:fixed;
-}
-
-</style>
-
-<script>
-function runTest() {
- if (window.internals)
- window.internals.setTopContentInset(100);
- window.scrollTo(0, 100);
-}
-
-window.addEventListener('load', runTest, false);
-</script>
-</head>
-
-<body>
-
-<div id="fixed-background-box"></div>
-
-</body>
-<html>
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172346 => 172347)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-08 18:13:54 UTC (rev 172346)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-08 18:28:55 UTC (rev 172347)
@@ -1,3 +1,21 @@
+2014-08-08 Lucas Forschler <[email protected]>
+
+ Merge r172332
+
+ 2014-08-07 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r172291.
+ https://bugs.webkit.org/show_bug.cgi?id=135748
+
+ broke background-attachment-fixed with backround-size-contain
+ (e.g. iCloud.com) (Requested by thorton on #webkit).
+
+ Reverted changeset:
+
+ "Fixed backgrounds don't paint in blurred inset areas"
+ https://bugs.webkit.org/show_bug.cgi?id=135712
+ http://trac.webkit.org/changeset/172291
+
2014-08-07 Lucas Forschler <[email protected]>
Merge r172287
Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp (172346 => 172347)
--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-08-08 18:13:54 UTC (rev 172346)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-08-08 18:28:55 UTC (rev 172347)
@@ -1127,12 +1127,11 @@
if (frame().settings().fixedBackgroundsPaintRelativeToDocument())
viewportRect = view().unscaledDocumentRect();
else {
- viewportRect.setSize(view().frameView().unscaledVisibleContentSizeIncludingObscuredArea());
- top += view().frameView().topContentInset(ScrollView::TopContentInsetType::WebCoreOrPlatformContentInset);
+ viewportRect = view().viewRect();
if (fixedBackgroundPaintsInLocalCoordinates())
viewportRect.setLocation(LayoutPoint());
else
- viewportRect.setLocation(toLayoutPoint(view().frameView().documentScrollOffsetRelativeToViewOrigin()));
+ viewportRect.setLocation(toLayoutPoint(view().frameView().scrollOffsetForFixedPosition()));
}
if (paintContainer)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
