Attachment #122828 for bug #76485

View Details Raw Unified Return to Bug 76485



2012-01-17  Sam Weinig  <sam@webkit.org>

        Add helper macro for forward declaring objective-c classes
        https://bugs.webkit.org/show_bug.cgi?id=76485

        Reviewed by NOBODY (OOPS!).

        * wtf/Compiler.h:
        Add OBJC_CLASS macro which helps reduce code when forward declaring an
        objective-c class in a header which can be included from both Objective-C
        and non-Objective-C files.

2012-01-17  Filip Pizlo  <fpizlo@apple.com>

        DFG should be able to do JS and custom getter caching



2012-01-17  Sam Weinig  <sam@webkit.org>

        Add helper macro for forward declaring objective-c classes
        https://bugs.webkit.org/show_bug.cgi?id=76485

        Reviewed by NOBODY (OOPS!).

        * accessibility/AccessibilityObject.h:
        * bindings/js/ScriptController.h:
        * bridge/objc/objc_utility.h:
        * page/DragClient.h:
        * page/EditorClient.h:
        * platform/AutodrainedPool.h:
        * platform/ContextMenuItem.h:
        * platform/Cursor.h:
        * platform/DragData.h:
        * platform/DragImage.h:
        * platform/KURL.h:
        * platform/Pasteboard.h:
        * platform/PlatformKeyboardEvent.h:
        * platform/PlatformMenuDescription.h:
        * platform/PlatformScreen.h:
        * platform/SharedBuffer.h:
        * platform/Widget.h:
        * platform/cf/SchedulePair.h:
        * platform/graphics/BitmapImage.h:
        * platform/graphics/FontPlatformData.h:
        * platform/graphics/GraphicsContext3D.h:
        * platform/graphics/GraphicsLayer.h:
        * platform/graphics/Icon.h:
        * platform/graphics/Image.h:
        * platform/graphics/MediaPlayer.h:
        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
        * platform/graphics/ca/PlatformCAAnimation.h:
        * platform/graphics/ca/mac/TileCache.h:
        * platform/graphics/mac/ColorMac.h:
        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
        * platform/graphics/mac/MediaPlayerProxy.h:
        * platform/mac/ClipboardMac.h:
        * platform/mac/LocalCurrentGraphicsContext.h:
        * platform/mac/PasteboardHelper.h:
        * platform/mac/PopupMenuMac.h:
        * platform/mac/ScrollAnimatorMac.h:
        * platform/mac/WebCoreSystemInterface.h:
        * platform/network/ResourceHandle.h:
        * platform/network/ResourceHandleClient.h:
        * platform/network/ResourceHandleInternal.h:
        * platform/network/cf/AuthenticationChallenge.h:
        * platform/network/cf/ResourceError.h:
        * platform/network/cf/ResourceRequest.h:
        * platform/network/cf/ResourceResponse.h:
        * rendering/RenderThemeMac.h:
        Deploy OBJC_CLASS for a little code reduction.

2012-01-17  Andreas Kling  <awesomekling@apple.com>

        SpaceSplitString: Share equivalent string piece vectors.



2012-01-17  Sam Weinig  <sam@webkit.org>

        Add helper macro for forward declaring objective-c classes
        https://bugs.webkit.org/show_bug.cgi?id=76485

        Reviewed by NOBODY (OOPS!).

        * WebProcess/WebCoreSupport/WebDragClient.h:
        Deploy OBJC_CLASS for a little code reduction.

        * config.h:
        Remove duplicate copy of OBJC_CLASS.

2012-01-17  Martin Robinson  <mrobinson@igalia.com>

        [GTK] [WK2] WebKitPrivate should include the entire WebKit2 C API

Lines 1-5 a/Source/JavaScriptCore/wtf/Compiler.h_sec1
- a/Source/JavaScriptCore/wtf/Compiler.h -1 / +11 lines
1	/*	1	/*
2	* Copyright (C) 2011 Apple Inc. All rights reserved.	2	* Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions	5	* modification, are permitted provided that the following conditions
Lines 239-242 a/Source/JavaScriptCore/wtf/Compiler.h_sec2
239	#define FINAL	239	#define FINAL
240	#endif	240	#endif
241		241
		242	/* OBJC_CLASS */
		243
		244	#ifndef OBJC_CLASS
		245	#ifdef __OBJC__
		246	#define OBJC_CLASS @class
		247	#else
		248	#define OBJC_CLASS class
		249	#endif
		250	#endif
		251
242	#endif /* WTF_Compiler_h */	252	#endif /* WTF_Compiler_h */



#include "AccessibilityObjectWrapper.h"
#endif

#if PLATFORM(MAC)

typedef struct _NSRange NSRange;

OBJC_CLASS NSArray;
OBJC_CLASS NSAttributedString;
OBJC_CLASS NSData;
OBJC_CLASS NSMutableAttributedString;
OBJC_CLASS NSString;
OBJC_CLASS NSValue;
OBJC_CLASS NSView;
OBJC_CLASS WebAccessibilityObjectWrapper;

typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;

#elif PLATFORM(GTK)
class NSData;
class NSMutableAttributedString;
class NSString;
class NSValue;
class NSView;
#if PLATFORM(GTK)
typedef struct _AtkObject AtkObject;
typedef struct _AtkObject AccessibilityObjectWrapper;
#elif PLATFORM(MAC)
class WebAccessibilityObjectWrapper;
#else
class AccessibilityObjectWrapper;
#endif
#endif

#if PLATFORM(MAC)
typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
#endif

