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

Unified Diff: content/renderer/render_widget.cc

Issue 131443007: aura: Remove old GL paths from RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removecode: ackpreviousframe Created 6 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 | « content/renderer/gpu/compositor_output_surface.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 5f19a2f9466bed9021a04e66897dac5a2f8058ed..55a570b13793edbbd3378df4110210b8f82b659a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -930,7 +930,11 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface(bool fallback) {
scoped_ptr<cc::SoftwareOutputDevice>()));
}
if (command_line.HasSwitch(cc::switches::kCompositeToMailbox)) {
- DCHECK(is_threaded_compositing_enabled_);
+ // Composite-to-mailbox is currently used for layout tests in order to cause
+ // them to draw inside in the renderer to do the readback there. This should
+ // no longer be the case when crbug.com/311404 is fixed.
+ DCHECK(is_threaded_compositing_enabled_ ||
+ RenderThreadImpl::current()->layout_test_mode());
cc::ResourceFormat format = cc::RGBA_8888;
#if defined(OS_ANDROID)
if (base::android::SysUtils::IsLowEndDevice())
« no previous file with comments | « content/renderer/gpu/compositor_output_surface.cc ('k') | content/shell/app/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698