Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / android / content_view_core_impl.h

diff --git a/src/content/browser/android/content_view_core_impl.h b/src/content/browser/android/content_view_core_impl.h
index 9887c0e..8a823ee 100644 (file)
--- a/src/content/browser/android/content_view_core_impl.h
+++ b/src/content/browser/android/content_view_core_impl.h
@@ -47,25 +47,25 @@ class ContentViewCoreImpl : public ContentViewCore,
                       jobject java_bridge_retained_object_set);
 
   // ContentViewCore implementation.
-  virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
-  virtual WebContents* GetWebContents() const OVERRIDE;
-  virtual ui::ViewAndroid* GetViewAndroid() const OVERRIDE;
-  virtual ui::WindowAndroid* GetWindowAndroid() const OVERRIDE;
-  virtual scoped_refptr<cc::Layer> GetLayer() const OVERRIDE;
-  virtual void ShowPastePopup(int x, int y) OVERRIDE;
+  virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
+  virtual WebContents* GetWebContents() const override;
+  virtual ui::ViewAndroid* GetViewAndroid() const override;
+  virtual ui::WindowAndroid* GetWindowAndroid() const override;
+  virtual scoped_refptr<cc::Layer> GetLayer() const override;
+  virtual void ShowPastePopup(int x, int y) override;
   virtual void GetScaledContentBitmap(
       float scale,
       SkColorType color_type,
       gfx::Rect src_subrect,
       const base::Callback<void(bool, const SkBitmap&)>& result_callback)
-      OVERRIDE;
-  virtual float GetDpiScale() const OVERRIDE;
-  virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE;
+      override;
+  virtual float GetDpiScale() const override;
+  virtual void PauseOrResumeGeolocation(bool should_pause) override;
   virtual void RequestTextSurroundingSelection(
       int max_length,
       const base::Callback<void(const base::string16& content,
                                 int start_offset,
-                                int end_offset)>& callback) OVERRIDE;
+                                int end_offset)>& callback) override;
 
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
@@ -143,7 +143,10 @@ class ContentViewCoreImpl : public ContentViewCore,
                                 jfloat x1, jfloat y1,
                                 jfloat x2, jfloat y2);
   void MoveCaret(JNIEnv* env, jobject obj, jfloat x, jfloat y);
-  void HideTextHandles(JNIEnv* env, jobject obj);
+  void DismissTextHandles(JNIEnv* env, jobject obj);
+  void SetTextHandlesTemporarilyHidden(JNIEnv* env,
+                                       jobject obj,
+                                       jboolean hidden);
 
   void ResetGestureDetection(JNIEnv* env, jobject obj);
   void SetDoubleTapSupportEnabled(JNIEnv* env, jobject obj, jboolean enabled);
@@ -151,8 +154,6 @@ class ContentViewCoreImpl : public ContentViewCore,
                                        jobject obj,
                                        jboolean enabled);
 
-  void PostMessageToFrame(JNIEnv* env, jobject obj, jstring frame_id,
-      jstring message, jstring source_origin, jstring target_origin);
   long GetNativeImeAdapter(JNIEnv* env, jobject obj);
   void SetFocus(JNIEnv* env, jobject obj, jboolean focused);
 
@@ -245,17 +246,15 @@ class ContentViewCoreImpl : public ContentViewCore,
   // testing/benchmarking purposes
   base::android::ScopedJavaLocalRef<jobject> CreateTouchEventSynthesizer();
 
-  base::android::ScopedJavaLocalRef<jobject> GetContentVideoViewClient();
-
-  // Returns the context that the ContentViewCore was created with, it would
-  // typically be an Activity context for an on screen view.
-  base::android::ScopedJavaLocalRef<jobject> GetContext();
-
   // Returns True if the given media should be blocked to load.
   bool ShouldBlockMediaRequest(const GURL& url);
 
   void DidStopFlinging();
 
+  // Returns the context with which the ContentViewCore was created, typically
+  // the Activity context.
+  base::android::ScopedJavaLocalRef<jobject> GetContext() const;
+
   // Returns the viewport size after accounting for the viewport offset.
   gfx::Size GetViewSize() const;
 
@@ -274,8 +273,10 @@ class ContentViewCoreImpl : public ContentViewCore,
   void AttachLayer(scoped_refptr<cc::Layer> layer);
   void RemoveLayer(scoped_refptr<cc::Layer> layer);
 
-  void SelectBetweenCoordinates(const gfx::PointF& start,
-                                const gfx::PointF& end);
+  void MoveRangeSelectionExtent(const gfx::PointF& extent);
+
+  void SelectBetweenCoordinates(const gfx::PointF& base,
+                                const gfx::PointF& extent);
 
  private:
   class ContentViewUserData;
@@ -284,10 +285,10 @@ class ContentViewCoreImpl : public ContentViewCore,
   virtual ~ContentViewCoreImpl();
 
   // WebContentsObserver implementation.
-  virtual void RenderViewReady() OVERRIDE;
+  virtual void RenderViewReady() override;
   virtual void RenderViewHostChanged(RenderViewHost* old_host,
-                                     RenderViewHost* new_host) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
+                                     RenderViewHost* new_host) override;
+  virtual void WebContentsDestroyed() override;
 
   // --------------------------------------------------------------------------
   // Other private methods and data