diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 16:56:12 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 16:56:12 +0000 |
| commit | a0b4b1bb9311e8c01a8f0f09bffbb52092ab6f38 (patch) | |
| tree | 035faa9929766fbeabaf31e1d46676210a0475ab /ui | |
| parent | 00ff8db3314c93000d06bbab7ad8d885913a1248 (diff) | |
| download | chromium_src-a0b4b1bb9311e8c01a8f0f09bffbb52092ab6f38.zip chromium_src-a0b4b1bb9311e8c01a8f0f09bffbb52092ab6f38.tar.gz chromium_src-a0b4b1bb9311e8c01a8f0f09bffbb52092ab6f38.tar.bz2 | |
Fixes compile with webkit compositor.
I think this is the correct fix, but it might be because my local git repo is in a bad state.
Review URL: http://codereview.chromium.org/8500012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/desktop.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc index 2f6bde8..2518039 100644 --- a/ui/aura/desktop.cc +++ b/ui/aura/desktop.cc @@ -184,7 +184,7 @@ Desktop::Desktop() Desktop::~Desktop() { in_destructor_ = true; #ifdef USE_WEBKIT_COMPOSITOR - if (!compositor_factory_) + if (!ui::Compositor::compositor_factory()) ui::CompositorCC::Terminate(); #endif if (instance_ == this) |