diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/wml | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/wml')
| -rw-r--r-- | Source/WebCore/wml/WMLInputElement.h | 1 | ||||
| -rw-r--r-- | Source/WebCore/wml/WMLTableElement.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/wml/WMLInputElement.h b/Source/WebCore/wml/WMLInputElement.h index df7f497..6c66410 100644 --- a/Source/WebCore/wml/WMLInputElement.h +++ b/Source/WebCore/wml/WMLInputElement.h @@ -63,6 +63,7 @@ public: virtual String value() const; virtual void setValue(const String&, bool sendChangeEvent = false); virtual void setValueForUser(const String&); + virtual String visibleValue() const { return value(); } virtual void setValueFromRenderer(const String&); virtual bool saveFormControlState(String& value) const; diff --git a/Source/WebCore/wml/WMLTableElement.cpp b/Source/WebCore/wml/WMLTableElement.cpp index ed3522d..7501e24 100644 --- a/Source/WebCore/wml/WMLTableElement.cpp +++ b/Source/WebCore/wml/WMLTableElement.cpp @@ -26,7 +26,6 @@ #include "Attribute.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" -#include "CharacterNames.h" #include "Document.h" #include "HTMLNames.h" #include "NodeList.h" @@ -34,6 +33,7 @@ #include "Text.h" #include "WMLErrorHandling.h" #include "WMLNames.h" +#include <wtf/unicode/CharacterNames.h> namespace WebCore { |