| Index: blimp/client/core/contents/blimp_contents_manager.cc
|
| diff --git a/blimp/client/core/contents/blimp_contents_manager.cc b/blimp/client/core/contents/blimp_contents_manager.cc
|
| index f0a1f6bf560da4167512eb7a99ba49eced4195f3..a0b97e306f472c41a1757bf3fc57f88236a588b4 100644
|
| --- a/blimp/client/core/contents/blimp_contents_manager.cc
|
| +++ b/blimp/client/core/contents/blimp_contents_manager.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/bind.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| +#include "blimp/client/core/compositor/compositor_deps_provider.h"
|
| #include "blimp/client/public/contents/blimp_contents_observer.h"
|
|
|
| namespace {
|
| @@ -47,14 +48,20 @@ void BlimpContentsManager::BlimpContentsDeletionObserver::
|
| blimp_contents_manager_->GetWeakPtr(), id));
|
| }
|
|
|
| -BlimpContentsManager::BlimpContentsManager() : weak_ptr_factory_(this) {}
|
| +BlimpContentsManager::BlimpContentsManager(
|
| + bool use_direct_rendering,
|
| + RenderWidgetFeature* render_widget_feature)
|
| + : compositor_deps_provider_(use_direct_rendering),
|
| + render_widget_feature_(render_widget_feature),
|
| + weak_ptr_factory_(this) {}
|
|
|
| BlimpContentsManager::~BlimpContentsManager() {}
|
|
|
| std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents() {
|
| int id = CreateBlimpContentsId();
|
| std::unique_ptr<BlimpContentsImpl> new_contents =
|
| - base::MakeUnique<BlimpContentsImpl>(id);
|
| + base::MakeUnique<BlimpContentsImpl>(id, &compositor_deps_provider_,
|
| + render_widget_feature_);
|
| std::unique_ptr<BlimpContentsDeletionObserver> observer =
|
| base::MakeUnique<BlimpContentsDeletionObserver>(this, new_contents.get());
|
| observer_map_.insert(
|
|
|