| Index: content/browser/renderer_host/delegated_frame_host.cc
|
| diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
|
| index 6fa63cc3e0e09060f4d366b71ea16a0b84d819e4..e36af333325d2789b7a86ade2fc830187c2b3683 100644
|
| --- a/content/browser/renderer_host/delegated_frame_host.cc
|
| +++ b/content/browser/renderer_host/delegated_frame_host.cc
|
| @@ -18,6 +18,7 @@
|
| #include "cc/output/copy_output_request.h"
|
| #include "cc/resources/single_release_callback.h"
|
| #include "cc/resources/texture_mailbox.h"
|
| +#include "cc/surfaces/framesink_manager.h"
|
| #include "cc/surfaces/surface.h"
|
| #include "cc/surfaces/surface_factory.h"
|
| #include "cc/surfaces/surface_hittest.h"
|
| @@ -57,10 +58,10 @@ DelegatedFrameHost::DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
|
| ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
|
| factory->GetContextFactory()->AddObserver(this);
|
| id_allocator_.reset(new cc::SurfaceIdAllocator());
|
| - factory->GetContextFactoryPrivate()->GetSurfaceManager()->RegisterFrameSinkId(
|
| - frame_sink_id_);
|
| + factory->GetContextFactoryPrivate()->GetFrameSinkManager()
|
| + ->RegisterFrameSinkId( frame_sink_id_);
|
| factory->GetContextFactoryPrivate()
|
| - ->GetSurfaceManager()
|
| + ->GetFrameSinkManager()
|
| ->RegisterSurfaceFactoryClient(frame_sink_id_, this);
|
| surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(
|
| frame_sink_id_, factory->GetContextFactoryPrivate()->GetSurfaceManager(),
|
| @@ -814,10 +815,10 @@ DelegatedFrameHost::~DelegatedFrameHost() {
|
| factory->GetContextFactory()->RemoveObserver(this);
|
| surface_factory_->EvictSurface();
|
| factory->GetContextFactoryPrivate()
|
| - ->GetSurfaceManager()
|
| + ->GetFrameSinkManager()
|
| ->UnregisterSurfaceFactoryClient(frame_sink_id_);
|
| factory->GetContextFactoryPrivate()
|
| - ->GetSurfaceManager()
|
| + ->GetFrameSinkManager()
|
| ->InvalidateFrameSinkId(frame_sink_id_);
|
|
|
| DCHECK(!vsync_manager_.get());
|
|
|