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

12 files changed, 25 insertions, 11 deletions

diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index 1c7c13b..c3ad2d3 100644
--- a/webkit/appcache/webkit_appcache.gypi
+++ b/webkit/appcache/webkit_appcache.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -6,6 +6,7 @@
   'targets': [
     {
       'target_name': 'appcache',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       # TODO(dpranke): Uncomment '<(component)',
       # 'type': '<(component)',
       'type': 'static_library',
diff --git a/webkit/blob/webkit_blob.gypi b/webkit/blob/webkit_blob.gypi
index 1b47d96..57769b8 100644
--- a/webkit/blob/webkit_blob.gypi
+++ b/webkit/blob/webkit_blob.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -7,6 +7,7 @@
     {
       'target_name': 'blob',
       'type': '<(component)',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
diff --git a/webkit/database/webkit_database.gypi b/webkit/database/webkit_database.gypi
index 91589a6..ecd9797 100644
--- a/webkit/database/webkit_database.gypi
+++ b/webkit/database/webkit_database.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -7,6 +7,7 @@
     {
       'target_name': 'database',
       'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/sql/sql.gyp:sql',
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi
index 2f81151..5ae71e4 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -7,6 +7,7 @@
     {
       'target_name': 'fileapi',
       'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/net/net.gyp:net',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 47ad919..42a1ae3 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -107,6 +107,7 @@
     {
       'target_name': 'glue',
       'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/base.gyp:base_static',
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',
diff --git a/webkit/quota/webkit_quota.gypi b/webkit/quota/webkit_quota.gypi
index 9a665d6..ffd8a21 100644
--- a/webkit/quota/webkit_quota.gypi
+++ b/webkit/quota/webkit_quota.gypi
@@ -7,6 +7,7 @@
     {
       'target_name': 'quota',
       'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/net/net.gyp:net',
diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc
index b315958..ab0f1c0 100644
--- a/webkit/support/platform_support_linux.cc
+++ b/webkit/support/platform_support_linux.cc
@@ -52,7 +52,7 @@ base::StringPiece GetDataResource(int resource_id) {
   resources_path = resources_path.Append("DumpRenderTree_resources");
   switch (resource_id) {
     case IDR_BROKENIMAGE: {
-      static std::string broken_image_data;
+      CR_DEFINE_STATIC_LOCAL(std::string, broken_image_data, ());
       if (broken_image_data.empty()) {
         FilePath path = resources_path.Append("missingImage.gif");
         bool success = file_util::ReadFileToString(path, &broken_image_data);
@@ -62,7 +62,7 @@ base::StringPiece GetDataResource(int resource_id) {
       return broken_image_data;
     }
     case IDR_TEXTAREA_RESIZER: {
-      static std::string resize_corner_data;
+      CR_DEFINE_STATIC_LOCAL(std::string, resize_corner_data, ());
       if (resize_corner_data.empty()) {
         FilePath path = resources_path.Append("textAreaResizeCorner.png");
         bool success = file_util::ReadFileToString(path, &resize_corner_data);
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 0592e04..099b9bf 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -198,7 +198,7 @@ base::StringPiece GetDataResource(int resource_id) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
-    static std::string broken_image_data;
+    CR_DEFINE_STATIC_LOCAL(std::string, broken_image_data, ());
     if (broken_image_data.empty()) {
       FilePath path = GetResourcesFilePath();
       // In order to match WebKit's colors for the missing image, we have to
@@ -214,7 +214,7 @@ base::StringPiece GetDataResource(int resource_id) {
   }
   case IDR_TEXTAREA_RESIZER: {
     // Use webkit's text area resizer image.
-    static std::string resize_corner_data;
+    CR_DEFINE_STATIC_LOCAL(std::string, resize_corner_data, ());
     if (resize_corner_data.empty()) {
       FilePath path = GetResourcesFilePath();
       path = path.AppendASCII("textAreaResizeCorner.png");
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 33bc013..ae165eb 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -10,6 +10,7 @@
     {
       'target_name': 'webkit_support',
       'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/media/media.gyp:media',
@@ -78,6 +79,7 @@
     {
       'target_name': 'webkit_support_common',
       'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/crypto/crypto.gyp:crypto',
@@ -129,6 +131,7 @@
     {
       'target_name': 'webkit_support_gfx',
       'type': 'static_library',
+      'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
       ],
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index b1174d3..29ca159 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -20,12 +20,12 @@
 
 using webkit_glue::WebSocketStreamHandleBridge;
 
-static const int kNoSocketId = 0;
+const int kNoSocketId = 0;
 
 namespace {
 
 MessageLoop* g_io_thread;
-scoped_refptr<net::URLRequestContext> g_request_context;
+net::URLRequestContext* g_request_context;
 
 class WebSocketStreamHandleBridgeImpl
     : public WebSocketStreamHandleBridge,
@@ -223,11 +223,14 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() {
 void SimpleSocketStreamBridge::InitializeOnIOThread(
     net::URLRequestContext* request_context) {
   g_io_thread = MessageLoop::current();
-  g_request_context = request_context;
+  if ((g_request_context = request_context))
+    g_request_context->AddRef();
 }
 
 void SimpleSocketStreamBridge::Cleanup() {
   g_io_thread = NULL;
+  if (g_request_context)
+    g_request_context->Release();
   g_request_context = NULL;
 }