diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 17:10:10 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 14:50:08 +0100 |
| commit | b98ea1c82f93c8ea37e69dbd7761f154c089d9a3 (patch) | |
| tree | 7c648b36296e6782e0b88ed94bc5e6b3e794fb62 /WebKit/android/jni | |
| parent | d4469626cf6f8e2a856de975610502e65a3ba27c (diff) | |
| download | external_webkit-b98ea1c82f93c8ea37e69dbd7761f154c089d9a3.zip external_webkit-b98ea1c82f93c8ea37e69dbd7761f154c089d9a3.tar.gz external_webkit-b98ea1c82f93c8ea37e69dbd7761f154c089d9a3.tar.bz2 | |
Merge webkit.org at r60469 : @60418 requires us to use associatedElements() accessor instead of accessing members
http://trac.webkit.org/changeset/60418
Change-Id: I6f50f6ba29c48a7628452af35dcd1269e090cff2
Diffstat (limited to 'WebKit/android/jni')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index fe00fe7..bc1022f 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1408,8 +1408,8 @@ static jboolean HasPasswordField(JNIEnv *env, jobject obj) // class, but just normal Element class. while (node && !found && !node->namespaceURI().isNull() && !node->namespaceURI().isEmpty()) { - WTF::Vector<WebCore::HTMLFormControlElement*>& elements = - ((WebCore::HTMLFormElement*)node)->formElements; + const WTF::Vector<WebCore::HTMLFormControlElement*>& elements = + ((WebCore::HTMLFormElement*)node)->associatedElements(); size_t size = elements.size(); for (size_t i = 0; i< size && !found; i++) { WebCore::HTMLFormControlElement* e = elements[i]; @@ -1439,8 +1439,8 @@ static jobjectArray GetUsernamePassword(JNIEnv *env, jobject obj) WebCore::Node* node = form->firstItem(); while (node && !found && !node->namespaceURI().isNull() && !node->namespaceURI().isEmpty()) { - WTF::Vector<WebCore::HTMLFormControlElement*>& elements = - ((WebCore::HTMLFormElement*)node)->formElements; + const WTF::Vector<WebCore::HTMLFormControlElement*>& elements = + ((WebCore::HTMLFormElement*)node)->associatedElements(); size_t size = elements.size(); for (size_t i = 0; i< size && !found; i++) { WebCore::HTMLFormControlElement* e = elements[i]; @@ -1485,8 +1485,8 @@ static void SetUsernamePassword(JNIEnv *env, jobject obj, WebCore::Node* node = form->firstItem(); while (node && !found && !node->namespaceURI().isNull() && !node->namespaceURI().isEmpty()) { - WTF::Vector<WebCore::HTMLFormControlElement*>& elements = - ((WebCore::HTMLFormElement*)node)->formElements; + const WTF::Vector<WebCore::HTMLFormControlElement*>& elements = + ((WebCore::HTMLFormElement*)node)->associatedElements(); size_t size = elements.size(); for (size_t i = 0; i< size && !found; i++) { WebCore::HTMLFormControlElement* e = elements[i]; @@ -1538,7 +1538,7 @@ static jobject GetFormTextData(JNIEnv *env, jobject obj) node = collection->nextItem()) { form = static_cast<WebCore::HTMLFormElement*>(node); if (form->autoComplete()) { - WTF::Vector<WebCore::HTMLFormControlElement*> elements = form->formElements; + WTF::Vector<WebCore::HTMLFormControlElement*> elements = form->associatedElements(); size_t size = elements.size(); for (size_t i = 0; i < size; i++) { WebCore::HTMLFormControlElement* e = elements[i]; |