| Index: cc/output/copy_output_request.cc
|
| diff --git a/cc/output/copy_output_request.cc b/cc/output/copy_output_request.cc
|
| index 05f15ae1727c1c51c0a77221a912f4b7cfa54616..d7fb86862d173f4c6093c9add80cbac782c40549 100644
|
| --- a/cc/output/copy_output_request.cc
|
| +++ b/cc/output/copy_output_request.cc
|
| @@ -20,26 +20,19 @@ std::unique_ptr<CopyOutputRequest> CopyOutputRequest::CreateRelayRequest(
|
| const CopyOutputRequestCallback& result_callback) {
|
| std::unique_ptr<CopyOutputRequest> relay = CreateRequest(result_callback);
|
| relay->force_bitmap_result_ = original_request.force_bitmap_result_;
|
| - relay->has_area_ = original_request.has_area_;
|
| relay->area_ = original_request.area_;
|
| - relay->has_texture_mailbox_ = original_request.has_texture_mailbox_;
|
| relay->texture_mailbox_ = original_request.texture_mailbox_;
|
| return relay;
|
| }
|
|
|
| CopyOutputRequest::CopyOutputRequest()
|
| - : source_(nullptr),
|
| - force_bitmap_result_(false),
|
| - has_area_(false),
|
| - has_texture_mailbox_(false) {}
|
| + : source_(nullptr), force_bitmap_result_(false) {}
|
|
|
| CopyOutputRequest::CopyOutputRequest(
|
| bool force_bitmap_result,
|
| const CopyOutputRequestCallback& result_callback)
|
| : source_(nullptr),
|
| force_bitmap_result_(force_bitmap_result),
|
| - has_area_(false),
|
| - has_texture_mailbox_(false),
|
| result_callback_(result_callback) {
|
| DCHECK(!result_callback_.is_null());
|
| TRACE_EVENT_ASYNC_BEGIN0("cc", "CopyOutputRequest", this);
|
| @@ -77,7 +70,6 @@ void CopyOutputRequest::SetTextureMailbox(
|
| const TextureMailbox& texture_mailbox) {
|
| DCHECK(!force_bitmap_result_);
|
| DCHECK(texture_mailbox.IsTexture());
|
| - has_texture_mailbox_ = true;
|
| texture_mailbox_ = texture_mailbox;
|
| }
|
|
|
|
|