diff options
Diffstat (limited to 'chromium/cc/output/copy_output_request.cc')
| -rw-r--r-- | chromium/cc/output/copy_output_request.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chromium/cc/output/copy_output_request.cc b/chromium/cc/output/copy_output_request.cc index 50173d5853d..97b95e10e0f 100644 --- a/chromium/cc/output/copy_output_request.cc +++ b/chromium/cc/output/copy_output_request.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/debug/trace_event.h" #include "base/logging.h" #include "cc/output/copy_output_result.h" -#include "cc/resources/single_release_callback.h" #include "cc/resources/texture_mailbox.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -35,7 +35,10 @@ CopyOutputRequest::CopyOutputRequest( : force_bitmap_result_(force_bitmap_result), has_area_(false), has_texture_mailbox_(false), - result_callback_(result_callback) {} + result_callback_(result_callback) { + DCHECK(!result_callback_.is_null()); + TRACE_EVENT_ASYNC_BEGIN0("cc", "CopyOutputRequest", this); +} CopyOutputRequest::~CopyOutputRequest() { if (!result_callback_.is_null()) @@ -43,7 +46,9 @@ CopyOutputRequest::~CopyOutputRequest() { } void CopyOutputRequest::SendResult(scoped_ptr<CopyOutputResult> result) { + bool success = !result->IsEmpty(); base::ResetAndReturn(&result_callback_).Run(result.Pass()); + TRACE_EVENT_ASYNC_END1("cc", "CopyOutputRequest", this, "success", success); } void CopyOutputRequest::SendEmptyResult() { @@ -55,7 +60,7 @@ void CopyOutputRequest::SendBitmapResult(scoped_ptr<SkBitmap> bitmap) { } void CopyOutputRequest::SendTextureResult( - gfx::Size size, + const gfx::Size& size, const TextureMailbox& texture_mailbox, scoped_ptr<SingleReleaseCallback> release_callback) { DCHECK(texture_mailbox.IsTexture()); |