Title: [172294] branches/safari-600.1-branch
Diff
Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172293 => 172294)
--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 22:27:18 UTC (rev 172293)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 22:30:26 UTC (rev 172294)
@@ -1,5 +1,31 @@
2014-08-07 Dana Burkart <[email protected]>
+ Merge r172291
+
+ 2014-08-07 Beth Dakin <[email protected]>
+
+ Fixed backgrounds don't paint in blurred inset areas
+ https://bugs.webkit.org/show_bug.cgi?id=135712
+
+ Reviewed by Simon Fraser.
+
+ Unfortunately for this test to be valid in WK2, it needs to be run from the
+ platform/mac-wk2/tiled-drawing directory so that tiled drawing is enabled. So
+ there are two copies of the test so that we can get coverage for WK1 and WK2.
+ * platform/mac-wk1/TestExpectations:
+ * platform/mac-wk1/fast: Added.
+ * platform/mac-wk1/fast/backgrounds: Added.
+ * platform/mac-wk1/fast/backgrounds/resources: Added.
+ * platform/mac-wk1/fast/backgrounds/resources/green.png: Added.
+ * platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html: Added.
+ * platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html: Added.
+ * platform/mac-wk2/tiled-drawing/resources/green.png: Added.
+ * platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html: Added.
+ * platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html: Added.
+ * platform/mac/fast/backgrounds/resources: Added.
+
+2014-08-07 Dana Burkart <[email protected]>
+
Merge r172183
2014-08-06 Simon Fraser <[email protected]>
Modified: branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations (172293 => 172294)
--- branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2014-08-07 22:27:18 UTC (rev 172293)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2014-08-07 22:30:26 UTC (rev 172294)
@@ -52,6 +52,7 @@
# 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
########################################
Copied: branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png (from rev 172291, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png)
(Binary files differ)
Copied: branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html (from rev 172291, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html) (0 => 172294)
--- branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html 2014-08-07 22:30:26 UTC (rev 172294)
@@ -0,0 +1,26 @@
+<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>
Copied: branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html (from rev 172291, trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html) (0 => 172294)
--- branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html 2014-08-07 22:30:26 UTC (rev 172294)
@@ -0,0 +1,36 @@
+<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 (172293 => 172294)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 22:27:18 UTC (rev 172293)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 22:30:26 UTC (rev 172294)
@@ -1,5 +1,22 @@
2014-08-07 Dana Burkart <[email protected]>
+ Merge r172291
+
+ 2014-08-07 Beth Dakin <[email protected]>
+
+ Fixed backgrounds don't paint in blurred inset areas
+ https://bugs.webkit.org/show_bug.cgi?id=135712
+
+ Reviewed by Simon Fraser.
+
+ Background geometry calculations for fixed background need to use the larger
+ visible rect.
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+
+2014-08-07 Dana Burkart <[email protected]>
+
Merge r172275
2014-08-07 Daniel Bates <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp (172293 => 172294)
--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-08-07 22:27:18 UTC (rev 172293)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-08-07 22:30:26 UTC (rev 172294)
@@ -1127,11 +1127,12 @@
if (frame().settings().fixedBackgroundsPaintRelativeToDocument())
viewportRect = view().unscaledDocumentRect();
else {
- viewportRect = view().viewRect();
+ viewportRect.setSize(view().frameView().unscaledVisibleContentSizeIncludingObscuredArea());
+ top += view().frameView().topContentInset(ScrollView::TopContentInsetType::WebCoreOrPlatformContentInset);
if (fixedBackgroundPaintsInLocalCoordinates())
viewportRect.setLocation(LayoutPoint());
else
- viewportRect.setLocation(toLayoutPoint(view().frameView().scrollOffsetForFixedPosition()));
+ viewportRect.setLocation(toLayoutPoint(view().frameView().documentScrollOffsetRelativeToViewOrigin()));
}
if (paintContainer)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
