diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 23:21:09 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 23:21:09 +0000 |
| commit | e30ecf719e306c7d6c85784da1eb78e38127995a (patch) | |
| tree | 38daf2ebe16fd4b9dda98be6c5430ef2ec674d3e /ui/compositor/compositor.h | |
| parent | 6cff06f3fcca5fe19cac06820a7b8a17cbc88179 (diff) | |
| download | chromium_src-e30ecf719e306c7d6c85784da1eb78e38127995a.zip chromium_src-e30ecf719e306c7d6c85784da1eb78e38127995a.tar.gz chromium_src-e30ecf719e306c7d6c85784da1eb78e38127995a.tar.bz2 | |
Revert 230981 "Make TRANSPARENT windows be layered windows on wi..."
> Make TRANSPARENT windows be layered windows on win aura
>
> This builds on jbauman's patch to plumb use_software_compositor
> from here: https://codereview.chromium.org/23621054/
>
> The motivation here is that we currently have very different
> event, focus, activation paths on DWM vs. classic because of the
> differences between when we use top-level windows and when we
> don't. With this change, all translucent (i.e. shaped) windows
> are converted to being top level (always), and are rendered by
> the software compositor and are converted to layered windows for
> rendering.
>
> BUG=293218 and many other focus/activation bugs
>
> Review URL: https://codereview.chromium.org/26888006
BUG=312277,313349,313462
TBR=scottmg@chromium.org,cpu@chromium.org,ananta@chromium.org
Review URL: https://codereview.chromium.org/56623002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor/compositor.h')
| -rw-r--r-- | ui/compositor/compositor.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index 513822a..8b0aba6 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -221,8 +221,7 @@ class COMPOSITOR_EXPORT Compositor : NON_EXPORTED_BASE(public cc::LayerTreeHostClient), public base::SupportsWeakPtr<Compositor> { public: - Compositor(bool use_software_renderer, - gfx::AcceleratedWidget widget); + explicit Compositor(gfx::AcceleratedWidget widget); virtual ~Compositor(); static void Initialize(); @@ -334,10 +333,6 @@ class COMPOSITOR_EXPORT Compositor const cc::LayerTreeDebugState& GetLayerTreeDebugState() const; void SetLayerTreeDebugState(const cc::LayerTreeDebugState& debug_state); - // Should the compositor use a software output device. If false, it may still - // use a software output device if no GPU is available. - bool use_software_renderer() { return use_software_renderer_; } - private: friend class base::RefCounted<Compositor>; friend class CompositorLock; @@ -387,8 +382,6 @@ class COMPOSITOR_EXPORT Compositor base::WeakPtrFactory<Compositor> schedule_draw_factory_; - bool use_software_renderer_; - DISALLOW_COPY_AND_ASSIGN(Compositor); }; |