1 files changed, 20 insertions, 4 deletions

diff --git a/WebKit/android/jni/WebViewCore.h b/WebKit/android/jni/WebViewCore.h
index f1893ff..f528c73 100644
--- a/WebKit/android/jni/WebViewCore.h
+++ b/WebKit/android/jni/WebViewCore.h
@@ -247,7 +247,6 @@ namespace android {
         WebCore::String retrieveHref(WebCore::Frame* frame, WebCore::Node* node);
         WebCore::String retrieveAnchorText(WebCore::Frame* frame, WebCore::Node* node);
         WebCore::String requestLabel(WebCore::Frame* , WebCore::Node* );
-        WebCore::String getSelection(SkRegion* );
 
         // Create a single picture to represent the drawn DOM (used by navcache)
         void recordPicture(SkPicture* picture);
@@ -266,8 +265,8 @@ namespace android {
         void setGlobalBounds(int x, int y, int h, int v);
 
         void setSizeScreenWidthAndScale(int width, int height, int screenWidth,
-            float scale, int realScreenWidth, int screenHeight,
-            bool ignoreHeight);
+            float scale, int realScreenWidth, int screenHeight, int anchorX,
+            int anchorY, bool ignoreHeight);
 
         /**
          * Handle key events from Java.
@@ -376,7 +375,7 @@ namespace android {
         Node* cursorNodeIsPlugin();
 
         // Notify the Java side whether it needs to pass down the touch events
-        void needTouchEvents(bool);
+        void needTouchEvents(bool, bool);
 
         // Notify the Java side that webkit is requesting a keyboard
         void requestKeyboard(bool showKeyboard, bool isTextView);
@@ -406,6 +405,15 @@ namespace android {
         jobject getContext();
 
         bool validNodeAndBounds(Frame* , Node* , const IntRect& );
+
+        // Make the rect (left, top, width, height) visible. If it can be fully
+        // fit, center it on the screen. Otherwise make sure the point specified
+        // by (left + xPercentInDoc * width, top + yPercentInDoc * height)
+        // pinned at the screen position (xPercentInView, yPercentInView).
+        void showRect(int left, int top, int width, int height, int contentWidth,
+            int contentHeight, float xPercentInDoc, float xPercentInView,
+            float yPercentInDoc, float yPercentInView);
+
         // other public functions
     public:
         // Open a file chooser for selecting a file to upload
@@ -454,6 +462,8 @@ namespace android {
         // field safely from our respective threads
         static Mutex gButtonMutex;
         WTF::Vector<Container> m_buttons;
+        static bool isPaused() { return s_isPaused; }
+        static void setIsPaused(bool isPaused) { s_isPaused = isPaused; }
         // end of shared members
 
         // internal functions
@@ -510,6 +520,7 @@ namespace android {
         unsigned m_domtree_version;
         bool m_check_domtree_version;
         PageGroup* m_groupForVisitedLinks;
+        static bool s_isPaused;
 
         SkTDArray<PluginWidgetAndroid*> m_plugins;
         WebCore::Timer<WebViewCore> m_pluginInvalTimer;
@@ -524,6 +535,11 @@ namespace android {
         bool handleMouseClick(WebCore::Frame* framePtr, WebCore::Node* nodePtr);
         WebCore::HTMLAnchorElement* retrieveAnchorElement(WebCore::Frame* frame, WebCore::Node* node);
 
+#if ENABLE(TOUCH_EVENTS)
+        int m_touchEventListenerCount;
+        IntPoint m_lastTouchPoint;
+#endif
+
 #if DEBUG_NAV_UI
         uint32_t m_now;
 #endif