git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a32688)
Unreviewed, rolling out r172291.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Aug 2014 06:50:29 +0000 (06:50 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Aug 2014 06:50:29 +0000 (06:50 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/platform/mac-wk1/TestExpectations patch | blob | history
LayoutTests/platform/mac-wk1/fast/backgrounds/resources/green.png [deleted file] patch | blob | history
LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html [deleted file] patch | blob | history
LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html [deleted file] patch | blob | history
LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png [deleted file] patch | blob | history
LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html [deleted file] patch | blob | history
LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html [deleted file] patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/rendering/RenderBoxModelObject.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0a680d6..314273f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2014-08-07  Commit Queue  <commit-queue@webkit.org>
+
+        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  Zalan Bujtas  <zalan@apple.com>
 
         Subpixel rendering: Border thickness and length flooring can result empty borders
diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
index 25e6f62..c060617 100644 (file)
--- a/LayoutTests/platform/mac-wk1/TestExpectations
+++ b/LayoutTests/platform/mac-wk1/TestExpectations
@@ -51,7 +51,6 @@ plugins/snapshotting
 [ 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/fast/scrolling/scroll-select-bottom-test.html [ Skip ]
-[ MountainLion Mavericks ] platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html [ Skip ]
 
 ### END OF (2) Failures without bug reports
 ########################################
diff --git a/LayoutTests/platform/mac-wk1/fast/backgrounds/resources/green.png b/LayoutTests/platform/mac-wk1/fast/backgrounds/resources/green.png
deleted file mode 100644 (file)
index 6290f68..0000000
Binary files a/LayoutTests/platform/mac-wk1/fast/backgrounds/resources/green.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html b/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html
deleted file mode 100644 (file)
index 4cce795..0000000
--- a/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html
+++ /dev/null
@@ -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>
diff --git a/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html b/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html
deleted file mode 100644 (file)
index 75b4dc7..0000000
--- a/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html
+++ /dev/null
@@ -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>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png b/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png
deleted file mode 100644 (file)
index 6290f68..0000000
Binary files a/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html b/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html
deleted file mode 100644 (file)
index 4cce795..0000000
--- a/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html
+++ /dev/null
@@ -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>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html b/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html
deleted file mode 100644 (file)
index 75b4dc7..0000000
--- a/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html
+++ /dev/null
@@ -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>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 62df9f4..2b563ba 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2014-08-07  Commit Queue  <commit-queue@webkit.org>
+
+        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  Zalan Bujtas  <zalan@apple.com>
 
         Subpixel rendering: Border thickness and length flooring can result empty borders
diff --git a/Source/WebCore/rendering/RenderBoxModelObject.cpp b/Source/WebCore/rendering/RenderBoxModelObject.cpp
index beec141..c2baf2a 100644 (file)
--- a/Source/WebCore/rendering/RenderBoxModelObject.cpp
+++ b/Source/WebCore/rendering/RenderBoxModelObject.cpp
@@ -1127,12 +1127,11 @@ void RenderBoxModelObject::calculateBackgroundImageGeometry(const RenderLayerMod
         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)
Mirror of the WebKit open source project from svn.webkit.org.