1 files changed, 9 insertions, 14 deletions

diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index 5971505..d38be79 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -149,14 +149,6 @@ namespace android {
         void scrollTo(int x, int y, bool animate = false);
 
         /**
-         * Scroll to the point x,y relative to the current position.
-         * @param x The relative x position.
-         * @param y The relative y position.
-         * @param animate If it is true, animate to the new scroll position
-         */
-        void scrollBy(int x, int y, bool animate);
-
-        /**
          * Record the invalid rectangle
          */
         void contentInvalidate(const WebCore::IntRect &rect);
@@ -311,7 +303,7 @@ namespace android {
             WebCore::Frame* frame, int x, int y);
 
         // set the scroll amount that webview.java is currently showing
-        void setScrollOffset(int moveGeneration, int userScrolled, int dx, int dy);
+        void setScrollOffset(int moveGeneration, bool sendScrollEvent, int dx, int dy);
 
         void setGlobalBounds(int x, int y, int h, int v);
 
@@ -671,18 +663,21 @@ namespace android {
         // below are members responsible for accessibility support
         String modifySelectionTextNavigationAxis(DOMSelection* selection, int direction, int granularity);
         String modifySelectionDomNavigationAxis(DOMSelection* selection, int direction, int granularity);
-        Text* traverseVisibleNonEmptyNonWhitespaceTextNode(Node* fromNode, Node* toNode ,int direction);
+        Text* traverseNextContentTextNode(Node* fromNode, Node* toNode ,int direction);
         bool isVisible(Node* node);
         bool isHeading(Node* node);
         String formatMarkup(DOMSelection* selection);
         void selectAt(int x, int y);
         Node* m_currentNodeDomNavigationAxis;
         void scrollNodeIntoView(Frame* frame, Node* node);
-        bool isVisibleNonEmptyNonWhitespaceTextNode(Node* node);
+        bool isContentTextNode(Node* node);
         String stripAppleSpanFromMarkup(String markup);
-        int rangeCompliantChildOffset(Node* parent, int offset);
-        Node* getFirstIntermediaryInputOrButton(Node* fromNode, Node* toNode);
-        bool isInputControl(Node* node);
+        Node* getIntermediaryInputElement(Node* fromNode, Node* toNode, int direction);
+        bool isContentInputElement(Node* node);
+        bool isDescendantOf(Node* parent, Node* node);
+        void advanceAnchorNode(DOMSelection* selection, int direction, String& markup, bool ignoreFirstNode, ExceptionCode& ec);
+        Node* getNextAnchorNode(Node* anchorNode, bool skipFirstHack, int direction);
+        Node* getImplicitAnchorOrFocusNode(Node* node, unsigned offset, int direction);
 
 #if ENABLE(TOUCH_EVENTS)
         bool m_forwardingTouchEvents;