diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 21:29:27 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 21:29:27 +0000 |
| commit | 2f3eff4cc24b0b6a210103cbfb1a9d6a6a080af5 (patch) | |
| tree | 52003c1ec4c4e17a87f2d92929b6beacf514be16 /webkit/gpu | |
| parent | e0bd3b9bfa7550dc48c9f7dfb988d1d654b8959a (diff) | |
| download | chromium_src-2f3eff4cc24b0b6a210103cbfb1a9d6a6a080af5.zip chromium_src-2f3eff4cc24b0b6a210103cbfb1a9d6a6a080af5.tar.gz chromium_src-2f3eff4cc24b0b6a210103cbfb1a9d6a6a080af5.tar.bz2 | |
webkit: Remove 3 exit time destructor and turn on -Wexit-time-destructors.
BUG=101600
TEST=none
Review URL: http://codereview.chromium.org/8524016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 3 | ||||
| -rw-r--r-- | webkit/gpu/webkit_gpu.gypi | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 4f8044b..b1ff0c7 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -408,7 +408,8 @@ bool GLInProcessContext::Initialize(bool onscreen, const GURL& active_url, gfx::GpuPreference gpu_preference) { // Use one share group for all contexts. - static scoped_refptr<gfx::GLShareGroup> share_group(new gfx::GLShareGroup); + CR_DEFINE_STATIC_LOCAL(scoped_refptr<gfx::GLShareGroup>, share_group, + (new gfx::GLShareGroup)); DCHECK(size.width() >= 0 && size.height() >= 0); diff --git a/webkit/gpu/webkit_gpu.gypi b/webkit/gpu/webkit_gpu.gypi index fb537f4..a342636 100644 --- a/webkit/gpu/webkit_gpu.gypi +++ b/webkit/gpu/webkit_gpu.gypi @@ -7,6 +7,7 @@ { 'target_name': 'webkit_gpu', 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', |