Changeset 101778 in webkit


Ignore:
Timestamp:
Dec 2, 2011 3:41:26 AM (12 years ago)
Author:
morrita@google.com
Message:

Unreviewed, rolling out r101751 and r101775.
​http://trac.webkit.org/changeset/101751
​http://trac.webkit.org/changeset/101775
​https://bugs.webkit.org/show_bug.cgi?id=73191

breaks Windows build

Source/JavaScriptCore:

  • JavaScriptCore.xcodeproj/project.pbxproj:
  • config.h:
  • runtime/JSExportMacros.h: Removed.
  • wtf/ExportMacros.h:
  • wtf/Platform.h:
  • wtf/WTFThreadData.h:
  • wtf/text/AtomicString.h:
  • wtf/text/StringStatics.cpp:

Source/JavaScriptGlue:

  • ForwardingHeaders/runtime/JSExportMacros.h: Removed.
  • ForwardingHeaders/wtf/ExportMacros.h: Removed.
  • config.h:

Source/WebCore:

  • ForwardingHeaders/runtime/JSExportMacros.h: Removed.
  • ForwardingHeaders/wtf/ExportMacros.h: Removed.
  • WebCore.vcproj/QTMovieWinCommon.vsprops:
  • WebCore.xcodeproj/project.pbxproj:
  • config.h:
  • platform/PlatformExportMacros.h: Removed.

Source/WebKit/cf:

  • WebCoreSupport/WebInspectorClientCF.cpp:

Source/WebKit/mac:

  • WebKitPrefix.h:

Source/WebKit/qt:

  • tests/MIMESniffing/MIMESniffing.pro:

Source/WebKit2:

  • config.h:

Tools:

  • DumpRenderTree/chromium/config.h:
  • DumpRenderTree/config.h:
  • TestWebKitAPI/config.h:
  • WebKitTestRunner/config.h:
