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

Unified Diff: chrome/browser/android/compositor/tab_content_manager.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: chrome/browser/android/compositor/tab_content_manager.cc
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc
index 4da3916a46e151341e66d3bcc1a9065dc7adb9d4..9f24b91c198f80a5e29aff86a0109c9d578364fb 100644
--- a/chrome/browser/android/compositor/tab_content_manager.cc
+++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -70,8 +70,10 @@ class TabContentManager::TabReadbackRequest {
return;
}
+#if defined(OS_ANDROID) && !defined(USE_AURA)
DCHECK(view->GetWebContents());
view->GetWebContents()->GetRenderViewHost()->LockBackingStore();
+#endif
SkColorType color_type = kN32_SkColorType;
@@ -84,6 +86,7 @@ class TabContentManager::TabReadbackRequest {
void OnFinishGetTabThumbnailBitmap(const SkBitmap& bitmap,
content::ReadbackResponse response) {
DCHECK(!j_content_view_core_.is_null());
+#if defined(OS_ANDROID) && !defined(USE_AURA)
JNIEnv* env = base::android::AttachCurrentThread();
content::ContentViewCore* view =
content::ContentViewCore::GetNativeContentViewCore(
@@ -93,6 +96,7 @@ class TabContentManager::TabReadbackRequest {
DCHECK(view->GetWebContents());
view->GetWebContents()->GetRenderViewHost()->UnlockBackingStore();
}
+#endif
// TODO(jdduke): Tailor response to different failure values appropriately.
if (response != content::READBACK_SUCCESS || drop_after_readback_) {

Powered by Google App Engine
This is Rietveld 408576698