webkit/support/platform_support_mac.mm - Issue 8524016: webkit: Remove 1 exit time destructor and turn on -Wexit-time-destructors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/support/platform_support_mac.mm

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: . 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

« webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc ('K') | « webkit/support/platform_support_linux.cc ('k') | webkit/support/webkit_support.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/support/platform_support_mac.mm

diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm

index 0592e0469e12cc44b82b9834f75b3b7d31692b4f..099b9bfc1dab9da20b8253beee3eeafd0132c261 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");