| Index: cc/surfaces/display.cc
|
| diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
|
| index 483ea20f0ba9e57cade307c7bcc890035e97f574..a82d3be213aa0bcfcc8f4195e5ff8e4bc4d67edb 100644
|
| --- a/cc/surfaces/display.cc
|
| +++ b/cc/surfaces/display.cc
|
| @@ -17,11 +17,14 @@
|
|
|
| namespace cc {
|
|
|
| -Display::Display(DisplayClient* client, SurfaceManager* manager)
|
| +Display::Display(DisplayClient* client,
|
| + SurfaceManager* manager,
|
| + SharedBitmapManager* bitmap_manager)
|
| : scheduled_draw_(false),
|
| client_(client),
|
| manager_(manager),
|
| - aggregator_(manager) {
|
| + aggregator_(manager),
|
| + bitmap_manager_(bitmap_manager) {
|
| }
|
|
|
| Display::~Display() {
|
| @@ -47,8 +50,8 @@ bool Display::Draw() {
|
| // TODO(jbauman): Switch to use ResourceProvider and GLRenderer directly,
|
| // as using LayerTreeHost from here is a layering violation.
|
| LayerTreeSettings settings;
|
| - layer_tree_host_ =
|
| - LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings);
|
| + layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(
|
| + this, this, bitmap_manager_, settings);
|
| resource_collection_ = new DelegatedFrameResourceCollection;
|
| resource_collection_->SetClient(this);
|
| layer_tree_host_->SetLayerTreeHostClientReady();
|
|
|