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

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 1021863005: Pass format as argument to getContentBitmapAsync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add config parameter tp function header. Created 5 years, 9 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
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 d13d79600eae2e65f432ae7260f7ac7ab0368c9f..68e1062d5e7acd6a0ab5743cd15fc1ca7f27d496 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -640,7 +640,7 @@ void ContentViewCoreImpl::GetScaledContentBitmap(
gfx::Rect src_subrect,
ReadbackRequestCallback& result_callback) {
RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
- if (!view) {
+ if (!view || color_type == kUnknown_SkColorType) {
result_callback.Run(SkBitmap(), READBACK_FAILED);
return;
}
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ContentReadbackHandler.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698