summaryrefslogtreecommitdiffstats
path: root/WebCore/wml
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-08-19 17:55:56 +0100
committerIain Merrick <husky@google.com>2010-08-23 11:05:40 +0100
commitf486d19d62f1bc33246748b14b14a9dfa617b57f (patch)
tree195485454c93125455a30e553a73981c3816144d /WebCore/wml
parent6ba0b43722d16bc295606bec39f396f596e4fef1 (diff)
downloadexternal_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip
external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz
external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebCore/wml')
-rw-r--r--WebCore/wml/WMLInputElement.h1
-rw-r--r--WebCore/wml/WMLPageState.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/wml/WMLInputElement.h b/WebCore/wml/WMLInputElement.h
index fe1ae89..329d869 100644
--- a/WebCore/wml/WMLInputElement.h
+++ b/WebCore/wml/WMLInputElement.h
@@ -47,6 +47,7 @@ public:
virtual bool isIndeterminate() const { return false; }
virtual bool isTextFormControl() const { return true; }
virtual bool isRadioButton() const { return false; }
+ virtual bool isCheckbox() const { return false; }
virtual bool isTextField() const { return true; }
virtual bool isSearchField() const { return false; }
virtual bool isInputTypeHidden() const { return false; }
diff --git a/WebCore/wml/WMLPageState.h b/WebCore/wml/WMLPageState.h
index 614bc94..0ea7cbb 100644
--- a/WebCore/wml/WMLPageState.h
+++ b/WebCore/wml/WMLPageState.h
@@ -24,9 +24,9 @@
#define WMLPageState_h
#if ENABLE(WML)
-#include "StringHash.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {