Skip to content
Permalink
Browse files
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:


Canonical link: https://commits.webkit.org/52463@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@61453 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Anders Carlsson committed Jun 18, 2010
1 parent f429800 commit 3852d24dadd5757a443604934c7241a785d28e08
Showing 12 changed files with 70 additions and 49 deletions.
@@ -1,3 +1,12 @@
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 Abhishek Arya <inferno@chromium.org>

Reviewed by Adam Barth.
@@ -59,30 +59,27 @@ typedef struct _NSRect NSRect;
@class QTMovie;
@class QTMovieView;
#else
typedef struct NSArray NSArray;
typedef struct NSButtonCell NSButtonCell;
typedef struct NSData NSData;
typedef struct NSDate NSDate;
typedef struct NSEvent NSEvent;
typedef struct NSFont NSFont;
typedef struct NSImage NSImage;
typedef struct NSMenu NSMenu;
typedef struct NSMutableArray NSMutableArray;
typedef struct NSMutableURLRequest NSMutableURLRequest;
typedef struct NSURLRequest NSURLRequest;
typedef struct NSString NSString;
typedef struct NSTextFieldCell NSTextFieldCell;
typedef struct NSURLConnection NSURLConnection;
typedef struct NSURLResponse NSURLResponse;
typedef struct NSView NSView;
typedef struct objc_object *id;
typedef struct QTMovie QTMovie;
typedef struct QTMovieView QTMovieView;
class NSArray;
class NSButtonCell;
class NSData;
class NSDate;
class NSEvent;
class NSFont;
class NSImage;
class NSMenu;
class NSMutableArray;
class NSMutableURLRequest;
class NSURLRequest;
class NSString;
class NSTextFieldCell;
class NSURLConnection;
class NSURLResponse;
class NSView;
class QTMovie;
class QTMovieView;
#endif

#ifdef __cplusplus
extern "C" {
#endif

// In alphabetical order.

@@ -177,8 +174,6 @@ extern NSMutableArray *(*wkNoteOpenPanelFiles)(NSArray *);
extern void* wkNoteOpenPanelFiles;
#endif

#ifdef __cplusplus
}
#endif

#endif
@@ -1,3 +1,12 @@
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 Dan Bernstein.
@@ -311,7 +311,7 @@
9398112C0824BF01008DF038 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */; };
9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D623DD051E791F002F47DD /* libicucore.dylib */; };
9398112F0824BF01008DF038 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 830E81E005853AC000AD0891 /* Security.framework */; };
93EB178D09F88D460091F8FF /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF /* WebSystemInterface.m */; };
93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EB178C09F88D460091F8FF /* WebSystemInterface.mm */; };
93EB178F09F88D510091F8FF /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 93EB178E09F88D510091F8FF /* WebSystemInterface.h */; };
93FDE9330D79CAF30074F029 /* WebHistoryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */; };
A70936AF0B5608DC00CDB48E /* WebDragClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A70936AD0B5608DC00CDB48E /* WebDragClient.h */; };
@@ -596,7 +596,7 @@
93C6F14507920B93002449CD /* WebFrameViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameViewPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSObjectExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
93D623DD051E791F002F47DD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
93EB178C09F88D460091F8FF /* WebSystemInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebSystemInterface.m; sourceTree = "<group>"; };
93EB178C09F88D460091F8FF /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
93EB178E09F88D510091F8FF /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
93FDE9320D79CAF30074F029 /* WebHistoryInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryInternal.h; sourceTree = "<group>"; };
9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1251,7 +1251,7 @@
0A2D87FB107AF52B00CDDEE3 /* WebPluginHalterClient.h */,
0A2D87FC107AF52B00CDDEE3 /* WebPluginHalterClient.mm */,
93EB178E09F88D510091F8FF /* WebSystemInterface.h */,
93EB178C09F88D460091F8FF /* WebSystemInterface.m */,
93EB178C09F88D460091F8FF /* WebSystemInterface.mm */,
F5F7174C02885C5B018635CA /* WebViewFactory.h */,
F5F7174D02885C5B018635CA /* WebViewFactory.mm */,
);
@@ -1889,7 +1889,7 @@
51079D170CED11B00077247D /* WebSecurityOrigin.mm in Sources */,
BC26C6A510B7447A00B687ED /* WebSerializedJSValue.mm in Sources */,
939810CC0824BF01008DF038 /* WebStringTruncator.mm in Sources */,
93EB178D09F88D460091F8FF /* WebSystemInterface.m in Sources */,
93EB178D09F88D460091F8FF /* WebSystemInterface.mm in Sources */,
936A2DE80FD2D08000D312DB /* WebTextCompletionController.mm in Sources */,
1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */,
F834AAD80E64B1C700E2737C /* WebTextIterator.mm in Sources */,
@@ -1,3 +1,14 @@
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.
@@ -26,12 +26,4 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#ifdef __cplusplus
extern "C" {
#endif

void InitWebCoreSystemInterface(void);

#ifdef __cplusplus
}
#endif
void InitWebCoreSystemInterface();
@@ -1,3 +1,16 @@
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:

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

