Changeset 61453 in webkit


Ignore:
Timestamp:
Jun 18, 2010 4:23:47 PM (14 years ago)
Author:
andersca@apple.com
Message:

2010-06-18 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Make WebCoreSystemInterface.h a C++ only header
​https://bugs.webkit.org/show_bug.cgi?id=40867

  • WebKit.xcodeproj/project.pbxproj:

2010-06-18 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Make WebCoreSystemInterface.h a C++ only header
​https://bugs.webkit.org/show_bug.cgi?id=40867

  • WebCoreSupport/WebSystemInterface.h:
  • WebCoreSupport/WebSystemInterface.m: Removed.
  • WebCoreSupport/WebSystemInterface.mm: Copied from WebKit/mac/WebCoreSupport/WebSystemInterface.m.

2010-06-18 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Make WebCoreSystemInterface.h a C++ only header
​https://bugs.webkit.org/show_bug.cgi?id=40867

  • platform/mac/WebCoreSystemInterface.h:

2010-06-18 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

Make WebCoreSystemInterface.h a C++ only header
​https://bugs.webkit.org/show_bug.cgi?id=40867

  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/WebCoreSupport/mac/WebSystemInterface.h:
  • WebProcess/WebCoreSupport/mac/WebSystemInterface.m: Removed.
  • WebProcess/WebCoreSupport/mac/WebSystemInterface.mm: Copied from WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.m.
  • mac/WebKit2.exp:
