projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c30bd2e)
Unreviewed, rolling out r114285.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Apr 2012 00:55:31 +0000 (00:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Apr 2012 00:55:31 +0000 (00:55 +0000)
http://trac.webkit.org/changeset/114285
https://bugs.webkit.org/show_bug.cgi?id=84107

broke fast/media/media-query-list-08.html in Mac (Requested by
andersca on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-04-16

Source/WebCore:

* dom/Document.cpp:
(WebCore::Document::styleSelectorChanged):
* dom/Document.h:
(Document):
* page/FrameView.cpp:
(WebCore::FrameView::layout):

LayoutTests:

* fast/media/media-query-list-08-expected.txt: Removed.
* fast/media/media-query-list-08.html: Removed.
* platform/qt/Skipped:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/media/media-query-list-08-expected.txt [deleted file] patch | blob | history
LayoutTests/fast/media/media-query-list-08.html [deleted file] patch | blob | history
LayoutTests/platform/qt/Skipped patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/dom/Document.cpp patch | blob | history
Source/WebCore/dom/Document.h patch | blob | history
Source/WebCore/page/FrameView.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9f2a906..c3ee32d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r114285.
+        http://trac.webkit.org/changeset/114285
+        https://bugs.webkit.org/show_bug.cgi?id=84107
+
+        broke fast/media/media-query-list-08.html in Mac (Requested by
+        andersca on #webkit).
+
+        * fast/media/media-query-list-08-expected.txt: Removed.
+        * fast/media/media-query-list-08.html: Removed.
+        * platform/qt/Skipped:
+
 2012-04-16  Anders Carlsson  <andersca@apple.com>
 
         Add two flaky tests in fast/profiler.
diff --git a/LayoutTests/fast/media/media-query-list-08-expected.txt b/LayoutTests/fast/media/media-query-list-08-expected.txt
deleted file mode 100644 (file)
index d947f9a..0000000
--- a/LayoutTests/fast/media/media-query-list-08-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Test the MediaQueryList interface: http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface.
-
-Testing viewport related callbacks
-
-PASS
-
diff --git a/LayoutTests/fast/media/media-query-list-08.html b/LayoutTests/fast/media/media-query-list-08.html
deleted file mode 100644 (file)
index 9b7c91e..0000000
--- a/LayoutTests/fast/media/media-query-list-08.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-<head>
-<title>Test CSSOM View module: MediaQueryList interface</title>
-<script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
-    }
-
-    function log(m) {
-        document.getElementById('results').innerHTML += m + '<br>';
-    }
-
-    function callback(query) {
-        log("PASS");
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
-    }
-
-    function runTests()
-    {
-        window.matchMedia("(max-width: 250px)").addListener(callback);
-        window.resizeTo(200, 300);
-    }
-
-</script>
-</head>
-<body onload="runTests()">
-    <p>Test the MediaQueryList interface: <a href="http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface" title="CSSOM View Module">http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface</a>.</p>
-    <p>Testing viewport related callbacks</p>
-    <div id="results">
-    </div>
-</body>
-</html>
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index e080184..a639f4b 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -1108,9 +1108,6 @@ fast/autoresize
 fast/canvas/2d.backingStorePixelRatio.html
 fast/canvas/2d.imageDataHD.html
 
-# window.resizeTo() does not trigger a relayout in our DumpRenderTree
-fast/media/media-query-list-08.html
-
 # This requires didClearWindowObjectForFrameInIsolatedWorld foo in FrameLoaderClient
 http/tests/security/isolatedWorld/didClearWindowObject.html
 # This needs more investigation
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f337244..3705087 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r114285.
+        http://trac.webkit.org/changeset/114285
+        https://bugs.webkit.org/show_bug.cgi?id=84107
+
+        broke fast/media/media-query-list-08.html in Mac (Requested by
+        andersca on #webkit).
+
+        * dom/Document.cpp:
+        (WebCore::Document::styleSelectorChanged):
+        * dom/Document.h:
+        (Document):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+
 2012-04-16  Nate Chapin  <japhet@chromium.org>
 
         Remove unused variable CachedResourceLoader::m_loadFinishing
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index 81f2524..53b9a70 100644 (file)
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -3145,12 +3145,6 @@ void Document::removePendingSheet()
         view()->scrollToFragment(m_url);
 }
 
-void Document::evaluateMediaQueryList()
-{
-    if (m_mediaQueryMatcher)
-        m_mediaQueryMatcher->styleSelectorChanged();
-}
-
 void Document::styleSelectorChanged(StyleSelectorUpdateFlag updateFlag)
 {
     // Don't bother updating, since we haven't loaded all our style info yet
@@ -3200,7 +3194,8 @@ void Document::styleSelectorChanged(StyleSelectorUpdateFlag updateFlag)
             view()->scheduleRelayout();
     }
 
-    evaluateMediaQueryList();
+    if (m_mediaQueryMatcher)
+        m_mediaQueryMatcher->styleSelectorChanged();
 }
 
 void Document::addStyleSheetCandidateNode(Node* node, bool createdByParser)
diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
index 4545c8a..8950de5 100644 (file)
--- a/Source/WebCore/dom/Document.h
+++ b/Source/WebCore/dom/Document.h
@@ -505,8 +505,6 @@ public:
      */
     void styleSelectorChanged(StyleSelectorUpdateFlag);
 
-    void evaluateMediaQueryList();
-
     bool usesSiblingRules() const { return m_usesSiblingRules || m_usesSiblingRulesOverride; }
     void setUsesSiblingRules(bool b) { m_usesSiblingRulesOverride = b; }
     bool usesFirstLineRules() const { return m_usesFirstLineRules; }
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 472d73b..844de28 100644 (file)
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -976,8 +976,7 @@ void FrameView::layout(bool allowSubtree)
         if (document->styleSelector()->affectedByViewportChange()) {
             document->styleSelectorChanged(RecalcStyleImmediately);
             InspectorInstrumentation::mediaQueryResultChanged(document);
-        } else
-            document->evaluateMediaQueryList();
+        }
 
         // Always ensure our style info is up-to-date. This can happen in situations where
         // the layout beats any sort of style recalc update that needs to occur.
Domain: Web Framework / Uncategorized;