Changeset 102849 in webkit
- Timestamp:
- Dec 14, 2011 4:51:42 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 7 added
- 28 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r102839 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 - Moved Export related macro definitions from config.h to ExportMacros.h and JSExportMacros.h. 7 - Moved WTF_USE_JSC and WTF_USE_V8 from various config.h family to Platform.h. 8 - Replaced JS_EXPORTDATA in wtf moudule with newly introduced WTF_EXPORTDATA. 9 10 Reviewed by Kevin Ollivier. 11 12 * JavaScriptCore.xcodeproj/project.pbxproj: 13 * config.h: 14 * runtime/JSExportMacros.h: Added. 15 * wtf/ExportMacros.h: 16 * wtf/Platform.h: 17 * wtf/WTFThreadData.h: 18 * wtf/text/AtomicString.h: 19 * wtf/text/StringStatics.cpp: 20 1 21 2011-12-14 Anders Carlsson <andersca@apple.com> 2 22 -
trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r102730 r102849 493 493 A7A1F7AD0F252B3C00E184E2 /* ByteArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A1F7AB0F252B3C00E184E2 /* ByteArray.h */; settings = {ATTRIBUTES = (Private, ); }; }; 494 494 A7B48F490EE8936F00DCBDB6 /* ExecutableAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */; }; 495 A7B4ACAF1484C9CE00B38A36 /* JSExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; }; 495 496 A7BC0C82140608B000B1BB71 /* CheckedArithmetic.h in Headers */ = {isa = PBXBuildFile; fileRef = A7BC0C81140608B000B1BB71 /* CheckedArithmetic.h */; settings = {ATTRIBUTES = (Private, ); }; }; 496 497 A7C1E8E4112E72EF00A37F98 /* JITPropertyAccess32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */; }; … … 507 508 A7FB60A4103F7DC20017A286 /* PropertyDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7FB60A3103F7DC20017A286 /* PropertyDescriptor.cpp */; }; 508 509 A7FB61001040C38B0017A286 /* PropertyDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = A7FB604B103F5EAB0017A286 /* PropertyDescriptor.h */; settings = {ATTRIBUTES = (Private, ); }; }; 510 A7FEE67614837B32005DC1A6 /* ExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A275F514837A8E001DBB39 /* ExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; }; 509 511 BC02E90D0E1839DB000F9297 /* ErrorConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9050E1839DB000F9297 /* ErrorConstructor.h */; }; 510 512 BC02E90F0E1839DB000F9297 /* ErrorPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9070E1839DB000F9297 /* ErrorPrototype.h */; }; … … 1316 1318 A7A1F7AA0F252B3C00E184E2 /* ByteArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ByteArray.cpp; sourceTree = "<group>"; }; 1317 1319 A7A1F7AB0F252B3C00E184E2 /* ByteArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteArray.h; sourceTree = "<group>"; }; 1320 A7A275F514837A8E001DBB39 /* ExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExportMacros.h; sourceTree = "<group>"; }; 1318 1321 A7A7EE7411B98B8D0065A14F /* ASTBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTBuilder.h; sourceTree = "<group>"; }; 1319 1322 A7A7EE7711B98B8D0065A14F /* SyntaxChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyntaxChecker.h; sourceTree = "<group>"; }; 1320 1323 A7B48DB50EE74CFC00DCBDB6 /* ExecutableAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExecutableAllocator.h; sourceTree = "<group>"; }; 1321 1324 A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecutableAllocator.cpp; sourceTree = "<group>"; }; 1325 A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExportMacros.h; sourceTree = "<group>"; }; 1322 1326 A7BC0C81140608B000B1BB71 /* CheckedArithmetic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CheckedArithmetic.h; sourceTree = "<group>"; }; 1323 1327 A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITPropertyAccess32_64.cpp; sourceTree = "<group>"; }; … … 1940 1944 D75AF59612F8CB9500FC0ADF /* DynamicAnnotations.h */, 1941 1945 5135FAD612D26856003C083B /* Encoder.h */, 1946 A7A275F514837A8E001DBB39 /* ExportMacros.h */, 1942 1947 E48E0F2C0F82151700A8CA37 /* FastAllocBase.h */, 1943 1948 65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */, … … 2188 2193 9788FC221471AD0C0068CE2D /* JSDateMath.cpp */, 2189 2194 9788FC231471AD0C0068CE2D /* JSDateMath.h */, 2195 A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */, 2190 2196 F692A85E0255597D01FF60F7 /* JSFunction.cpp */, 2191 2197 F692A85F0255597D01FF60F7 /* JSFunction.h */, … … 2668 2674 86CAFEE31035DDE60028A609 /* Executable.h in Headers */, 2669 2675 A766B44F0EE8DCD1009518CA /* ExecutableAllocator.h in Headers */, 2676 A7FEE67614837B32005DC1A6 /* ExportMacros.h in Headers */, 2670 2677 E48E0F2D0F82151700A8CA37 /* FastAllocBase.h in Headers */, 2671 2678 BC18C4020E16F5CD00B34460 /* FastMalloc.h in Headers */, … … 2713 2720 BC18C41E0E16F5CD00B34460 /* JSContextRef.h in Headers */, 2714 2721 148CD1D8108CF902008163C6 /* JSContextRefPrivate.h in Headers */, 2722 A7B4ACAF1484C9CE00B38A36 /* JSExportMacros.h in Headers */, 2715 2723 BC18C41F0E16F5CD00B34460 /* JSFunction.h in Headers */, 2716 2724 BC18C4200E16F5CD00B34460 /* JSGlobalData.h in Headers */, -
trunk/Source/JavaScriptCore/config.h
r101778 r102849 29 29 30 30 #include <wtf/Platform.h> 31 32 /* See note in wtf/Platform.h for more info on EXPORT_MACROS. */33 #if USE(EXPORT_MACROS)34 35 31 #include <wtf/ExportMacros.h> 36 37 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) 38 #define WTF_EXPORT_PRIVATE WTF_EXPORT 39 #define WTF_EXPORT_HIDDEN WTF_HIDDEN 40 #define JS_EXPORT_PRIVATE WTF_EXPORT 41 #define JS_EXPORT_HIDDEN WTF_HIDDEN 42 #else 43 #define WTF_EXPORT_PRIVATE WTF_IMPORT 44 #define WTF_EXPORT_HIDDEN 45 #define JS_EXPORT_PRIVATE WTF_IMPORT 46 #define JS_EXPORT_HIDDEN 32 // WTF cannot depend on JSC even if USE(JSC). 33 #if USE(JSC) && !defined(BUILDING_WTF) 34 #include "JSExportMacros.h" 47 35 #endif 48 49 #define JS_EXPORTDATA JS_EXPORT_PRIVATE50 #define JS_EXPORTCLASS JS_EXPORT_PRIVATE51 52 #else /* !USE(EXPORT_MACROS) */53 54 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)55 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)56 #define JS_EXPORTDATA __declspec(dllexport)57 #else58 #define JS_EXPORTDATA __declspec(dllimport)59 #endif60 #define JS_EXPORTCLASS JS_EXPORTDATA61 #else62 #define JS_EXPORTDATA63 #define JS_EXPORTCLASS64 #endif65 66 #define WTF_EXPORT_PRIVATE67 #define WTF_EXPORT_HIDDEN68 #define JS_EXPORT_PRIVATE69 #define JS_EXPORT_HIDDEN70 71 #endif /* USE(EXPORT_MACROS) */72 73 #define WTF_INLINE WTF_EXPORT_HIDDEN inline74 #define JS_INLINE JS_EXPORT_HIDDEN inline75 36 76 37 #if OS(WINDOWS) … … 129 90 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 130 91 #endif 131 132 #if PLATFORM(CHROMIUM)133 #if !defined(WTF_USE_V8)134 #define WTF_USE_V8 1135 #endif136 #endif /* PLATFORM(CHROMIUM) */137 138 #if !defined(WTF_USE_V8)139 #define WTF_USE_V8 0140 #endif /* !defined(WTF_USE_V8) */141 142 /* Using V8 implies not using JSC and vice versa */143 #define WTF_USE_JSC !WTF_USE_V8 -
trunk/Source/JavaScriptCore/runtime/JSExportMacros.h
-
Property
svn:executable
set to
*
r102848 r102849 28 28 */ 29 29 30 #ifndef ExportMacros_h31 #define ExportMacros_h30 #ifndef JSExportMacros_h 31 #define JSExportMacros_h 32 32 33 #include "Platform.h" 33 #include <wtf/Platform.h> 34 #include <wtf/ExportMacros.h> 34 35 35 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC) 36 #define WTF_EXPORT __declspec(dllexport) 37 #define WTF_IMPORT __declspec(dllimport) 38 #define WTF_HIDDEN 39 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) 40 #define WTF_EXPORT __attribute__((visibility("default"))) 41 #define WTF_IMPORT WTF_EXPORT 42 #define WTF_HIDDEN __attribute__((visibility("hidden"))) 36 // See note in wtf/Platform.h for more info on EXPORT_MACROS. 37 #if USE(EXPORT_MACROS) 38 39 #if defined(BUILDING_JavaScriptCore) 40 #define JS_EXPORT_PRIVATE WTF_EXPORT 43 41 #else 44 #define WTF_EXPORT 45 #define WTF_IMPORT 46 #define WTF_HIDDEN 42 #define JS_EXPORT_PRIVATE WTF_IMPORT 47 43 #endif 48 44 49 #endif /* ExportMacros_h */ 45 #define JS_EXPORT_HIDDEN WTF_HIDDEN 46 #define JS_EXPORTDATA JS_EXPORT_PRIVATE 47 #define JS_EXPORTCLASS JS_EXPORT_PRIVATE 48 49 #else // !USE(EXPORT_MACROS) 50 51 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) 52 53 #if defined(BUILDING_JavaScriptCore) 54 #define JS_EXPORTDATA __declspec(dllexport) 55 #else 56 #define JS_EXPORTDATA __declspec(dllimport) 57 #endif 58 59 #define JS_EXPORTCLASS JS_EXPORTDATA 60 61 #else // !PLATFORM... 62 63 #define JS_EXPORTDATA 64 #define JS_EXPORTCLASS 65 66 #endif // !PLATFORM... 67 68 #define JS_EXPORT_PRIVATE 69 #define JS_EXPORT_HIDDEN 70 71 #endif // USE(EXPORT_MACROS) 72 73 #define JS_INLINE JS_EXPORT_HIDDEN inline 74 75 #endif // JSExportMacros_h -
Property
svn:executable
set to
-
trunk/Source/JavaScriptCore/wtf/ExportMacros.h
r101778 r102849 33 33 #include "Platform.h" 34 34 35 // See note in wtf/Platform.h for more info on EXPORT_MACROS. 36 #if USE(EXPORT_MACROS) 37 35 38 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC) 36 39 #define WTF_EXPORT __declspec(dllexport) … … 47 50 #endif 48 51 49 #endif /* ExportMacros_h */ 52 // FIXME: When all ports are using the export macros, we should replace 53 // WTF_EXPORTDATA with WTF_EXPORT_PRIVATE macros. 54 #if defined(BUILDING_WTF) 55 #define WTF_EXPORTDATA WTF_EXPORT 56 #else 57 #define WTF_EXPORTDATA WTF_IMPORT 58 #endif 59 60 #else // !USE(EXPORT_MACROS) 61 62 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC) 63 #if defined(BUILDING_WTF) 64 #define WTF_EXPORTDATA __declspec(dllexport) 65 #else 66 #define WTF_EXPORTDATA __declspec(dllimport) 67 #endif 68 #else // PLATFORM(CHROMIUM) || !OS(WINDOWS) || COMPILER(GCC) 69 #define WTF_EXPORTDATA 70 #endif // !PLATFORM(CHROMIUM)... 71 72 #define WTF_EXPORTCLASS WTF_EXPORTDATA 73 74 #define WTF_EXPORT 75 #define WTF_IMPORT 76 #define WTF_HIDDEN 77 78 #endif // USE(EXPORT_MACROS) 79 80 #if defined(BUILDING_WTF) 81 #define WTF_EXPORT_PRIVATE WTF_EXPORT 82 #else 83 #define WTF_EXPORT_PRIVATE WTF_IMPORT 84 #endif 85 86 #define WTF_EXPORT_HIDDEN WTF_HIDDEN 87 #define WTF_INLINE WTF_EXPORT_HIDDEN inline 88 89 #endif // ExportMacros_h -
trunk/Source/JavaScriptCore/wtf/Platform.h
r102831 r102849 1142 1142 #endif 1143 1143 1144 #if PLATFORM(CHROMIUM) 1145 #if !defined(WTF_USE_V8) 1146 #define WTF_USE_V8 1 1147 #endif 1148 #endif /* PLATFORM(CHROMIUM) */ 1149 1150 #if !defined(WTF_USE_V8) 1151 #define WTF_USE_V8 0 1152 #endif /* !defined(WTF_USE_V8) */ 1153 1154 /* Using V8 implies not using JSC and vice versa */ 1155 #define WTF_USE_JSC !WTF_USE_V8 1156 1157 1144 1158 #endif /* WTF_Platform_h */ -
trunk/Source/JavaScriptCore/wtf/WTFThreadData.h
r101778 r102849 121 121 #endif 122 122 123 static JS_EXPORTDATA ThreadSpecific<WTFThreadData>* staticData;123 static WTF_EXPORTDATA ThreadSpecific<WTFThreadData>* staticData; 124 124 friend WTFThreadData& wtfThreadData(); 125 125 friend class AtomicStringTable; -
trunk/Source/JavaScriptCore/wtf/text/AtomicString.h
r102692 r102849 166 166 // These are only usable from the main thread. 167 167 #ifndef ATOMICSTRING_HIDE_GLOBALS 168 extern const JS_EXPORTDATA AtomicString nullAtom;169 extern const JS_EXPORTDATA AtomicString emptyAtom;170 extern const JS_EXPORTDATA AtomicString textAtom;171 extern const JS_EXPORTDATA AtomicString commentAtom;172 extern const JS_EXPORTDATA AtomicString starAtom;173 extern const JS_EXPORTDATA AtomicString xmlAtom;174 extern const JS_EXPORTDATA AtomicString xmlnsAtom;168 extern const WTF_EXPORTDATA AtomicString nullAtom; 169 extern const WTF_EXPORTDATA AtomicString emptyAtom; 170 extern const WTF_EXPORTDATA AtomicString textAtom; 171 extern const WTF_EXPORTDATA AtomicString commentAtom; 172 extern const WTF_EXPORTDATA AtomicString starAtom; 173 extern const WTF_EXPORTDATA AtomicString xmlAtom; 174 extern const WTF_EXPORTDATA AtomicString xmlnsAtom; 175 175 176 176 inline AtomicString AtomicString::fromUTF8(const char* characters, size_t length) -
trunk/Source/JavaScriptCore/wtf/text/StringStatics.cpp
r102082 r102849 53 53 } 54 54 55 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, nullAtom)56 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, emptyAtom, "")57 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, textAtom, "#text")58 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, commentAtom, "#comment")59 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, starAtom, "*")60 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlAtom, "xml")61 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlnsAtom, "xmlns")55 WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, nullAtom) 56 WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, emptyAtom, "") 57 WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, textAtom, "#text") 58 WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, commentAtom, "#comment") 59 WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, starAtom, "*") 60 WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlAtom, "xml") 61 WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlnsAtom, "xmlns") 62 62 63 63 void AtomicString::init() -
trunk/Source/JavaScriptGlue/ChangeLog
r101913 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 - Extracted export related macro definitions to ExportMacros.h and JSExportMacros.h 7 - Added forwarding headers which used in config.h 8 9 Reviewed by Kevin Ollivier. 10 11 * ForwardingHeaders/runtime/JSExportMacros.h: Added. 12 * ForwardingHeaders/wtf/ExportMacros.h: Added. 13 * config.h: 14 1 15 2011-12-02 David Levin <levin@chromium.org> 2 16 -
trunk/Source/JavaScriptGlue/config.h
r101778 r102849 4 4 5 5 #include <wtf/Platform.h> 6 7 #if PLATFORM(CHROMIUM) 8 #if !defined(WTF_USE_V8) 9 #define WTF_USE_V8 1 10 #endif 11 #endif /* PLATFORM(CHROMIUM) */ 12 13 #if !defined(WTF_USE_V8) 14 #define WTF_USE_V8 0 15 #endif /* !defined(WTF_USE_V8) */ 16 17 /* Using V8 implies not using JSC and vice versa */ 18 #define WTF_USE_JSC !WTF_USE_V8 19 20 #define JS_EXPORTDATA 21 #define JS_EXPORTCLASS 22 #define JS_EXPORT_PRIVATE 23 #define WTF_EXPORT_PRIVATE 24 6 #include <wtf/ExportMacros.h> 7 #include <runtime/JSExportMacros.h> -
trunk/Source/WebCore/ChangeLog
r102846 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 Reviewed by Kevin Ollivier. 7 8 - Moved export related definitions from config.h 9 to ExportMacros.h, JSExportMacros.h and PlatformExportMacros.h 10 - Added forwarding headers which are referred from config.h 11 12 No new tests. Only build related changes. 13 14 * ForwardingHeaders/runtime/JSExportMacros.h: Added. 15 * ForwardingHeaders/wtf/ExportMacros.h: Added. 16 * WebCore.xcodeproj/project.pbxproj: 17 * config.h: 18 * platform/PlatformExportMacros.h: Copied from Source/JavaScriptCore/wtf/ExportMacros.h. 19 1 20 2011-12-14 Enrica Casucci <enrica@apple.com> 2 21 -
trunk/Source/WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops
r101778 r102849 7 7 <Tool 8 8 Name="VCCLCompilerTool" 9 AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..\ ForwardingHeaders";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\QTInternalSDK\CIncludes";"$(WebKitLibrariesDir)\QuickTime SDK\CIncludes";"$(ProgramFiles)/QuickTime SDK/cincludes";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private""9 AdditionalIncludeDirectories=""$(ProjectDir)..\";"$(ProjectDir)..\Platform\";"$(ProjectDir)..\ForwardingHeaders";"$(WebKitLibrariesDir)\Include\JavaScriptCore";"$(WebKitLibrariesDir)\include\private\JavaScriptCore";"$(ConfigurationBuildDir)\Include\JavaScriptCore";"$(ConfigurationBuildDir)\include\private\JavaScriptCore";"$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders";"$(ConfigurationBuildDir)\Include";"$(ConfigurationBuildDir)\Include\private";"$(WebKitLibrariesDir)\QTInternalSDK\CIncludes";"$(WebKitLibrariesDir)\QuickTime SDK\CIncludes";"$(ProgramFiles)/QuickTime SDK/cincludes";"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\private"" 10 10 PreprocessorDefinitions="_USRDLL;QTMOVIEWIN_EXPORTS;TARGET_OS_WIN32" 11 11 DisableSpecificWarnings="4819" -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r102815 r102849 3469 3469 A71C30B81381265E00DBC351 /* ShadowInclusionSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71C30B61381265E00DBC351 /* ShadowInclusionSelector.cpp */; }; 3470 3470 A71C30B91381265E00DBC351 /* ShadowInclusionSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A71C30B71381265E00DBC351 /* ShadowInclusionSelector.h */; }; 3471 A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3471 3472 A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; }; 3472 3473 A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 10705 10706 A71C30B61381265E00DBC351 /* ShadowInclusionSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowInclusionSelector.cpp; sourceTree = "<group>"; }; 10706 10707 A71C30B71381265E00DBC351 /* ShadowInclusionSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowInclusionSelector.h; sourceTree = "<group>"; }; 10708 A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformExportMacros.h; sourceTree = "<group>"; }; 10707 10709 A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedRect.cpp; sourceTree = "<group>"; }; 10708 10710 A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; }; … … 20207 20209 98EB1F941313FE0500D0E1EA /* NotImplemented.h */, 20208 20210 4B2708C50AF19EE40065127F /* Pasteboard.h */, 20211 A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */, 20209 20212 BC9585DF12F0989500755821 /* PlatformGestureEvent.h */, 20210 20213 935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */, … … 23873 23876 499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */, 23874 23877 493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */, 23878 A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */, 23875 23879 BC9585E112F0989500755821 /* PlatformGestureEvent.h in Headers */, 23876 23880 935C476809AC4D4300A6AAB4 /* PlatformKeyboardEvent.h in Headers */, -
trunk/Source/WebCore/config.h
r101778 r102849 34 34 #endif 35 35 36 /* See note in wtf/Platform.h for more info on EXPORT_MACROS. */37 #if USE(EXPORT_MACROS)38 39 36 #include <wtf/ExportMacros.h> 40 41 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) 42 #define WTF_EXPORT_PRIVATE WTF_EXPORT 43 #define JS_EXPORT_PRIVATE WTF_EXPORT 44 #else 45 #define WTF_EXPORT_PRIVATE WTF_IMPORT 46 #define JS_EXPORT_PRIVATE WTF_IMPORT 37 #if USE(JSC) 38 #include <runtime/JSExportMacros.h> 47 39 #endif 48 49 #define JS_EXPORTDATA JS_EXPORT_PRIVATE 50 #define JS_EXPORTCLASS JS_EXPORT_PRIVATE 51 52 #if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) 53 #define WEBKIT_EXPORTDATA WTF_EXPORT 54 #else 55 #define WEBKIT_EXPORTDATA WTF_IMPORT 56 #endif 57 58 #else /* !USE(EXPORT_MACROS) */ 59 60 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) 61 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) 62 #define JS_EXPORTDATA __declspec(dllexport) 63 #else 64 #define JS_EXPORTDATA __declspec(dllimport) 65 #endif 66 #if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) 67 #define WEBKIT_EXPORTDATA __declspec(dllexport) 68 #else 69 #define WEBKIT_EXPORTDATA __declspec(dllimport) 70 #endif 71 #define WTF_EXPORT_PRIVATE 72 #define JS_EXPORT_PRIVATE 73 #define JS_EXPORTCLASS JS_EXPORTDATA 74 #else 75 #define JS_EXPORTDATA 76 #define JS_EXPORTCLASS 77 #define WEBKIT_EXPORTDATA 78 #define WTF_EXPORT_PRIVATE 79 #define JS_EXPORT_PRIVATE 80 #endif 81 82 #endif /* USE(EXPORT_MACROS) */ 40 #include "PlatformExportMacros.h" 83 41 84 42 #ifdef __APPLE__ … … 178 136 #define WTF_USE_GOOGLEURL 1 179 137 180 #if !defined(WTF_USE_V8)181 #define WTF_USE_V8 1182 #endif183 184 138 #endif /* PLATFORM(CHROMIUM) */ 185 186 #if !defined(WTF_USE_V8)187 #define WTF_USE_V8 0188 #endif /* !defined(WTF_USE_V8) */189 190 /* Using V8 implies not using JSC and vice versa */191 #if !defined(WTF_USE_JSC)192 #define WTF_USE_JSC !WTF_USE_V8193 #endif194 139 195 140 #if USE(CG) -
trunk/Source/WebCore/platform/PlatformExportMacros.h
-
Property
svn:executable
set to
*
r102848 r102849 27 27 * properly on all platforms and compilers that WebKit builds under. 28 28 */ 29 #ifndef PlatformExportMacros_h 30 #define PlatformExportMacros_h 29 31 30 #i fndef ExportMacros_h31 # define ExportMacros_h32 #include <wtf/Platform.h> 33 #include <wtf/ExportMacros.h> 32 34 33 #include "Platform.h" 35 // See note in wtf/Platform.h for more info on EXPORT_MACROS. 36 #if USE(EXPORT_MACROS) 34 37 35 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC) 36 #define WTF_EXPORT __declspec(dllexport) 37 #define WTF_IMPORT __declspec(dllimport) 38 #define WTF_HIDDEN 39 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) 40 #define WTF_EXPORT __attribute__((visibility("default"))) 41 #define WTF_IMPORT WTF_EXPORT 42 #define WTF_HIDDEN __attribute__((visibility("hidden"))) 38 #if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) 39 #define WEBKIT_EXPORTDATA WTF_EXPORT 43 40 #else 44 #define WTF_EXPORT 45 #define WTF_IMPORT 46 #define WTF_HIDDEN 41 #define WEBKIT_EXPORTDATA WTF_IMPORT 47 42 #endif 48 43 49 #endif /* ExportMacros_h */ 44 #else // !USE(EXPORT_MACROS) 45 46 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) 47 48 #if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) 49 #define WEBKIT_EXPORTDATA __declspec(dllexport) 50 #else 51 #define WEBKIT_EXPORTDATA __declspec(dllimport) 52 #endif 53 54 #else // !PLATFORM... 55 56 #define WEBKIT_EXPORTDATA 57 58 #endif // !PLATFORM... 59 60 #endif // USE(EXPORT_MACROS) 61 62 #endif // PlatformExportMacros_h -
Property
svn:executable
set to
-
trunk/Source/WebKit/cf/ChangeLog
r101778 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 Reviewed by Kevin Ollivier. 7 8 Removed macro definitions which is now provided by Platform.h 9 10 * WebCoreSupport/WebInspectorClientCF.cpp: 11 1 12 2011-12-02 Hajime Morrita <morrita@chromium.org> 2 13 -
trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
r101778 r102849 26 26 // FIXME: On Windows, we require all WebKit source files to include config.h 27 27 // before including any other files. Failing to include config.h will leave 28 // WTF_USE_CF and WTF_USE_JSCundefined, causing build failures in this28 // WTF_USE_CF undefined, causing build failures in this 29 29 // file. But Mac doesn't have a config.h for WebKit, so we can't include the 30 // Windows one here. For now we can just define WTF_USE_CF , WTF_USE_JSC,and30 // Windows one here. For now we can just define WTF_USE_CF and 31 31 // WTF_USE_CFNETWORK manually, but we need a better long-term solution. 32 32 #ifndef WTF_USE_CF … … 34 34 #endif 35 35 36 #ifndef WTF_USE_JSC 37 #define WTF_USE_JSC 1 38 #endif 39 40 // Leave these set to nothing until we switch Mac and Win ports over to 41 // using the export macros. 42 #define JS_EXPORT_PRIVATE 43 #define WTF_EXPORT_PRIVATE 44 45 #if defined(WIN32) || defined(_WIN32) 46 #ifndef WTF_USE_CFNETWORK 47 #define WTF_USE_CFNETWORK 1 48 #endif 49 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) 50 #define JS_EXPORTDATA __declspec(dllexport) 51 #else 52 #define JS_EXPORTDATA __declspec(dllimport) 53 #endif 54 #define JS_EXPORTCLASS JS_EXPORTDATA 55 #else 56 #define JS_EXPORTDATA 57 #define JS_EXPORTCLASS 58 #endif 36 // NOTE: These need to appear up top, as they declare macros 37 // used in the JS and WTF headers. 38 #include <runtime/JSExportMacros.h> 39 #include <wtf/ExportMacros.h> 59 40 60 41 #include "WebInspectorClient.h" -
trunk/Source/WebKit/mac/ChangeLog
r102836 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 Reviewed by Kevin Ollivier. 7 8 Removed macro definitions which is now provided by Platform.h 9 10 * WebKitPrefix.h: 11 1 12 2011-12-13 Jon Lee <jonlee@apple.com> 2 13 -
trunk/Source/WebKit/mac/WebKitPrefix.h
r101778 r102849 72 72 73 73 #include <wtf/Platform.h> 74 74 #include <wtf/ExportMacros.h> 75 #include <runtime/JSExportMacros.h> 76 #include <WebCore/PlatformExportMacros.h> 75 77 #include <WebCore/EmptyProtocolDefinitions.h> 76 77 /* WebKit has no way to pull settings from WebCore/config.h for now */78 /* so we assume WebKit is always being compiled on top of JavaScriptCore */79 #define WTF_USE_JSC 180 #define WTF_USE_V8 081 78 82 79 /* Work around bug with C++ library that screws up Objective-C++ when exception support is disabled. */ 83 80 #undef try 84 81 #undef catch 85 86 #define JS_EXPORTDATA87 #define JS_EXPORTCLASS88 #define WEBKIT_EXPORTDATA89 #define WTF_EXPORT_PRIVATE90 #define JS_EXPORT_PRIVATE91 82 92 83 #ifdef __cplusplus -
trunk/Source/WebKit/qt/ChangeLog
r102822 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 Reviewed by Kevin Ollivier. 7 8 Added a INCLUDEPATH to make JSExportMacros.h visible. 9 10 * tests/MIMESniffing/MIMESniffing.pro 11 1 12 2011-12-14 Alexander Færøy <ahf@0x90.dk> 2 13 -
trunk/Source/WebKit/qt/tests/MIMESniffing/MIMESniffing.pro
r101778 r102849 10 10 INCLUDEPATH += \ 11 11 ../../../../WebCore/platform/network \ 12 ../../../../JavaScriptCore 12 ../../../../JavaScriptCore \ 13 ../../../../JavaScriptCore/runtime 13 14 14 15 debug { -
trunk/Source/WebKit2/ChangeLog
r102848 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 Reviewed by Kevin Ollivier. 7 8 Removed macro definitions which is now provided by Platform.h 9 10 * config.h: 11 1 12 2011-12-14 Alexey Proskuryakov <ap@apple.com> 2 13 -
trunk/Source/WebKit2/config.h
r101778 r102849 35 35 #include <wtf/DisallowCType.h> 36 36 #include <wtf/Platform.h> 37 #include <wtf/ExportMacros.h> 38 #if USE(JSC) 39 #include <runtime/JSExportMacros.h> 40 #endif 37 41 38 42 #ifdef __cplusplus … … 56 60 } 57 61 58 #if defined (BUILDING_WITH_CMAKE) 59 60 #define JS_EXPORTDATA 61 #define JS_EXPORTCLASS 62 #define WTF_EXPORT_PRIVATE 63 #define JS_EXPORT_PRIVATE 64 65 #elif defined(BUILDING_QT__) || defined(BUILDING_GTK__) 66 67 #define WTF_USE_JSC 1 68 #define WTF_USE_V8 0 69 70 #define JS_EXPORTDATA 71 #define JS_EXPORTCLASS 72 #define WTF_EXPORT_PRIVATE 73 #define JS_EXPORT_PRIVATE 74 75 #elif defined(__APPLE__) 62 #if defined(__APPLE__) 76 63 77 64 #ifdef __OBJC__ … … 97 84 #endif 98 85 99 /* WebKit has no way to pull settings from WebCore/config.h for now */100 /* so we assume WebKit is always being compiled on top of JavaScriptCore */101 #define WTF_USE_JSC 1102 #define WTF_USE_V8 0103 104 #define JS_EXPORTDATA105 #define JS_EXPORTCLASS106 #define WEBKIT_EXPORTDATA107 108 #define WTF_EXPORT_PRIVATE109 #define JS_EXPORT_PRIVATE110 86 111 87 #include <WebCore/EmptyProtocolDefinitions.h> -
trunk/Tools/ChangeLog
r102841 r102849 1 2011-12-14 Hajime Morrita <morrita@chromium.org> 2 3 JS_INLINE and WTF_INLINE should be visible from WebCore 4 https://bugs.webkit.org/show_bug.cgi?id=73191 5 6 Reviewed by Kevin Ollivier. 7 8 Removed macro definitions which is now provided by Platform.h 9 10 * DumpRenderTree/chromium/config.h: 11 * DumpRenderTree/config.h: 12 * DumpRenderTree/ForwardingHeaders/runtime/JSExportMacros.h: Added. 13 * DumpRenderTree/ForwardingHeaders/wtf/ExportMacros.h: Added. 14 * DumpRenderTree/win/DumpRenderTreePreBuild.cmd: Add new ForwardingHeaders. 15 * TestWebKitAPI/config.h: 16 * WebKitTestRunner/config.h: 17 1 18 2011-12-14 Kentaro Hara <haraken@chromium.org> 2 19 -
trunk/Tools/DumpRenderTree/chromium/config.h
r101778 r102849 44 44 45 45 #include <wtf/Platform.h> 46 #include <wtf/ExportMacros.h> 46 47 47 48 #if OS(WINDOWS) && !COMPILER(GCC) 48 49 // Allow 'this' to be used in base member initializer list. 49 50 #pragma warning(disable : 4355) 50 // JS_EXPORTDATA is needed to inlucde wtf/WTFString.h.51 #define JS_EXPORTDATA __declspec(dllimport)52 #else53 #define JS_EXPORTDATA54 51 #endif 55 52 56 #define WTF_EXPORT_PRIVATE57 #define JS_EXPORT_PRIVATE58 59 53 #endif // config_h -
trunk/Tools/DumpRenderTree/config.h
r101778 r102849 30 30 31 31 #include <wtf/Platform.h> 32 33 /* See note in wtf/Platform.h for more info on EXPORT_MACROS. */34 #if USE(EXPORT_MACROS)35 36 32 #include <wtf/ExportMacros.h> 37 38 #define WTF_EXPORT_PRIVATE WTF_IMPORT 39 #define JS_EXPORT_PRIVATE WTF_IMPORT 40 #define WEBKIT_EXPORTDATA WTF_IMPORT 41 42 #define JS_EXPORTDATA JS_EXPORT_PRIVATE 43 #define JS_EXPORTCLASS JS_EXPORT_PRIVATE 44 45 #else /* !USE(EXPORT_MACROS) */ 46 47 #if OS(WINDOWS) && !COMPILER(GCC) && !defined(BUILDING_WX__) 48 #define JS_EXPORTDATA __declspec(dllimport) 49 #define WEBKIT_EXPORTDATA __declspec(dllimport) 50 #else 51 #define JS_EXPORTDATA 52 #define WEBKIT_EXPORTDATA 33 #if USE(JSC) 34 #include <runtime/JSExportMacros.h> 53 35 #endif 54 55 #define WTF_EXPORT_PRIVATE56 #define JS_EXPORT_PRIVATE57 58 #endif /* USE(EXPORT_MACROS) */59 36 60 37 // On MSW, wx headers need to be included before windows.h is. -
trunk/Tools/DumpRenderTree/win/DumpRenderTreePreBuild.cmd
r75138 r102849 8 8 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\DumpRenderTree" 9 9 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\DumpRenderTree\ForwardingHeaders" 10 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\DumpRenderTree\ForwardingHeaders\runtime" 10 11 mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\DumpRenderTree\ForwardingHeaders\wtf" 11 12 12 13 xcopy /y /d "%PROJECTDIR%\..\ForwardingHeaders\wtf\*.h" "%CONFIGURATIONBUILDDIR%\include\DumpRenderTree\ForwardingHeaders\wtf" 14 xcopy /y /d "%PROJECTDIR%\..\ForwardingHeaders\runtime\*.h" "%CONFIGURATIONBUILDDIR%\include\DumpRenderTree\ForwardingHeaders\runtime" 13 15 14 16 if "%CONFIGURATIONNAME%"=="Debug_Cairo_CFLite" xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\wtf\MD5.h" "%CONFIGURATIONBUILDDIR%\include\DumpRenderTree\ForwardingHeaders\wtf" -
trunk/Tools/TestWebKitAPI/config.h
r101778 r102849 25 25 26 26 #include <wtf/Platform.h> 27 #include <wtf/ExportMacros.h> 28 #if USE(JSC) 29 #include <runtime/JSExportMacros.h> 30 #endif 27 31 28 32 #if __APPLE__ … … 37 41 38 42 #endif 39 40 /* FIXME: Define these properly once USE(EXPORT_MACROS) is set for ports using this */41 #define JS_EXPORT_PRIVATE42 #define WTF_EXPORT_PRIVATE43 44 #define JS_EXPORTDATA45 43 46 44 #include <stdint.h> -
trunk/Tools/WebKitTestRunner/config.h
r101778 r102849 27 27 28 28 #include <wtf/Platform.h> 29 30 /* See note in wtf/Platform.h for more info on EXPORT_MACROS. */31 #if USE(EXPORT_MACROS)32 33 29 #include <wtf/ExportMacros.h> 34 35 #define WTF_EXPORT_PRIVATE WTF_IMPORT 36 #define JS_EXPORT_PRIVATE WTF_IMPORT 37 #define WEBKIT_EXPORTDATA WTF_IMPORT 38 39 #define JS_EXPORTDATA JS_EXPORT_PRIVATE 40 #define JS_EXPORTCLASS JS_EXPORT_PRIVATE 41 42 #else /* !USE(EXPORT_MACROS) */ 43 44 #if OS(WINDOWS) && !COMPILER(GCC) && !defined(BUILDING_WX__) 45 #define JS_EXPORTDATA __declspec(dllimport) 46 #define WEBKIT_EXPORTDATA __declspec(dllimport) 47 #else 48 #define JS_EXPORTDATA 49 #define WEBKIT_EXPORTDATA 30 #if USE(JSC) 31 #include <runtime/JSExportMacros.h> 50 32 #endif 51 52 #define WTF_EXPORT_PRIVATE53 #define JS_EXPORT_PRIVATE54 55 #endif /* USE(EXPORT_MACROS) */56 33 57 34 #if PLATFORM(WIN)
Note: See TracChangeset
for help on using the changeset viewer.