Diff
Modified: trunk/LayoutTests/ChangeLog (94789 => 94790)
--- trunk/LayoutTests/ChangeLog 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/LayoutTests/ChangeLog 2011-09-08 20:33:45 UTC (rev 94790)
@@ -1,3 +1,14 @@
+2011-09-08 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r94784.
+ http://trac.webkit.org/changeset/94784
+ https://bugs.webkit.org/show_bug.cgi?id=67796
+
+ Commit was premature (Requested by rolandsteiner on #webkit).
+
+ * fast/css/style-scoped/basic-attribute-expected.txt: Removed.
+ * fast/css/style-scoped/basic-attribute.html: Removed.
+
2011-09-08 W. James MacLean <wjmacl...@chromium.org>
[chromium] Add backend compositor support for rescaling (zooming) textures during zoom animation.
Deleted: trunk/LayoutTests/fast/css/style-scoped/basic-attribute-expected.txt (94789 => 94790)
--- trunk/LayoutTests/fast/css/style-scoped/basic-attribute-expected.txt 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/LayoutTests/fast/css/style-scoped/basic-attribute-expected.txt 2011-09-08 20:33:45 UTC (rev 94790)
@@ -1,62 +0,0 @@
-Basic test for the <style scoped> attribute.
-
---- Initial ---
-PASS global1.getAttribute('scoped') is null
-PASS global1.scoped is false
-PASS global2.getAttribute('scoped') is null
-PASS global2.scoped is false
-PASS testBooleanAttribute(scoped1, 'scoped') is true
-PASS scoped1.scoped is true
-PASS testBooleanAttribute(scoped2, 'scoped') is true
-PASS scoped2.scoped is true
-PASS testBooleanAttribute(scoped3, 'scoped') is true
-PASS scoped3.scoped is true
---- After insertion into tree ---
-PASS global1.getAttribute('scoped') is null
-PASS global1.scoped is false
-PASS global2.getAttribute('scoped') is null
-PASS global2.scoped is false
-PASS testBooleanAttribute(scoped1, 'scoped') is true
-PASS scoped1.scoped is true
-PASS testBooleanAttribute(scoped2, 'scoped') is true
-PASS scoped2.scoped is true
-PASS testBooleanAttribute(scoped3, 'scoped') is true
-PASS scoped3.scoped is true
---- Inverting 'scoped' attribute while in tree ---
-PASS testBooleanAttribute(global1, 'scoped') is true
-PASS global1.scoped is true
-PASS testBooleanAttribute(global2, 'scoped') is true
-PASS global2.scoped is true
-PASS scoped1.getAttribute('scoped') is null
-PASS scoped1.scoped is false
-PASS scoped2.getAttribute('scoped') is null
-PASS scoped2.scoped is false
-PASS scoped3.getAttribute('scoped') is null
-PASS scoped3.scoped is false
---- After removal from tree (attribute is still inverted) ---
-PASS testBooleanAttribute(global1, 'scoped') is true
-PASS global1.scoped is true
-PASS testBooleanAttribute(global2, 'scoped') is true
-PASS global2.scoped is true
-PASS scoped1.getAttribute('scoped') is null
-PASS scoped1.scoped is false
-PASS scoped2.getAttribute('scoped') is null
-PASS scoped2.scoped is false
-PASS scoped3.getAttribute('scoped') is null
-PASS scoped3.scoped is false
---- Inverting 'scoped' attribute again, while outside tree ---
-PASS global1.getAttribute('scoped') is null
-PASS global1.scoped is false
-PASS global2.getAttribute('scoped') is null
-PASS global2.scoped is false
-PASS testBooleanAttribute(scoped1, 'scoped') is true
-PASS scoped1.scoped is true
-PASS testBooleanAttribute(scoped2, 'scoped') is true
-PASS scoped2.scoped is true
-PASS testBooleanAttribute(scoped3, 'scoped') is true
-PASS scoped3.scoped is true
---- DONE ---
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/css/style-scoped/basic-attribute.html (94789 => 94790)
--- trunk/LayoutTests/fast/css/style-scoped/basic-attribute.html 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/LayoutTests/fast/css/style-scoped/basic-attribute.html 2011-09-08 20:33:45 UTC (rev 94790)
@@ -1,124 +0,0 @@
-<html>
-<head>
- <link rel="stylesheet" href=""
- <script src=""
-</head>
-<body>
- <p>Basic test for the <style scoped> attribute.</p>
- <div id="scope">
- <style id="global1"></style>
- <style scoped='scoped' id="scoped1"></style>
- </div>
-
- <div id="console"></div>
-
- <script>
- function testBooleanAttribute(elem, attr)
- {
- var val = elem.getAttribute(attr);
- if (val === null)
- return false
- if (val === '' || val === attr)
- return true;
- throw "Illegal value for boolean attribute!";
- }
-
- var scope = document.getElementById('scope');
-
- var global1 = document.getElementById('global1');
- var scoped1 = document.getElementById('scoped1');
-
- var global2 = document.createElement('style');
- var scoped2 = document.createElement('style');
- scoped2.setAttribute('scoped', 'scoped');
- var scoped3 = document.createElement('style');
- scoped3.scoped = true;
-
- debug("--- Initial ---");
- shouldBeNull("global1.getAttribute('scoped')");
- shouldBeFalse("global1.scoped");
- shouldBeNull("global2.getAttribute('scoped')");
- shouldBeFalse("global2.scoped");
- shouldBeTrue("testBooleanAttribute(scoped1, 'scoped')");
- shouldBeTrue("scoped1.scoped");
- shouldBeTrue("testBooleanAttribute(scoped2, 'scoped')");
- shouldBeTrue("scoped2.scoped");
- shouldBeTrue("testBooleanAttribute(scoped3, 'scoped')");
- shouldBeTrue("scoped3.scoped");
-
- debug("--- After insertion into tree ---")
- scope.appendChild(global2);
- scope.appendChild(scoped2);
- scope.appendChild(scoped3);
-
- shouldBeNull("global1.getAttribute('scoped')");
- shouldBeFalse("global1.scoped");
- shouldBeNull("global2.getAttribute('scoped')");
- shouldBeFalse("global2.scoped");
- shouldBeTrue("testBooleanAttribute(scoped1, 'scoped')");
- shouldBeTrue("scoped1.scoped");
- shouldBeTrue("testBooleanAttribute(scoped2, 'scoped')");
- shouldBeTrue("scoped2.scoped");
- shouldBeTrue("testBooleanAttribute(scoped3, 'scoped')");
- shouldBeTrue("scoped3.scoped");
-
- debug("--- Inverting 'scoped' attribute while in tree ---");
- scoped1.scoped = null;
- scoped2.scoped = false;
- scoped3.removeAttribute('scoped');
- global1.scoped = true;
- global2.setAttribute('scoped', 'scoped');
-
- shouldBeTrue("testBooleanAttribute(global1, 'scoped')");
- shouldBeTrue("global1.scoped");
- shouldBeTrue("testBooleanAttribute(global2, 'scoped')");
- shouldBeTrue("global2.scoped");
- shouldBeNull("scoped1.getAttribute('scoped')");
- shouldBeFalse("scoped1.scoped");
- shouldBeNull("scoped2.getAttribute('scoped')");
- shouldBeFalse("scoped2.scoped");
- shouldBeNull("scoped3.getAttribute('scoped')");
- shouldBeFalse("scoped3.scoped");
-
- debug("--- After removal from tree (attribute is still inverted) ---");
- scope.removeChild(global1);
- scope.removeChild(global2);
- scope.removeChild(scoped1);
- scope.removeChild(scoped2);
- scope.removeChild(scoped3);
-
- shouldBeTrue("testBooleanAttribute(global1, 'scoped')");
- shouldBeTrue("global1.scoped");
- shouldBeTrue("testBooleanAttribute(global2, 'scoped')");
- shouldBeTrue("global2.scoped");
- shouldBeNull("scoped1.getAttribute('scoped')");
- shouldBeFalse("scoped1.scoped");
- shouldBeNull("scoped2.getAttribute('scoped')");
- shouldBeFalse("scoped2.scoped");
- shouldBeNull("scoped3.getAttribute('scoped')");
- shouldBeFalse("scoped3.scoped");
-
- debug("--- Inverting 'scoped' attribute again, while outside tree ---");
- scoped1.scoped = true;
- scoped2.scoped = true;
- scoped3.setAttribute('scoped', 'scoped');
- global1.scoped = false;
- global2.removeAttribute('scoped');
-
- shouldBeNull("global1.getAttribute('scoped')");
- shouldBeFalse("global1.scoped");
- shouldBeNull("global2.getAttribute('scoped')");
- shouldBeFalse("global2.scoped");
- shouldBeTrue("testBooleanAttribute(scoped1, 'scoped')");
- shouldBeTrue("scoped1.scoped");
- shouldBeTrue("testBooleanAttribute(scoped2, 'scoped')");
- shouldBeTrue("scoped2.scoped");
- shouldBeTrue("testBooleanAttribute(scoped3, 'scoped')");
- shouldBeTrue("scoped3.scoped");
-
- debug("--- DONE ---");
- var successfullyParsed = true;
- </script>
- <script src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (94789 => 94790)
--- trunk/Source/WebCore/ChangeLog 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/Source/WebCore/ChangeLog 2011-09-08 20:33:45 UTC (rev 94790)
@@ -1,3 +1,16 @@
+2011-09-08 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r94784.
+ http://trac.webkit.org/changeset/94784
+ https://bugs.webkit.org/show_bug.cgi?id=67796
+
+ Commit was premature (Requested by rolandsteiner on #webkit).
+
+ * html/HTMLAttributeNames.in:
+ * html/HTMLStyleElement.cpp:
+ * html/HTMLStyleElement.h:
+ * html/HTMLStyleElement.idl:
+
2011-09-08 W. James MacLean <wjmacl...@chromium.org>
[chromium] Add backend compositor support for rescaling (zooming) textures during zoom animation.
Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (94789 => 94790)
--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2011-09-08 20:33:45 UTC (rev 94790)
@@ -266,7 +266,6 @@
sandbox
scheme
scope
-scoped
scrollamount
scrolldelay
scrolling
Modified: trunk/Source/WebCore/html/HTMLStyleElement.cpp (94789 => 94790)
--- trunk/Source/WebCore/html/HTMLStyleElement.cpp 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/Source/WebCore/html/HTMLStyleElement.cpp 2011-09-08 20:33:45 UTC (rev 94790)
@@ -94,31 +94,6 @@
return getAttribute(typeAttr);
}
-bool HTMLStyleElement::scoped() const
-{
- return fastHasAttribute(scopedAttr);
-}
-
-void HTMLStyleElement::setScoped(bool scopedValue)
-{
- setBooleanAttribute(scopedAttr, scopedValue);
-}
-
-Element* HTMLStyleElement::scopingElement() const
-{
- if (!scoped())
- return 0;
-
- // FIXME: This probably needs to be refined for scoped stylesheets within shadow DOM.
- // As written, such a stylesheet could style the host element, as well as children of the host.
- // OTOH, this paves the way for a :bound-element implementation.
- ContainerNode* parentOrHost = parentOrHostNode();
- if (!parentOrHost || !parentOrHost->isElementNode())
- return 0;
-
- return toElement(parentOrHost);
-}
-
void HTMLStyleElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
{
HTMLElement::addSubresourceAttributeURLs(urls);
Modified: trunk/Source/WebCore/html/HTMLStyleElement.h (94789 => 94790)
--- trunk/Source/WebCore/html/HTMLStyleElement.h 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/Source/WebCore/html/HTMLStyleElement.h 2011-09-08 20:33:45 UTC (rev 94790)
@@ -37,10 +37,6 @@
void setType(const AtomicString&);
- bool scoped() const;
- void setScoped(bool);
- Element* scopingElement() const;
-
using StyleElement::sheet;
bool disabled() const;
Modified: trunk/Source/WebCore/html/HTMLStyleElement.idl (94789 => 94790)
--- trunk/Source/WebCore/html/HTMLStyleElement.idl 2011-09-08 20:31:02 UTC (rev 94789)
+++ trunk/Source/WebCore/html/HTMLStyleElement.idl 2011-09-08 20:33:45 UTC (rev 94790)
@@ -22,7 +22,6 @@
interface HTMLStyleElement : HTMLElement {
attribute boolean disabled;
- attribute boolean scoped;
attribute [Reflect] DOMString media;
attribute [Reflect] DOMString type;
