Changeset 173283 in webkit


Ignore:
Timestamp:
Sep 4, 2014 2:36:14 PM (10 years ago)
Author:
aestes@apple.com
Message:

[Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
https://bugs.webkit.org/show_bug.cgi?id=136521

Reviewed by Anders Carlsson.

Source/WebCore:

  • platform/ios/wak/WebCoreThread.h: Stopped defining WEBCORE_EXPORT.

Source/WebKit/mac:

Taught MigrateHeaders.make to remove WEBCORE_EXPORT from headers using this sed expression:

s/( *)WEBCORE_EXPORT /\1/g

This removes WEBCORE_EXPORT and a single following space character but preserves preceeding whitespace.

  • MigrateHeaders.make:

Source/WebKit2:

  • config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.

Tools:

  • DumpRenderTree/config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.
  • TestWebKitAPI/config.h: Ditto.
  • WebKitTestRunner/config.h: Ditto.
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r173281 r173283  
     12014-09-03  Andy Estes  <aestes@apple.com>
     2
     3        [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
     4        https://bugs.webkit.org/show_bug.cgi?id=136521
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * platform/ios/wak/WebCoreThread.h: Stopped defining WEBCORE_EXPORT.
     9
    1102014-09-03  David Hyatt  <hyatt@apple.com>
    211
  • trunk/Source/WebCore/platform/ios/wak/WebCoreThread.h

    r173090 r173283  
    3030
    3131#import <CoreGraphics/CoreGraphics.h>
    32 
    33 /* For a project that uses WebCore but has no config.h, we need to explicitly set the export define here. */
    34 #ifndef WEBCORE_EXPORT
    35 #define WEBCORE_EXPORT
    36 #endif
    3732
    3833#if defined(__cplusplus)
  • trunk/Source/WebKit/mac/ChangeLog

    r173276 r173283  
     12014-09-03  Andy Estes  <aestes@apple.com>
     2
     3        [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
     4        https://bugs.webkit.org/show_bug.cgi?id=136521
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Taught MigrateHeaders.make to remove WEBCORE_EXPORT from headers using this sed expression:
     9
     10            s/(^ *)WEBCORE_EXPORT /\1/g
     11
     12        This removes WEBCORE_EXPORT and a single following space character but preserves preceeding whitespace.
     13
     14        * MigrateHeaders.make:
     15
    1162014-09-04  Maciej Stachowiak  <mjs@apple.com>
    217
  • trunk/Source/WebKit/mac/MigrateHeaders.make

    r173258 r173283  
    242242endif
    243243
    244 WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/
    245 WEBCORE_HEADER_MIGRATE_CMD = sed $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
     244WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/ -e "s/(^ *)WEBCORE_EXPORT /\1/"
     245WEBCORE_HEADER_MIGRATE_CMD = sed -E $(WEBCORE_HEADER_REPLACE_RULES) $< > $@
    246246
    247247$(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make
  • trunk/Source/WebKit2/ChangeLog

    r173276 r173283  
     12014-09-03  Andy Estes  <aestes@apple.com>
     2
     3        [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
     4        https://bugs.webkit.org/show_bug.cgi?id=136521
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.
     9
    1102014-09-04  Maciej Stachowiak  <mjs@apple.com>
    211
  • trunk/Source/WebKit2/config.h

    r172814 r173283  
    3131#include <wtf/Platform.h>
    3232
     33#include <WebCore/PlatformExportMacros.h>
    3334#include <runtime/JSExportMacros.h>
    3435#include <wtf/DisallowCType.h>
    3536#include <wtf/ExportMacros.h>
    36 
    37 // This is needed because we include WebCore's headers.
    38 #define WEBCORE_EXPORT
    3937
    4038#ifdef __cplusplus
  • trunk/Tools/ChangeLog

    r173273 r173283  
     12014-09-03  Andy Estes  <aestes@apple.com>
     2
     3        [Cocoa] Some WebKitLegacy headers migrated from WebCore incorrectly contain WEBCORE_EXPORT
     4        https://bugs.webkit.org/show_bug.cgi?id=136521
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * DumpRenderTree/config.h: Included <WebCore/PlatformExportMacros.h> instead of defining WEBCORE_EXPORT.
     9        * TestWebKitAPI/config.h: Ditto.
     10        * WebKitTestRunner/config.h: Ditto.
     11
    1122014-09-04  Alexey Proskuryakov  <ap@apple.com>
    213
  • trunk/Tools/DumpRenderTree/config.h

    r172967 r173283  
    2525#endif
    2626
     27#include <WebCore/PlatformExportMacros.h>
    2728#include <wtf/Platform.h>
    2829#include <wtf/ExportMacros.h>
    2930#include <runtime/JSExportMacros.h>
    30 
    31 #if PLATFORM(WIN) || PLATFORM(IOS)
    32 // This is needed because we include WebCore's headers.
    33 #define WEBCORE_EXPORT
    34 #endif
    3531
    3632#ifdef __cplusplus
  • trunk/Tools/TestWebKitAPI/config.h

    r172814 r173283  
    2828#endif
    2929
     30#include <WebCore/PlatformExportMacros.h>
    3031#include <wtf/Platform.h>
    3132#include <wtf/ExportMacros.h>
    3233#include <runtime/JSExportMacros.h>
    33 
    34 // This is needed because we include WebCore's headers.
    35 #define WEBCORE_EXPORT
    3634
    3735#if defined(__APPLE__) && __APPLE__
  • trunk/Tools/WebKitTestRunner/config.h

    r172825 r173283  
    3030#endif
    3131
     32#include <WebCore/PlatformExportMacros.h>
    3233#include <WebKit/WebKit2_C.h>
    3334#include <wtf/Platform.h>
     
    3536#include <runtime/JSExportMacros.h>
    3637
    37 // This is needed because we include WebCore's headers.
    38 #define WEBCORE_EXPORT
    39 
    4038#endif
Note: See TracChangeset for help on using the changeset viewer.