diff options
| author | Steve Block <steveblock@google.com> | 2011-06-03 13:06:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 15:24:34 +0100 |
| commit | b0b14195c45ffb5d126d15a9e9fea4b42501f0c8 (patch) | |
| tree | 85ae20a02ccb3debb5e5a67d174f7a72f2c0d0fb /Source/WebKit/android | |
| parent | 6742cf84f0251a9c6663b8afe6f1bb24256ea00f (diff) | |
| download | external_webkit-b0b14195c45ffb5d126d15a9e9fea4b42501f0c8.zip external_webkit-b0b14195c45ffb5d126d15a9e9fea4b42501f0c8.tar.gz external_webkit-b0b14195c45ffb5d126d15a9e9fea4b42501f0c8.tar.bz2 | |
Merge WebKit at r82507: toInputElement() is now a member of Node
See http://trac.webkit.org/changeset/80811
Change-Id: Icd8612c886ae6caa198c051ecf1d6f2681172387
Diffstat (limited to 'Source/WebKit/android')
| -rw-r--r-- | Source/WebKit/android/RenderSkinRadio.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/RenderSkinRadio.cpp b/Source/WebKit/android/RenderSkinRadio.cpp index 5dfee4a..46198d3 100644 --- a/Source/WebKit/android/RenderSkinRadio.cpp +++ b/Source/WebKit/android/RenderSkinRadio.cpp @@ -88,7 +88,7 @@ void RenderSkinRadio::Draw(SkCanvas* canvas, Node* element, const IntRect& ir, canvas->scale(scale, scale); bool checked = false; - if (InputElement* inputElement = toInputElement(static_cast<Element*>(element))) { + if (InputElement* inputElement = element->toInputElement()) { checked = inputElement->isChecked(); } diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 601d4ee..80fdd8d 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -2112,7 +2112,7 @@ void WebViewCore::setSelection(int start, int end) bool isPasswordField = false; if (focus->isElementNode()) { WebCore::Element* element = static_cast<WebCore::Element*>(focus); - if (WebCore::InputElement* inputElement = WebCore::toInputElement(element)) + if (WebCore::InputElement* inputElement = element->toInputElement()) isPasswordField = static_cast<WebCore::HTMLInputElement*>(inputElement)->isPasswordField(); } // For password fields, this is done in the UI side via |