[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
chang.shu at nokia.com
chang.shu at nokia.com
Sun Feb 20 23:17:50 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 619d38aadf9fde94bc28d4e9769f61cbf840a930
Author: chang.shu at nokia.com <chang.shu at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 19 19:31:36 2011 +0000
2011-01-19 Chang Shu <chang.shu at nokia.com>
Reviewed by Darin Adler.
https://bugs.webkit.org/show_bug.cgi?id=52056
1. Fixed test cases in the above bug;
2. Partially fixed test cases in other contentEditable bugs;
3. Updated expected result for fast/dom/element-attribute-js-null.html.
However, the test itself should be fixed later in bug 52057.
* editing/editability/attr-invalid-string-expected.txt:
* editing/editability/attr-invalid-string.html:
* editing/editability/attr-missing-ancestor-false-expected.txt:
* editing/editability/attr-missing-ancestor-false.html:
* editing/editability/attr-missing-ancestor-true-expected.txt:
* editing/editability/attr-missing-ancestor-true.html:
* editing/editability/attr-missing-parent-ancestor-missing-expected.txt:
* editing/editability/attr-missing-parent-ancestor-missing.html:
* editing/editability/attr-missing-parent-false-expected.txt:
* editing/editability/attr-missing-parent-false.html:
* editing/editability/attr-missing-parent-true-expected.txt:
* editing/editability/attr-missing-parent-true.html:
* editing/editability/set-false-expected.txt:
* editing/editability/set-inherit-parent-false-expected.txt:
* editing/editability/set-inherit-parent-true-expected.txt:
* editing/editability/set-invalid-value-expected.txt:
* editing/editability/set-true-expected.txt:
* editing/editability/set-value-caseinsensitive-expected.txt:
* fast/dom/element-attribute-js-null-expected.txt:
2011-01-19 Chang Shu <chang.shu at nokia.com>
Reviewed by Darin Adler.
The return value of contentEditable() function should depend on the DOM attribute
instead of render style userModify. The code change fixed test cases in the bug
and partially fixed test cases in other contentEditable bugs;
https://bugs.webkit.org/show_bug.cgi?id=52056
* html/HTMLElement.cpp:
(WebCore::HTMLElement::contentEditable):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76145 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f3d1176..2382179 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,33 @@
+2011-01-19 Chang Shu <chang.shu at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=52056
+ 1. Fixed test cases in the above bug;
+ 2. Partially fixed test cases in other contentEditable bugs;
+ 3. Updated expected result for fast/dom/element-attribute-js-null.html.
+ However, the test itself should be fixed later in bug 52057.
+
+ * editing/editability/attr-invalid-string-expected.txt:
+ * editing/editability/attr-invalid-string.html:
+ * editing/editability/attr-missing-ancestor-false-expected.txt:
+ * editing/editability/attr-missing-ancestor-false.html:
+ * editing/editability/attr-missing-ancestor-true-expected.txt:
+ * editing/editability/attr-missing-ancestor-true.html:
+ * editing/editability/attr-missing-parent-ancestor-missing-expected.txt:
+ * editing/editability/attr-missing-parent-ancestor-missing.html:
+ * editing/editability/attr-missing-parent-false-expected.txt:
+ * editing/editability/attr-missing-parent-false.html:
+ * editing/editability/attr-missing-parent-true-expected.txt:
+ * editing/editability/attr-missing-parent-true.html:
+ * editing/editability/set-false-expected.txt:
+ * editing/editability/set-inherit-parent-false-expected.txt:
+ * editing/editability/set-inherit-parent-true-expected.txt:
+ * editing/editability/set-invalid-value-expected.txt:
+ * editing/editability/set-true-expected.txt:
+ * editing/editability/set-value-caseinsensitive-expected.txt:
+ * fast/dom/element-attribute-js-null-expected.txt:
+
2011-01-19 Levi Weintraub <leviw at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/editing/editability/attr-invalid-string-expected.txt b/LayoutTests/editing/editability/attr-invalid-string-expected.txt
index bfb6d11..ef3e0dd 100644
--- a/LayoutTests/editing/editability/attr-invalid-string-expected.txt
+++ b/LayoutTests/editing/editability/attr-invalid-string-expected.txt
@@ -7,8 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("div").getAttribute("contentEditable") is "abc"
-FAIL document.getElementById("div").contentEditable should be inherit. Was false.
-FIXME: contentEditable attribute fails to take invalid value. https://bugs.webkit.org/show_bug.cgi?id=50636
+PASS document.getElementById("div").contentEditable is "inherit"
PASS document.getElementById("div").isContentEditable is false
PASS window.getComputedStyle(div, "").getPropertyValue("-webkit-user-modify") is "read-only"
diff --git a/LayoutTests/editing/editability/attr-invalid-string.html b/LayoutTests/editing/editability/attr-invalid-string.html
index 979b4be..a505f58 100644
--- a/LayoutTests/editing/editability/attr-invalid-string.html
+++ b/LayoutTests/editing/editability/attr-invalid-string.html
@@ -13,7 +13,6 @@ description('When contentEditable attribute is invalid string, element.contentEd
shouldBe('document.getElementById("div").getAttribute("contentEditable")','"abc"');
shouldBe('document.getElementById("div").contentEditable', '"inherit"');
-debug("FIXME: contentEditable attribute fails to take invalid value. https://bugs.webkit.org/show_bug.cgi?id=50636");
shouldBe('document.getElementById("div").isContentEditable', 'false');
shouldBe('window.getComputedStyle(div, "").getPropertyValue("-webkit-user-modify")', '"read-only"');
diff --git a/LayoutTests/editing/editability/attr-missing-ancestor-false-expected.txt b/LayoutTests/editing/editability/attr-missing-ancestor-false-expected.txt
index cc864e3..f6a06e1 100644
--- a/LayoutTests/editing/editability/attr-missing-ancestor-false-expected.txt
+++ b/LayoutTests/editing/editability/attr-missing-ancestor-false-expected.txt
@@ -7,8 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("p").hasAttribute("contentEditable") is false
-FAIL document.getElementById("p").contentEditable should be inherit. Was false.
-FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056
+PASS document.getElementById("p").contentEditable is "inherit"
PASS document.getElementById("p").isContentEditable is false
PASS window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify") is "read-only"
diff --git a/LayoutTests/editing/editability/attr-missing-ancestor-false.html b/LayoutTests/editing/editability/attr-missing-ancestor-false.html
index 56504ab..e95b52a 100644
--- a/LayoutTests/editing/editability/attr-missing-ancestor-false.html
+++ b/LayoutTests/editing/editability/attr-missing-ancestor-false.html
@@ -19,7 +19,6 @@ description('When contentEditable is missing, it maps to "inherit" state and the
shouldBe('document.getElementById("p").hasAttribute("contentEditable")', 'false');
shouldBe('document.getElementById("p").contentEditable', '"inherit"');
-debug("FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056");
shouldBe('document.getElementById("p").isContentEditable', 'false');
shouldBe('window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify")', '"read-only"');
diff --git a/LayoutTests/editing/editability/attr-missing-ancestor-true-expected.txt b/LayoutTests/editing/editability/attr-missing-ancestor-true-expected.txt
index 5b1a037..ab9ec82 100644
--- a/LayoutTests/editing/editability/attr-missing-ancestor-true-expected.txt
+++ b/LayoutTests/editing/editability/attr-missing-ancestor-true-expected.txt
@@ -7,8 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("p").hasAttribute("contentEditable") is false
-FAIL document.getElementById("p").contentEditable should be inherit. Was true.
-FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056
+PASS document.getElementById("p").contentEditable is "inherit"
PASS document.getElementById("p").isContentEditable is true
PASS window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify") is "read-write"
PASS successfullyParsed is true
diff --git a/LayoutTests/editing/editability/attr-missing-ancestor-true.html b/LayoutTests/editing/editability/attr-missing-ancestor-true.html
index 52dffd7..39ddbb6 100644
--- a/LayoutTests/editing/editability/attr-missing-ancestor-true.html
+++ b/LayoutTests/editing/editability/attr-missing-ancestor-true.html
@@ -20,7 +20,6 @@ description('When contentEditable is missing, it maps to "inherit" state and the
shouldBe('document.getElementById("p").hasAttribute("contentEditable")','false');
shouldBe('document.getElementById("p").contentEditable', '"inherit"');
-debug("FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056");
shouldBe('document.getElementById("p").isContentEditable', 'true');
shouldBe('window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify")', '"read-write"');
diff --git a/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing-expected.txt b/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing-expected.txt
index 0bbfd8a..cf6be56 100644
--- a/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing-expected.txt
+++ b/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing-expected.txt
@@ -7,8 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("p").hasAttribute("contentEditable") is false
-FAIL document.getElementById("p").contentEditable should be inherit. Was false.
-FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056
+PASS document.getElementById("p").contentEditable is "inherit"
PASS document.getElementById("p").isContentEditable is false
PASS window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify") is "read-only"
diff --git a/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing.html b/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing.html
index 6f1bafb..f32e2c5 100644
--- a/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing.html
+++ b/LayoutTests/editing/editability/attr-missing-parent-ancestor-missing.html
@@ -19,7 +19,6 @@ description('When contentEditable is missing, it maps to "inherit" state and the
shouldBe('document.getElementById("p").hasAttribute("contentEditable")','false');
shouldBe('document.getElementById("p").contentEditable', '"inherit"');
-debug("FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056");
shouldBe('document.getElementById("p").isContentEditable', 'false');
shouldBe('window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify")', '"read-only"');
diff --git a/LayoutTests/editing/editability/attr-missing-parent-false-expected.txt b/LayoutTests/editing/editability/attr-missing-parent-false-expected.txt
index 5d6de6c..0413c22 100644
--- a/LayoutTests/editing/editability/attr-missing-parent-false-expected.txt
+++ b/LayoutTests/editing/editability/attr-missing-parent-false-expected.txt
@@ -7,8 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("p").hasAttribute("contentEditable") is false
-FAIL document.getElementById("p").contentEditable should be inherit. Was false.
-FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056
+PASS document.getElementById("p").contentEditable is "inherit"
PASS document.getElementById("p").isContentEditable is false
PASS window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify") is "read-only"
diff --git a/LayoutTests/editing/editability/attr-missing-parent-false.html b/LayoutTests/editing/editability/attr-missing-parent-false.html
index 5db8faf..4bf6cd1 100644
--- a/LayoutTests/editing/editability/attr-missing-parent-false.html
+++ b/LayoutTests/editing/editability/attr-missing-parent-false.html
@@ -15,7 +15,6 @@ description('When contentEditable is missing, it maps to "inherit" state and the
shouldBe('document.getElementById("p").hasAttribute("contentEditable")','false');
shouldBe('document.getElementById("p").contentEditable', '"inherit"');
-debug("FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056");
shouldBe('document.getElementById("p").isContentEditable', 'false');
shouldBe('window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify")', '"read-only"');
diff --git a/LayoutTests/editing/editability/attr-missing-parent-true-expected.txt b/LayoutTests/editing/editability/attr-missing-parent-true-expected.txt
index b24685f..6b54cd5 100644
--- a/LayoutTests/editing/editability/attr-missing-parent-true-expected.txt
+++ b/LayoutTests/editing/editability/attr-missing-parent-true-expected.txt
@@ -7,8 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("p").hasAttribute("contentEditable") is false
-FAIL document.getElementById("p").contentEditable should be inherit. Was true.
-FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056
+PASS document.getElementById("p").contentEditable is "inherit"
PASS document.getElementById("p").isContentEditable is true
PASS window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify") is "read-write"
diff --git a/LayoutTests/editing/editability/attr-missing-parent-true.html b/LayoutTests/editing/editability/attr-missing-parent-true.html
index 96b5308..341c5f0 100644
--- a/LayoutTests/editing/editability/attr-missing-parent-true.html
+++ b/LayoutTests/editing/editability/attr-missing-parent-true.html
@@ -15,7 +15,6 @@ description('When contentEditable is missing, it maps to "inherit" state and the
shouldBe('document.getElementById("p").hasAttribute("contentEditable")','false');
shouldBe('document.getElementById("p").contentEditable', '"inherit"');
-debug("FIXME: contentEditable attribute should be inherit if missing. https://bugs.webkit.org/show_bug.cgi?id=52056");
shouldBe('document.getElementById("p").isContentEditable', 'true');
shouldBe('window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify")', '"read-write"');
diff --git a/LayoutTests/editing/editability/set-false-expected.txt b/LayoutTests/editing/editability/set-false-expected.txt
index e1bf41e..fb42bf5 100644
--- a/LayoutTests/editing/editability/set-false-expected.txt
+++ b/LayoutTests/editing/editability/set-false-expected.txt
@@ -8,7 +8,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("div1").getAttribute("contentEditable") is "false"
-FAIL document.getElementById("div1").contentEditable should be false. Was true.
+PASS document.getElementById("div1").contentEditable is "false"
FAIL document.getElementById("div1").isContentEditable should be false. Was true.
FIXME: setContentEditable with true/false/inherit string is not working properly. https://bugs.webkit.org/show_bug.cgi?id=52058
PASS window.getComputedStyle(div1, "").getPropertyValue("-webkit-user-modify") is "read-only"
diff --git a/LayoutTests/editing/editability/set-inherit-parent-false-expected.txt b/LayoutTests/editing/editability/set-inherit-parent-false-expected.txt
index ed4eefd..8033e25 100644
--- a/LayoutTests/editing/editability/set-inherit-parent-false-expected.txt
+++ b/LayoutTests/editing/editability/set-inherit-parent-false-expected.txt
@@ -7,7 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("p").hasAttribute("contentEditable") is false
-FAIL document.getElementById("p").contentEditable should be inherit. Was true.
+PASS document.getElementById("p").contentEditable is "inherit"
FAIL document.getElementById("p").isContentEditable should be false. Was true.
FIXME: setContentEditable with true/false/inherit string is not working properly. https://bugs.webkit.org/show_bug.cgi?id=52058
PASS window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify") is "read-only"
diff --git a/LayoutTests/editing/editability/set-inherit-parent-true-expected.txt b/LayoutTests/editing/editability/set-inherit-parent-true-expected.txt
index dbbcb36..3b6f0bd 100644
--- a/LayoutTests/editing/editability/set-inherit-parent-true-expected.txt
+++ b/LayoutTests/editing/editability/set-inherit-parent-true-expected.txt
@@ -7,7 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("p").hasAttribute("contentEditable") is false
-FAIL document.getElementById("p").contentEditable should be inherit. Was false.
+PASS document.getElementById("p").contentEditable is "inherit"
FAIL document.getElementById("p").isContentEditable should be true. Was false.
FIXME: setContentEditable with true/false/inherit string is not working properly. https://bugs.webkit.org/show_bug.cgi?id=52058
PASS window.getComputedStyle(p, "").getPropertyValue("-webkit-user-modify") is "read-write"
diff --git a/LayoutTests/editing/editability/set-invalid-value-expected.txt b/LayoutTests/editing/editability/set-invalid-value-expected.txt
index 73aca30..9349c8e 100644
--- a/LayoutTests/editing/editability/set-invalid-value-expected.txt
+++ b/LayoutTests/editing/editability/set-invalid-value-expected.txt
@@ -9,7 +9,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
FAIL exceptionThrown should be true. Was false.
FIXME: setContentEditable with invalid string should throw exception. https://bugs.webkit.org/show_bug.cgi?id=52057
PASS document.getElementById("div").getAttribute("contentEditable") is "abc"
-PASS document.getElementById("div").contentEditable is "true"
+FAIL document.getElementById("div").contentEditable should be true. Was inherit.
PASS document.getElementById("div").isContentEditable is true
FAIL window.getComputedStyle(div, "").getPropertyValue("-webkit-user-modify") should be read-write. Was read-only.
diff --git a/LayoutTests/editing/editability/set-true-expected.txt b/LayoutTests/editing/editability/set-true-expected.txt
index cf0f2e8..52ba0fa 100644
--- a/LayoutTests/editing/editability/set-true-expected.txt
+++ b/LayoutTests/editing/editability/set-true-expected.txt
@@ -8,7 +8,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("div1").getAttribute("contentEditable") is "true"
-FAIL document.getElementById("div1").contentEditable should be true. Was false.
+PASS document.getElementById("div1").contentEditable is "true"
FAIL document.getElementById("div1").isContentEditable should be true. Was false.
FIXME: setContentEditable with true/false/inherit string is not working properly. https://bugs.webkit.org/show_bug.cgi?id=52058
PASS window.getComputedStyle(div1, "").getPropertyValue("-webkit-user-modify") is "read-write"
diff --git a/LayoutTests/editing/editability/set-value-caseinsensitive-expected.txt b/LayoutTests/editing/editability/set-value-caseinsensitive-expected.txt
index 267b24b..029e920 100644
--- a/LayoutTests/editing/editability/set-value-caseinsensitive-expected.txt
+++ b/LayoutTests/editing/editability/set-value-caseinsensitive-expected.txt
@@ -9,7 +9,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS document.getElementById("div1").getAttribute("contentEditable") is "TRue"
-FAIL document.getElementById("div1").contentEditable should be true. Was false.
+PASS document.getElementById("div1").contentEditable is "true"
FAIL document.getElementById("div1").isContentEditable should be true. Was false.
PASS window.getComputedStyle(div1, "").getPropertyValue("-webkit-user-modify") is "read-write"
PASS document.getElementById("p1").getAttribute("contentEditable") is "faLSE"
@@ -17,7 +17,7 @@ PASS document.getElementById("p1").contentEditable is "false"
PASS document.getElementById("p1").isContentEditable is false
PASS window.getComputedStyle(p1, "").getPropertyValue("-webkit-user-modify") is "read-only"
FAIL document.getElementById("p2").hasAttribute("contentEditable") should be false. Was true.
-FAIL document.getElementById("p2").contentEditable should be inherit. Was false.
+PASS document.getElementById("p2").contentEditable is "inherit"
FAIL document.getElementById("p2").isContentEditable should be true. Was false.
FAIL window.getComputedStyle(p2, "").getPropertyValue("-webkit-user-modify") should be read-write. Was read-only.
FIXME: setContentEditable should be case insensitive. https://bugs.webkit.org/show_bug.cgi?id=52059
diff --git a/LayoutTests/fast/dom/element-attribute-js-null-expected.txt b/LayoutTests/fast/dom/element-attribute-js-null-expected.txt
index c0572ee..53c015f 100644
--- a/LayoutTests/fast/dom/element-attribute-js-null-expected.txt
+++ b/LayoutTests/fast/dom/element-attribute-js-null-expected.txt
@@ -11,7 +11,7 @@ TEST SUCCEEDED: The value was the empty string. [tested HTMLElement.dir]
TEST SUCCEEDED: The value was the empty string. [tested HTMLElement.className]
TEST SUCCEEDED: The value was the empty string. [tested HTMLElement.innerHTML]
TEST SUCCEEDED: The value was the empty string. [tested HTMLElement.innerText]
-TEST SUCCEEDED: The value was the string 'false'. [tested HTMLElement.contentEditable]
+TEST FAILED: The value should have been the string 'false' but was the string 'true'. [tested HTMLElement.contentEditable]
TEST SUCCEEDED: The value was the empty string. [tested HTMLAnchorElement.accessKey]
TEST SUCCEEDED: The value was the empty string. [tested HTMLAnchorElement.charset]
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 355a2c1..623876c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-19 Chang Shu <chang.shu at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ The return value of contentEditable() function should depend on the DOM attribute
+ instead of render style userModify. The code change fixed test cases in the bug
+ and partially fixed test cases in other contentEditable bugs;
+
+ https://bugs.webkit.org/show_bug.cgi?id=52056
+
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::contentEditable):
+
2011-01-19 Levi Weintraub <leviw at chromium.org>
Reviewed by Darin Adler.
diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp
index 1a4fc85..9ba7678 100644
--- a/Source/WebCore/html/HTMLElement.cpp
+++ b/Source/WebCore/html/HTMLElement.cpp
@@ -689,19 +689,18 @@ bool HTMLElement::isContentRichlyEditable() const
String HTMLElement::contentEditable() const
{
- if (!renderer())
- return "false";
-
- switch (renderer()->style()->userModify()) {
- case READ_WRITE:
- return "true";
- case READ_ONLY:
- return "false";
- case READ_WRITE_PLAINTEXT_ONLY:
- return "plaintext-only";
- default:
- return "inherit";
- }
+ const AtomicString& value = fastGetAttribute(contenteditableAttr);
+
+ if (value.isNull())
+ return "inherit";
+ if (value.isEmpty() || equalIgnoringCase(value, "true"))
+ return "true";
+ if (equalIgnoringCase(value, "false"))
+ return "false";
+ if (equalIgnoringCase(value, "plaintext-only"))
+ return "plaintext-only";
+
+ return "inherit";
}
void HTMLElement::setContentEditable(Attribute* attr)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list