From 70656dc99140d12728b7f56d0ebccaad8559a432 Mon Sep 17 00:00:00 2001 From: Heilig Benedek Date: Fri, 29 Jul 2016 19:54:35 +0200 Subject: [PATCH] revert framesubscription --- atom/browser/api/frame_subscriber.cc | 33 ++++------------------------ 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/atom/browser/api/frame_subscriber.cc b/atom/browser/api/frame_subscriber.cc index b8bfae2241bd..017310f67f40 100644 --- a/atom/browser/api/frame_subscriber.cc +++ b/atom/browser/api/frame_subscriber.cc @@ -48,48 +48,23 @@ bool FrameSubscriber::ShouldCaptureFrame( if (!view_ || !host) return false; - /*if (dirty_rect.IsEmpty()) - return false;*/ + if (dirty_rect.IsEmpty()) + return false; gfx::Rect rect = gfx::Rect(view_->GetVisibleViewportSize()); if (only_dirty_) rect = dirty_rect; - /*host->CopyFromBackingStore( + host->CopyFromBackingStore( rect, rect.size(), base::Bind(&FrameSubscriber::OnFrameDelivered, weak_factory_.GetWeakPtr(), callback_, rect), - kBGRA_8888_SkColorType);*/ + kBGRA_8888_SkColorType); - const auto base = reinterpret_cast( - view_); - content::ImageTransportFactory* itf = - content::ImageTransportFactory::GetInstance(); - cc::SurfaceManager* sfm = itf->GetSurfaceManager(); - cc::Surface* surface = sfm->GetSurfaceForId(base->SurfaceIdForTesting()); - - std::unique_ptr request = - cc::CopyOutputRequest::CreateBitmapRequest( - base::Bind(&FrameSubscriber::ReadbackResultAsBitmap, - base::Unretained(this))); - - // surface->RequestCopyOfOutput(std::move(request)); - std::cout << request.get() << surface << std::endl; return false; } -void FrameSubscriber::ReadbackResultAsBitmap( - std::unique_ptr result) { - std::unique_ptr bitmap = result->TakeBitmap(); - - SkAutoPixmapUnlock res; - if (!bitmap->requestLock(&res)) - return; - - std::cout << res.pixmap().addr() << std::endl; -} - void FrameSubscriber::OnFrameDelivered(const FrameCaptureCallback& callback, const gfx::Rect& damage_rect, const SkBitmap& bitmap,