| Index: content/renderer/child_frame_compositing_helper.cc
|
| diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
|
| index 8e6e6ad0e8e68ba70447b4f4b834abcef6a6bb2e..841cfadf70438d4a33f86feb87484ea4c0a66480 100644
|
| --- a/content/renderer/child_frame_compositing_helper.cc
|
| +++ b/content/renderer/child_frame_compositing_helper.cc
|
| @@ -112,21 +112,6 @@ void ChildFrameCompositingHelper::SendReclaimCompositorResourcesToBrowser(
|
| }
|
| }
|
|
|
| -void ChildFrameCompositingHelper::CopyFromCompositingSurface(
|
| - int request_id,
|
| - gfx::Rect source_rect,
|
| - gfx::Size dest_size) {
|
| - CHECK(background_layer_.get());
|
| - scoped_ptr<cc::CopyOutputRequest> request =
|
| - cc::CopyOutputRequest::CreateBitmapRequest(base::Bind(
|
| - &ChildFrameCompositingHelper::CopyFromCompositingSurfaceHasResult,
|
| - this,
|
| - request_id,
|
| - dest_size));
|
| - request->set_area(source_rect);
|
| - background_layer_->RequestCopyOfOutput(request.Pass());
|
| -}
|
| -
|
| void ChildFrameCompositingHelper::DidCommitCompositorFrame() {
|
| if (!resource_collection_.get() || !ack_pending_)
|
| return;
|
| @@ -297,27 +282,4 @@ void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) {
|
| delegated_layer_->SetContentsOpaque(opaque_);
|
| }
|
|
|
| -void ChildFrameCompositingHelper::CopyFromCompositingSurfaceHasResult(
|
| - int request_id,
|
| - gfx::Size dest_size,
|
| - scoped_ptr<cc::CopyOutputResult> result) {
|
| - scoped_ptr<SkBitmap> bitmap;
|
| - if (result && result->HasBitmap() && !result->size().IsEmpty())
|
| - bitmap = result->TakeBitmap();
|
| -
|
| - SkBitmap resized_bitmap;
|
| - if (bitmap) {
|
| - resized_bitmap =
|
| - skia::ImageOperations::Resize(*bitmap,
|
| - skia::ImageOperations::RESIZE_BEST,
|
| - dest_size.width(),
|
| - dest_size.height());
|
| - }
|
| - if (GetBrowserPluginManager()) {
|
| - GetBrowserPluginManager()->Send(
|
| - new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck(
|
| - host_routing_id_, GetInstanceID(), request_id, resized_bitmap));
|
| - }
|
| -}
|
| -
|
| } // namespace content
|
|
|