namespace WebCore {





#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
OBJC_CLASS WebScriptObject;
#ifdef __OBJC__
@class WebScriptObject;
#else
class WebScriptObject;
#endif
#endif

struct NPObject;



#include <runtime/Error.h>
#include <runtime/JSObject.h>

OBJC_CLASS NSString;
@class NSString;
#else
class NSString;
#endif

namespace JSC {
namespace Bindings {



#include "IntPoint.h"

#if PLATFORM(MAC)
OBJC_CLASS DOMElement;
OBJC_CLASS NSURL;
OBJC_CLASS NSString;
OBJC_CLASS NSPasteboard;
@class NSPasteboard;
#else
class DOMElement;
class NSURL;
class NSString;
class NSPasteboard;
#endif
#endif

namespace WebCore {



#include <wtf/Vector.h>

#if PLATFORM(MAC)
OBJC_CLASS NSAttributedString;
OBJC_CLASS NSPasteboard;
OBJC_CLASS NSString;
OBJC_CLASS NSURL;
@class NSURL;
#else
class NSAttributedString;
class NSPasteboard;
class NSString;
class NSURL;
#endif
#endif

namespace WebCore {




#include <wtf/Noncopyable.h>

OBJC_CLASS NSAutoreleasePool;
@class NSAutoreleasePool;
#else
class NSAutoreleasePool;
#endif

namespace WebCore {





#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
OBJC_CLASS NSMenuItem;
#ifdef __OBJC__
@class NSMenuItem;
#else
class NSMenuItem;
#endif
#elif PLATFORM(WIN)
typedef struct tagMENUITEMINFOW MENUITEMINFO;
#elif PLATFORM(GTK)



#endif

#if PLATFORM(MAC) && !PLATFORM(IOS)
OBJC_CLASS NSCursor;
@class NSCursor;
#else
class NSCursor;
#endif
#endif

#if PLATFORM(WX)




#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>

#ifdef __OBJC__ 
#import <Foundation/Foundation.h>
#import <AppKit/NSDragging.h>
typedef id <NSDraggingInfo> DragDataRef;
@class NSPasteboard;
#else
typedef void* DragDataRef;
class NSPasteboard;
#endif

OBJC_CLASS NSPasteboard;

#elif PLATFORM(QT)
QT_BEGIN_NAMESPACE
class QMimeData;




#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
OBJC_CLASS NSImage;
@class NSImage;
#else
class NSImage;
#endif
#elif PLATFORM(QT)
QT_BEGIN_NAMESPACE
class QPixmap;



#endif

#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
OBJC_CLASS NSURL;
@class NSURL;
#else
class NSURL;
#endif
#endif

#if PLATFORM(QT)



// knowledge of the frame and editor or moved into the editing directory.

#if PLATFORM(MAC)
OBJC_CLASS NSFileWrapper;
OBJC_CLASS NSPasteboard;
OBJC_CLASS NSArray;
@class NSArray;
#else
class NSFileWrapper;
class NSPasteboard;
class NSArray;
#endif
#endif

#if PLATFORM(WIN)




#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
OBJC_CLASS NSEvent;
@class NSEvent;
#else
class NSEvent;
#endif
#endif

#if PLATFORM(WIN)



#define PlatformMenuDescription_h

#if PLATFORM(MAC)
OBJC_CLASS NSMutableArray;
@class NSMutableArray;
#else
class NSMutableArray;
#endif
#elif PLATFORM(QT)
#include <qlist.h>
#elif PLATFORM(GTK)



#include <wtf/RefPtr.h>

#if PLATFORM(MAC)
OBJC_CLASS NSScreen;
OBJC_CLASS NSWindow;
    @class NSWindow;
#else
    class NSScreen;
    class NSWindow;
#endif
#endif

typedef uint32_t PlatformDisplayID;



 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */

#ifndef SharedBuffer_h
#define SharedBuffer_h


#endif

#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
OBJC_CLASS NSData;
@class NSData;
#else
class NSData;
#endif

#endif

namespace WebCore {



#endif

#if PLATFORM(MAC)
OBJC_CLASS NSView;
OBJC_CLASS NSWindow;
@class NSWindow;
#else
class NSView;
class NSWindow;
#endif
typedef NSView *PlatformWidget;
#endif




#include <wtf/RetainPtr.h>

#if PLATFORM(MAC)
OBJC_CLASS NSRunLoop;
@class NSRunLoop;
#else
class NSRunLoop;
#endif
#endif

namespace WebCore {




#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
OBJC_CLASS NSImage;
@class NSImage;
#else
class NSImage;
#endif
#endif

#if PLATFORM(WIN)



#endif

#if OS(DARWIN)
OBJC_CLASS NSFont;
@class NSFont;
#else
class NSFont;
#endif

typedef struct CGFont* CGFontRef;
typedef const struct __CTFont* CTFontRef;



#if PLATFORM(MAC)
#include <OpenGL/OpenGL.h>
#include <wtf/RetainPtr.h>
OBJC_CLASS CALayer;
OBJC_CLASS WebGLLayer;
@class WebGLLayer;
#else
class CALayer;
class WebGLLayer;
#endif
#elif PLATFORM(QT)
QT_BEGIN_NAMESPACE
class QPainter;



#include <wtf/PassOwnPtr.h>

#if PLATFORM(MAC)
OBJC_CLASS CALayer;
@class CALayer;
#else
class CALayer;
#endif
typedef CALayer PlatformLayer;
#elif PLATFORM(WIN)
typedef struct _CACFLayer PlatformLayer;




#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
OBJC_CLASS NSImage;
@class NSImage;
#else
class NSImage;
#endif
#elif PLATFORM(WIN)
typedef struct HICON__* HICON;
#elif PLATFORM(QT)



#include <wtf/text/WTFString.h>

#if PLATFORM(MAC)
OBJC_CLASS NSImage;
@class NSImage;
#else
class NSImage;
#endif
#endif

#if USE(CG)



#include "GraphicsLayer.h"
#endif

OBJC_CLASS AVPlayer;
OBJC_CLASS QTMovie;

#else
class AVPlayer;
class QTMovie;
#endif
class AVCFPlayer;
class QTMovieGWorld;
class QTMovieVisualContext;




#include "MediaPlayerPrivateAVFoundation.h"

OBJC_CLASS AVAsset;
OBJC_CLASS AVPlayer;
OBJC_CLASS AVPlayerItem;
OBJC_CLASS AVPlayerLayer;
OBJC_CLASS AVAssetImageGenerator;
OBJC_CLASS WebCoreAVFMovieObserver;

#ifndef __OBJC__
class AVAsset;
class AVPlayer;
class AVPlayerItem;
class AVPlayerLayer;
class AVAssetImageGenerator;
class WebCoreAVFMovieObserver;
typedef struct objc_object *id;
#endif




#include <wtf/Vector.h>

#if PLATFORM(MAC)
OBJC_CLASS CAPropertyAnimation;
@class CAPropertyAnimation;
#else
class CAPropertyAnimation;
#endif
typedef CAPropertyAnimation* PlatformAnimationRef;
#elif PLATFORM(WIN)
typedef struct _CACFAnimation* CACFAnimationRef;



#include <wtf/PassOwnPtr.h>
#include <wtf/RetainPtr.h>

OBJC_CLASS CALayer;
OBJC_CLASS WebTileCacheLayer;
OBJC_CLASS WebTileLayer;
@class WebTileLayer;
#else
class CALayer;
class WebTileCacheLayer;
class WebTileLayer;
#endif

namespace WebCore {





#include "Color.h"

OBJC_CLASS NSColor;
@class NSColor;
#else
class NSColor;
#endif

namespace WebCore {
    




#ifdef __OBJC__
#import <QTKit/QTTime.h>
@class QTMovie;
@class QTMovieView;
@class QTMovieLayer;
@class QTVideoRendererWebKitOnly;
@class WebCoreMovieObserver;
#else
class NSDictionary;
class NSMutableDictionary;
class QTMovie;
class QTMovieView;
class QTTime;
class QTMovieLayer;
class QTVideoRendererWebKitOnly;
class WebCoreMovieObserver;
#endif

OBJC_CLASS NSDictionary;
OBJC_CLASS NSMutableDictionary;
OBJC_CLASS QTMovie;
OBJC_CLASS QTMovieView;
OBJC_CLASS QTMovieLayer;
OBJC_CLASS QTVideoRendererWebKitOnly;
OBJC_CLASS WebCoreMovieObserver;

#ifndef DRAW_FRAME_RATE
#define DRAW_FRAME_RATE 0
#endif



#ifndef MediaPlayerProxy_h
#define MediaPlayerProxy_h

OBJC_CLASS WebMediaPlayerProxy;
@class WebMediaPlayerProxy;
#else
class WebMediaPlayerProxy;
#endif

enum MediaPlayerProxyNotificationType {




#include "Clipboard.h"
#include <wtf/RetainPtr.h>

OBJC_CLASS NSImage;
OBJC_CLASS NSPasteboard;
@class NSPasteboard;
#else
class NSImage;
class NSPasteboard;
#endif

namespace WebCore {




#include "skia/ext/skia_utils_mac.h"
#endif

OBJC_CLASS NSGraphicsContext;
@class NSGraphicsContext;
#else
class NSGraphicsContext;
#endif

namespace WebCore {





#import <wtf/Forward.h>

OBJC_CLASS DOMDocumentFragment;
@class DOMDocumentFragment;
#else
class DOMDocumentFragment;
#endif

namespace WebCore {




#include <wtf/RefCounted.h>
#include <wtf/RetainPtr.h>

OBJC_CLASS NSPopUpButtonCell;
@class NSPopUpButtonCell;
#else
class NSPopUpButtonCell;
#endif

namespace WebCore {




#include "Timer.h"
#include <wtf/RetainPtr.h>

OBJC_CLASS WebScrollAnimationHelperDelegate;
OBJC_CLASS WebScrollbarPainterControllerDelegate;
OBJC_CLASS WebScrollbarPainterDelegate;
@class WebScrollbarPainterDelegate;
#else
class WebScrollAnimationHelperDelegate;
class WebScrollbarPainterControllerDelegate;
class WebScrollbarPainterDelegate;
#endif

typedef id ScrollbarPainterController;




typedef const struct _CFURLRequest* CFURLRequestRef;
#endif

OBJC_CLASS AVAsset;
OBJC_CLASS NSArray;
OBJC_CLASS NSButtonCell;
OBJC_CLASS NSControl;
OBJC_CLASS NSCursor;
OBJC_CLASS NSData;
OBJC_CLASS NSDate;
OBJC_CLASS NSEvent;
OBJC_CLASS NSFont;
OBJC_CLASS NSHTTPCookie;
OBJC_CLASS NSImage;
OBJC_CLASS NSMenu;
OBJC_CLASS NSMutableURLRequest;
OBJC_CLASS NSString;
OBJC_CLASS NSTextFieldCell;
OBJC_CLASS NSURL;
OBJC_CLASS NSURLConnection;
OBJC_CLASS NSURLRequest;
OBJC_CLASS NSURLResponse;
OBJC_CLASS NSView;
OBJC_CLASS NSWindow;
OBJC_CLASS QTMovie;
OBJC_CLASS QTMovieView;
@class QTMovieView;
#else
class AVAsset;
class NSArray;
class NSButtonCell;
class NSControl;
class NSCursor;
class NSData;
class NSDate;
class NSEvent;
class NSFont;
class NSHTTPCookie;
class NSImage;
class NSMenu;
class NSMutableArray;
class NSMutableURLRequest;
class NSURL;
class NSURLRequest;
class NSString;
class NSTextFieldCell;
class NSURLConnection;
class NSURLResponse;
class NSView;
class NSWindow;
class QTMovie;
class QTMovieView;
#endif

extern "C" {




#endif

#if PLATFORM(MAC)
OBJC_CLASS NSData;
OBJC_CLASS NSError;
OBJC_CLASS NSURLConnection;
OBJC_CLASS WebCoreResourceHandleAsDelegate;
#ifndef __OBJC__
#else
class NSData;
class NSError;
class NSURLConnection;
class WebCoreResourceHandleAsDelegate;
typedef struct objc_object *id;
#endif
#endif



#endif

#if PLATFORM(MAC)
OBJC_CLASS NSCachedURLResponse;
@class NSCachedURLResponse;
#else
class NSCachedURLResponse;
#endif
#endif

namespace WebCore {



#endif

#if PLATFORM(MAC)
OBJC_CLASS NSURLAuthenticationChallenge;
OBJC_CLASS NSURLConnection;
@class NSURLConnection;
#else
class NSURLAuthenticationChallenge;
class NSURLConnection;
#endif
#endif

// The allocations and releases in ResourceHandleInternal are



#include <wtf/RefPtr.h>

#if USE(CFNETWORK)

typedef struct _CFURLAuthChallenge* CFURLAuthChallengeRef;

#else

#ifndef __OBJC__
typedef struct objc_object *id;
class NSURLAuthenticationChallenge;
#else
@class NSURLAuthenticationChallenge;
#endif

OBJC_CLASS NSURLAuthenticationChallenge;

#endif

namespace WebCore {



#include <wincrypt.h> // windows.h must be included before wincrypt.h.
#endif

#if PLATFORM(MAC)
OBJC_CLASS NSError;
#else
class NSError;
#endif

namespace WebCore {



typedef const struct _CFURLRequest* CFURLRequestRef;
#endif

OBJC_CLASS NSURLRequest;
@class NSURLRequest;
#else
class NSURLRequest;
#endif

#if USE(CFURLSTORAGESESSIONS) && (defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LEOPARD))
typedef struct __CFURLStorageSession* CFURLStorageSessionRef;



typedef struct _CFURLResponse* CFURLResponseRef;
#endif

OBJC_CLASS NSURLResponse;
@class NSURLResponse;
#else
class NSURLResponse;
#endif

namespace WebCore {




#import <wtf/HashMap.h>
#import <wtf/RetainPtr.h>

class RenderProgress;

OBJC_CLASS WebCoreRenderThemeNotificationObserver;
@class WebCoreRenderThemeNotificationObserver;
#else
class WebCoreRenderThemeNotificationObserver;
#endif

namespace WebCore {

class RenderProgress;
class RenderStyle;

class RenderThemeMac : public RenderTheme {



#include <WebCore/DragClient.h>

#if PLATFORM(MAC)
OBJC_CLASS WKPasteboardFilePromiseOwner;
OBJC_CLASS WKPasteboardOwner;
@class WKPasteboardOwner;
#else
class WKPasteboardFilePromiseOwner;
class WKPasteboardOwner;
#endif
#endif

namespace WebKit {




#if PLATFORM(MAC)

#ifdef __OBJC__
#define OBJC_CLASS @class
#else
#define OBJC_CLASS class
#endif

#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
#define ENABLE_WEB_PROCESS_SANDBOX 1
#endif

Return to Bug 76485

Lines 55-65 a/Source/WebCore/platform/graphics/FontPlatformData.h_sec1
- a/Source/WebCore/platform/graphics/FontPlatformData.h -5 / +1 lines
55	#endif	55	#endif
56		56
57	#if OS(DARWIN)	57	#if OS(DARWIN)
58	#ifdef __OBJC__	58	OBJC_CLASS NSFont;
59	@class NSFont;
60	#else
61	class NSFont;
62	#endif
63		59
64	typedef struct CGFont* CGFontRef;	60	typedef struct CGFont* CGFontRef;
65	typedef const struct __CTFont* CTFontRef;	61	typedef const struct __CTFont* CTFontRef;

Lines 77-132 typedef struct _CFURLRequest* CFMutableURLRequestRef; a/Source/WebCore/platform/mac/WebCoreSystemInterface.h_sec1
- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h -50 / +23 lines
77	typedef const struct _CFURLRequest* CFURLRequestRef;	77	typedef const struct _CFURLRequest* CFURLRequestRef;
78	#endif	78	#endif
79		79
80	#ifdef __OBJC__	80	OBJC_CLASS AVAsset;
81	@class AVAsset;	81	OBJC_CLASS NSArray;
82	@class NSArray;	82	OBJC_CLASS NSButtonCell;
83	@class NSButtonCell;	83	OBJC_CLASS NSControl;
84	@class NSControl;	84	OBJC_CLASS NSCursor;
85	@class NSCursor;	85	OBJC_CLASS NSData;
86	@class NSData;	86	OBJC_CLASS NSDate;
87	@class NSDate;	87	OBJC_CLASS NSEvent;
88	@class NSEvent;	88	OBJC_CLASS NSFont;
89	@class NSFont;	89	OBJC_CLASS NSHTTPCookie;
90	@class NSHTTPCookie;	90	OBJC_CLASS NSImage;
91	@class NSImage;	91	OBJC_CLASS NSMenu;
92	@class NSMenu;	92	OBJC_CLASS NSMutableURLRequest;
93	@class NSMutableURLRequest;	93	OBJC_CLASS NSString;
94	@class NSString;	94	OBJC_CLASS NSTextFieldCell;
95	@class NSTextFieldCell;	95	OBJC_CLASS NSURL;
96	@class NSURL;	96	OBJC_CLASS NSURLConnection;
97	@class NSURLConnection;	97	OBJC_CLASS NSURLRequest;
98	@class NSURLRequest;	98	OBJC_CLASS NSURLResponse;
99	@class NSURLResponse;	99	OBJC_CLASS NSView;
100	@class NSView;	100	OBJC_CLASS NSWindow;
101	@class NSWindow;	101	OBJC_CLASS QTMovie;
102	@class QTMovie;	102	OBJC_CLASS QTMovieView;
103	@class QTMovieView;
104	#else
105	class AVAsset;
106	class NSArray;
107	class NSButtonCell;
108	class NSControl;
109	class NSCursor;
110	class NSData;
111	class NSDate;
112	class NSEvent;
113	class NSFont;
114	class NSHTTPCookie;
115	class NSImage;
116	class NSMenu;
117	class NSMutableArray;
118	class NSMutableURLRequest;
119	class NSURL;
120	class NSURLRequest;
121	class NSString;
122	class NSTextFieldCell;
123	class NSURLConnection;
124	class NSURLResponse;
125	class NSView;
126	class NSWindow;
127	class QTMovie;
128	class QTMovieView;
129	#endif
130		103
131	extern "C" {	104	extern "C" {
132		105

Lines 52-67 typedef LPVOID HINTERNET; a/Source/WebCore/platform/network/ResourceHandle.h_sec1
- a/Source/WebCore/platform/network/ResourceHandle.h -10 / +5 lines
52	#endif	52	#endif
53		53
54	#if PLATFORM(MAC)	54	#if PLATFORM(MAC)
55	#ifdef __OBJC__	55	OBJC_CLASS NSData;
56	@class NSData;	56	OBJC_CLASS NSError;
57	@class NSError;	57	OBJC_CLASS NSURLConnection;
58	@class NSURLConnection;	58	OBJC_CLASS WebCoreResourceHandleAsDelegate;
59	@class WebCoreResourceHandleAsDelegate;	59	#ifndef __OBJC__
60	#else
61	class NSData;
62	class NSError;
63	class NSURLConnection;
64	class WebCoreResourceHandleAsDelegate;
65	typedef struct objc_object *id;	60	typedef struct objc_object *id;
66	#endif	61	#endif
67	#endif	62	#endif

Lines 61-73 class QNetworkReplyHandler; a/Source/WebCore/platform/network/ResourceHandleInternal.h_sec1
- a/Source/WebCore/platform/network/ResourceHandleInternal.h -7 / +2 lines
61	#endif	61	#endif
62		62
63	#if PLATFORM(MAC)	63	#if PLATFORM(MAC)
64	#ifdef __OBJC__	64	OBJC_CLASS NSURLAuthenticationChallenge;
65	@class NSURLAuthenticationChallenge;	65	OBJC_CLASS NSURLConnection;
66	@class NSURLConnection;
67	#else
68	class NSURLAuthenticationChallenge;
69	class NSURLConnection;
70	#endif
71	#endif	66	#endif
72		67
73	// The allocations and releases in ResourceHandleInternal are	68	// The allocations and releases in ResourceHandleInternal are

Lines 1-3 a/Source/JavaScriptCore/ChangeLog_sec1
- a/Source/JavaScriptCore/ChangeLog +12 lines
		1	2012-01-17 Sam Weinig <sam@webkit.org>
		2
		3	Add helper macro for forward declaring objective-c classes
		4	https://bugs.webkit.org/show_bug.cgi?id=76485
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* wtf/Compiler.h:
		9	Add OBJC_CLASS macro which helps reduce code when forward declaring an
		10	objective-c class in a header which can be included from both Objective-C
		11	and non-Objective-C files.
		12
1	2012-01-17 Filip Pizlo <fpizlo@apple.com>	13	2012-01-17 Filip Pizlo <fpizlo@apple.com>
2		14
3	DFG should be able to do JS and custom getter caching	15	DFG should be able to do JS and custom getter caching

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +54 lines
		1	2012-01-17 Sam Weinig <sam@webkit.org>
		2
		3	Add helper macro for forward declaring objective-c classes
		4	https://bugs.webkit.org/show_bug.cgi?id=76485
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* accessibility/AccessibilityObject.h:
		9	* bindings/js/ScriptController.h:
		10	* bridge/objc/objc_utility.h:
		11	* page/DragClient.h:
		12	* page/EditorClient.h:
		13	* platform/AutodrainedPool.h:
		14	* platform/ContextMenuItem.h:
		15	* platform/Cursor.h:
		16	* platform/DragData.h:
		17	* platform/DragImage.h:
		18	* platform/KURL.h:
		19	* platform/Pasteboard.h:
		20	* platform/PlatformKeyboardEvent.h:
		21	* platform/PlatformMenuDescription.h:
		22	* platform/PlatformScreen.h:
		23	* platform/SharedBuffer.h:
		24	* platform/Widget.h:
		25	* platform/cf/SchedulePair.h:
		26	* platform/graphics/BitmapImage.h:
		27	* platform/graphics/FontPlatformData.h:
		28	* platform/graphics/GraphicsContext3D.h:
		29	* platform/graphics/GraphicsLayer.h:
		30	* platform/graphics/Icon.h:
		31	* platform/graphics/Image.h:
		32	* platform/graphics/MediaPlayer.h:
		33	* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
		34	* platform/graphics/ca/PlatformCAAnimation.h:
		35	* platform/graphics/ca/mac/TileCache.h:
		36	* platform/graphics/mac/ColorMac.h:
		37	* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
		38	* platform/graphics/mac/MediaPlayerProxy.h:
		39	* platform/mac/ClipboardMac.h:
		40	* platform/mac/LocalCurrentGraphicsContext.h:
		41	* platform/mac/PasteboardHelper.h:
		42	* platform/mac/PopupMenuMac.h:
		43	* platform/mac/ScrollAnimatorMac.h:
		44	* platform/mac/WebCoreSystemInterface.h:
		45	* platform/network/ResourceHandle.h:
		46	* platform/network/ResourceHandleClient.h:
		47	* platform/network/ResourceHandleInternal.h:
		48	* platform/network/cf/AuthenticationChallenge.h:
		49	* platform/network/cf/ResourceError.h:
		50	* platform/network/cf/ResourceRequest.h:
		51	* platform/network/cf/ResourceResponse.h:
		52	* rendering/RenderThemeMac.h:
		53	Deploy OBJC_CLASS for a little code reduction.
		54
1	2012-01-17 Andreas Kling <awesomekling@apple.com>	55	2012-01-17 Andreas Kling <awesomekling@apple.com>
2		56
3	SpaceSplitString: Share equivalent string piece vectors.	57	SpaceSplitString: Share equivalent string piece vectors.

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +13 lines
		1	2012-01-17 Sam Weinig <sam@webkit.org>
		2
		3	Add helper macro for forward declaring objective-c classes
		4	https://bugs.webkit.org/show_bug.cgi?id=76485
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* WebProcess/WebCoreSupport/WebDragClient.h:
		9	Deploy OBJC_CLASS for a little code reduction.
		10
		11	* config.h:
		12	Remove duplicate copy of OBJC_CLASS.
		13
1	2012-01-17 Martin Robinson <mrobinson@igalia.com>	14	2012-01-17 Martin Robinson <mrobinson@igalia.com>
2		15
3	[GTK] [WK2] WebKitPrivate should include the entire WebKit2 C API	16	[GTK] [WK2] WebKitPrivate should include the entire WebKit2 C API

Lines 47-84 a/Source/WebCore/accessibility/AccessibilityObject.h_sec1
- a/Source/WebCore/accessibility/AccessibilityObject.h -25 / +14 lines
47	#include "AccessibilityObjectWrapper.h"	47	#include "AccessibilityObjectWrapper.h"
48	#endif	48	#endif
49		49
		50	#if PLATFORM(MAC)
		51
50	typedef struct _NSRange NSRange;	52	typedef struct _NSRange NSRange;
51		53
52	#ifdef __OBJC__	54	OBJC_CLASS NSArray;
53	@class NSArray;	55	OBJC_CLASS NSAttributedString;
54	@class NSAttributedString;	56	OBJC_CLASS NSData;
55	@class NSData;	57	OBJC_CLASS NSMutableAttributedString;
56	@class NSMutableAttributedString;	58	OBJC_CLASS NSString;
57	@class NSString;	59	OBJC_CLASS NSValue;
58	@class NSValue;	60	OBJC_CLASS NSView;
59	@class NSView;	61	OBJC_CLASS WebAccessibilityObjectWrapper;
60	@class WebAccessibilityObjectWrapper;	62
61	#else	63	typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
62	class NSArray;	64
63	class NSAttributedString;	65	#elif PLATFORM(GTK)
64	class NSData;
65	class NSMutableAttributedString;
66	class NSString;
67	class NSValue;
68	class NSView;
69	#if PLATFORM(GTK)
70	typedef struct _AtkObject AtkObject;	66	typedef struct _AtkObject AtkObject;
71	typedef struct _AtkObject AccessibilityObjectWrapper;	67	typedef struct _AtkObject AccessibilityObjectWrapper;
72	#elif PLATFORM(MAC)
73	class WebAccessibilityObjectWrapper;
74	#else	68	#else
75	class AccessibilityObjectWrapper;	69	class AccessibilityObjectWrapper;
76	#endif	70	#endif
77	#endif
78
79	#if PLATFORM(MAC)
80	typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
81	#endif
82		71
83	namespace WebCore {	72	namespace WebCore {
84		73

Lines 33-44 a/Source/WebCore/bindings/js/ScriptController.h_sec1
- a/Source/WebCore/bindings/js/ScriptController.h -6 / +1 lines
33		33
34	#if PLATFORM(MAC)	34	#if PLATFORM(MAC)
35	#include <wtf/RetainPtr.h>	35	#include <wtf/RetainPtr.h>
36		36	OBJC_CLASS WebScriptObject;
37	#ifdef __OBJC__
38	@class WebScriptObject;
39	#else
40	class WebScriptObject;
41	#endif
42	#endif	37	#endif
43		38
44	struct NPObject;	39	struct NPObject;

Lines 32-42 a/Source/WebCore/bridge/objc/objc_utility.h_sec1
- a/Source/WebCore/bridge/objc/objc_utility.h -5 / +1 lines
32	#include <runtime/Error.h>	32	#include <runtime/Error.h>
33	#include <runtime/JSObject.h>	33	#include <runtime/JSObject.h>
34		34
35	#ifdef __OBJC__	35	OBJC_CLASS NSString;
36	@class NSString;
37	#else
38	class NSString;
39	#endif
40		36
41	namespace JSC {	37	namespace JSC {
42	namespace Bindings {	38	namespace Bindings {

Lines 32-48 a/Source/WebCore/page/DragClient.h_sec1
- a/Source/WebCore/page/DragClient.h -11 / +4 lines
32	#include "IntPoint.h"	32	#include "IntPoint.h"
33		33
34	#if PLATFORM(MAC)	34	#if PLATFORM(MAC)
35	#ifdef __OBJC__	35	OBJC_CLASS DOMElement;
36	@class DOMElement;	36	OBJC_CLASS NSURL;
37	@class NSURL;	37	OBJC_CLASS NSString;
38	@class NSString;	38	OBJC_CLASS NSPasteboard;
39	@class NSPasteboard;
40	#else
41	class DOMElement;
42	class NSURL;
43	class NSString;
44	class NSPasteboard;
45	#endif
46	#endif	39	#endif
47		40
48	namespace WebCore {	41	namespace WebCore {

Lines 36-52 a/Source/WebCore/page/EditorClient.h_sec1
- a/Source/WebCore/page/EditorClient.h -11 / +4 lines
36	#include <wtf/Vector.h>	36	#include <wtf/Vector.h>
37		37
38	#if PLATFORM(MAC)	38	#if PLATFORM(MAC)
39	#ifdef __OBJC__	39	OBJC_CLASS NSAttributedString;
40	@class NSAttributedString;	40	OBJC_CLASS NSPasteboard;
41	@class NSPasteboard;	41	OBJC_CLASS NSString;
42	@class NSString;	42	OBJC_CLASS NSURL;
43	@class NSURL;
44	#else
45	class NSAttributedString;
46	class NSPasteboard;
47	class NSString;
48	class NSURL;
49	#endif
50	#endif	43	#endif
51		44
52	namespace WebCore {	45	namespace WebCore {

Lines 31-41 a/Source/WebCore/platform/AutodrainedPool.h_sec1
- a/Source/WebCore/platform/AutodrainedPool.h -5 / +1 lines
31		31
32	#include <wtf/Noncopyable.h>	32	#include <wtf/Noncopyable.h>
33		33
34	#ifdef __OBJC__	34	OBJC_CLASS NSAutoreleasePool;
35	@class NSAutoreleasePool;
36	#else
37	class NSAutoreleasePool;
38	#endif
39		35
40	namespace WebCore {	36	namespace WebCore {
41		37

Lines 33-44 a/Source/WebCore/platform/ContextMenuItem.h_sec1
- a/Source/WebCore/platform/ContextMenuItem.h -6 / +1 lines
33		33
34	#if PLATFORM(MAC)	34	#if PLATFORM(MAC)
35	#include <wtf/RetainPtr.h>	35	#include <wtf/RetainPtr.h>
36		36	OBJC_CLASS NSMenuItem;
37	#ifdef __OBJC__
38	@class NSMenuItem;
39	#else
40	class NSMenuItem;
41	#endif
42	#elif PLATFORM(WIN)	37	#elif PLATFORM(WIN)
43	typedef struct tagMENUITEMINFOW MENUITEMINFO;	38	typedef struct tagMENUITEMINFOW MENUITEMINFO;
44	#elif PLATFORM(GTK)	39	#elif PLATFORM(GTK)

Lines 46-56 typedef HICON HCURSOR; a/Source/WebCore/platform/Cursor.h_sec1
- a/Source/WebCore/platform/Cursor.h -5 / +1 lines
46	#endif	46	#endif
47		47
48	#if PLATFORM(MAC) && !PLATFORM(IOS)	48	#if PLATFORM(MAC) && !PLATFORM(IOS)
49	#ifdef __OBJC__	49	OBJC_CLASS NSCursor;
50	@class NSCursor;
51	#else
52	class NSCursor;
53	#endif
54	#endif	50	#endif
55		51
56	#if PLATFORM(WX)	52	#if PLATFORM(WX)

Lines 36-50 a/Source/WebCore/platform/DragData.h_sec1
- a/Source/WebCore/platform/DragData.h -2 / +4 lines
36		36
37	#if PLATFORM(MAC)	37	#if PLATFORM(MAC)
38	#include <wtf/RetainPtr.h>	38	#include <wtf/RetainPtr.h>
		39
39	#ifdef __OBJC__	40	#ifdef __OBJC__
40	#import <Foundation/Foundation.h>	41	#import <Foundation/Foundation.h>
41	#import <AppKit/NSDragging.h>	42	#import <AppKit/NSDragging.h>
42	typedef id <NSDraggingInfo> DragDataRef;	43	typedef id <NSDraggingInfo> DragDataRef;
43	@class NSPasteboard;
44	#else	44	#else
45	typedef void* DragDataRef;	45	typedef void* DragDataRef;
46	class NSPasteboard;
47	#endif	46	#endif
		47
		48	OBJC_CLASS NSPasteboard;
		49
48	#elif PLATFORM(QT)	50	#elif PLATFORM(QT)
49	QT_BEGIN_NAMESPACE	51	QT_BEGIN_NAMESPACE
50	class QMimeData;	52	class QMimeData;

Lines 32-42 a/Source/WebCore/platform/DragImage.h_sec1
- a/Source/WebCore/platform/DragImage.h -5 / +1 lines
32		32
33	#if PLATFORM(MAC)	33	#if PLATFORM(MAC)
34	#include <wtf/RetainPtr.h>	34	#include <wtf/RetainPtr.h>
35	#ifdef __OBJC__	35	OBJC_CLASS NSImage;
36	@class NSImage;
37	#else
38	class NSImage;
39	#endif
40	#elif PLATFORM(QT)	36	#elif PLATFORM(QT)
41	QT_BEGIN_NAMESPACE	37	QT_BEGIN_NAMESPACE
42	class QPixmap;	38	class QPixmap;

Lines 35-45 typedef const struct __CFURL* CFURLRef; a/Source/WebCore/platform/KURL.h_sec1
- a/Source/WebCore/platform/KURL.h -5 / +1 lines
35	#endif	35	#endif
36		36
37	#if PLATFORM(MAC) \|\| (PLATFORM(QT) && USE(QTKIT))	37	#if PLATFORM(MAC) \|\| (PLATFORM(QT) && USE(QTKIT))
38	#ifdef __OBJC__	38	OBJC_CLASS NSURL;
39	@class NSURL;
40	#else
41	class NSURL;
42	#endif
43	#endif	39	#endif
44		40
45	#if PLATFORM(QT)	41	#if PLATFORM(QT)

Lines 43-57 a/Source/WebCore/platform/Pasteboard.h_sec1
- a/Source/WebCore/platform/Pasteboard.h -9 / +3 lines
43	// knowledge of the frame and editor or moved into the editing directory.	43	// knowledge of the frame and editor or moved into the editing directory.
44		44
45	#if PLATFORM(MAC)	45	#if PLATFORM(MAC)
46	#ifdef __OBJC__	46	OBJC_CLASS NSFileWrapper;
47	@class NSFileWrapper;	47	OBJC_CLASS NSPasteboard;
48	@class NSPasteboard;	48	OBJC_CLASS NSArray;
49	@class NSArray;
50	#else
51	class NSFileWrapper;
52	class NSPasteboard;
53	class NSArray;
54	#endif
55	#endif	49	#endif
56		50
57	#if PLATFORM(WIN)	51	#if PLATFORM(WIN)

Lines 32-42 a/Source/WebCore/platform/PlatformKeyboardEvent.h_sec1
- a/Source/WebCore/platform/PlatformKeyboardEvent.h -5 / +1 lines
32		32
33	#if PLATFORM(MAC)	33	#if PLATFORM(MAC)
34	#include <wtf/RetainPtr.h>	34	#include <wtf/RetainPtr.h>
35	#ifdef __OBJC__	35	OBJC_CLASS NSEvent;
36	@class NSEvent;
37	#else
38	class NSEvent;
39	#endif
40	#endif	36	#endif
41		37
42	#if PLATFORM(WIN)	38	#if PLATFORM(WIN)

Lines 27-37 a/Source/WebCore/platform/PlatformMenuDescription.h_sec1
- a/Source/WebCore/platform/PlatformMenuDescription.h -5 / +1 lines
27	#define PlatformMenuDescription_h	27	#define PlatformMenuDescription_h
28		28
29	#if PLATFORM(MAC)	29	#if PLATFORM(MAC)
30	#ifdef __OBJC__	30	OBJC_CLASS NSMutableArray;
31	@class NSMutableArray;
32	#else
33	class NSMutableArray;
34	#endif
35	#elif PLATFORM(QT)	31	#elif PLATFORM(QT)
36	#include <qlist.h>	32	#include <qlist.h>
37	#elif PLATFORM(GTK)	33	#elif PLATFORM(GTK)

Lines 31-43 a/Source/WebCore/platform/PlatformScreen.h_sec1
- a/Source/WebCore/platform/PlatformScreen.h -7 / +2 lines
31	#include <wtf/RefPtr.h>	31	#include <wtf/RefPtr.h>
32		32
33	#if PLATFORM(MAC)	33	#if PLATFORM(MAC)
34	#ifdef __OBJC__	34	OBJC_CLASS NSScreen;
35	@class NSScreen;	35	OBJC_CLASS NSWindow;
36	@class NSWindow;
37	#else
38	class NSScreen;
39	class NSWindow;
40	#endif
41	#endif	36	#endif
42		37
43	typedef uint32_t PlatformDisplayID;	38	typedef uint32_t PlatformDisplayID;

Lines 23-28 a/Source/WebCore/platform/SharedBuffer.h_sec1
- a/Source/WebCore/platform/SharedBuffer.h -6 / +2 lines
23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE	23	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	24	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25	*/	25	*/
		26
26	#ifndef SharedBuffer_h	27	#ifndef SharedBuffer_h
27	#define SharedBuffer_h	28	#define SharedBuffer_h
28		29
Lines 37-48 a/Source/WebCore/platform/SharedBuffer.h_sec2
37	#endif	38	#endif
38		39
39	#if PLATFORM(MAC) \|\| (PLATFORM(QT) && USE(QTKIT))	40	#if PLATFORM(MAC) \|\| (PLATFORM(QT) && USE(QTKIT))
40	#ifdef __OBJC__	41	OBJC_CLASS NSData;
41	@class NSData;
42	#else
43	class NSData;
44	#endif
45
46	#endif	42	#endif
47		43
48	namespace WebCore {	44	namespace WebCore {

Lines 45-57 a/Source/WebCore/platform/Widget.h_sec1
- a/Source/WebCore/platform/Widget.h -7 / +2 lines
45	#endif	45	#endif
46		46
47	#if PLATFORM(MAC)	47	#if PLATFORM(MAC)
48	#ifdef __OBJC__	48	OBJC_CLASS NSView;
49	@class NSView;	49	OBJC_CLASS NSWindow;
50	@class NSWindow;
51	#else
52	class NSView;
53	class NSWindow;
54	#endif
55	typedef NSView *PlatformWidget;	50	typedef NSView *PlatformWidget;
56	#endif	51	#endif
57		52

Lines 35-45 a/Source/WebCore/platform/cf/SchedulePair.h_sec1
- a/Source/WebCore/platform/cf/SchedulePair.h -5 / +1 lines
35	#include <wtf/RetainPtr.h>	35	#include <wtf/RetainPtr.h>
36		36
37	#if PLATFORM(MAC)	37	#if PLATFORM(MAC)
38	#ifdef __OBJC__	38	OBJC_CLASS NSRunLoop;
39	@class NSRunLoop;
40	#else
41	class NSRunLoop;
42	#endif
43	#endif	39	#endif
44		40
45	namespace WebCore {	41	namespace WebCore {

Lines 34-44 a/Source/WebCore/platform/graphics/BitmapImage.h_sec1
- a/Source/WebCore/platform/graphics/BitmapImage.h -5 / +1 lines
34		34
35	#if PLATFORM(MAC)	35	#if PLATFORM(MAC)
36	#include <wtf/RetainPtr.h>	36	#include <wtf/RetainPtr.h>
37	#ifdef __OBJC__	37	OBJC_CLASS NSImage;
38	@class NSImage;
39	#else
40	class NSImage;
41	#endif
42	#endif	38	#endif
43		39
44	#if PLATFORM(WIN)	40	#if PLATFORM(WIN)

Lines 50-62 a/Source/WebCore/platform/graphics/GraphicsContext3D.h_sec1
- a/Source/WebCore/platform/graphics/GraphicsContext3D.h -7 / +2 lines
50	#if PLATFORM(MAC)	50	#if PLATFORM(MAC)
51	#include <OpenGL/OpenGL.h>	51	#include <OpenGL/OpenGL.h>
52	#include <wtf/RetainPtr.h>	52	#include <wtf/RetainPtr.h>
53	#ifdef __OBJC__	53	OBJC_CLASS CALayer;
54	@class CALayer;	54	OBJC_CLASS WebGLLayer;
55	@class WebGLLayer;
56	#else
57	class CALayer;
58	class WebGLLayer;
59	#endif
60	#elif PLATFORM(QT)	55	#elif PLATFORM(QT)
61	QT_BEGIN_NAMESPACE	56	QT_BEGIN_NAMESPACE
62	class QPainter;	57	class QPainter;

Lines 44-54 a/Source/WebCore/platform/graphics/GraphicsLayer.h_sec1
- a/Source/WebCore/platform/graphics/GraphicsLayer.h -5 / +1 lines
44	#include <wtf/PassOwnPtr.h>	44	#include <wtf/PassOwnPtr.h>
45		45
46	#if PLATFORM(MAC)	46	#if PLATFORM(MAC)
47	#ifdef __OBJC__	47	OBJC_CLASS CALayer;
48	@class CALayer;
49	#else
50	class CALayer;
51	#endif
52	typedef CALayer PlatformLayer;	48	typedef CALayer PlatformLayer;
53	#elif PLATFORM(WIN)	49	#elif PLATFORM(WIN)
54	typedef struct _CACFLayer PlatformLayer;	50	typedef struct _CACFLayer PlatformLayer;

Lines 28-38 a/Source/WebCore/platform/graphics/Icon.h_sec1
- a/Source/WebCore/platform/graphics/Icon.h -5 / +1 lines
28		28
29	#if PLATFORM(MAC)	29	#if PLATFORM(MAC)
30	#include <wtf/RetainPtr.h>	30	#include <wtf/RetainPtr.h>
31	#ifdef __OBJC__	31	OBJC_CLASS NSImage;
32	@class NSImage;
33	#else
34	class NSImage;
35	#endif
36	#elif PLATFORM(WIN)	32	#elif PLATFORM(WIN)
37	typedef struct HICON__* HICON;	33	typedef struct HICON__* HICON;
38	#elif PLATFORM(QT)	34	#elif PLATFORM(QT)

Lines 39-49 a/Source/WebCore/platform/graphics/Image.h_sec1
- a/Source/WebCore/platform/graphics/Image.h -5 / +1 lines
39	#include <wtf/text/WTFString.h>	39	#include <wtf/text/WTFString.h>
40		40
41	#if PLATFORM(MAC)	41	#if PLATFORM(MAC)
42	#ifdef __OBJC__	42	OBJC_CLASS NSImage;
43	@class NSImage;
44	#else
45	class NSImage;
46	#endif
47	#endif	43	#endif
48		44
49	#if USE(CG)	45	#if USE(CG)

Lines 46-58 a/Source/WebCore/platform/graphics/MediaPlayer.h_sec1
- a/Source/WebCore/platform/graphics/MediaPlayer.h -7 / +3 lines
46	#include "GraphicsLayer.h"	46	#include "GraphicsLayer.h"
47	#endif	47	#endif
48		48
49	#ifdef __OBJC__	49	OBJC_CLASS AVPlayer;
50	@class AVPlayer;	50	OBJC_CLASS QTMovie;
51	@class QTMovie;	51
52	#else
53	class AVPlayer;
54	class QTMovie;
55	#endif
56	class AVCFPlayer;	52	class AVCFPlayer;
57	class QTMovieGWorld;	53	class QTMovieGWorld;
58	class QTMovieVisualContext;	54	class QTMovieVisualContext;

Lines 30-49 a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h_sec1
- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h -14 / +8 lines
30		30
31	#include "MediaPlayerPrivateAVFoundation.h"	31	#include "MediaPlayerPrivateAVFoundation.h"
32		32
33	#ifdef __OBJC__	33	OBJC_CLASS AVAsset;
34	@class AVAsset;	34	OBJC_CLASS AVPlayer;
35	@class AVPlayer;	35	OBJC_CLASS AVPlayerItem;
36	@class AVPlayerItem;	36	OBJC_CLASS AVPlayerLayer;
37	@class AVPlayerLayer;	37	OBJC_CLASS AVAssetImageGenerator;
38	@class AVAssetImageGenerator;	38	OBJC_CLASS WebCoreAVFMovieObserver;
39	@class WebCoreAVFMovieObserver;	39
40	#else	40	#ifndef __OBJC__
41	class AVAsset;
42	class AVPlayer;
43	class AVPlayerItem;
44	class AVPlayerLayer;
45	class AVAssetImageGenerator;
46	class WebCoreAVFMovieObserver;
47	typedef struct objc_object *id;	41	typedef struct objc_object *id;
48	#endif	42	#endif
49		43

Lines 36-46 a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h_sec1
- a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h -5 / +1 lines
36	#include <wtf/Vector.h>	36	#include <wtf/Vector.h>
37		37
38	#if PLATFORM(MAC)	38	#if PLATFORM(MAC)
39	#ifdef __OBJC__	39	OBJC_CLASS CAPropertyAnimation;
40	@class CAPropertyAnimation;
41	#else
42	class CAPropertyAnimation;
43	#endif
44	typedef CAPropertyAnimation* PlatformAnimationRef;	40	typedef CAPropertyAnimation* PlatformAnimationRef;
45	#elif PLATFORM(WIN)	41	#elif PLATFORM(WIN)
46	typedef struct _CACFAnimation* CACFAnimationRef;	42	typedef struct _CACFAnimation* CACFAnimationRef;

Lines 31-41 a/Source/WebCore/platform/graphics/mac/ColorMac.h_sec1
- a/Source/WebCore/platform/graphics/mac/ColorMac.h -5 / +1 lines
31		31
32	#include "Color.h"	32	#include "Color.h"
33		33
34	#ifdef __OBJC__	34	OBJC_CLASS NSColor;
35	@class NSColor;
36	#else
37	class NSColor;
38	#endif
39		35
40	namespace WebCore {	36	namespace WebCore {
41		37