Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Unified Diff: webkit/support/platform_support_linux.cc

Issue 8524016: webkit: Remove 1 exit time destructor and turn on -Wexit-time-destructors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/quota/webkit_quota.gypi ('k') | webkit/support/platform_support_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/platform_support_linux.cc
diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc
index b31595830a8c31cc46cd9f94957a5671e21685b6..ab0f1c0223e36b5ba98e79317676141ddbeca4d5 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);
« no previous file with comments | « webkit/quota/webkit_quota.gypi ('k') | webkit/support/platform_support_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698