1 files changed, 0 insertions, 22 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 729296d..c4c25db 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -38,7 +38,6 @@
 #include "HTMLAreaElement.h"
 #include "HTMLImageElement.h"
 #include "HTMLInputElement.h"
-#include "HTMLLabelElement.h"
 #include "HTMLMapElement.h"
 #include "HTMLNames.h"
 #include "HTMLOptionElement.h"
@@ -46,7 +45,6 @@
 #include "HTMLTextAreaElement.h"
 #include "InlineTextBox.h"
 #include "KURL.h"
-#include "NodeList.h"
 #include "PluginView.h"
 #include "RegisteredEventListener.h"
 #include "RenderImage.h"
@@ -862,23 +860,6 @@ static bool checkForPluginViewThatWantsFocus(RenderObject* renderer) {
     return false;
 }
 
-// Code copied from AccessibilityRenderObject.cpp.  If/when Webkit makes this
-// function public, we can use their version.
-static HTMLLabelElement* labelForElement(Element* element)
-{
-    RefPtr<NodeList> list = element->document()->getElementsByTagName("label");
-    unsigned len = list->length();
-    for (unsigned i = 0; i < len; i++) {
-        if (list->item(i)->hasTagName(HTMLNames::labelTag)) {
-            HTMLLabelElement* label = static_cast<HTMLLabelElement*>(list->item(i));
-            if (label->correspondingControl() == element)
-                return label;
-        }
-    }
-
-    return 0;
-}
-
 // when new focus is found, push it's parent on a stack
     // as long as more focii are found with the same (grand) parent, note it
     // (which only requires retrieving the last parent on the stack)
@@ -1126,9 +1107,6 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
                 cachedInput.setFormPointer(input->form());
                 cachedInput.setIsTextField(true);
                 cachedInput.setIsReadOnly(input->readOnly());
-                HTMLLabelElement* label = labelForElement(input);
-                if (label)
-                    cachedInput.setLabel(label->innerHTML());
                 exported = input->value().threadsafeCopy();
                 cachedInput.setMaxLength(input->maxLength());
                 cachedInput.setInputType(inputType);