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

Unified Diff: content/shell/renderer/test_runner/web_test_proxy.cc

Issue 597773002: Remove incorrect isAcceleratedCompositingActive check (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add TODOs Created 6 years, 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/web_test_proxy.cc
diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc
index 0aa1ee35293e10f60182ae3fbeb59bf3ba8e588f..ad6ac9b7fd5bff7bb0b74d4149af132e3746f05a 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.cc
+++ b/content/shell/renderer/test_runner/web_test_proxy.cc
@@ -489,9 +489,9 @@ void WebTestProxyBase::CopyImageAtAndCapturePixels(
// It may happen that there is a scheduled animation and
// no rootGraphicsLayer yet. If so we would run it right now. Otherwise
// isAcceleratedCompositingActive will return false;
+ // TODO(enne): remove this: http://crbug.com/397321
AnimateNow();
- DCHECK(web_widget_->isAcceleratedCompositingActive());
DCHECK(!callback.is_null());
uint64_t sequence_number = blink::Platform::current()->clipboard()->
sequenceNumber(blink::WebClipboard::Buffer());
@@ -574,9 +574,9 @@ void WebTestProxyBase::CapturePixelsAsync(
// It may happen that there is a scheduled animation and
// no rootGraphicsLayer yet. If so we would run it right now. Otherwise
// isAcceleratedCompositingActive will return false;
+ // TODO(enne): remove this: http://crbug.com/397321
AnimateNow();
- DCHECK(web_widget_->isAcceleratedCompositingActive());
DCHECK(!callback.is_null());
if (test_interfaces_->GetTestRunner()->isPrinting()) {
@@ -626,9 +626,9 @@ void WebTestProxyBase::DisplayAsyncThen(const base::Closure& callback) {
// It may happen that there is a scheduled animation and
// no rootGraphicsLayer yet. If so we would run it right now. Otherwise
// isAcceleratedCompositingActive will return false;
+ // TODO(enne): remove this: http://crbug.com/397321
AnimateNow();
- CHECK(web_widget_->isAcceleratedCompositingActive());
CapturePixelsAsync(base::Bind(
&WebTestProxyBase::DidDisplayAsync, base::Unretained(this), callback));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698