content/browser/renderer_host/render_widget_host_view_android.h - Issue 176943004: [Android] Implement asynchronous zero-copy bitmap capture API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 176943004: [Android] Implement asynchronous zero-copy bitmap capture API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« content/browser/android/content_view_core_impl.cc ('K') | « content/browser/frame_host/render_widget_host_view_guest.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | content/port/browser/render_widget_host_view_port.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_android.h

diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h

index f00aa7d4725a30e40de7d585b4ae971c323e1752..8b6d59dbe47de1e1496a9f17b58e11f27711ea4c 100644

--- a/content/browser/renderer_host/render_widget_host_view_android.h

+++ b/content/browser/renderer_host/render_widget_host_view_android.h

@@ -22,6 +22,7 @@

#include "content/browser/renderer_host/image_transport_factory_android.h"

#include "content/browser/renderer_host/ime_adapter_android.h"

#include "content/browser/renderer_host/render_widget_host_view_base.h"

+#include "content/public/browser/android/content_view_core.h"

#include "gpu/command_buffer/common/mailbox.h"

#include "third_party/skia/include/core/SkColor.h"

#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"

@@ -139,7 +140,8 @@ class RenderWidgetHostViewAndroid

const gfx::Rect& src_subrect,

const gfx::Size& dst_size,

const base::Callback<void(bool, const SkBitmap&)>& callback,

- const SkBitmap::Config config) OVERRIDE;

+ const SkBitmap::Config config,

+ scoped_ptr<SkBitmap> bitmap) OVERRIDE;

virtual void CopyFromCompositingSurfaceToVideoFrame(

const gfx::Rect& src_subrect,

const scoped_refptr<media::VideoFrame>& target,

@@ -226,7 +228,10 @@ class RenderWidgetHostViewAndroid

void GetScaledContentBitmap(

float scale,

- const base::Callback<void(bool, const SkBitmap&)>& result_callback);

+ const base::Callback<void(bool, const SkBitmap&)>& result_callback,

+ SkBitmap::Config bitmap_config,

+ const gfx::Rect& bounding_rect,

+ const BitmapAllocator bitmap_allocator);

bool PopulateBitmapWithContents(jobject jbitmap);

bool HasValidFrame() const;

@@ -275,6 +280,7 @@ class RenderWidgetHostViewAndroid

const gfx::Size& dst_size_in_pixel,

const SkBitmap::Config config,

const base::TimeTicks& start_time,

+ scoped_ptr<SkBitmap> bitmap,

const base::Callback<void(bool, const SkBitmap&)>& callback,

scoped_ptr<cc::CopyOutputResult> result);

static void PrepareBitmapCopyOutputResult(