diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/pending/StaticConstructors.h | 73 |
2 files changed, 1 insertions, 74 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@2719", + "/trunk/deps/third_party/WebKit@2802", "src/third_party/cygwin": "/trunk/deps/third_party/cygwin@1788", diff --git a/webkit/pending/StaticConstructors.h b/webkit/pending/StaticConstructors.h deleted file mode 100644 index 3a6d656..0000000 --- a/webkit/pending/StaticConstructors.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of the DOM implementation for KDE. - * - * Copyright (C) 2006 Apple Computer, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - */ - -// For WebCore we need to avoid having static constructors. -// Our strategy is to declare the global objects with a different type (initialized to 0) -// and then use placement new to initialize the global objects later. This is not completely -// portable, and it would be good to figure out a 100% clean way that still avoids code that -// runs at init time. - -// Bug 1279152. This is a hack. For MSVC, AVOID_STATIC_CONSTRUCTORS will not -// be set in config.h, because it's not supported. The problem is that, we -// need to take a bunch of the paths that !AVOID_STATIC_CONSTRUCTORS takes, so -// unless we fork a bunch of files to fix the ifdefs, this is the easiest thing -// to do: -// - Leave AVOID_STATIC_CONSTRUCTORS undefined, if we define it, the variables -// will not be extern'd and we won't be able to link. Also, we need the -// default empty constructor for QualifiedName that we only get if -// AVOID_STATIC_CONSTRUCTORS is undefined. -// - Assume that all includes of this header want ALL of their static -// initializers ignored. This is currently the case. This means that if -// a .cc includes this header (or it somehow gets included), all static -// initializers after the include will be ignored. -// - We do this with a pragma, so that all of the static initializer pointers -// go into our own section, and the CRT won't call them. Eventually it would -// be nice if the section was discarded, because we don't want the pointers. -// See: http://msdn.microsoft.com/en-us/library/7977wcck(VS.80).aspx -#ifndef AVOID_STATIC_CONSTRUCTORS -#if COMPILER(MSVC) -#pragma warning(disable:4075) -#pragma init_seg(".unwantedstaticinits") -#endif -#endif - -#ifndef AVOID_STATIC_CONSTRUCTORS - // Define an global in the normal way. -#if COMPILER(MSVC7) -#define DEFINE_GLOBAL(type, name) \ - const type name; -#else -#define DEFINE_GLOBAL(type, name, ...) \ - const type name; -#endif - -#else -// Define an correctly-sized array of pointers to avoid static initialization. -// Use an array of pointers instead of an array of char in case there is some alignment issue. -#if COMPILER(MSVC7) -#define DEFINE_GLOBAL(type, name) \ - void * name[(sizeof(type) + sizeof(void *) - 1) / sizeof(void *)]; -#else -#define DEFINE_GLOBAL(type, name, ...) \ - void * name[(sizeof(type) + sizeof(void *) - 1) / sizeof(void *)]; -#endif -#endif |