Changeset 77985 in webkit

Timestamp:

Feb 8, 2011 3:59:30 PM (13 years ago)

Author:

aestes@apple.com

Message:

2011-02-08 Andy Estes <​aestes@apple.com>

Reviewed by Darin Adler.

REGRESSION (r76301): 'plaintext-only' must be a supported contentEditable mode.
​https://bugs.webkit.org/show_bug.cgi?id=54041

• html/HTMLElement.cpp: (WebCore::HTMLElement::setContentEditable): Setting the contentEditable attribute to 'plaintext-only' should not throw an exception.

2011-02-08 Andy Estes <​aestes@apple.com>

Reviewed by Darin Adler.

REGRESSION (r76301): 'plaintext-only' must be a supported contentEditable mode.
​https://bugs.webkit.org/show_bug.cgi?id=54041

• fast/dom/HTMLElement/set-value-caseinsensitive-expected.txt:
• fast/dom/HTMLElement/set-value-caseinsensitive.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLElement/set-value-caseinsensitive-expected.txt (modified) (2 diffs)
• LayoutTests/fast/dom/HTMLElement/set-value-caseinsensitive.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-08  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r76301): 'plaintext-only' must be a supported contentEditable mode.
+        https://bugs.webkit.org/show_bug.cgi?id=54041
+
+        * fast/dom/HTMLElement/set-value-caseinsensitive-expected.txt:
+        * fast/dom/HTMLElement/set-value-caseinsensitive.html:
+
 2011-02-08  Martin Robinson  <mrobinson@igalia.com>
 

trunk/LayoutTests/fast/dom/HTMLElement/set-value-caseinsensitive-expected.txt

@@ -2 +2 @@
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
 
 
@@ -22 +23 @@
 PASS document.getElementById("p2").isContentEditable is true
 PASS window.getComputedStyle(p2, "").getPropertyValue("-webkit-user-modify") is "read-write"
+PASS document.getElementById("div3").hasAttribute("contentEditable") is true
+PASS document.getElementById("div3").contentEditable is "plaintext-only"
+PASS document.getElementById("div3").isContentEditable is true
+PASS window.getComputedStyle(div3, "").getPropertyValue("-webkit-user-modify") is "read-write-plaintext-only"
+PASS document.getElementById("p3").hasAttribute("contentEditable") is false
+PASS document.getElementById("p3").contentEditable is "inherit"
+PASS document.getElementById("p3").isContentEditable is true
+PASS window.getComputedStyle(p3, "").getPropertyValue("-webkit-user-modify") is "read-write-plaintext-only"
 
 PASS successfullyParsed is true

trunk/LayoutTests/fast/dom/HTMLElement/set-value-caseinsensitive.html

@@ -14 +14 @@
     <p id="p2" contenteditable="false"></p>
 </div>
+<div id="div3" contenteditable="true">
+    <p id="p3" contenteditable="false"></p>
+</div>
 <script>
 description('When contentEditable is set to a new value, the new value can be case-insensitive.')
@@ -20 +23 @@
 document.getElementById("p1").contentEditable = "faLSE";
 document.getElementById("p2").contentEditable = "inHERIT";
+document.getElementById("div3").contentEditable = "PlainText-Only"
+document.getElementById("p3").contentEditable = "Inherit"
 
 shouldBe('document.getElementById("div1").getAttribute("contentEditable")','"true"');
@@ -37 +42 @@
 shouldBe('window.getComputedStyle(p2, "").getPropertyValue("-webkit-user-modify")', '"read-write"');
 
+shouldBe('document.getElementById("div3").hasAttribute("contentEditable")','true');
+shouldBe('document.getElementById("div3").contentEditable', '"plaintext-only"');
+shouldBe('document.getElementById("div3").isContentEditable', 'true');
+shouldBe('window.getComputedStyle(div3, "").getPropertyValue("-webkit-user-modify")', '"read-write-plaintext-only"');
+
+shouldBe('document.getElementById("p3").hasAttribute("contentEditable")','false');
+shouldBe('document.getElementById("p3").contentEditable', '"inherit"');
+shouldBe('document.getElementById("p3").isContentEditable', 'true');
+shouldBe('window.getComputedStyle(p3, "").getPropertyValue("-webkit-user-modify")', '"read-write-plaintext-only"');
+
 document.getElementById("div1").style.display= 'none';
 document.getElementById("p1").style.display= 'none';
 document.getElementById("div2").style.display= 'none';
+document.getElementById("div3").style.display= 'none';
+
 
 window.successfullyParsed = true;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-08  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r76301): 'plaintext-only' must be a supported contentEditable mode.
+        https://bugs.webkit.org/show_bug.cgi?id=54041
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::setContentEditable): Setting the contentEditable
+        attribute to 'plaintext-only' should not throw an exception.
+
 2011-02-08  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -736 +736 @@
     else if (equalIgnoringCase(enabled, "false"))
         setAttribute(contenteditableAttr, "false", ec);
+    else if (equalIgnoringCase(enabled, "plaintext-only"))
+        setAttribute(contenteditableAttr, "plaintext-only");
     else if (equalIgnoringCase(enabled, "inherit"))
         removeAttribute(contenteditableAttr, ec);