From b6aae790cf6733af080a463776553bfb60df5d75 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Thu, 25 Oct 2018 17:27:12 +1100 Subject: [PATCH] fixme: C70 removed DidReceiveCompositorFrame (OSR relatied) refs: https://github.com/electron/electron/commit/1de1ca906a36adfde432190284f8c378118a3c94 cc @brenca --- atom/browser/api/frame_subscriber.cc | 19 ++++++++++--------- atom/browser/api/frame_subscriber.h | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/atom/browser/api/frame_subscriber.cc b/atom/browser/api/frame_subscriber.cc index 7bcb7ab9370..9db2834cb7c 100644 --- a/atom/browser/api/frame_subscriber.cc +++ b/atom/browser/api/frame_subscriber.cc @@ -58,16 +58,17 @@ gfx::Rect FrameSubscriber::GetDamageRect() { } } -void FrameSubscriber::DidReceiveCompositorFrame() { - auto* view = web_contents()->GetRenderWidgetHostView(); - if (view == nullptr) - return; +// FIXME(MarshallOfSound): Removed in C70 +// void FrameSubscriber::DidReceiveCompositorFrame() { +// auto* view = web_contents()->GetRenderWidgetHostView(); +// if (view == nullptr) +// return; - view->CopyFromSurface( - gfx::Rect(), view->GetViewBounds().size(), - base::BindOnce(&FrameSubscriber::Done, weak_ptr_factory_.GetWeakPtr(), - GetDamageRect())); -} +// view->CopyFromSurface( +// gfx::Rect(), view->GetViewBounds().size(), +// base::BindOnce(&FrameSubscriber::Done, weak_ptr_factory_.GetWeakPtr(), +// GetDamageRect())); +// } void FrameSubscriber::Done(const gfx::Rect& damage, const SkBitmap& frame) { if (frame.drawsNothing()) diff --git a/atom/browser/api/frame_subscriber.h b/atom/browser/api/frame_subscriber.h index d3e82855417..3542234887b 100644 --- a/atom/browser/api/frame_subscriber.h +++ b/atom/browser/api/frame_subscriber.h @@ -33,7 +33,8 @@ class FrameSubscriber : public content::WebContentsObserver { private: gfx::Rect GetDamageRect(); - void DidReceiveCompositorFrame() override; + // FIXME(MarshallOfSound): Removed in C70 + // void DidReceiveCompositorFrame() override; void Done(const gfx::Rect& damage, const SkBitmap& frame); v8::Isolate* isolate_;