diff options
| author | enne <enne@chromium.org> | 2016-03-24 14:50:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 21:51:54 +0000 |
| commit | ae96391ad67ebb128d0e0082bdd9633989fd370b (patch) | |
| tree | 797edb6d1d2b0fe363b2dbfb6c490ac59a319d25 /blimp/engine/session | |
| parent | 2c19b09a75daf19a0309ae44cd2aa4558ff1115c (diff) | |
| download | chromium_src-ae96391ad67ebb128d0e0082bdd9633989fd370b.zip chromium_src-ae96391ad67ebb128d0e0082bdd9633989fd370b.tar.gz chromium_src-ae96391ad67ebb128d0e0082bdd9633989fd370b.tar.bz2 | |
Remove BlimpUiContextFactory
This removes the override of the ContextFactory and replaces it by just
dropping the OnAcceleratedWidgetAvailable call on the floor. This
prevents GetSharedBitmap/ResizeDisplay/CreateOutputSurface from being
called at all rather than ignoring them when they got called.
R=sievers@chromium.org,haibinlu@chromium.org
Review URL: https://codereview.chromium.org/1830293003
Cr-Commit-Position: refs/heads/master@{#383156}
Diffstat (limited to 'blimp/engine/session')
| -rw-r--r-- | blimp/engine/session/blimp_engine_session.cc | 3 | ||||
| -rw-r--r-- | blimp/engine/session/blimp_engine_session.h | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/blimp/engine/session/blimp_engine_session.cc b/blimp/engine/session/blimp_engine_session.cc index 64d0e8f..a1bfbbe 100644 --- a/blimp/engine/session/blimp_engine_session.cc +++ b/blimp/engine/session/blimp_engine_session.cc @@ -13,7 +13,6 @@ #include "blimp/engine/app/blimp_engine_config.h" #include "blimp/engine/app/ui/blimp_layout_manager.h" #include "blimp/engine/app/ui/blimp_screen.h" -#include "blimp/engine/app/ui/blimp_ui_context_factory.h" #include "blimp/engine/app/ui/blimp_window_tree_host.h" #include "blimp/engine/common/blimp_browser_context.h" #include "blimp/net/blimp_connection.h" @@ -207,8 +206,6 @@ void BlimpEngineSession::Initialize() { DCHECK(!gfx::Screen::GetScreen()); gfx::Screen::SetScreenInstance(screen_.get()); - context_factory_.reset(new BlimpUiContextFactory()); - aura::Env::GetInstance()->set_context_factory(context_factory_.get()); window_tree_host_.reset(new BlimpWindowTreeHost()); screen_->set_window_tree_host(window_tree_host_.get()); diff --git a/blimp/engine/session/blimp_engine_session.h b/blimp/engine/session/blimp_engine_session.h index 1298c77..75bde2e 100644 --- a/blimp/engine/session/blimp_engine_session.h +++ b/blimp/engine/session/blimp_engine_session.h @@ -61,7 +61,6 @@ class BlimpBrowserContext; class BlimpEngineConfig; class BlimpFocusClient; class BlimpScreen; -class BlimpUiContextFactory; class BlimpWindowTreeHost; class EngineNetworkComponents; @@ -161,9 +160,6 @@ class BlimpEngineSession // Presents the client's single screen. scoped_ptr<BlimpScreen> screen_; - // Context factory for compositor. - scoped_ptr<BlimpUiContextFactory> context_factory_; - // Represents the (currently single) browser window into which tab(s) will // be rendered. scoped_ptr<BlimpWindowTreeHost> window_tree_host_; |