content/browser/android/content_view_core_impl.cc - Issue 157033007: API to Convert Java Bitmap Config to SkBitmap::Config

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/android/content_view_core_impl.cc

Issue 157033007: API to Convert Java Bitmap Config to SkBitmap::Config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Auto generation of Bitmap Format enum in Java and C++. 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

« base/android/java/src/org/chromium/base/BitmapFormat.template ('K') | « content/browser/android/content_view_core_impl.h ('k') | content/browser/renderer_host/render_widget_host_view_android.h » ('j') | ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_view_core_impl.cc

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc

index 8d023829d8a25c2cba7e4a73c1c2436b9253f6d4..5ba20c6e9f435f73d48fa25a16a4ea35fd25ecf1 100644

--- a/content/browser/android/content_view_core_impl.cc

+++ b/content/browser/android/content_view_core_impl.cc

@@ -688,14 +688,16 @@ void ContentViewCoreImpl::ShowPastePopup(int x_dip, int y_dip) {

void ContentViewCoreImpl::GetScaledContentBitmap(

float scale,

gfx::Size* out_size,

+ jobject jbitmap_config,

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

RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();

if (!view) {

result_callback.Run(false, SkBitmap());

return;

}

- view->GetScaledContentBitmap(scale, out_size, result_callback);

+ SkBitmap::Config skbitmap_format = gfx::ConvertToSkiaConfig(jbitmap_config);

+ view->GetScaledContentBitmap(scale, out_size, skbitmap_format,

+ result_callback);

}

void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) {