diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 12:27:28 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 17:38:06 +0100 |
| commit | 6fc495ad78b1663298d1395115dc316eeb537036 (patch) | |
| tree | c62f9a1177bec2dbd5c47ca90b91cde129c37441 /Source/WebCore/html/HTMLElement.cpp | |
| parent | d7957e4817d6aa730d583fb56e2556bb4e626fb0 (diff) | |
| download | external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.zip external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.tar.gz external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.tar.bz2 | |
Cherry-pick WebKit change r85267 as a prerequisite for r92139
See http://trac.webkit.org/changeset/85267
Bug: 6329073
Change-Id: I7c46eab459647059890732214a9b953adef0a647
Diffstat (limited to 'Source/WebCore/html/HTMLElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLElement.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp index b2b57a2..82e33d1 100644 --- a/Source/WebCore/html/HTMLElement.cpp +++ b/Source/WebCore/html/HTMLElement.cpp @@ -682,11 +682,6 @@ void HTMLElement::setContentEditable(Attribute* attr) attr->decl()->removeProperty(CSSPropertyWordWrap, false); attr->decl()->removeProperty(CSSPropertyWebkitNbspMode, false); attr->decl()->removeProperty(CSSPropertyWebkitLineBreak, false); - } else if (equalIgnoringCase(enabled, "inherit")) { - addCSSProperty(attr, CSSPropertyWebkitUserModify, CSSValueInherit); - attr->decl()->removeProperty(CSSPropertyWordWrap, false); - attr->decl()->removeProperty(CSSPropertyWebkitNbspMode, false); - attr->decl()->removeProperty(CSSPropertyWebkitLineBreak, false); } else if (equalIgnoringCase(enabled, "plaintext-only")) { addCSSProperty(attr, CSSPropertyWebkitUserModify, CSSValueReadWritePlaintextOnly); addCSSProperty(attr, CSSPropertyWordWrap, CSSValueBreakWord); |