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

Unified Diff: content/browser/compositor/delegated_frame_host.cc

Issue 511603002: Prevent CopyOutputRequest from crashing when using surfaces. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/browser/compositor/delegated_frame_host.cc
diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc
index d416ae8a5182e03b8f6ab5a2bd2cec36034d75e5..3e115ca48040ff60b2ee86fdde0987b9529155ea 100644
--- a/content/browser/compositor/delegated_frame_host.cc
+++ b/content/browser/compositor/delegated_frame_host.cc
@@ -127,7 +127,12 @@ bool DelegatedFrameHost::ShouldCreateResizeLock() {
void DelegatedFrameHost::RequestCopyOfOutput(
scoped_ptr<cc::CopyOutputRequest> request) {
- client_->GetLayer()->RequestCopyOfOutput(request.Pass());
+ if (use_surfaces_) {
+ // TODO(jbauman): Make this work with surfaces.
+ request->SendEmptyResult();
+ } else {
+ client_->GetLayer()->RequestCopyOfOutput(request.Pass());
+ }
}
void DelegatedFrameHost::CopyFromCompositingSurface(
« 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