Location:
trunk
Files:
10 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r61451 r61453  
     12010-06-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Make WebCoreSystemInterface.h a C++ only header
     6        https://bugs.webkit.org/show_bug.cgi?id=40867
     7
     8        * platform/mac/WebCoreSystemInterface.h:
     9
    1102010-06-18  Abhishek Arya  <inferno@chromium.org>
    211

  • trunk/WebCore/platform/mac/WebCoreSystemInterface.h

    r60974 r61453  
    6060@class QTMovieView;
    6161#else
    62 typedef struct NSArray NSArray;
    63 typedef struct NSButtonCell NSButtonCell;
    64 typedef struct NSData NSData;
    65 typedef struct NSDate NSDate;
    66 typedef struct NSEvent NSEvent;
    67 typedef struct NSFont NSFont;
    68 typedef struct NSImage NSImage;
    69 typedef struct NSMenu NSMenu;
    70 typedef struct NSMutableArray NSMutableArray;
    71 typedef struct NSMutableURLRequest NSMutableURLRequest;
    72 typedef struct NSURLRequest NSURLRequest;
    73 typedef struct NSString NSString;
    74 typedef struct NSTextFieldCell NSTextFieldCell;
    75 typedef struct NSURLConnection NSURLConnection;
    76 typedef struct NSURLResponse NSURLResponse;
    77 typedef struct NSView NSView;
    78 typedef struct objc_object *id;
    79 typedef struct QTMovie QTMovie;
    80 typedef struct QTMovieView QTMovieView;
     62class NSArray;
     63class NSButtonCell;
     64class NSData;
     65class NSDate;
     66class NSEvent;
     67class NSFont;
     68class NSImage;
     69class NSMenu;
     70class NSMutableArray;
     71class NSMutableURLRequest;
     72class NSURLRequest;
     73class NSString;
     74class NSTextFieldCell;
     75class NSURLConnection;
     76class NSURLResponse;
     77class NSView;
     78class QTMovie;
     79class QTMovieView;
    8180#endif
    8281
    83 #ifdef __cplusplus
    8482extern "C" {
    85 #endif
    8683
    8784// In alphabetical order.
    … …  
    178175#endif
    179176
    180 #ifdef __cplusplus
    181177}
    182 #endif
    183178
    184179#endif

  • trunk/WebKit/ChangeLog

    r61438 r61453  
     12010-06-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Make WebCoreSystemInterface.h a C++ only header
     6        https://bugs.webkit.org/show_bug.cgi?id=40867
     7
     8        * WebKit.xcodeproj/project.pbxproj:
     9
    1102010-06-18  Anders Carlsson  <andersca@apple.com>
    211

  • trunk/WebKit/WebKit.xcodeproj/project.pbxproj

    r61438 r61453  
    312312                9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D623DD051E791F002F47DD /* libicucore.dylib */; };
    313313                9398112F0824BF01008DF038 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 830E81E005853AC000AD0891 /* Security.framework */; };
    314                 93EB178D09F88D460091F8FF /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF /* WebSystemInterface.m */; };
     314                93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF /* WebSystemInterface.mm */; };
    315315                93EB178F09F88D510091F8FF /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 93EB178E09F88D510091F8FF /* WebSystemInterface.h */; };
    316316                93FDE9330D79CAF30074F029 /* WebHistoryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */; };
    … …  
    597597                93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSObjectExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    598598                93D623DD051E791F002F47DD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
    599                 93EB178C09F88D460091F8FF /* WebSystemInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebSystemInterface.m; sourceTree = "<group>"; };
     599                93EB178C09F88D460091F8FF /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
    600600                93EB178E09F88D510091F8FF /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
    601601                93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryInternal.h; sourceTree = "<group>"; };
    … …  
    12521252                                0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */,
    12531253                                93EB178E09F88D510091F8FF /* WebSystemInterface.h */,
    1254                                 93EB178C09F88D460091F8FF /* WebSystemInterface.m */,
     1254                                93EB178C09F88D460091F8FF /* WebSystemInterface.mm */,
    12551255                                F5F7174C02885C5B018635CA /* WebViewFactory.h */,
    12561256                                F5F7174D02885C5B018635CA /* WebViewFactory.mm */,
    … …  
    18901890                                BC26C6A510B7447A00B687ED /* WebSerializedJSValue.mm in Sources */,
    18911891                                939810CC0824BF01008DF038 /* WebStringTruncator.mm in Sources */,
    1892                                 93EB178D09F88D460091F8FF /* WebSystemInterface.m in Sources */,
     1892                                93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */,
    18931893                                936A2DE80FD2D08000D312DB /* WebTextCompletionController.mm in Sources */,
    18941894                                1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */,

  • trunk/WebKit/mac/ChangeLog

    r61452 r61453  
     12010-06-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Make WebCoreSystemInterface.h a C++ only header
     6        https://bugs.webkit.org/show_bug.cgi?id=40867
     7
     8        * WebCoreSupport/WebSystemInterface.h:
     9        * WebCoreSupport/WebSystemInterface.m: Removed.
     10        * WebCoreSupport/WebSystemInterface.mm: Copied from WebKit/mac/WebCoreSupport/WebSystemInterface.m.
     11
    1122010-06-18  Anders Carlsson  <andersca@apple.com>
    213

  • trunk/WebKit/mac/WebCoreSupport/WebSystemInterface.h

    r17000 r61453  
    2727 */
    2828
    29 #ifdef __cplusplus
    30 extern "C" {
    31 #endif
    32 
    33 void InitWebCoreSystemInterface(void);
    34 
    35 #ifdef __cplusplus
    36 }
    37 #endif
     29void InitWebCoreSystemInterface();

  • trunk/WebKit2/ChangeLog

    r61447 r61453  
     12010-06-18  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Make WebCoreSystemInterface.h a C++ only header
     6        https://bugs.webkit.org/show_bug.cgi?id=40867
     7
     8        * WebKit2.xcodeproj/project.pbxproj:
     9        * WebProcess/WebCoreSupport/mac/WebSystemInterface.h:
     10        * WebProcess/WebCoreSupport/mac/WebSystemInterface.m: Removed.
     11        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm: Copied from WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.m.
     12        * mac/WebKit2.exp:
     13
    1142010-06-18  Anders Carlsson  <andersca@apple.com>
    215

  • trunk/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r61447 r61453  
    162162                BCC56F791159957D001CCAF9 /* MachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC56F771159957D001CCAF9 /* MachPort.h */; };
    163163                BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */; };
    164                 BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */; };
     164                BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */; };
    165165                BCC57162115ADB42001CCAF9 /* NotImplemented.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57161115ADB42001CCAF9 /* NotImplemented.h */; };
    166166                BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC938E01180DE440085E5FE /* WKContextPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    379379                BCC56F771159957D001CCAF9 /* MachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachPort.h; sourceTree = "<group>"; };
    380380                BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
    381                 BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebSystemInterface.m; sourceTree = "<group>"; };
     381                BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
    382382                BCC57161115ADB42001CCAF9 /* NotImplemented.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotImplemented.h; sourceTree = "<group>"; };
    383383                BCC938E01180DE440085E5FE /* WKContextPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextPrivate.h; sourceTree = "<group>"; };
    … …  
    717717                                BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */,
    718718                                BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */,
    719                                 BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */,
     719                                BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */,
    720720                        );
    721721                        path = mac;
    … …  
    11391139                                BC0092F7115837A300E0AE2A /* RunLoopMac.mm in Sources */,
    11401140                                BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,
    1141                                 BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.m in Sources */,
     1141                                BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */,
    11421142                                1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
    11431143                                BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */,

  • trunk/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.h

    r57359 r61453  
    2727#define WebSystemInterface_h
    2828
    29 #ifdef __cplusplus
    30 extern "C" {
    31 #endif
    32 
    3329void InitWebCoreSystemInterface(void);
    3430
    35 #ifdef __cplusplus
    36 }
    37 #endif
    38 
    3931#endif /* WebSystemInterface_h */

  • trunk/WebKit2/mac/WebKit2.exp

    r61443 r61453  
    11.objc_class_name_WKView
    2 _InitWebCoreSystemInterface
    32_WKBundlePageGetMainFrameURL
    43_WKBundlePageSetClient
    … …  
    4443_WKURLCreateWithCFURL
    4544_WKURLRelease
     45__Z26InitWebCoreSystemInterfacev
    4646__ZN6WebKit10WebProcess10initializeEjP7RunLoop
    4747__ZN6WebKit10WebProcess6sharedEv
Note: See TracChangeset for help on using the changeset viewer.