Commit 842ea0c3 authored by darin's avatar darin

Reviewed by Adele.

        - preparations for making more code C++

        * WebKitPrefix.h: Fixed ifdef so that C++ files get all the precompiled stuff
        that non-C++ files get.

        * Misc/WebKitLogging.h:
        * Misc/WebKitSystemBits.h:
        * Misc/WebLocalizableStrings.h:
        * WebCoreSupport/WebSystemInterface.h:
        Added extern "C".

        * Misc/WebNSViewExtras.h:
        * WebView/WebDataSource.m: (addTypesFromClass):
        * WebView/WebFrameView.m: (addTypesFromClass):
        Eliminated use of the identifier "class".

        * WebView/WebView.m: (-[WebView _goToItem:withLoadType:]): Added a type cast.

        * Plugins/WebBaseNetscapePluginView.m: Added lots of type casts.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 72fab966
2006-10-11 Darin Adler <darin@apple.com>
Reviewed by Adele.
- preparations for making more code C++
* WebKitPrefix.h: Fixed ifdef so that C++ files get all the precompiled stuff
that non-C++ files get.
* Misc/WebKitLogging.h:
* Misc/WebKitSystemBits.h:
* Misc/WebLocalizableStrings.h:
* WebCoreSupport/WebSystemInterface.h:
Added extern "C".
* Misc/WebNSViewExtras.h:
* WebView/WebDataSource.m: (addTypesFromClass):
* WebView/WebFrameView.m: (addTypesFromClass):
Eliminated use of the identifier "class".
* WebView/WebView.m: (-[WebView _goToItem:withLoadType:]): Added a type cast.
* Plugins/WebBaseNetscapePluginView.m: Added lots of type casts.
2006-10-10 Brady Eidson <beidson@apple.com>
Reviewed by Maciej.
......
......@@ -32,6 +32,10 @@
#define LOG_CHANNEL_PREFIX WebKitLog
#endif
#ifdef __cplusplus
extern "C" {
#endif
extern WTFLogChannel WebKitLogTiming;
extern WTFLogChannel WebKitLogLoading;
extern WTFLogChannel WebKitLogFontCache;
......@@ -57,3 +61,7 @@ extern WTFLogChannel WebKitLogPluginEvents;
extern WTFLogChannel WebKitLogIconDatabase;
void WebKitInitializeLoggingChannelsIfNecessary(void);
#ifdef __cplusplus
}
#endif
......@@ -28,5 +28,13 @@
#import <Foundation/Foundation.h>
#ifdef __cplusplus
extern "C" {
#endif
vm_size_t WebSystemMainMemory(void);
int WebNumberOfCPUs(void);
#ifdef __cplusplus
}
#endif
/*
* Copyright (C) 2005 Apple Computer, Inc. All rights reserved.
* Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -33,8 +33,16 @@ typedef struct {
NSBundle *bundle;
} WebLocalizableStringsBundle;
#ifdef __cplusplus
extern "C" {
#endif
NSString *WebLocalizedString(WebLocalizableStringsBundle *bundle, const char *key);
#ifdef __cplusplus
}
#endif
#ifdef FRAMEWORK_NAME
#define LOCALIZABLE_STRINGS_BUNDLE(F) LOCALIZABLE_STRINGS_BUNDLE_HELPER(F)
......
......@@ -36,7 +36,7 @@
@interface NSView (WebExtras)
// Returns the nearest enclosing view of the given class, or nil if none.
- (NSView *)_web_superviewOfClass:(Class)class;
- (NSView *)_web_superviewOfClass:(Class)viewClass;
- (WebFrameView *)_web_parentWebFrameView;
// returns whether a drag should begin starting with mouseDownEvent; if the time
......
This diff is collapsed.
......@@ -26,4 +26,12 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef __cplusplus
extern "C" {
#endif
void InitWebCoreSystemInterface(void);
#ifdef __cplusplus
}
#endif
......@@ -51,7 +51,7 @@
#include <cstddef>
#include <new>
#else
#endif
#import <ApplicationServices/ApplicationServices.h>
#import <Carbon/Carbon.h>
......@@ -61,5 +61,3 @@
#endif
#include <JavaScriptCore/Platform.h>
#endif
/*
* Copyright (C) 2005 Apple Computer, Inc. All rights reserved.
* Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -92,14 +92,14 @@ @interface WebDataSource (WebFileInternal)
@implementation WebDataSource (WebFileInternal)
- (void)_setRepresentation: (id<WebDocumentRepresentation>)representation
- (void)_setRepresentation:(id<WebDocumentRepresentation>)representation
{
[_private->representation release];
_private->representation = [representation retain];
_private->representationFinishedLoading = NO;
}
static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class, NSArray *supportTypes)
static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCClass, NSArray *supportTypes)
{
NSEnumerator *enumerator = [supportTypes objectEnumerator];
ASSERT(enumerator != nil);
......@@ -107,7 +107,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
while ((mime = [enumerator nextObject]) != nil) {
// Don't clobber previously-registered classes.
if ([allTypes objectForKey:mime] == nil)
[allTypes setObject:class forKey:mime];
[allTypes setObject:objCClass forKey:mime];
}
}
......
......@@ -244,7 +244,7 @@ - (float)_verticalPageScrollDistance
return (height < overlap) ? height / 2 : height - overlap;
}
static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class, NSArray *supportTypes)
static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCClass, NSArray *supportTypes)
{
NSEnumerator *enumerator = [supportTypes objectEnumerator];
ASSERT(enumerator != nil);
......@@ -252,7 +252,7 @@ static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class class,
while ((mime = [enumerator nextObject]) != nil) {
// Don't clobber previously-registered classes.
if ([allTypes objectForKey:mime] == nil)
[allTypes setObject:class forKey:mime];
[allTypes setObject:objCClass forKey:mime];
}
}
......
......@@ -799,7 +799,7 @@ - (void)_goToItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)type
// abort any current load if we're going back/forward
[[self mainFrame] stopLoading];
[[self mainFrame] _goToItem:item withLoadType:type];
[[self mainFrame] _goToItem:item withLoadType:(FrameLoadType)type];
}
- (void)_loadBackForwardListFromOtherView:(WebView *)otherView
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment