diff options
| author | Steve Block <steveblock@google.com> | 2012-04-13 07:41:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-13 07:41:38 -0700 |
| commit | 72e6719059c962ab33d1e9f89e13f9c79657ba11 (patch) | |
| tree | 610a3c09c8e93d9c24fc106ce67a661d8b48e9b4 /Source/WebCore/html | |
| parent | e255ec29a4361a0814bd7c7eccfeed88883ddd0f (diff) | |
| parent | d60e027437c746fb2412aef1c1cad6b1347c1b5e (diff) | |
| download | external_webkit-72e6719059c962ab33d1e9f89e13f9c79657ba11.zip external_webkit-72e6719059c962ab33d1e9f89e13f9c79657ba11.tar.gz external_webkit-72e6719059c962ab33d1e9f89e13f9c79657ba11.tar.bz2 | |
Merge changes If869bd58,I18c371c9,I7c46eab4
* changes:
Cherry-pick WebKit change r92139 to fix a LayoutTest crash
Cherry-pick WebKit change r87227 as a prerequisite for r92139
Cherry-pick WebKit change r85267 as a prerequisite for r92139
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/HTMLElement.cpp | 5 | ||||
| -rw-r--r-- | Source/WebCore/html/shadow/TextControlInnerElements.h | 5 |
2 files changed, 2 insertions, 8 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); diff --git a/Source/WebCore/html/shadow/TextControlInnerElements.h b/Source/WebCore/html/shadow/TextControlInnerElements.h index 2340970..886fbf8 100644 --- a/Source/WebCore/html/shadow/TextControlInnerElements.h +++ b/Source/WebCore/html/shadow/TextControlInnerElements.h @@ -101,9 +101,8 @@ private: virtual void detach(); virtual bool isSpinButtonElement() const { return true; } - // FIXME: shadowAncestorNode() should be const. - virtual bool isEnabledFormControl() const { return static_cast<Element*>(const_cast<SpinButtonElement*>(this)->shadowAncestorNode())->isEnabledFormControl(); } - virtual bool isReadOnlyFormControl() const { return static_cast<Element*>(const_cast<SpinButtonElement*>(this)->shadowAncestorNode())->isReadOnlyFormControl(); } + virtual bool isEnabledFormControl() const { return static_cast<Element*>(shadowAncestorNode())->isEnabledFormControl(); } + virtual bool isReadOnlyFormControl() const { return static_cast<Element*>(shadowAncestorNode())->isReadOnlyFormControl(); } virtual void defaultEventHandler(Event*); void startRepeatingTimer(); void stopRepeatingTimer(); |