Location:
trunk
Files:
6 deleted
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r101751 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * JavaScriptCore.xcodeproj/project.pbxproj:
     11        * config.h:
     12        * runtime/JSExportMacros.h: Removed.
     13        * wtf/ExportMacros.h:
     14        * wtf/Platform.h:
     15        * wtf/WTFThreadData.h:
     16        * wtf/text/AtomicString.h:
     17        * wtf/text/StringStatics.cpp:
     18
    1192011-12-01  Hajime Morrita  <morrita@chromium.org>
    220

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r101751 r101778  
    490490                A7A1F7AD0F252B3C00E184E2 /* ByteArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A1F7AB0F252B3C00E184E2 /* ByteArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
    491491                A7B48F490EE8936F00DCBDB6 /* ExecutableAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */; };
    492                 A7B4ACAF1484C9CE00B38A36 /* JSExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
    493492                A7BC0C82140608B000B1BB71 /* CheckedArithmetic.h in Headers */ = {isa = PBXBuildFile; fileRef = A7BC0C81140608B000B1BB71 /* CheckedArithmetic.h */; settings = {ATTRIBUTES = (Private, ); }; };
    494493                A7C1E8E4112E72EF00A37F98 /* JITPropertyAccess32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */; };
    … …  
    505504                A7FB60A4103F7DC20017A286 /* PropertyDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7FB60A3103F7DC20017A286 /* PropertyDescriptor.cpp */; };
    506505                A7FB61001040C38B0017A286 /* PropertyDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = A7FB604B103F5EAB0017A286 /* PropertyDescriptor.h */; settings = {ATTRIBUTES = (Private, ); }; };
    507                 A7FEE67614837B32005DC1A6 /* ExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A275F514837A8E001DBB39 /* ExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
    508506                BC02E90D0E1839DB000F9297 /* ErrorConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9050E1839DB000F9297 /* ErrorConstructor.h */; };
    509507                BC02E90F0E1839DB000F9297 /* ErrorPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = BC02E9070E1839DB000F9297 /* ErrorPrototype.h */; };
    … …  
    13121310                A7A1F7AA0F252B3C00E184E2 /* ByteArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ByteArray.cpp; sourceTree = "<group>"; };
    13131311                A7A1F7AB0F252B3C00E184E2 /* ByteArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteArray.h; sourceTree = "<group>"; };
    1314                 A7A275F514837A8E001DBB39 /* ExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExportMacros.h; sourceTree = "<group>"; };
    13151312                A7A7EE7411B98B8D0065A14F /* ASTBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTBuilder.h; sourceTree = "<group>"; };
    13161313                A7A7EE7711B98B8D0065A14F /* SyntaxChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyntaxChecker.h; sourceTree = "<group>"; };
    13171314                A7B48DB50EE74CFC00DCBDB6 /* ExecutableAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExecutableAllocator.h; sourceTree = "<group>"; };
    13181315                A7B48DB60EE74CFC00DCBDB6 /* ExecutableAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecutableAllocator.cpp; sourceTree = "<group>"; };
    1319                 A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSExportMacros.h; sourceTree = "<group>"; };
    13201316                A7BC0C81140608B000B1BB71 /* CheckedArithmetic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CheckedArithmetic.h; sourceTree = "<group>"; };
    13211317                A7C1E8C8112E701C00A37F98 /* JITPropertyAccess32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITPropertyAccess32_64.cpp; sourceTree = "<group>"; };
    … …  
    19381934                                D75AF59612F8CB9500FC0ADF /* DynamicAnnotations.h */,
    19391935                                5135FAD612D26856003C083B /* Encoder.h */,
    1940                                 A7A275F514837A8E001DBB39 /* ExportMacros.h */,
    19411936                                E48E0F2C0F82151700A8CA37 /* FastAllocBase.h */,
    19421937                                65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
    … …  
    21872182                                9788FC221471AD0C0068CE2D /* JSDateMath.cpp */,
    21882183                                9788FC231471AD0C0068CE2D /* JSDateMath.h */,
    2189                                 A7B4ACAE1484C9CE00B38A36 /* JSExportMacros.h */,
    21902184                                F692A85E0255597D01FF60F7 /* JSFunction.cpp */,
    21912185                                F692A85F0255597D01FF60F7 /* JSFunction.h */,
    … …  
    26662660                                86CAFEE31035DDE60028A609 /* Executable.h in Headers */,
    26672661                                A766B44F0EE8DCD1009518CA /* ExecutableAllocator.h in Headers */,
    2668                                 A7FEE67614837B32005DC1A6 /* ExportMacros.h in Headers */,
    26692662                                E48E0F2D0F82151700A8CA37 /* FastAllocBase.h in Headers */,
    26702663                                BC18C4020E16F5CD00B34460 /* FastMalloc.h in Headers */,
    … …  
    27122705                                BC18C41E0E16F5CD00B34460 /* JSContextRef.h in Headers */,
    27132706                                148CD1D8108CF902008163C6 /* JSContextRefPrivate.h in Headers */,
    2714                                 A7B4ACAF1484C9CE00B38A36 /* JSExportMacros.h in Headers */,
    27152707                                BC18C41F0E16F5CD00B34460 /* JSFunction.h in Headers */,
    27162708                                BC18C4200E16F5CD00B34460 /* JSGlobalData.h in Headers */,

  • trunk/Source/JavaScriptCore/config.h

    r101751 r101778  
    2929
    3030#include <wtf/Platform.h>
     31
     32/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
     33#if USE(EXPORT_MACROS)
     34
    3135#include <wtf/ExportMacros.h>
    32 // WTF cannot depend on JSC even if USE(JSC).
    33 #if USE(JSC) && !defined(BUILDING_WTF)
    34 #include "JSExportMacros.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
    3547#endif
     48
     49#define JS_EXPORTDATA JS_EXPORT_PRIVATE
     50#define JS_EXPORTCLASS JS_EXPORT_PRIVATE
     51
     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#else
     58#define JS_EXPORTDATA __declspec(dllimport)
     59#endif
     60#define JS_EXPORTCLASS JS_EXPORTDATA
     61#else
     62#define JS_EXPORTDATA
     63#define JS_EXPORTCLASS
     64#endif
     65
     66#define WTF_EXPORT_PRIVATE
     67#define WTF_EXPORT_HIDDEN
     68#define JS_EXPORT_PRIVATE
     69#define JS_EXPORT_HIDDEN
     70
     71#endif /* USE(EXPORT_MACROS) */
     72
     73#define WTF_INLINE WTF_EXPORT_HIDDEN inline
     74#define JS_INLINE JS_EXPORT_HIDDEN inline
    3675
    3776#if OS(WINDOWS)
    … …  
    90129#define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
    91130#endif
     131
     132#if PLATFORM(CHROMIUM)
     133#if !defined(WTF_USE_V8)
     134#define WTF_USE_V8 1
     135#endif
     136#endif /* PLATFORM(CHROMIUM) */
     137
     138#if !defined(WTF_USE_V8)
     139#define WTF_USE_V8 0
     140#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/wtf/ExportMacros.h

    r101751 r101778  
    3333#include "Platform.h"
    3434
    35 // See note in wtf/Platform.h for more info on EXPORT_MACROS.
    36 #if USE(EXPORT_MACROS)
    37 
    3835#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC)
    3936#define WTF_EXPORT __declspec(dllexport)
    … …  
    5047#endif
    5148
    52 #else // !USE(EXPORT_MACROS)
    53 
    54 #define WTF_EXPORT
    55 #define WTF_IMPORT
    56 #define WTF_HIDDEN
    57 
    58 #endif // USE(EXPORT_MACROS)
    59 
    60 #if defined(BUILDING_WTF)
    61 #define WTF_EXPORT_PRIVATE WTF_EXPORT
    62 #else
    63 #define WTF_EXPORT_PRIVATE WTF_IMPORT
    64 #endif
    65 
    66 #define WTF_EXPORTDATA WTF_EXPORT_PRIVATE
    67 #define WTF_EXPORT_HIDDEN WTF_HIDDEN
    68 #define WTF_INLINE WTF_EXPORT_HIDDEN inline
    69 
    70 #endif // ExportMacros_h
     49#endif /* ExportMacros_h */

  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r101751 r101778  
    11481148#endif
    11491149
    1150 #if PLATFORM(CHROMIUM)
    1151 #if !defined(WTF_USE_V8)
    1152 #define WTF_USE_V8 1
    1153 #endif
    1154 #endif /* PLATFORM(CHROMIUM) */
    1155 
    1156 #if !defined(WTF_USE_V8)
    1157 #define WTF_USE_V8 0
    1158 #endif /* !defined(WTF_USE_V8) */
    1159 
    1160 /* Using V8 implies not using JSC and vice versa */
    1161 #define WTF_USE_JSC !WTF_USE_V8
    1162 
    1163 
    11641150#endif /* WTF_Platform_h */

  • trunk/Source/JavaScriptCore/wtf/WTFThreadData.h

    r101751 r101778  
    121121#endif
    122122
    123     static WTF_EXPORTDATA ThreadSpecific<WTFThreadData>* staticData;
     123    static JS_EXPORTDATA ThreadSpecific<WTFThreadData>* staticData;
    124124    friend WTFThreadData& wtfThreadData();
    125125    friend class AtomicStringTable;

  • trunk/Source/JavaScriptCore/wtf/text/AtomicString.h

    r101751 r101778  
    166166// These are only usable from the main thread.
    167167#ifndef ATOMICSTRING_HIDE_GLOBALS
    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;
     168extern const JS_EXPORTDATA AtomicString nullAtom;
     169extern const JS_EXPORTDATA AtomicString emptyAtom;
     170extern const JS_EXPORTDATA AtomicString textAtom;
     171extern const JS_EXPORTDATA AtomicString commentAtom;
     172extern const JS_EXPORTDATA AtomicString starAtom;
     173extern const JS_EXPORTDATA AtomicString xmlAtom;
     174extern const JS_EXPORTDATA AtomicString xmlnsAtom;
    175175
    176176inline AtomicString AtomicString::fromUTF8(const char* characters, size_t length)

  • trunk/Source/JavaScriptCore/wtf/text/StringStatics.cpp

    r101751 r101778  
    5353}
    5454
    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")
     55JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, nullAtom)
     56JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, emptyAtom, "")
     57JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, textAtom, "#text")
     58JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, commentAtom, "#comment")
     59JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, starAtom, "*")
     60JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlAtom, "xml")
     61JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlnsAtom, "xmlns")
    6262
    6363void AtomicString::init()

  • trunk/Source/JavaScriptGlue/ChangeLog

    r101751 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * ForwardingHeaders/runtime/JSExportMacros.h: Removed.
     11        * ForwardingHeaders/wtf/ExportMacros.h: Removed.
     12        * config.h:
     13
    1142011-12-01  Hajime Morrita  <morrita@chromium.org>
    215

  • trunk/Source/JavaScriptGlue/config.h

    r101751 r101778  
    44
    55#include <wtf/Platform.h>
    6 #include <wtf/ExportMacros.h>
    7 #include <runtime/JSExportMacros.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

  • trunk/Source/WebCore/ChangeLog

    r101777 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * ForwardingHeaders/runtime/JSExportMacros.h: Removed.
     11        * ForwardingHeaders/wtf/ExportMacros.h: Removed.
     12        * WebCore.vcproj/QTMovieWinCommon.vsprops:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * config.h:
     15        * platform/PlatformExportMacros.h: Removed.
     16
    1172011-12-02  Pavel Feldman  <pfeldman@google.com>
    218

  • trunk/Source/WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops

    r101775 r101778  
    77        <Tool
    88                Name="VCCLCompilerTool"
    9                 AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\QTInternalSDK\CIncludes&quot;;&quot;$(WebKitLibrariesDir)\QuickTime SDK\CIncludes&quot;;&quot;$(ProgramFiles)/QuickTime SDK/cincludes&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore&quot;"
     9                AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\private\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\Include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(ConfigurationBuildDir)\Include&quot;;&quot;$(ConfigurationBuildDir)\Include\private&quot;;&quot;$(WebKitLibrariesDir)\QTInternalSDK\CIncludes&quot;;&quot;$(WebKitLibrariesDir)\QuickTime SDK\CIncludes&quot;;&quot;$(ProgramFiles)/QuickTime SDK/cincludes&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;"
    1010                PreprocessorDefinitions="_USRDLL;QTMOVIEWIN_EXPORTS;TARGET_OS_WIN32"
    1111                DisableSpecificWarnings="4819"

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r101751 r101778  
    34493449                A71C30B81381265E00DBC351 /* ShadowInclusionSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A71C30B61381265E00DBC351 /* ShadowInclusionSelector.cpp */; };
    34503450                A71C30B91381265E00DBC351 /* ShadowInclusionSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = A71C30B71381265E00DBC351 /* ShadowInclusionSelector.h */; };
    3451                 A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
    34523451                A73F95FE12C97BFE0031AAF9 /* RoundedRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */; };
    34533452                A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */ = {isa = PBXBuildFile; fileRef = A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1066210661                A71C30B61381265E00DBC351 /* ShadowInclusionSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowInclusionSelector.cpp; sourceTree = "<group>"; };
    1066310662                A71C30B71381265E00DBC351 /* ShadowInclusionSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowInclusionSelector.h; sourceTree = "<group>"; };
    10664                 A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformExportMacros.h; sourceTree = "<group>"; };
    1066510663                A73F95FC12C97BFE0031AAF9 /* RoundedRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RoundedRect.cpp; sourceTree = "<group>"; };
    1066610664                A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; };
    … …  
    2013720135                                98EB1F941313FE0500D0E1EA /* NotImplemented.h */,
    2013820136                                4B2708C50AF19EE40065127F /* Pasteboard.h */,
    20139                                 A723F77A1484CA4C008C6DBE /* PlatformExportMacros.h */,
    2014020137                                BC9585DF12F0989500755821 /* PlatformGestureEvent.h */,
    2014120138                                935C476609AC4D4300A6AAB4 /* PlatformKeyboardEvent.h */,
    … …  
    2379923796                                499B3EC5128CCC4700E726C2 /* PlatformCALayer.h in Headers */,
    2380023797                                493E5E0912D6420500020081 /* PlatformCALayerClient.h in Headers */,
    23801                                 A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */,
    2380223798                                BC9585E112F0989500755821 /* PlatformGestureEvent.h in Headers */,
    2380323799                                935C476809AC4D4300A6AAB4 /* PlatformKeyboardEvent.h in Headers */,

  • trunk/Source/WebCore/config.h

    r101751 r101778  
    3434#endif
    3535
     36/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
     37#if USE(EXPORT_MACROS)
     38
    3639#include <wtf/ExportMacros.h>
    37 #if USE(JSC)
    38 #include <runtime/JSExportMacros.h>
    39 #endif
    40 #include "PlatformExportMacros.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
     47#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) */
    4183
    4284#ifdef __APPLE__
    … …  
    136178#define WTF_USE_GOOGLEURL 1
    137179
     180#if !defined(WTF_USE_V8)
     181#define WTF_USE_V8 1
     182#endif
     183
    138184#endif /* PLATFORM(CHROMIUM) */
     185
     186#if !defined(WTF_USE_V8)
     187#define WTF_USE_V8 0
     188#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_V8
     193#endif
    139194
    140195#if USE(CG)

  • trunk/Source/WebKit/cf/ChangeLog

    r101751 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * WebCoreSupport/WebInspectorClientCF.cpp:
     11
    1122011-12-01  Hajime Morrita  <morrita@chromium.org>
    213

  • trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp

    r101751 r101778  
    2626// FIXME: On Windows, we require all WebKit source files to include config.h
    2727// before including any other files. Failing to include config.h will leave
    28 // WTF_USE_CF undefined, causing build failures in this
     28// WTF_USE_CF and WTF_USE_JSC undefined, causing build failures in this
    2929// 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 and
     30// Windows one here. For now we can just define WTF_USE_CF,  WTF_USE_JSC, and
    3131// WTF_USE_CFNETWORK manually, but we need a better long-term solution.
    3232#ifndef WTF_USE_CF
    3333#define WTF_USE_CF 1
     34#endif
     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
    3458#endif
    3559

  • trunk/Source/WebKit/mac/ChangeLog

    r101751 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * WebKitPrefix.h:
     11
    1122011-12-01  Hajime Morrita  <morrita@chromium.org>
    213

  • trunk/Source/WebKit/mac/WebKitPrefix.h

    r101751 r101778  
    7272
    7373#include <wtf/Platform.h>
    74 #include <wtf/ExportMacros.h>
    75 #include <runtime/JSExportMacros.h>
    76 #include <WebCore/PlatformExportMacros.h>
     74
    7775#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 1
     80#define WTF_USE_V8 0
    7881
    7982/* Work around bug with C++ library that screws up Objective-C++ when exception support is disabled. */
    8083#undef try
    8184#undef catch
     85
     86#define JS_EXPORTDATA
     87#define JS_EXPORTCLASS
     88#define WEBKIT_EXPORTDATA
     89#define WTF_EXPORT_PRIVATE
     90#define JS_EXPORT_PRIVATE
    8291
    8392#ifdef __cplusplus

  • trunk/Source/WebKit/qt/ChangeLog

    r101751 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * tests/MIMESniffing/MIMESniffing.pro:
     11
    1122011-12-01  Hajime Morrita  <morrita@chromium.org>
    213

  • trunk/Source/WebKit/qt/tests/MIMESniffing/MIMESniffing.pro

    r101751 r101778  
    1010INCLUDEPATH += \
    1111    ../../../../WebCore/platform/network \
    12     ../../../../JavaScriptCore \
    13     ../../../../JavaScriptCore/runtime
     12    ../../../../JavaScriptCore
    1413
    1514debug {

  • trunk/Source/WebKit2/ChangeLog

    r101770 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * config.h:
     11
    1122011-12-02  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebKit2/config.h

    r101751 r101778  
    3535#include <wtf/DisallowCType.h>
    3636#include <wtf/Platform.h>
    37 #include <wtf/ExportMacros.h>
    38 #if USE(JSC)
    39 #include <runtime/JSExportMacros.h>
    40 #endif
    4137
    4238#ifdef __cplusplus
    … …  
    6056}
    6157
    62 #if defined(__APPLE__)
     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__)
    6376
    6477#ifdef __OBJC__
    … …  
    8497#endif
    8598
     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 1
     102#define WTF_USE_V8 0
     103
     104#define JS_EXPORTDATA
     105#define JS_EXPORTCLASS
     106#define WEBKIT_EXPORTDATA
     107
     108#define WTF_EXPORT_PRIVATE
     109#define JS_EXPORT_PRIVATE
    86110
    87111#include <WebCore/EmptyProtocolDefinitions.h>

  • trunk/Tools/ChangeLog

    r101767 r101778  
     12011-12-02  Hajime Morrita  <morrita@chromium.org>
     2
     3        Unreviewed, rolling out r101751 and r101775.
     4        http://trac.webkit.org/changeset/101751
     5        http://trac.webkit.org/changeset/101775
     6        https://bugs.webkit.org/show_bug.cgi?id=73191
     7
     8        breaks Windows build
     9
     10        * DumpRenderTree/chromium/config.h:
     11        * DumpRenderTree/config.h:
     12        * TestWebKitAPI/config.h:
     13        * WebKitTestRunner/config.h:
     14
    1152011-12-02  Kentaro Hara  <haraken@chromium.org>
    216

  • trunk/Tools/DumpRenderTree/chromium/config.h

    r101751 r101778  
    4444
    4545#include <wtf/Platform.h>
    46 #include <wtf/ExportMacros.h>
    4746
    4847#if OS(WINDOWS) && !COMPILER(GCC)
    4948// Allow 'this' to be used in base member initializer list.
    5049#pragma warning(disable : 4355)
     50// JS_EXPORTDATA is needed to inlucde wtf/WTFString.h.
     51#define JS_EXPORTDATA __declspec(dllimport)
     52#else
     53#define JS_EXPORTDATA
    5154#endif
    5255
     56#define WTF_EXPORT_PRIVATE
     57#define JS_EXPORT_PRIVATE
     58
    5359#endif // config_h

  • trunk/Tools/DumpRenderTree/config.h

    r101751 r101778  
    3030
    3131#include <wtf/Platform.h>
     32
     33/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
     34#if USE(EXPORT_MACROS)
     35
    3236#include <wtf/ExportMacros.h>
    33 #if USE(JSC)
    34 #include <runtime/JSExportMacros.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
    3553#endif
     54
     55#define WTF_EXPORT_PRIVATE
     56#define JS_EXPORT_PRIVATE
     57
     58#endif /* USE(EXPORT_MACROS) */
    3659
    3760// On MSW, wx headers need to be included before windows.h is.

  • trunk/Tools/TestWebKitAPI/config.h

    r101751 r101778  
    2525
    2626#include <wtf/Platform.h>
    27 #include <wtf/ExportMacros.h>
    28 #if USE(JSC)
    29 #include <runtime/JSExportMacros.h>
    30 #endif
    3127
    3228#if __APPLE__
    … …  
    4137
    4238#endif
     39
     40/* FIXME: Define these properly once USE(EXPORT_MACROS) is set for ports using this */
     41#define JS_EXPORT_PRIVATE
     42#define WTF_EXPORT_PRIVATE
     43
     44#define JS_EXPORTDATA
    4345
    4446#include <stdint.h>

  • trunk/Tools/WebKitTestRunner/config.h

    r101751 r101778  
    2727
    2828#include <wtf/Platform.h>
     29
     30/* See note in wtf/Platform.h for more info on EXPORT_MACROS. */
     31#if USE(EXPORT_MACROS)
     32
    2933#include <wtf/ExportMacros.h>
    30 #if USE(JSC)
    31 #include <runtime/JSExportMacros.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
    3250#endif
     51
     52#define WTF_EXPORT_PRIVATE
     53#define JS_EXPORT_PRIVATE
     54
     55#endif /* USE(EXPORT_MACROS) */
    3356
    3457#if PLATFORM(WIN)
Note: See TracChangeset for help on using the changeset viewer.