Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Side by Side Diff: content/public/browser/android/content_view_core.h

Issue 15484013: Remove dead WebCompositorInputHandler related code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
6 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_ 6 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 10 matching lines...) Expand all
21 class Size; 21 class Size;
22 class SizeF; 22 class SizeF;
23 class Vector2dF; 23 class Vector2dF;
24 } 24 }
25 25
26 namespace ui { 26 namespace ui {
27 class ViewAndroid; 27 class ViewAndroid;
28 class WindowAndroid; 28 class WindowAndroid;
29 } 29 }
30 30
31 namespace WebKit {
32 class WebCompositorInputHandler;
33 }
34
35 namespace content { 31 namespace content {
36 class WebContents; 32 class WebContents;
37 33
38 // Native side of the ContentViewCore.java, which is the primary way of 34 // Native side of the ContentViewCore.java, which is the primary way of
39 // communicating with the native Chromium code on Android. This is a 35 // communicating with the native Chromium code on Android. This is a
40 // public interface used by native code outside of the content module. 36 // public interface used by native code outside of the content module.
41 class CONTENT_EXPORT ContentViewCore { 37 class CONTENT_EXPORT ContentViewCore {
42 public: 38 public:
43 // Returns the existing ContentViewCore for |web_contents|, or NULL. 39 // Returns the existing ContentViewCore for |web_contents|, or NULL.
44 static ContentViewCore* FromWebContents(WebContents* web_contents); 40 static ContentViewCore* FromWebContents(WebContents* web_contents);
45 static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj); 41 static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
46 42
47 virtual WebContents* GetWebContents() const = 0; 43 virtual WebContents* GetWebContents() const = 0;
48 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0; 44 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
49 virtual ui::ViewAndroid* GetViewAndroid() const = 0; 45 virtual ui::ViewAndroid* GetViewAndroid() const = 0;
50 virtual ui::WindowAndroid* GetWindowAndroid() const = 0; 46 virtual ui::WindowAndroid* GetWindowAndroid() const = 0;
51 virtual scoped_refptr<cc::Layer> GetLayer() const = 0; 47 virtual scoped_refptr<cc::Layer> GetLayer() const = 0;
52 virtual void LoadUrl(NavigationController::LoadURLParams& params) = 0; 48 virtual void LoadUrl(NavigationController::LoadURLParams& params) = 0;
53 virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) = 0; 49 virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) = 0;
54 virtual void ShowPastePopup(int x, int y) = 0; 50 virtual void ShowPastePopup(int x, int y) = 0;
55 virtual unsigned int GetScaledContentTexture( 51 virtual unsigned int GetScaledContentTexture(
56 float scale, 52 float scale,
57 gfx::Size* out_size) = 0; 53 gfx::Size* out_size) = 0;
58 virtual float GetDpiScale() const = 0; 54 virtual float GetDpiScale() const = 0;
59 virtual void SetInputHandler(
60 WebKit::WebCompositorInputHandler* input_handler) = 0;
joth 2013/05/22 04:34:24 Rather than remove then re-add this function, coul
jamesr 2013/05/22 07:05:09 No. I don't know what the hookup will look like (a
61 virtual void RequestContentClipping(const gfx::Rect& clipping, 55 virtual void RequestContentClipping(const gfx::Rect& clipping,
62 const gfx::Size& content_size) = 0; 56 const gfx::Size& content_size) = 0;
63 57
64 // Observer callback for frame metadata updates. 58 // Observer callback for frame metadata updates.
65 typedef base::Callback<void( 59 typedef base::Callback<void(
66 const gfx::SizeF& content_size, 60 const gfx::SizeF& content_size,
67 const gfx::Vector2dF& scroll_offset, 61 const gfx::Vector2dF& scroll_offset,
68 float page_scale_factor)> UpdateFrameInfoCallback; 62 float page_scale_factor)> UpdateFrameInfoCallback;
69 63
70 virtual void AddFrameInfoCallback( 64 virtual void AddFrameInfoCallback(
71 const UpdateFrameInfoCallback& callback) = 0; 65 const UpdateFrameInfoCallback& callback) = 0;
72 virtual void RemoveFrameInfoCallback( 66 virtual void RemoveFrameInfoCallback(
73 const UpdateFrameInfoCallback& callback) = 0; 67 const UpdateFrameInfoCallback& callback) = 0;
74 68
75 protected: 69 protected:
76 virtual ~ContentViewCore() {}; 70 virtual ~ContentViewCore() {};
77 }; 71 };
78 72
79 }; // namespace content 73 }; // namespace content
80 74
81 #endif // CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_ 75 #endif // CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698