Attachment 122828 Details for Bug 76485 – Patch

[patch] Patch

bug-76485-20120117154156.patch (text/plain), 34.59 KB, created by Sam Weinig on 2012-01-17 15:41:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Weinig

Created: 2012-01-17 15:41:49 PST

Size: 34.59 KB

patch

obsolete

>Subversion Revision: 105186
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 27a7b7965d3183614f8ee003f5b77a7ccd63624a..ea235005918b1c2765f3cc185f7541b6a0b2baec 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,15 @@
>+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
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 95dd985bd167519ba285cecafad7643288a15baa..2054ccd827e81a6a5d8fed7cbb4591becae4e4b3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,57 @@
>+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.
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 7fe63667602f90db65acb5d5c9e5e3f2c1eb0050..e915c2c4ce1e7b385ed490ee8e74bc4c55864d27 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,16 @@
>+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
>diff --git a/Source/JavaScriptCore/wtf/Compiler.h b/Source/JavaScriptCore/wtf/Compiler.h
>index 93d3316bfbbca1f9e70eb0ac204f9dc8908da0ee..96ad6e40eb438164b1341cec06bfa82591468934 100644
>--- a/Source/JavaScriptCore/wtf/Compiler.h
>+++ b/Source/JavaScriptCore/wtf/Compiler.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>+ * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -239,4 +239,14 @@
> #define FINAL
> #endif
> 
>+/* OBJC_CLASS */
>+
>+#ifndef OBJC_CLASS
>+#ifdef __OBJC__
>+#define OBJC_CLASS @class
>+#else
>+#define OBJC_CLASS class
>+#endif
>+#endif
>+
> #endif /* WTF_Compiler_h */
>diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
>index 428324d6a87b9b634680c8c1c59e83e7deb394e5..737e2dff129433e58194e58e91286378930e87dd 100644
>--- a/Source/WebCore/accessibility/AccessibilityObject.h
>+++ b/Source/WebCore/accessibility/AccessibilityObject.h
>@@ -47,38 +47,27 @@
> #include "AccessibilityObjectWrapper.h"
> #endif
> 
>+#if PLATFORM(MAC)
>+
> typedef struct _NSRange NSRange;
> 
>-#ifdef __OBJC__
>-@class NSArray;
>-@class NSAttributedString;
>-@class NSData;
>-@class NSMutableAttributedString;
>-@class NSString;
>-@class NSValue;
>-@class NSView;
>-@class WebAccessibilityObjectWrapper;
>-#else
>-class NSArray;
>-class NSAttributedString;
>-class NSData;
>-class NSMutableAttributedString;
>-class NSString;
>-class NSValue;
>-class NSView;
>-#if PLATFORM(GTK)
>+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)
> 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 {
> 
>diff --git a/Source/WebCore/bindings/js/ScriptController.h b/Source/WebCore/bindings/js/ScriptController.h
>index d672f42de04bf4beac12b785ca2c201e7b697ff1..6b662daac0a2d89b61027b53b291a7db9fffbdb7 100644
>--- a/Source/WebCore/bindings/js/ScriptController.h
>+++ b/Source/WebCore/bindings/js/ScriptController.h
>@@ -33,12 +33,7 @@
> 
> #if PLATFORM(MAC)
> #include <wtf/RetainPtr.h>
>-
>-#ifdef __OBJC__
>-@class WebScriptObject;
>-#else
>-class WebScriptObject;
>-#endif
>+OBJC_CLASS WebScriptObject;
> #endif
> 
> struct NPObject;
>diff --git a/Source/WebCore/bridge/objc/objc_utility.h b/Source/WebCore/bridge/objc/objc_utility.h
>index 48107521eba09923bd3175f36bfb198b41cf20c8..533c11e6c8c73c90df8fb63118b5aa9da6a34e61 100644
>--- a/Source/WebCore/bridge/objc/objc_utility.h
>+++ b/Source/WebCore/bridge/objc/objc_utility.h
>@@ -32,11 +32,7 @@
> #include <runtime/Error.h>
> #include <runtime/JSObject.h>
> 
>-#ifdef __OBJC__
>-@class NSString;
>-#else
>-class NSString;
>-#endif
>+OBJC_CLASS NSString;
> 
> namespace JSC {
> namespace Bindings {
>diff --git a/Source/WebCore/page/DragClient.h b/Source/WebCore/page/DragClient.h
>index ea70c5e034b28e9d5faa4e095cc2756b1d1b6429..090c29d62e10c933595600abd002216020ca8dd4 100644
>--- a/Source/WebCore/page/DragClient.h
>+++ b/Source/WebCore/page/DragClient.h
>@@ -32,17 +32,10 @@
> #include "IntPoint.h"
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class DOMElement;
>-@class NSURL;
>-@class NSString;
>-@class NSPasteboard;
>-#else
>-class DOMElement;
>-class NSURL;
>-class NSString;
>-class NSPasteboard;
>-#endif
>+OBJC_CLASS DOMElement;
>+OBJC_CLASS NSURL;
>+OBJC_CLASS NSString;
>+OBJC_CLASS NSPasteboard;
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/page/EditorClient.h b/Source/WebCore/page/EditorClient.h
>index 5a4be2ca7cf18561dcd4e1696ffe41fa689178d3..4d33e9f3dcdefd0f764fc3c32a38ea7cea2a27fa 100644
>--- a/Source/WebCore/page/EditorClient.h
>+++ b/Source/WebCore/page/EditorClient.h
>@@ -36,17 +36,10 @@
> #include <wtf/Vector.h>
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSAttributedString;
>-@class NSPasteboard;
>-@class NSString;
>-@class NSURL;
>-#else
>-class NSAttributedString;
>-class NSPasteboard;
>-class NSString;
>-class NSURL;
>-#endif
>+OBJC_CLASS NSAttributedString;
>+OBJC_CLASS NSPasteboard;
>+OBJC_CLASS NSString;
>+OBJC_CLASS NSURL;
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/AutodrainedPool.h b/Source/WebCore/platform/AutodrainedPool.h
>index f03ec812e1c02e19a2877469f5f507dfe021f66f..207aadcbe7ba88638efd92ed24129ed6b7d30d21 100644
>--- a/Source/WebCore/platform/AutodrainedPool.h
>+++ b/Source/WebCore/platform/AutodrainedPool.h
>@@ -31,11 +31,7 @@
> 
> #include <wtf/Noncopyable.h>
> 
>-#ifdef __OBJC__
>-@class NSAutoreleasePool;
>-#else
>-class NSAutoreleasePool;
>-#endif
>+OBJC_CLASS NSAutoreleasePool;
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/ContextMenuItem.h b/Source/WebCore/platform/ContextMenuItem.h
>index c1c18255578be6c99c29446e3a2b109072449241..2520c64e68254828b26eafe232601feb539aa39e 100644
>--- a/Source/WebCore/platform/ContextMenuItem.h
>+++ b/Source/WebCore/platform/ContextMenuItem.h
>@@ -33,12 +33,7 @@
> 
> #if PLATFORM(MAC)
> #include <wtf/RetainPtr.h>
>-
>-#ifdef __OBJC__
>-@class NSMenuItem;
>-#else
>-class NSMenuItem;
>-#endif
>+OBJC_CLASS NSMenuItem;
> #elif PLATFORM(WIN)
> typedef struct tagMENUITEMINFOW MENUITEMINFO;
> #elif PLATFORM(GTK)
>diff --git a/Source/WebCore/platform/Cursor.h b/Source/WebCore/platform/Cursor.h
>index c324ef00ee5d3143b5bef1e3dee457c921a794e7..bc518407092491043b507910c3ad4d3e1f3aeda2 100644
>--- a/Source/WebCore/platform/Cursor.h
>+++ b/Source/WebCore/platform/Cursor.h
>@@ -46,11 +46,7 @@ typedef HICON HCURSOR;
> #endif
> 
> #if PLATFORM(MAC) && !PLATFORM(IOS)
>-#ifdef __OBJC__
>-@class NSCursor;
>-#else
>-class NSCursor;
>-#endif
>+OBJC_CLASS NSCursor;
> #endif
> 
> #if PLATFORM(WX)
>diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h
>index bb242f9e9162a769e1862ef0a9348ad95e8588ad..17abd44fa47c40e7de31893d782e2dc969a32043 100644
>--- a/Source/WebCore/platform/DragData.h
>+++ b/Source/WebCore/platform/DragData.h
>@@ -36,15 +36,17 @@
> 
> #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;
>diff --git a/Source/WebCore/platform/DragImage.h b/Source/WebCore/platform/DragImage.h
>index 811fa56d257bb04472fef6c1ed8a0c089c857858..a22db6a761c33831864bfe9b111ba401a1f369d1 100644
>--- a/Source/WebCore/platform/DragImage.h
>+++ b/Source/WebCore/platform/DragImage.h
>@@ -32,11 +32,7 @@
> 
> #if PLATFORM(MAC)
> #include <wtf/RetainPtr.h>
>-#ifdef __OBJC__
>-@class NSImage;
>-#else
>-class NSImage;
>-#endif
>+OBJC_CLASS NSImage;
> #elif PLATFORM(QT)
> QT_BEGIN_NAMESPACE
> class QPixmap;
>diff --git a/Source/WebCore/platform/KURL.h b/Source/WebCore/platform/KURL.h
>index 49cd9514cd6c74997dad3fd933577af082ce2b02..8dec81f70321396ce6d8c1b01f18d3c9d3a3f9fa 100644
>--- a/Source/WebCore/platform/KURL.h
>+++ b/Source/WebCore/platform/KURL.h
>@@ -35,11 +35,7 @@ typedef const struct __CFURL* CFURLRef;
> #endif
> 
> #if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
>-#ifdef __OBJC__
>-@class NSURL;
>-#else
>-class NSURL;
>-#endif
>+OBJC_CLASS NSURL;
> #endif
> 
> #if PLATFORM(QT)
>diff --git a/Source/WebCore/platform/Pasteboard.h b/Source/WebCore/platform/Pasteboard.h
>index 866e7e53276135c5c98c71b24429fcacda2d8c19..8791d398e85671456a9872c055a176a536541f0e 100644
>--- a/Source/WebCore/platform/Pasteboard.h
>+++ b/Source/WebCore/platform/Pasteboard.h
>@@ -43,15 +43,9 @@
> // knowledge of the frame and editor or moved into the editing directory.
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSFileWrapper;
>-@class NSPasteboard;
>-@class NSArray;
>-#else
>-class NSFileWrapper;
>-class NSPasteboard;
>-class NSArray;
>-#endif
>+OBJC_CLASS NSFileWrapper;
>+OBJC_CLASS NSPasteboard;
>+OBJC_CLASS NSArray;
> #endif
> 
> #if PLATFORM(WIN)
>diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h
>index f154966732ad949a8d8b30096236715797328488..5990098db650f731ed326385f05d6eaf4a57c509 100644
>--- a/Source/WebCore/platform/PlatformKeyboardEvent.h
>+++ b/Source/WebCore/platform/PlatformKeyboardEvent.h
>@@ -32,11 +32,7 @@
> 
> #if PLATFORM(MAC)
> #include <wtf/RetainPtr.h>
>-#ifdef __OBJC__
>-@class NSEvent;
>-#else
>-class NSEvent;
>-#endif
>+OBJC_CLASS NSEvent;
> #endif
> 
> #if PLATFORM(WIN)
>diff --git a/Source/WebCore/platform/PlatformMenuDescription.h b/Source/WebCore/platform/PlatformMenuDescription.h
>index 08845cb4a8bf43042255a27b33c35010eb24754f..459d0a5ea5090a5b797ae76161827af73734b501 100644
>--- a/Source/WebCore/platform/PlatformMenuDescription.h
>+++ b/Source/WebCore/platform/PlatformMenuDescription.h
>@@ -27,11 +27,7 @@
> #define PlatformMenuDescription_h
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSMutableArray;
>-#else
>-class NSMutableArray;
>-#endif
>+OBJC_CLASS NSMutableArray;
> #elif PLATFORM(QT)
> #include <qlist.h>
> #elif PLATFORM(GTK)
>diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
>index a9acb5dd0b52ffc796c4580a8966187748841fc5..b4c78a5af241b7f0eacc6deff06cd08247849480 100644
>--- a/Source/WebCore/platform/PlatformScreen.h
>+++ b/Source/WebCore/platform/PlatformScreen.h
>@@ -31,13 +31,8 @@
> #include <wtf/RefPtr.h>
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-    @class NSScreen;
>-    @class NSWindow;
>-#else
>-    class NSScreen;
>-    class NSWindow;
>-#endif
>+OBJC_CLASS NSScreen;
>+OBJC_CLASS NSWindow;
> #endif
> 
> typedef uint32_t PlatformDisplayID;
>diff --git a/Source/WebCore/platform/SharedBuffer.h b/Source/WebCore/platform/SharedBuffer.h
>index d85abba1bd6799c9ec0e06a2460083085dc02d24..57cfc2949e6b5ade767968bb52f1c8d633696617 100644
>--- a/Source/WebCore/platform/SharedBuffer.h
>+++ b/Source/WebCore/platform/SharedBuffer.h
>@@ -23,6 +23,7 @@
>  * (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
> 
>@@ -37,12 +38,7 @@
> #endif
> 
> #if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
>-#ifdef __OBJC__
>-@class NSData;
>-#else
>-class NSData;
>-#endif
>-
>+OBJC_CLASS NSData;
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/Widget.h b/Source/WebCore/platform/Widget.h
>index 9fddf7092db0ef28532792228397c680a44124f5..3f19b61e2c959bcc6069f8aac687ebd7b52764b2 100644
>--- a/Source/WebCore/platform/Widget.h
>+++ b/Source/WebCore/platform/Widget.h
>@@ -45,13 +45,8 @@
> #endif
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSView;
>-@class NSWindow;
>-#else
>-class NSView;
>-class NSWindow;
>-#endif
>+OBJC_CLASS NSView;
>+OBJC_CLASS NSWindow;
> typedef NSView *PlatformWidget;
> #endif
> 
>diff --git a/Source/WebCore/platform/cf/SchedulePair.h b/Source/WebCore/platform/cf/SchedulePair.h
>index 517243688b3903c0f91f5766d6543a1330f5f4b6..764c29fc416ce7cb76a8ec86e8e69bca5afa6e9e 100644
>--- a/Source/WebCore/platform/cf/SchedulePair.h
>+++ b/Source/WebCore/platform/cf/SchedulePair.h
>@@ -35,11 +35,7 @@
> #include <wtf/RetainPtr.h>
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSRunLoop;
>-#else
>-class NSRunLoop;
>-#endif
>+OBJC_CLASS NSRunLoop;
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/graphics/BitmapImage.h b/Source/WebCore/platform/graphics/BitmapImage.h
>index f4d50ce75e2ab1619b10e14d5423531fe61eaac2..00802f69feea6828bdebd83f5b34f44557bedda1 100644
>--- a/Source/WebCore/platform/graphics/BitmapImage.h
>+++ b/Source/WebCore/platform/graphics/BitmapImage.h
>@@ -34,11 +34,7 @@
> 
> #if PLATFORM(MAC)
> #include <wtf/RetainPtr.h>
>-#ifdef __OBJC__
>-@class NSImage;
>-#else
>-class NSImage;
>-#endif
>+OBJC_CLASS NSImage;
> #endif
> 
> #if PLATFORM(WIN)
>diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h
>index 1fcba312f105b6fe516c46e485a1d2ff087ceb57..705c58897145df8b2c2fa44277011f890e36e7fc 100644
>--- a/Source/WebCore/platform/graphics/FontPlatformData.h
>+++ b/Source/WebCore/platform/graphics/FontPlatformData.h
>@@ -55,11 +55,7 @@
> #endif
> 
> #if OS(DARWIN)
>-#ifdef __OBJC__
>-@class NSFont;
>-#else
>-class NSFont;
>-#endif
>+OBJC_CLASS NSFont;
> 
> typedef struct CGFont* CGFontRef;
> typedef const struct __CTFont* CTFontRef;
>diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.h b/Source/WebCore/platform/graphics/GraphicsContext3D.h
>index e4f69d8aa6688f09e3a5a38ef997e137f8093b82..dfebbba9b02d8726c300f3197ddc199b249e9935 100644
>--- a/Source/WebCore/platform/graphics/GraphicsContext3D.h
>+++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h
>@@ -50,13 +50,8 @@
> #if PLATFORM(MAC)
> #include <OpenGL/OpenGL.h>
> #include <wtf/RetainPtr.h>
>-#ifdef __OBJC__
>-@class CALayer;
>-@class WebGLLayer;
>-#else
>-class CALayer;
>-class WebGLLayer;
>-#endif
>+OBJC_CLASS CALayer;
>+OBJC_CLASS WebGLLayer;
> #elif PLATFORM(QT)
> QT_BEGIN_NAMESPACE
> class QPainter;
>diff --git a/Source/WebCore/platform/graphics/GraphicsLayer.h b/Source/WebCore/platform/graphics/GraphicsLayer.h
>index 14750c6feb9edd83b13289ab43608bfe3385f39b..a6936c279f6158708747c32971e7865c898574c2 100644
>--- a/Source/WebCore/platform/graphics/GraphicsLayer.h
>+++ b/Source/WebCore/platform/graphics/GraphicsLayer.h
>@@ -44,11 +44,7 @@
> #include <wtf/PassOwnPtr.h>
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class CALayer;
>-#else
>-class CALayer;
>-#endif
>+OBJC_CLASS CALayer;
> typedef CALayer PlatformLayer;
> #elif PLATFORM(WIN)
> typedef struct _CACFLayer PlatformLayer;
>diff --git a/Source/WebCore/platform/graphics/Icon.h b/Source/WebCore/platform/graphics/Icon.h
>index 2797133310249eb19349d41eb3f7969f42301557..781a08cb2e63980f929eb24cfcab700aca979724 100644
>--- a/Source/WebCore/platform/graphics/Icon.h
>+++ b/Source/WebCore/platform/graphics/Icon.h
>@@ -28,11 +28,7 @@
> 
> #if PLATFORM(MAC)
> #include <wtf/RetainPtr.h>
>-#ifdef __OBJC__
>-@class NSImage;
>-#else
>-class NSImage;
>-#endif
>+OBJC_CLASS NSImage;
> #elif PLATFORM(WIN)
> typedef struct HICON__* HICON;
> #elif PLATFORM(QT)
>diff --git a/Source/WebCore/platform/graphics/Image.h b/Source/WebCore/platform/graphics/Image.h
>index 21b37d357c6a7c746dab45a6993b9b8630696df1..b78fc7d8164b3ad8280a393b432cb69f64e46bfe 100644
>--- a/Source/WebCore/platform/graphics/Image.h
>+++ b/Source/WebCore/platform/graphics/Image.h
>@@ -39,11 +39,7 @@
> #include <wtf/text/WTFString.h>
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSImage;
>-#else
>-class NSImage;
>-#endif
>+OBJC_CLASS NSImage;
> #endif
> 
> #if USE(CG)
>diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h
>index da53de15286fc52e192c93a4c4991028fdb873ed..bde35cd405fec98feb54b2fdac19f1f0b898f2fa 100644
>--- a/Source/WebCore/platform/graphics/MediaPlayer.h
>+++ b/Source/WebCore/platform/graphics/MediaPlayer.h
>@@ -46,13 +46,9 @@
> #include "GraphicsLayer.h"
> #endif
> 
>-#ifdef __OBJC__
>-@class AVPlayer;
>-@class QTMovie;
>-#else
>-class AVPlayer;
>-class QTMovie;
>-#endif
>+OBJC_CLASS AVPlayer;
>+OBJC_CLASS QTMovie;
>+
> class AVCFPlayer;
> class QTMovieGWorld;
> class QTMovieVisualContext;
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
>index 7fd2465dcf289e75a1c3630381ba451bd2c6beb0..dcc046d077b5ff73fcebe7a35c7e35e5b3019561 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
>@@ -30,20 +30,14 @@
> 
> #include "MediaPlayerPrivateAVFoundation.h"
> 
>-#ifdef __OBJC__
>-@class AVAsset;
>-@class AVPlayer;
>-@class AVPlayerItem;
>-@class AVPlayerLayer;
>-@class AVAssetImageGenerator;
>-@class WebCoreAVFMovieObserver;
>-#else
>-class AVAsset;
>-class AVPlayer;
>-class AVPlayerItem;
>-class AVPlayerLayer;
>-class AVAssetImageGenerator;
>-class WebCoreAVFMovieObserver;
>+OBJC_CLASS AVAsset;
>+OBJC_CLASS AVPlayer;
>+OBJC_CLASS AVPlayerItem;
>+OBJC_CLASS AVPlayerLayer;
>+OBJC_CLASS AVAssetImageGenerator;
>+OBJC_CLASS WebCoreAVFMovieObserver;
>+
>+#ifndef __OBJC__
> typedef struct objc_object *id;
> #endif
> 
>diff --git a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
>index bfd76c82aede5998809dacbeaae9394915d55b4b..b2d325956baed398dbe03c59793108fc0995cd10 100644
>--- a/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
>+++ b/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
>@@ -36,11 +36,7 @@
> #include <wtf/Vector.h>
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class CAPropertyAnimation;
>-#else
>-class CAPropertyAnimation;
>-#endif
>+OBJC_CLASS CAPropertyAnimation;
> typedef CAPropertyAnimation* PlatformAnimationRef;
> #elif PLATFORM(WIN)
> typedef struct _CACFAnimation* CACFAnimationRef;
>diff --git a/Source/WebCore/platform/graphics/ca/mac/TileCache.h b/Source/WebCore/platform/graphics/ca/mac/TileCache.h
>index bb60c48d66b96a71824d3b3d689376371b36e27d..0fc25de8b8d2dd44bc85f2459bc42bc9a00f85ba 100644
>--- a/Source/WebCore/platform/graphics/ca/mac/TileCache.h
>+++ b/Source/WebCore/platform/graphics/ca/mac/TileCache.h
>@@ -31,15 +31,9 @@
> #include <wtf/PassOwnPtr.h>
> #include <wtf/RetainPtr.h>
> 
>-#ifdef __OBJC__
>-@class CALayer;
>-@class WebTileCacheLayer;
>-@class WebTileLayer;
>-#else
>-class CALayer;
>-class WebTileCacheLayer;
>-class WebTileLayer;
>-#endif
>+OBJC_CLASS CALayer;
>+OBJC_CLASS WebTileCacheLayer;
>+OBJC_CLASS WebTileLayer;
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/graphics/mac/ColorMac.h b/Source/WebCore/platform/graphics/mac/ColorMac.h
>index b68b15763a3cbbcb7c98907796440b3aa83d99dd..2482b593bb8ee28a2c005829b53b371c927678b2 100644
>--- a/Source/WebCore/platform/graphics/mac/ColorMac.h
>+++ b/Source/WebCore/platform/graphics/mac/ColorMac.h
>@@ -31,11 +31,7 @@
> 
> #include "Color.h"
> 
>-#ifdef __OBJC__
>-@class NSColor;
>-#else
>-class NSColor;
>-#endif
>+OBJC_CLASS NSColor;
> 
> namespace WebCore {
>     
>diff --git a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
>index 951dfff97672692eb33d18ba0bc8766403363515..3089ae2d46b4d214047ecbbfd99947cf16a351d7 100644
>--- a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
>+++ b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
>@@ -35,22 +35,18 @@
> 
> #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
>diff --git a/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h b/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h
>index cc7ec9556c50824d7e7e5f835522c1d14bc49c89..c586fb86fefa40680fa95a23577623d03a129bbb 100644
>--- a/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h
>+++ b/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h
>@@ -26,11 +26,7 @@
> #ifndef MediaPlayerProxy_h
> #define MediaPlayerProxy_h
> 
>-#ifdef __OBJC__
>-@class WebMediaPlayerProxy;
>-#else
>-class WebMediaPlayerProxy;
>-#endif
>+OBJC_CLASS WebMediaPlayerProxy;
> 
> enum MediaPlayerProxyNotificationType {
> 
>diff --git a/Source/WebCore/platform/mac/ClipboardMac.h b/Source/WebCore/platform/mac/ClipboardMac.h
>index 6c93ed5b92f2e2a4e82b9a47934abf0c6a52432a..24e9b8060a29c69c89169208fca74f9fe7d15d4b 100644
>--- a/Source/WebCore/platform/mac/ClipboardMac.h
>+++ b/Source/WebCore/platform/mac/ClipboardMac.h
>@@ -30,13 +30,8 @@
> #include "Clipboard.h"
> #include <wtf/RetainPtr.h>
> 
>-#ifdef __OBJC__
>-@class NSImage;
>-@class NSPasteboard;
>-#else
>-class NSImage;
>-class NSPasteboard;
>-#endif
>+OBJC_CLASS NSImage;
>+OBJC_CLASS NSPasteboard;
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h b/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h
>index 0907fac52dd168959cc4b6e7485b1b81f8b75c31..d4df7e60e37e95ac2f744de51be25f47cbb964f6 100644
>--- a/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h
>+++ b/Source/WebCore/platform/mac/LocalCurrentGraphicsContext.h
>@@ -24,11 +24,7 @@
> #include "skia/ext/skia_utils_mac.h"
> #endif
> 
>-#ifdef __OBJC__
>-@class NSGraphicsContext;
>-#else
>-class NSGraphicsContext;
>-#endif
>+OBJC_CLASS NSGraphicsContext;
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/mac/PasteboardHelper.h b/Source/WebCore/platform/mac/PasteboardHelper.h
>index 7bd62e5fb47e89df06dc7ede98c4e326338ca14d..6c1e844ea2dd39a3779ab2757331b3a06296e65f 100644
>--- a/Source/WebCore/platform/mac/PasteboardHelper.h
>+++ b/Source/WebCore/platform/mac/PasteboardHelper.h
>@@ -34,11 +34,7 @@
> 
> #import <wtf/Forward.h>
> 
>-#ifdef __OBJC__
>-@class DOMDocumentFragment;
>-#else
>-class DOMDocumentFragment;
>-#endif
>+OBJC_CLASS DOMDocumentFragment;
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/mac/PopupMenuMac.h b/Source/WebCore/platform/mac/PopupMenuMac.h
>index 8e21913a2ef86871fb936d0a6ab8f9ad22ee3e53..8dd6aff60e94615e2ceb8f0f157f6a6253af8efb 100644
>--- a/Source/WebCore/platform/mac/PopupMenuMac.h
>+++ b/Source/WebCore/platform/mac/PopupMenuMac.h
>@@ -26,11 +26,7 @@
> #include <wtf/RefCounted.h>
> #include <wtf/RetainPtr.h>
> 
>-#ifdef __OBJC__
>-@class NSPopUpButtonCell;
>-#else
>-class NSPopUpButtonCell;
>-#endif
>+OBJC_CLASS NSPopUpButtonCell;
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/platform/mac/ScrollAnimatorMac.h b/Source/WebCore/platform/mac/ScrollAnimatorMac.h
>index a38883bc36a0547bab5398e668a9f232db7fbf8c..48ddf7d03838cf00f0003e4e4cb5cb0f6d67f09e 100644
>--- a/Source/WebCore/platform/mac/ScrollAnimatorMac.h
>+++ b/Source/WebCore/platform/mac/ScrollAnimatorMac.h
>@@ -36,15 +36,9 @@
> #include "Timer.h"
> #include <wtf/RetainPtr.h>
> 
>-#ifdef __OBJC__
>-@class WebScrollAnimationHelperDelegate;
>-@class WebScrollbarPainterControllerDelegate;
>-@class WebScrollbarPainterDelegate;
>-#else
>-class WebScrollAnimationHelperDelegate;
>-class WebScrollbarPainterControllerDelegate;
>-class WebScrollbarPainterDelegate;
>-#endif
>+OBJC_CLASS WebScrollAnimationHelperDelegate;
>+OBJC_CLASS WebScrollbarPainterControllerDelegate;
>+OBJC_CLASS WebScrollbarPainterDelegate;
> 
> typedef id ScrollbarPainterController;
> 
>diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
>index beb36ca06dd38b507a060c804fecf3be330caa0a..d988669807b836e15a7318cb3b6183a55b3ab5d5 100644
>--- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h
>+++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.h
>@@ -77,56 +77,29 @@ typedef struct _CFURLRequest* CFMutableURLRequestRef;
> typedef const struct _CFURLRequest* CFURLRequestRef;
> #endif
> 
>-#ifdef __OBJC__
>-@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 NSMutableURLRequest;
>-@class NSString;
>-@class NSTextFieldCell;
>-@class NSURL;
>-@class NSURLConnection;
>-@class NSURLRequest;
>-@class NSURLResponse;
>-@class NSView;
>-@class NSWindow;
>-@class QTMovie;
>-@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
>+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;
> 
> extern "C" {
> 
>diff --git a/Source/WebCore/platform/network/ResourceHandle.h b/Source/WebCore/platform/network/ResourceHandle.h
>index a3633b25a715dcb6fa2ae45461c4ae0bef5aa8f7..1b1eacc73b6c428c8b28233c2f345b431a576d96 100644
>--- a/Source/WebCore/platform/network/ResourceHandle.h
>+++ b/Source/WebCore/platform/network/ResourceHandle.h
>@@ -52,16 +52,11 @@ typedef LPVOID HINTERNET;
> #endif
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSData;
>-@class NSError;
>-@class NSURLConnection;
>-@class WebCoreResourceHandleAsDelegate;
>-#else
>-class NSData;
>-class NSError;
>-class NSURLConnection;
>-class WebCoreResourceHandleAsDelegate;
>+OBJC_CLASS NSData;
>+OBJC_CLASS NSError;
>+OBJC_CLASS NSURLConnection;
>+OBJC_CLASS WebCoreResourceHandleAsDelegate;
>+#ifndef __OBJC__
> typedef struct objc_object *id;
> #endif
> #endif
>diff --git a/Source/WebCore/platform/network/ResourceHandleClient.h b/Source/WebCore/platform/network/ResourceHandleClient.h
>index a458b5da20aa642956b3257409f7a999aaed7170..befbccfa0c12fa9a1fadda6d0d6b8d27669acdd3 100644
>--- a/Source/WebCore/platform/network/ResourceHandleClient.h
>+++ b/Source/WebCore/platform/network/ResourceHandleClient.h
>@@ -40,11 +40,7 @@
> #endif
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSCachedURLResponse;
>-#else
>-class NSCachedURLResponse;
>-#endif
>+OBJC_CLASS NSCachedURLResponse;
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/network/ResourceHandleInternal.h b/Source/WebCore/platform/network/ResourceHandleInternal.h
>index cad38341a878df21994fa3cdcfe44cdc4c435cfc..877997963884bddbd7a76c06a29ef681deadf166 100644
>--- a/Source/WebCore/platform/network/ResourceHandleInternal.h
>+++ b/Source/WebCore/platform/network/ResourceHandleInternal.h
>@@ -61,13 +61,8 @@ class QNetworkReplyHandler;
> #endif
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class NSURLAuthenticationChallenge;
>-@class NSURLConnection;
>-#else
>-class NSURLAuthenticationChallenge;
>-class NSURLConnection;
>-#endif
>+OBJC_CLASS NSURLAuthenticationChallenge;
>+OBJC_CLASS NSURLConnection;
> #endif
> 
> // The allocations and releases in ResourceHandleInternal are
>diff --git a/Source/WebCore/platform/network/cf/AuthenticationChallenge.h b/Source/WebCore/platform/network/cf/AuthenticationChallenge.h
>index ca4a06c55b22c89211309bba5f2af8f9b72897ae..109ede81b6b07f05caa248eeacf47488c3f4a4e5 100644
>--- a/Source/WebCore/platform/network/cf/AuthenticationChallenge.h
>+++ b/Source/WebCore/platform/network/cf/AuthenticationChallenge.h
>@@ -31,14 +31,17 @@
> #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 {
>diff --git a/Source/WebCore/platform/network/cf/ResourceError.h b/Source/WebCore/platform/network/cf/ResourceError.h
>index 27c63ff5f0eadea5b5aec765751d02cf0481422a..30e0a5ea0a31fdb09ccba5e8762b81131e611926 100644
>--- a/Source/WebCore/platform/network/cf/ResourceError.h
>+++ b/Source/WebCore/platform/network/cf/ResourceError.h
>@@ -37,10 +37,8 @@
> #include <wincrypt.h> // windows.h must be included before wincrypt.h.
> #endif
> 
>-#ifdef __OBJC__
>-@class NSError;
>-#else
>-class NSError;
>+#if PLATFORM(MAC)
>+OBJC_CLASS NSError;
> #endif
> 
> namespace WebCore {
>diff --git a/Source/WebCore/platform/network/cf/ResourceRequest.h b/Source/WebCore/platform/network/cf/ResourceRequest.h
>index 47b155b716428e712581ddfc882380aa9f4c2ae3..72522d9ed91d2c57483c4f1e9f0cbb4df3d3af82 100644
>--- a/Source/WebCore/platform/network/cf/ResourceRequest.h
>+++ b/Source/WebCore/platform/network/cf/ResourceRequest.h
>@@ -34,11 +34,7 @@
> typedef const struct _CFURLRequest* CFURLRequestRef;
> #endif
> 
>-#ifdef __OBJC__
>-@class NSURLRequest;
>-#else
>-class NSURLRequest;
>-#endif
>+OBJC_CLASS NSURLRequest;
> 
> #if USE(CFURLSTORAGESESSIONS) && (defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LEOPARD))
> typedef struct __CFURLStorageSession* CFURLStorageSessionRef;
>diff --git a/Source/WebCore/platform/network/cf/ResourceResponse.h b/Source/WebCore/platform/network/cf/ResourceResponse.h
>index 946eee0833bed27b9cf651ccc6847c633767dd1a..d83a6610f4dcd46497be2d656c2708917c6cf7ae 100644
>--- a/Source/WebCore/platform/network/cf/ResourceResponse.h
>+++ b/Source/WebCore/platform/network/cf/ResourceResponse.h
>@@ -33,11 +33,7 @@
> typedef struct _CFURLResponse* CFURLResponseRef;
> #endif
> 
>-#ifdef __OBJC__
>-@class NSURLResponse;
>-#else
>-class NSURLResponse;
>-#endif
>+OBJC_CLASS NSURLResponse;
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/rendering/RenderThemeMac.h b/Source/WebCore/rendering/RenderThemeMac.h
>index 42fe3e3aba983a5429a97df7fea6682f37bb7d74..a6fc5b366e4ffae2e80ffd2eaf2c0990e5951346 100644
>--- a/Source/WebCore/rendering/RenderThemeMac.h
>+++ b/Source/WebCore/rendering/RenderThemeMac.h
>@@ -27,16 +27,12 @@
> #import <wtf/HashMap.h>
> #import <wtf/RetainPtr.h>
> 
>-class RenderProgress;
> 
>-#ifdef __OBJC__
>-@class WebCoreRenderThemeNotificationObserver;
>-#else
>-class WebCoreRenderThemeNotificationObserver;
>-#endif
>+OBJC_CLASS WebCoreRenderThemeNotificationObserver;
> 
> namespace WebCore {
> 
>+class RenderProgress;
> class RenderStyle;
> 
> class RenderThemeMac : public RenderTheme {
>diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
>index f0109fddbb80a4cfbfd383967b4c3f34b7a05bb8..913eb6e56d4480968a4626c698b10efb4fb89099 100644
>--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
>+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
>@@ -29,13 +29,8 @@
> #include <WebCore/DragClient.h>
> 
> #if PLATFORM(MAC)
>-#ifdef __OBJC__
>-@class WKPasteboardFilePromiseOwner;
>-@class WKPasteboardOwner;
>-#else
>-class WKPasteboardFilePromiseOwner;
>-class WKPasteboardOwner;
>-#endif
>+OBJC_CLASS WKPasteboardFilePromiseOwner;
>+OBJC_CLASS WKPasteboardOwner;
> #endif
> 
> namespace WebKit {
>diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
>index b8e8a775b0e737946380dd8c3c63b4411207abf3..7db76c02018e75a75488eb6fad2c1f8ad19c9cf5 100644
>--- a/Source/WebKit2/config.h
>+++ b/Source/WebKit2/config.h
>@@ -61,12 +61,6 @@ static const type& name() \
> 
> #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

Flags:

andersca: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 76485: 122828