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

Unified Diff: content/shell/renderer/test_runner/WebTestProxy.cpp

Issue 272683003: Make compositing mode sticky when RenderView is reused in LayoutTests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sticky: rebase Created 6 years, 7 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/render_widget.cc ('k') | content/shell/renderer/webkit_test_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/WebTestProxy.cpp
diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp
index 8a30f274bf10374b0f32cc2b27bb2f27ec9f7007..4295806e7b6ae075fc0ea01de9c3a8a7a0227262 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.cpp
+++ b/content/shell/renderer/test_runner/WebTestProxy.cpp
@@ -496,18 +496,7 @@ void WebTestProxyBase::CapturePixelsAsync(
base::Callback<void(const SkBitmap&)> callback) {
TRACE_EVENT0("shell", "WebTestProxyBase::CapturePixelsAsync");
- // Do a layout here because it might leave compositing mode! x.x
- // TODO(danakj): Remove this when we have kForceCompositingMode everywhere.
- webWidget()->layout();
-
- if (!webWidget()->isAcceleratedCompositingActive()) {
- TRACE_EVENT0("shell",
- "WebTestProxyBase::CapturePixelsAsync "
- "isAcceleratedCompositingActive false");
- callback.Run(SkBitmap());
- return;
- }
-
+ DCHECK(webWidget()->isAcceleratedCompositingActive());
DCHECK(!callback.is_null());
DCHECK(m_compositeAndReadbackCallback.is_null());
m_compositeAndReadbackCallback = callback;
« no previous file with comments | « content/renderer/render_widget.cc ('k') | content/shell/renderer/webkit_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698