Commit 5d0211f2 authored by jbauman's avatar jbauman Committed by Commit bot

Prevent CopyOutputRequest from crashing when using surfaces.

It was hitting a DCHECK when attempting to copy the CopyOutputRequest whenever navigating between pages.

BUG=

Review URL: https://codereview.chromium.org/511603002

Cr-Commit-Position: refs/heads/master@{#292037}
parent 2813c1b0
...@@ -130,7 +130,12 @@ bool DelegatedFrameHost::ShouldCreateResizeLock() { ...@@ -130,7 +130,12 @@ bool DelegatedFrameHost::ShouldCreateResizeLock() {
void DelegatedFrameHost::RequestCopyOfOutput( void DelegatedFrameHost::RequestCopyOfOutput(
scoped_ptr<cc::CopyOutputRequest> request) { 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( void DelegatedFrameHost::CopyFromCompositingSurface(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment