Diff
Modified: trunk/LayoutTests/ChangeLog (114329 => 114330)
--- trunk/LayoutTests/ChangeLog 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/LayoutTests/ChangeLog 2012-04-17 00:55:31 UTC (rev 114330)
@@ -1,3 +1,16 @@
+2012-04-16 Sheriff Bot <webkit.review....@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 <ander...@apple.com>
Add two flaky tests in fast/profiler.
Deleted: trunk/LayoutTests/fast/media/media-query-list-08-expected.txt (114329 => 114330)
--- trunk/LayoutTests/fast/media/media-query-list-08-expected.txt 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/LayoutTests/fast/media/media-query-list-08-expected.txt 2012-04-17 00:55:31 UTC (rev 114330)
@@ -1,6 +0,0 @@
-Test the MediaQueryList interface: http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface.
-
-Testing viewport related callbacks
-
-PASS
-
Deleted: trunk/LayoutTests/fast/media/media-query-list-08.html (114329 => 114330)
--- trunk/LayoutTests/fast/media/media-query-list-08.html 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/LayoutTests/fast/media/media-query-list-08.html 2012-04-17 00:55:31 UTC (rev 114330)
@@ -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="" 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>
Modified: trunk/LayoutTests/platform/qt/Skipped (114329 => 114330)
--- trunk/LayoutTests/platform/qt/Skipped 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-04-17 00:55:31 UTC (rev 114330)
@@ -1108,9 +1108,6 @@
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
Modified: trunk/Source/WebCore/ChangeLog (114329 => 114330)
--- trunk/Source/WebCore/ChangeLog 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/Source/WebCore/ChangeLog 2012-04-17 00:55:31 UTC (rev 114330)
@@ -1,3 +1,19 @@
+2012-04-16 Sheriff Bot <webkit.review....@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 <jap...@chromium.org>
Remove unused variable CachedResourceLoader::m_loadFinishing
Modified: trunk/Source/WebCore/dom/Document.cpp (114329 => 114330)
--- trunk/Source/WebCore/dom/Document.cpp 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-04-17 00:55:31 UTC (rev 114330)
@@ -3145,12 +3145,6 @@
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 @@
view()->scheduleRelayout();
}
- evaluateMediaQueryList();
+ if (m_mediaQueryMatcher)
+ m_mediaQueryMatcher->styleSelectorChanged();
}
void Document::addStyleSheetCandidateNode(Node* node, bool createdByParser)
Modified: trunk/Source/WebCore/dom/Document.h (114329 => 114330)
--- trunk/Source/WebCore/dom/Document.h 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/Source/WebCore/dom/Document.h 2012-04-17 00:55:31 UTC (rev 114330)
@@ -505,8 +505,6 @@
*/
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; }
Modified: trunk/Source/WebCore/page/FrameView.cpp (114329 => 114330)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-04-17 00:48:17 UTC (rev 114329)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-04-17 00:55:31 UTC (rev 114330)
@@ -976,8 +976,7 @@
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.
