auto import from //branches/cupcake/...@125939

5 files changed, 1 insertions, 50 deletions

diff --git a/WebCore/html/HTMLAreaElement.cpp b/WebCore/html/HTMLAreaElement.cpp
index 7c6d65f..a865122 100644
--- a/WebCore/html/HTMLAreaElement.cpp
+++ b/WebCore/html/HTMLAreaElement.cpp
@@ -29,10 +29,6 @@
 #include "Length.h"
 #include "RenderObject.h"
 
-#ifdef ANDROID_NAVIGATE_AREAMAPS
-#include "RenderImage.h"
-#endif
-
 using namespace std;
 
 namespace WebCore {
@@ -45,9 +41,6 @@ HTMLAreaElement::HTMLAreaElement(Document *doc)
     , m_coordsLen(0)
     , m_lastSize(-1, -1)
     , m_shape(Unknown)
-#ifdef ANDROID_NAVIGATE_AREAMAPS
-    , m_map(0)
-#endif
 {
 }
 
@@ -231,15 +224,4 @@ void HTMLAreaElement::setTarget(const String& value)
     setAttribute(targetAttr, value);
 }
 
-#ifdef ANDROID_NAVIGATE_AREAMAPS
-IntRect HTMLAreaElement::getAreaRect() const
-{
-    if (m_map) {
-        if (isDefault())
-          return m_map->absoluteBoundingBoxRect();
-        return getRect(m_map);
-    }
-    return IntRect();
-}
-#endif
 }
diff --git a/WebCore/html/HTMLAreaElement.h b/WebCore/html/HTMLAreaElement.h
index 2cce901..986116b 100644
--- a/WebCore/html/HTMLAreaElement.h
+++ b/WebCore/html/HTMLAreaElement.h
@@ -29,14 +29,6 @@
 
 namespace WebCore {
 
-#ifdef ANDROID_NAVIGATE_AREAMAPS
-    // in android, we have no pointer, so we can't access area elements
-    // via mapMouseEvent.  instead, we store the RenderImage here so we
-    // can use it to find its dimensions to focus on it and draw a ring
-    // around it
-    class RenderImage;
-#endif
-
 class HitTestResult;
 
 class HTMLAreaElement : public HTMLAnchorElement {
@@ -78,11 +70,6 @@ public:
     virtual String target() const;
     void setTarget(const String&);
 
-#ifdef ANDROID_NAVIGATE_AREAMAPS
-    IntRect getAreaRect() const;
-    void setMap(RenderImage* map) { m_map = map; }
-#endif
-
 private:
     enum Shape { Default, Poly, Rect, Circle, Unknown };
     Path getRegion(const IntSize&) const;
@@ -91,9 +78,6 @@ private:
     int m_coordsLen;
     IntSize m_lastSize;
     Shape m_shape;
-#ifdef ANDROID_NAVIGATE_AREAMAPS
-    RenderImage* m_map;
-#endif
 };
 
 } //namespace
diff --git a/WebCore/html/HTMLElement.cpp b/WebCore/html/HTMLElement.cpp
index 3f8a983..572a7a5 100644
--- a/WebCore/html/HTMLElement.cpp
+++ b/WebCore/html/HTMLElement.cpp
@@ -241,10 +241,6 @@ void HTMLElement::parseMappedAttribute(MappedAttribute *attr)
 
 String HTMLElement::innerHTML() const
 {
-#ifdef ANDROID_NO_BODY_INNER_HTML
-	if (id()==bodyTag || id()==htmlTag)
-	   return "fastinnerhtml!";
-#endif
     return createMarkup(this, ChildrenOnly);
 }
 
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index cebfb51..c5c55fd 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -58,7 +58,7 @@
 #if USE(LOW_BANDWIDTH_DISPLAY)
 #include "FrameLoader.h"
 #endif
-#ifdef ANDROID // multiple additions: see below
+#ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
 #include "WebViewCore.h"
 #endif
 #include "TextIterator.h"
@@ -197,7 +197,6 @@ bool HTMLInputElement::isKeyboardFocusable(KeyboardEvent* event) const
         if (name().isEmpty())
             return false;
 
-#ifndef ANDROID_KEYBOARD_NAVIGATION
         // Never allow keyboard tabbing to leave you in the same radio group.  Always
         // skip any other elements in the group.
         Node* currentFocusedNode = document()->focusedNode();
@@ -207,7 +206,6 @@ bool HTMLInputElement::isKeyboardFocusable(KeyboardEvent* event) const
                 focusedInput->name() == name())
                 return false;
         }
-#endif    
         
         // Allow keyboard focus if we're checked or if nothing in the group is checked.
         return checked() || !checkedRadioButtons(this).checkedButtonForGroup(name());
@@ -1297,11 +1295,6 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
                     clickElement = true;
                     break;
                 case RADIO:
-#ifdef ANDROID_KEYBOARD_NAVIGATION
-// allow enter to change state of radio
-                    if (!checked())
-                        clickElement = true;
-#endif
                     break; // Don't do anything for enter on a radio button.
             }
         } else if (charCode == ' ') {
@@ -1348,7 +1341,6 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
             }
         }
 
-#ifndef ANDROID_KEYBOARD_NAVIGATION
 // allow enter to change state of radio
         if (inputType() == RADIO && (key == "Up" || key == "Down" || key == "Left" || key == "Right")) {
             // Left and up mean "previous radio button".
@@ -1384,7 +1376,6 @@ void HTMLInputElement::defaultEventHandler(Event* evt)
                 }
             }
         }
-#endif
     }
 
     if (evt->type() == eventNames().keyupEvent && evt->isKeyboardEvent()) {
diff --git a/WebCore/html/HTMLSelectElement.cpp b/WebCore/html/HTMLSelectElement.cpp
index 44e7fe4..e95bfd3 100644
--- a/WebCore/html/HTMLSelectElement.cpp
+++ b/WebCore/html/HTMLSelectElement.cpp
@@ -586,12 +586,10 @@ void HTMLSelectElement::dispatchFocusEvent()
 
 void HTMLSelectElement::dispatchBlurEvent()
 {
-#ifndef ANDROID_NAVIGATE_LISTBOX
     // We only need to fire onChange here for menu lists, because we fire onChange for list boxes whenever the selection change is actually made.
     // This matches other browsers' behavior.
     if (usesMenuList())
         menuListOnChange();
-#endif
     HTMLFormControlElementWithState::dispatchBlurEvent();
 }