Unreviewed, rolling out r143616.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2013 18:51:20 +0000 (18:51 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Feb 2013 18:51:20 +0000 (18:51 +0000)
http://trac.webkit.org/changeset/143616
https://bugs.webkit.org/show_bug.cgi?id=110491

Caused a test failure on Chromium Mac. (Requested by vollick
on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-21

Source/WebCore:

* page/FrameView.cpp:
(WebCore::FrameView::visibleContentsResized):
* page/FrameView.h:
(FrameView):
* page/Page.cpp:
(WebCore::Page::setPageScaleFactor):

LayoutTests:

* platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html: Removed.
* platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html: Removed.

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

LayoutTests/ChangeLog
LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html [deleted file]
LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/FrameView.h
Source/WebCore/page/Page.cpp

index 34875afe212146bd41d394454dddd827f60d701e..16dfd1c906ec7763435aea6952d705fee7093715 100644 (file)
@@ -1,3 +1,15 @@
+2013-02-21  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r143616.
+        http://trac.webkit.org/changeset/143616
+        https://bugs.webkit.org/show_bug.cgi?id=110491
+
+        Caused a test failure on Chromium Mac. (Requested by vollick
+        on #webkit).
+
+        * platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html: Removed.
+        * platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html: Removed.
+
 2013-02-21  Alok Priyadarshi  <alokp@chromium.org>
 
         Mark GraphicsLayers as opaque when possible
diff --git a/LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html b/LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale-expected.html
deleted file mode 100644 (file)
index 8b5b803..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.fixed_size {
-    position:absolute;
-    background-color:#ccffcc;
-    width:25px;
-    height:25px;
-}
-.percentage_size {
-    position:absolute;
-    background-color:#ccccff;
-    width:10%;
-    height:10%;
-}
-</style>
-</head>
-<body style="width:800px;height:600px;margin:0;">
-<div class="fixed_size" style="left:5px;top:10px"></div>
-<div class="fixed_size" style="right:15px;top:20px"></div>
-<div class="fixed_size" style="left:25px;bottom:30px"></div>
-<div class="fixed_size" style="right:35px;bottom:40px"></div>
-<div class="percentage_size" style="left:40%;top:35%"></div>
-<div class="percentage_size" style="right:30%;top:25%"></div>
-<div class="percentage_size" style="left:20%;bottom:15%"></div>
-<div class="percentage_size" style="right:10%;bottom:5%"></div>
-</body>
-</html>
diff --git a/LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html b/LayoutTests/platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html
deleted file mode 100644 (file)
index 024ec65..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This test is successful if fixed position elements re-layout correctly on page scale changes</title>
-<style>
-.fixed_size {
-    position:fixed;
-    background-color:#ccffcc;
-    width:50px;
-    height:50px;
-}
-.percentage_size {
-    position:fixed;
-    background-color:#ccccff;
-    width:10%;
-    height:10%;
-}
-</style>
-</head>
-<body onload="runTest();" style="width:1600px;height:1200px;margin:0;">
-<div class="fixed_size" style="left:10px;top:20px"></div>
-<div class="fixed_size" style="right:30px;top:40px"></div>
-<div class="fixed_size" style="left:50px;bottom:60px"></div>
-<div class="fixed_size" style="right:70px;bottom:80px"></div>
-<div class="percentage_size" style="left:40%;top:35%"></div>
-<div class="percentage_size" style="right:30%;top:25%"></div>
-<div class="percentage_size" style="left:20%;bottom:15%"></div>
-<div class="percentage_size" style="right:10%;bottom:5%"></div>
-<script>
-function runTest() {
-    if (window.internals) {
-        window.internals.settings.setFixedElementsLayoutRelativeToFrame(true);
-
-        // Force scrollbar to hide and re-layout immediately.
-        window.internals.setPageScaleFactor(0.1, 0, 0);
-        document.body.offsetTop;
-
-        window.internals.setPageScaleFactor(0.5, 0, 0);
-    }
-}
-</script>
-</body>
-</html>
index 24965934b0a253510d78d9f2a1e9f799a468e5f3..640313cbd3ff17c797f0b88644c14e2f7e78315e 100644 (file)
@@ -1,3 +1,19 @@
+2013-02-21  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r143616.
+        http://trac.webkit.org/changeset/143616
+        https://bugs.webkit.org/show_bug.cgi?id=110491
+
+        Caused a test failure on Chromium Mac. (Requested by vollick
+        on #webkit).
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::visibleContentsResized):
+        * page/FrameView.h:
+        (FrameView):
+        * page/Page.cpp:
+        (WebCore::Page::setPageScaleFactor):
+
 2013-02-21  Robert Hogan  <robert@webkit.org>
 
         Overflow can be cleared just before it is computed
index 69d50776382023237f5a778b1da3aaef06749de6..6d665dac08489412b271849ad4a4eb179522fd12 100644 (file)
@@ -2049,8 +2049,6 @@ void FrameView::visibleContentsResized()
     if (!frame()->view())
         return;
 
-    setViewportConstrainedObjectsNeedLayout();
-
     if (!useFixedLayout() && needsLayout())
         layout();
 
index ea0465890b58bbe597090e8eb7bd9882e8a972ed..494ae47b71d53a93c58f88551e50621f27ae2417 100644 (file)
@@ -111,7 +111,6 @@ public:
 
     bool needsLayout() const;
     void setNeedsLayout();
-    void setViewportConstrainedObjectsNeedLayout();
 
     bool needsFullRepaint() const { return m_doFullRepaint; }
 
@@ -486,6 +485,8 @@ private:
 
     bool doLayoutWithFrameFlattening(bool allowSubtree);
 
+    void setViewportConstrainedObjectsNeedLayout();
+
     virtual AXObjectCache* axObjectCache() const;
     void notifyWidgetsInAllFrames(WidgetNotification);
     void removeFromAXObjectCache();
index d17f38fb58b95c25b83b8afb053142c3f27219ca..5133567fa8c1dfa42744fc6d8650dfa2edd240b2 100644 (file)
@@ -748,9 +748,6 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin)
     mainFrame()->deviceOrPageScaleFactorChanged();
 #endif
 
-    if (view)
-        view->setViewportConstrainedObjectsNeedLayout();
-
     if (view && view->scrollPosition() != origin) {
         if (!m_settings->applyPageScaleFactorInCompositor() && document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())
             view->layout();