Ignore:
Timestamp:
Dec 14, 2011, 4:51:42 PM (13 years ago)
Author:
[email protected]
Message:

JS_INLINE and WTF_INLINE should be visible from WebCore
​https://bugs.webkit.org/show_bug.cgi?id=73191

Source/JavaScriptCore:

  • Moved Export related macro definitions from config.h to ExportMacros.h and JSExportMacros.h.
  • Moved WTF_USE_JSC and WTF_USE_V8 from various config.h family to Platform.h.
  • Replaced JS_EXPORTDATA in wtf moudule with newly introduced WTF_EXPORTDATA.

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

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

Source/JavaScriptGlue:

  • Extracted export related macro definitions to ExportMacros.h and JSExportMacros.h
  • Added forwarding headers which used in config.h

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

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

Source/WebCore:

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

  • Moved export related definitions from config.h to ExportMacros.h, JSExportMacros.h and PlatformExportMacros.h
  • Added forwarding headers which are referred from config.h

No new tests. Only build related changes.

  • ForwardingHeaders/runtime/JSExportMacros.h: Added.
  • ForwardingHeaders/wtf/ExportMacros.h: Added.
  • WebCore.xcodeproj/project.pbxproj:
  • config.h:
  • platform/PlatformExportMacros.h: Copied from Source/JavaScriptCore/wtf/ExportMacros.h.

Source/WebKit/cf:

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

Removed macro definitions which is now provided by Platform.h

  • WebCoreSupport/WebInspectorClientCF.cpp:

Source/WebKit/mac:

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

Removed macro definitions which is now provided by Platform.h

  • WebKitPrefix.h:

Source/WebKit/qt:

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

Added a INCLUDEPATH to make JSExportMacros.h visible.

  • tests/MIMESniffing/MIMESniffing.pro

Source/WebKit2:

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

Removed macro definitions which is now provided by Platform.h

  • config.h:

Tools:

Patch by Hajime Morrita <​[email protected]> on 2011-12-14
Reviewed by Kevin Ollivier.

Removed macro definitions which is now provided by Platform.h

  • DumpRenderTree/chromium/config.h:
  • DumpRenderTree/config.h:
  • DumpRenderTree/ForwardingHeaders/runtime/JSExportMacros.h: Added.
  • DumpRenderTree/ForwardingHeaders/wtf/ExportMacros.h: Added.
  • DumpRenderTree/win/DumpRenderTreePreBuild.cmd: Add new ForwardingHeaders.
  • TestWebKitAPI/config.h:
  • WebKitTestRunner/config.h:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/config.h

    r101778 r102849  
    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 
    3531#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"
    4735#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
    7536
    7637#if OS(WINDOWS)
    … …  
    12990#define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
    13091#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
Note: See TracChangeset for help on using the changeset viewer.