Diff
Modified: trunk/LayoutTests/ChangeLog (93438 => 93439)
--- trunk/LayoutTests/ChangeLog 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/ChangeLog 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,3 +1,30 @@
+2011-08-19 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r93425.
+ http://trac.webkit.org/changeset/93425
+ https://bugs.webkit.org/show_bug.cgi?id=66591
+
+ "The newly-added ASSERT is being triggered on several bots"
+ (Requested by jchaffraix on #webkit).
+
+ * fast/css/link-disabled-attr-expected.txt:
+ * fast/css/stylesheet-enable-first-alternate-expected.txt: Removed.
+ * fast/css/stylesheet-enable-first-alternate-on-load-expected.txt: Removed.
+ * fast/css/stylesheet-enable-first-alternate-on-load.html: Removed.
+ * fast/css/stylesheet-enable-first-alternate.html: Removed.
+ * fast/css/stylesheet-enable-second-alternate-expected.txt: Removed.
+ * fast/css/stylesheet-enable-second-alternate-on-load-expected.txt: Removed.
+ * fast/css/stylesheet-enable-second-alternate-on-load.html: Removed.
+ * fast/css/stylesheet-enable-second-alternate.html: Removed.
+ * http/tests/css/link-css-disabled-value-with-slow-loading-sheet-expected.txt: Removed.
+ * http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt: Removed.
+ * http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html: Removed.
+ * http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html: Removed.
+ * http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js: Removed.
+ * http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet.js: Removed.
+ * http/tests/css/resources/slow-loading-sheet-in-error.php: Removed.
+ * http/tests/css/resources/slow-loading-sheet.php: Removed.
+
2011-08-19 Victoria Kirst <v...@chromium.org>
Tell media player to prepareToPlay() at end of HTMLMediaElement::load()
Modified: trunk/LayoutTests/fast/css/link-disabled-attr-expected.txt (93438 => 93439)
--- trunk/LayoutTests/fast/css/link-disabled-attr-expected.txt 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/link-disabled-attr-expected.txt 2011-08-19 21:37:27 UTC (rev 93439)
@@ -15,11 +15,11 @@
altsheet
FAIL link.disabled should be true. Was false.
PASS link.sheet is non-null.
-PASS getComputedStyle(console).backgroundColor is 'rgb(0, 128, 0)'
+FAIL getComputedStyle(console).backgroundColor should be rgb(0, 128, 0). Was rgba(0, 0, 0, 0).
FAIL link.disabled should be true. Was false.
-FAIL getComputedStyle(console).backgroundColor should be rgba(0, 0, 0, 0). Was rgb(0, 128, 0).
+PASS getComputedStyle(console).backgroundColor is originalBG
PASS link.disabled is false
-PASS getComputedStyle(console).backgroundColor is 'rgb(0, 128, 0)'
+FAIL getComputedStyle(console).backgroundColor should be rgb(0, 128, 0). Was rgba(0, 0, 0, 0).
PASS getComputedStyle(console).backgroundColor is originalBG
PASS successfullyParsed is true
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-expected.txt (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-expected.txt 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-expected.txt 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,5 +0,0 @@
-Test for 65140: REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page
-
-This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).
-
-PASSED
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-on-load-expected.txt (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-on-load-expected.txt 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-on-load-expected.txt 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,5 +0,0 @@
-Test for 65140: REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page
-
-This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).
-
-PASSED
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-on-load.html (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-on-load.html 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate-on-load.html 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="" media="all" title="Default Style Sheet" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<script type="text/_javascript_">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
- function test() {
- var red = document.getElementsByTagName("link")[0];
- red.disabled = true;
- var green = document.getElementsByTagName("link")[1];
- green.disabled = true;
- green.disabled = false;
-
- var console = document.getElementById("console");
- if (getComputedStyle(console, null).backgroundColor === "rgb(0, 128, 0)")
- console.innerHTML = "PASSED";
- else
- console.innerHTML = "FAILED, background = "" + getComputedStyle(console, null).backgroundColor;
- }
- window.addEventListener("load", test, false);
-</script>
-</head>
-<body>
-<p>Test for <a href="" REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page</p>
-<p>This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).</p>
-<div id="console">FAILED</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate.html (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate.html 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-first-alternate.html 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="" media="all" title="Default Style Sheet" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<script type="text/_javascript_">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
- var red = document.getElementsByTagName("link")[0];
- red.disabled = true;
- var green = document.getElementsByTagName("link")[1];
- green.disabled = true;
- green.disabled = false;
-
- function test() {
- var console = document.getElementById("console");
- if (getComputedStyle(console, null).backgroundColor === "rgb(0, 128, 0)")
- console.innerHTML = "PASSED";
- else
- console.innerHTML = "FAILED, background = "" + getComputedStyle(console, null).backgroundColor;
- }
- window.addEventListener("load", test, false);
-</script>
-</head>
-<body>
-<p>Test for <a href="" REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page</p>
-<p>This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).</p>
-<div id="console">FAILED</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-expected.txt (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-expected.txt 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-expected.txt 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,5 +0,0 @@
-Test for 65140: REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page
-
-This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).
-
-PASSED
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-on-load-expected.txt (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-on-load-expected.txt 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-on-load-expected.txt 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,5 +0,0 @@
-Test for 65140: REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page
-
-This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).
-
-PASSED
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-on-load.html (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-on-load.html 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate-on-load.html 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="" media="all" title="Default Style Sheet" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<script type="text/_javascript_">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
- function test() {
- var red = document.getElementsByTagName("link")[0];
- red.disabled = true;
- var green = document.getElementsByTagName("link")[2];
- green.disabled = false;
-
- var console = document.getElementById("console");
- if (getComputedStyle(console, null).backgroundColor === "rgb(0, 128, 0)")
- console.innerHTML = "PASSED";
- else
- console.innerHTML = "FAILED, background = "" + getComputedStyle(console, null).backgroundColor;
- }
- window.addEventListener("load", test, false);
-</script>
-</head>
-<body>
-<p>Test for <a href="" REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page</p>
-<p>This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).</p>
-<div id="console">FAILED</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate.html (93438 => 93439)
--- trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate.html 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/fast/css/stylesheet-enable-second-alternate.html 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="" media="all" title="Default Style Sheet" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<script type="text/_javascript_">
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
-
- var red = document.getElementsByTagName("link")[0];
- red.disabled = true;
- var green = document.getElementsByTagName("link")[2];
- green.disabled = false;
-
- function test() {
- var console = document.getElementById("console");
- if (getComputedStyle(console, null).backgroundColor === "rgb(0, 128, 0)")
- console.innerHTML = "PASSED";
- else
- console.innerHTML = "FAILED, background = "" + getComputedStyle(console, null).backgroundColor;
- }
- window.addEventListener("load", test, false);
-</script>
-</head>
-<body>
-<p>Test for <a href="" REGRESSION (r84327-r84329): CSS stylesheets fail to load on www.flagstar.com login page</p>
-<p>This test PASSED if PASSED is written below (alternatively the next line should have a GREEN background).</p>
-<div id="console">FAILED</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-expected.txt (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-expected.txt 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-expected.txt 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,19 +0,0 @@
-Test that HTMLLinkElement's disabled attribute is properly cached while set when loading a stylesheet.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Testing value of 'disabled' prior to load just after setting them
-PASS mainSheetLink.sheet is non-null.
-PASS alternateSheetLink.sheet is null
-PASS mainSheetLink.disabled is true
-PASS alternateSheetLink.disabled is false
-Testing the values when the alternate sheet is loaded (as this is the only one that has sheet() === null)
-PASS mainSheetLink.sheet is non-null.
-PASS alternateSheetLink.sheet is non-null.
-PASS mainSheetLink.disabled is true
-PASS alternateSheetLink.disabled is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,19 +0,0 @@
-Test that HTMLLinkElement's disabled attribute is properly cached while set when loading a stylesheet.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Testing value of 'disabled' prior to load just after setting them
-PASS mainSheetLink.sheet is non-null.
-PASS alternateSheetLink.sheet is null
-PASS mainSheetLink.disabled is true
-PASS alternateSheetLink.disabled is false
-Testing the values when the alternate sheet is loaded (as this is the only one that has sheet() === null)
-PASS mainSheetLink.sheet is non-null.
-PASS alternateSheetLink.sheet is non-null.
-PASS mainSheetLink.disabled is true
-PASS alternateSheetLink.disabled is false
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="" media="all" title="Default Style Sheet" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src=""
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="" media="all" title="Default Style Sheet" type="text/css" />
-<link rel="alternate stylesheet" href="" media="all" title="green" type="text/css" />
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src=""
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,45 +0,0 @@
-description("Test that HTMLLinkElement's disabled attribute is properly cached while set when loading a stylesheet.");
-
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
-
-window.jsTestIsAsync = true;
-
-mainSheetLink = document.getElementsByTagName("link")[0];
-alternateSheetLink = document.getElementsByTagName("link")[1];
-
-mainSheetLink.disabled = true;
-alternateSheetLink.disabled = false;
-
-debug("Testing value of 'disabled' prior to load just after setting them");
-shouldBeNonNull("mainSheetLink.sheet");
-shouldBeNull("alternateSheetLink.sheet");
-shouldBeTrue("mainSheetLink.disabled", true);
-shouldBeFalse("alternateSheetLink.disabled");
-
-debug("Testing the values when the alternate sheet is loaded (as this is the only one that has sheet() === null)");
-
-function onSheetLoaded(f, elem, maxtime) {
- if (elem.sheet || maxtime <= 0)
- f();
- else
- setTimeout(function () { onSheetLoaded(f, elem, maxtime - 25);}, 25);
-}
-
-function testWhenLoaded() {
- // Those next 2 lines are a sanity check.
- // If the second check fails, it is likely that the test timed out and thus
- // you can discard the rest of results as it is not testing what we want
- // (namely that the disabled value is passed to the final sheet).
- shouldBeNonNull("mainSheetLink.sheet");
- shouldBeNonNull("alternateSheetLink.sheet");
-
- shouldBeTrue("mainSheetLink.disabled");
- shouldBeFalse("alternateSheetLink.disabled");
-
- finishJSTest();
-}
-
-onSheetLoaded(testWhenLoaded, alternateSheetLink, 500);
-
-var successfullyParsed = true;
Deleted: trunk/LayoutTests/http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet.js (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet.js 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet.js 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,45 +0,0 @@
-description("Test that HTMLLinkElement's disabled attribute is properly cached while set when loading a stylesheet.");
-
-if (window.layoutTestController)
- layoutTestController.waitUntilDone();
-
-window.jsTestIsAsync = true;
-
-mainSheetLink = document.getElementsByTagName("link")[0];
-alternateSheetLink = document.getElementsByTagName("link")[1];
-
-mainSheetLink.disabled = true;
-alternateSheetLink.disabled = false;
-
-debug("Testing value of 'disabled' prior to load just after setting them");
-shouldBeNonNull("mainSheetLink.sheet");
-shouldBeNull("alternateSheetLink.sheet");
-shouldBeTrue("mainSheetLink.disabled", true);
-shouldBeFalse("alternateSheetLink.disabled");
-
-debug("Testing the values when the alternate sheet is loaded (as this is the only one that has sheet() === null)");
-
-function onSheetLoaded(f, elem, maxtime) {
- if (elem.sheet || maxtime <= 0)
- f();
- else
- setTimeout(function () { onSheetLoaded(f, elem, maxtime - 25);}, 25);
-}
-
-function testWhenLoaded() {
- // Those next 2 lines are a sanity check.
- // If the second check fails, it is likely that the test timed out and thus
- // you can discard the rest of results as it is not testing what we want
- // (namely that the disabled value is passed to the final sheet).
- shouldBeNonNull("mainSheetLink.sheet");
- shouldBeNonNull("alternateSheetLink.sheet");
-
- shouldBeTrue("mainSheetLink.disabled");
- shouldBeFalse("alternateSheetLink.disabled");
-
- finishJSTest();
-}
-
-onSheetLoaded(testWhenLoaded, alternateSheetLink, 500);
-
-var successfullyParsed = true;
Deleted: trunk/LayoutTests/http/tests/css/resources/slow-loading-sheet-in-error.php (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/resources/slow-loading-sheet-in-error.php 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/resources/slow-loading-sheet-in-error.php 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,13 +0,0 @@
-<?php
-// We sleep here so that we are have enough time to test the different attributes before the stylesheet is fully loaded.
-usleep(100);
-
-header("HTTP/1.0 500 Internal Error");
-header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-header("Cache-Control: no-cache, no-store, must-revalidate");
-header("Pragma: no-cache");
-header("Content-Type: text/css");
-
-ob_flush();
-flush();
-?>
Deleted: trunk/LayoutTests/http/tests/css/resources/slow-loading-sheet.php (93438 => 93439)
--- trunk/LayoutTests/http/tests/css/resources/slow-loading-sheet.php 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/LayoutTests/http/tests/css/resources/slow-loading-sheet.php 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,15 +0,0 @@
-<?php
-// We sleep here so that we are have enough time to test the different attributes before the stylesheet is fully loaded.
-usleep(100);
-
-header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-header("Cache-Control: no-cache, no-store, must-revalidate");
-header("Pragma: no-cache");
-header("Content-Type: text/css");
-
-$color = $_GET['color'];
-
-echo "h1 { background-color: $color }\n";
-ob_flush();
-flush();
-?>
Modified: trunk/Source/WebCore/ChangeLog (93438 => 93439)
--- trunk/Source/WebCore/ChangeLog 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/Source/WebCore/ChangeLog 2011-08-19 21:37:27 UTC (rev 93439)
@@ -1,3 +1,20 @@
+2011-08-19 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r93425.
+ http://trac.webkit.org/changeset/93425
+ https://bugs.webkit.org/show_bug.cgi?id=66591
+
+ "The newly-added ASSERT is being triggered on several bots"
+ (Requested by jchaffraix on #webkit).
+
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::HTMLLinkElement):
+ (WebCore::HTMLLinkElement::setDisabled):
+ (WebCore::HTMLLinkElement::sheetLoaded):
+ (WebCore::HTMLLinkElement::disabled):
+ * html/HTMLLinkElement.h:
+ (WebCore::HTMLLinkElement::isEnabledViaScript):
+
2011-08-18 Adrienne Walker <e...@google.com>
[chromium] Refactor updateCompositorResources to take an explicit GraphicsContext3D
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (93438 => 93439)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-08-19 21:37:27 UTC (rev 93439)
@@ -56,7 +56,7 @@
, m_linkLoader(this)
, m_sizes(DOMSettableTokenList::create())
, m_loading(false)
- , m_scriptState(Unset)
+ , m_isEnabledViaScript(false)
, m_createdByParser(createdByParser)
, m_isInShadowTree(false)
, m_pendingSheetType(None)
@@ -85,20 +85,15 @@
void HTMLLinkElement::setDisabled(bool disabled)
{
- bool wasEnabledViaScript = isEnabledViaScript();
- setIsEnabledViaScript(!disabled);
-
if (!m_sheet)
return;
bool wasDisabled = m_sheet->disabled();
- if (wasDisabled == disabled) {
- if (wasEnabledViaScript != isEnabledViaScript())
- document()->styleSelectorChanged(DeferRecalcStyle);
+ if (wasDisabled == disabled)
return;
- }
m_sheet->setDisabled(disabled);
+ m_isEnabledViaScript = !disabled;
// If we change the disabled state while the sheet is still loading, then we have to
// perform three checks:
@@ -125,8 +120,6 @@
if (!disabled)
process();
-
- ASSERT(areDisabledAndScriptStatesConsistent());
}
StyleSheet* HTMLLinkElement::sheet() const
@@ -366,20 +359,10 @@
bool HTMLLinkElement::sheetLoaded()
{
- // Migrate the disabled information before removePendingSheet is called
- // as it will start a recalStyleSelector which needs this information.
- if (m_scriptState != Unset) {
- ASSERT(!m_loading);
- // FIXME: We should ASSERT that it was set for stylesheets only, but
- // currently we allow setDisabled to be called regardless of the <link> rel.
- setDisabled(m_scriptState == DisabledViaScript);
- }
-
if (!isLoading()) {
removePendingSheet();
return true;
}
-
return false;
}
@@ -462,20 +445,7 @@
bool HTMLLinkElement::disabled() const
{
- ASSERT(areDisabledAndScriptStatesConsistent());
-
- if (!m_sheet) {
- // FF disagrees with the CSS OM spec and always has an associated stylesheet for alternate sheet (regardless of whether
- // the resource is fetched). As we store the enabled state in m_scriptState while loading, return this information to be
- // consistent with FF. sheetLoaded() is called at the end of any transfer (whether it was in error or not) so m_scriptState
- // will be transfered back into our stylesheet and the disabled() value should always be consistent.
- if (isLoading() && m_scriptState != Unset)
- return m_scriptState == DisabledViaScript;
-
- return false;
- }
-
- return m_sheet->disabled();
+ return m_sheet && m_sheet->disabled();
}
DOMSettableTokenList* HTMLLinkElement::sizes() const
@@ -488,23 +458,4 @@
m_sizes->setValue(value);
}
-#ifndef NDEBUG
-bool HTMLLinkElement::areDisabledAndScriptStatesConsistent() const
-{
- if (!m_relAttribute.m_isStyleSheet)
- return true;
-
- // During loading, m_scriptState holds the temporary value for sheet()->disabled()
- // so it can have any values (same for sheet()->disabled()).
- if (isLoading())
- return true;
-
- if (m_scriptState == Unset)
- return true;
-
- bool isDisabledViaScript = m_scriptState == DisabledViaScript;
- return isDisabledViaScript == sheet()->disabled();
-}
-#endif
-
} // namespace WebCore
Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (93438 => 93439)
--- trunk/Source/WebCore/html/HTMLLinkElement.h 2011-08-19 21:24:17 UTC (rev 93438)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2011-08-19 21:37:27 UTC (rev 93439)
@@ -57,7 +57,7 @@
// FIXME: This should be renamed isStyleSheetLoading as this is only used for stylesheets.
bool isLoading() const;
- bool isEnabledViaScript() const { return m_scriptState == EnabledViaScript; }
+ bool isEnabledViaScript() const { return m_isEnabledViaScript; }
bool disabled() const;
void setDisabled(bool);
void setSizes(const String&);
@@ -85,6 +85,7 @@
virtual bool isURLAttribute(Attribute*) const;
+private:
virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
virtual void finishParsingChildren();
@@ -96,11 +97,6 @@
private:
HTMLLinkElement(const QualifiedName&, Document*, bool createdByParser);
- void setIsEnabledViaScript(bool enabled) { m_scriptState = enabled ? EnabledViaScript : DisabledViaScript; }
-#ifndef NDEBUG
- bool areDisabledAndScriptStatesConsistent() const;
-#endif
-
LinkLoader m_linkLoader;
CachedResourceHandle<CachedCSSStyleSheet> m_cachedSheet;
RefPtr<CSSStyleSheet> m_sheet;
@@ -110,11 +106,10 @@
RefPtr<DOMSettableTokenList> m_sizes;
LinkRelAttribute m_relAttribute;
bool m_loading;
- enum EnabledViaScriptState { Unset, EnabledViaScript, DisabledViaScript };
- EnabledViaScriptState m_scriptState;
+ bool m_isEnabledViaScript;
bool m_createdByParser;
bool m_isInShadowTree;
-
+
PendingSheetType m_pendingSheetType;
};
