content/browser/android/content_view_core_impl.h - Issue 143803004: android: Migrate old content readback to use async readback (and delegated renderer)

Side by Side Diff: content/browser/android/content_view_core_impl.h

Issue 143803004: android: Migrate old content readback to use async readback (and delegated renderer) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments Created 6 years, 10 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

« no previous file with comments | « content/browser/android/content_startup_flags.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | content/browser/renderer_host/compositor_impl_android.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_	5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_

6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_	6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/android/jni_android.h"	10 #include "base/android/jni_android.h"

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48	48

49 // ContentViewCore implementation.	49 // ContentViewCore implementation.

50 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;	50 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;

51 virtual WebContents* GetWebContents() const OVERRIDE;	51 virtual WebContents* GetWebContents() const OVERRIDE;

52 virtual ui::ViewAndroid* GetViewAndroid() const OVERRIDE;	52 virtual ui::ViewAndroid* GetViewAndroid() const OVERRIDE;

53 virtual ui::WindowAndroid* GetWindowAndroid() const OVERRIDE;	53 virtual ui::WindowAndroid* GetWindowAndroid() const OVERRIDE;

54 virtual scoped_refptr<cc::Layer> GetLayer() const OVERRIDE;	54 virtual scoped_refptr<cc::Layer> GetLayer() const OVERRIDE;

55 virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;	55 virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;

56 virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;	56 virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;

57 virtual void ShowPastePopup(int x, int y) OVERRIDE;	57 virtual void ShowPastePopup(int x, int y) OVERRIDE;

58 virtual unsigned int GetScaledContentTexture(	58 virtual void GetScaledContentBitmap(

59 float scale,	59 float scale,

60 gfx::Size* out_size) OVERRIDE;	60 gfx::Size* out_size,

	61 const base::Callback<void(bool, const SkBitmap&)>& callback) OVERRIDE;
	aelias_OOO_until_Jul13 2014/01/31 05:50:10 It's hard to understand from this API what this ca It's hard to understand from this API what this callback is for, could you comment it better and also typedef to a representative name? powei 2014/02/01 01:30:49 Done. Show quoted text On 2014/01/31 05:50:10, aelias wrote: > It's hard to understand from this API what this callback is for, could you > comment it better and also typedef to a representative name? Done.
61 virtual float GetDpiScale() const OVERRIDE;	62 virtual float GetDpiScale() const OVERRIDE;

62 virtual void RequestContentClipping(const gfx::Rect& clipping,	63 virtual void RequestContentClipping(const gfx::Rect& clipping,

63 const gfx::Size& content_size) OVERRIDE;	64 const gfx::Size& content_size) OVERRIDE;

64 virtual void PauseVideo() OVERRIDE;	65 virtual void PauseVideo() OVERRIDE;

65 virtual void ResumeVideo() OVERRIDE;	66 virtual void ResumeVideo() OVERRIDE;

66 virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE;	67 virtual void PauseOrResumeGeolocation(bool should_pause) OVERRIDE;

67	68

68 // --------------------------------------------------------------------------	69 // --------------------------------------------------------------------------

69 // Methods called from Java via JNI	70 // Methods called from Java via JNI

70 // --------------------------------------------------------------------------	71 // --------------------------------------------------------------------------

(...skipping 325 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
396 bool geolocation_needs_pause_;	397 bool geolocation_needs_pause_;

397	398

398 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);	399 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);

399 };	400 };

400	401

401 bool RegisterContentViewCore(JNIEnv* env);	402 bool RegisterContentViewCore(JNIEnv* env);

402	403

403 } // namespace content	404 } // namespace content

404	405

405 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_	406 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_

OLD	NEW