Reviewed by Sam Weinig.
@@ -161,7 +161,7 @@
BCB9F8B01124E07700A137E0 /* WebPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9F8AE1124E07700A137E0 /* WebPolicyClient.h */; };
BCC56F791159957D001CCAF9 /* MachPort.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC56F771159957D001CCAF9 /* MachPort.h */; };
BCC5715B115ADAEF001CCAF9 /* WebSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */; };
BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */; };
BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */; };
BCC57162115ADB42001CCAF9 /* NotImplemented.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC57161115ADB42001CCAF9 /* NotImplemented.h */; };
BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC938E01180DE440085E5FE /* WKContextPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCD0042D110C1E27003B8A67 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCD0042C110C1E27003B8A67 /* CoreServices.framework */; };
@@ -378,7 +378,7 @@
BCB9F8AE1124E07700A137E0 /* WebPolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPolicyClient.h; sourceTree = "<group>"; };
BCC56F771159957D001CCAF9 /* MachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachPort.h; sourceTree = "<group>"; };
BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSystemInterface.h; sourceTree = "<group>"; };
BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebSystemInterface.m; sourceTree = "<group>"; };
BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebSystemInterface.mm; sourceTree = "<group>"; };
BCC57161115ADB42001CCAF9 /* NotImplemented.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotImplemented.h; sourceTree = "<group>"; };
BCC938E01180DE440085E5FE /* WKContextPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextPrivate.h; sourceTree = "<group>"; };
BCD0042C110C1E27003B8A67 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
@@ -716,7 +716,7 @@
children = (
BC111ADF112F5BC200337BAB /* WebErrorsMac.mm */,
BCC57159115ADAEF001CCAF9 /* WebSystemInterface.h */,
BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.m */,
BCC5715A115ADAEF001CCAF9 /* WebSystemInterface.mm */,
);
path = mac;
sourceTree = "<group>";
@@ -1138,7 +1138,7 @@
BC9E95D411449B0300870E71 /* UpdateChunk.cpp in Sources */,
BC0092F7115837A300E0AE2A /* RunLoopMac.mm in Sources */,
BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */,
BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.m in Sources */,
BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */,
1A30EAC6115D7DA30053E937 /* ConnectionMac.cpp in Sources */,
BC8452A71162C80900CAB9B5 /* DrawingArea.cpp in Sources */,
BC8699B6116AADAA002A925B /* WKView.mm in Sources */,
@@ -26,14 +26,6 @@
#ifndef WebSystemInterface_h
#define WebSystemInterface_h

#ifdef __cplusplus
extern "C" {
#endif

void InitWebCoreSystemInterface(void);

#ifdef __cplusplus
}
#endif

#endif /* WebSystemInterface_h */
@@ -1,5 +1,4 @@
.objc_class_name_WKView
_InitWebCoreSystemInterface
_WKBundlePageGetMainFrameURL
_WKBundlePageSetClient
_WKBundleSetClient
@@ -43,6 +42,7 @@ _WKStringRetain
_WKURLCopyCFURL
_WKURLCreateWithCFURL
_WKURLRelease
__Z26InitWebCoreSystemInterfacev
__ZN6WebKit10WebProcess10initializeEjP7RunLoop
__ZN6WebKit10WebProcess6sharedEv
__ZN7RunLoop21initializeMainRunLoopEv

0 comments on commit 3852d24

Please sign in to comment.