[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
andersca at apple.com
andersca at apple.com
Mon Feb 21 00:14:41 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c837d980ba84221dd3b75203e4aca6c35885fceb
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 28 23:42:37 2011 +0000
2011-01-28 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
Add an OBJC_CLASS macro for forward declaring an Objective-C class
https://bugs.webkit.org/show_bug.cgi?id=53337
* Shared/NativeWebKeyboardEvent.h:
* Shared/PrintInfo.h:
* UIProcess/ChunkedUpdateDrawingAreaProxy.h:
* UIProcess/LayerBackedDrawingAreaProxy.h:
* UIProcess/WebInspectorProxy.h:
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebPopupMenuProxyMac.h:
* WebProcess/Downloads/Download.h:
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/WebPage/LayerBackedDrawingArea.h:
* WebProcess/WebPage/WebPage.h:
* config.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77007 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index de90149..b9028de 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -2,6 +2,26 @@
Reviewed by Sam Weinig.
+ Add an OBJC_CLASS macro for forward declaring an Objective-C class
+ https://bugs.webkit.org/show_bug.cgi?id=53337
+
+ * Shared/NativeWebKeyboardEvent.h:
+ * Shared/PrintInfo.h:
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.h:
+ * UIProcess/LayerBackedDrawingAreaProxy.h:
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebPopupMenuProxyMac.h:
+ * WebProcess/Downloads/Download.h:
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/WebPage/LayerBackedDrawingArea.h:
+ * WebProcess/WebPage/WebPage.h:
+ * config.h:
+
+2011-01-28 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
Don't put config.h in the message headers.
* Scripts/webkit2/messages.py:
diff --git a/Source/WebKit2/Shared/NativeWebKeyboardEvent.h b/Source/WebKit2/Shared/NativeWebKeyboardEvent.h
index 9c4e480..cdf1aef 100644
--- a/Source/WebKit2/Shared/NativeWebKeyboardEvent.h
+++ b/Source/WebKit2/Shared/NativeWebKeyboardEvent.h
@@ -30,11 +30,7 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class NSView;
-#else
-class NSView;
-#endif
+OBJC_CLASS NSView;
#elif PLATFORM(QT)
#include <QKeyEvent>
#endif
diff --git a/Source/WebKit2/Shared/PrintInfo.h b/Source/WebKit2/Shared/PrintInfo.h
index d6ccd4a..c63c517 100644
--- a/Source/WebKit2/Shared/PrintInfo.h
+++ b/Source/WebKit2/Shared/PrintInfo.h
@@ -28,11 +28,7 @@
#include <wtf/Platform.h>
-#ifdef __OBJC__
- at class NSPrintInfo;
-#else
-class NSPrintInfo;
-#endif
+OBJC_CLASS NSPrintInfo;
namespace CoreIPC {
class ArgumentDecoder;
diff --git a/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h b/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
index 348d04f..33121b4 100644
--- a/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
+++ b/Source/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
@@ -31,11 +31,7 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class WKView;
-#else
-class WKView;
-#endif
+OBJC_CLASS WKView;
#elif PLATFORM(QT)
#include <QImage>
class QGraphicsWKView;
diff --git a/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h b/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
index bbaa643..31aca5c 100644
--- a/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
+++ b/Source/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
@@ -33,13 +33,9 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class CALayer;
- at class WKView;
-#else
-class CALayer;
-class WKView;
-#endif
+
+OBJC_CLASS CALayer;
+OBJC_CLASS WKView;
#endif
namespace WebKit {
diff --git a/Source/WebKit2/UIProcess/WebInspectorProxy.h b/Source/WebKit2/UIProcess/WebInspectorProxy.h
index cc0725a..b106b09 100644
--- a/Source/WebKit2/UIProcess/WebInspectorProxy.h
+++ b/Source/WebKit2/UIProcess/WebInspectorProxy.h
@@ -36,15 +36,10 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class NSWindow;
- at class WKView;
- at class WebInspectorProxyObjCAdapter;
-#else
-class NSWindow;
-class WKView;
-class WebInspectorProxyObjCAdapter;
-#endif
+
+OBJC_CLASS NSWindow;
+OBJC_CLASS WKView;
+OBJC_CLASS WebInspectorProxyObjCAdapter;
#endif
namespace WebKit {
diff --git a/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h b/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
index ee4fa3d..20ffd0b 100644
--- a/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
+++ b/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
@@ -29,13 +29,8 @@
#include "WebContextMenuProxy.h"
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class NSPopUpButtonCell;
- at class WKView;
-#else
-class NSPopUpButtonCell;
-class WKView;
-#endif
+OBJC_CLASS NSPopUpButtonCell;
+OBJC_CLASS WKView;
namespace WebKit {
diff --git a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h
index 3c4902c..788fd20 100644
--- a/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h
+++ b/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h
@@ -29,13 +29,8 @@
#include "WebPopupMenuProxy.h"
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class NSPopUpButtonCell;
- at class WKView;
-#else
-class NSPopUpButtonCell;
-class WKView;
-#endif
+OBJC_CLASS NSPopUpButtonCell;
+OBJC_CLASS WKView;
namespace WebKit {
diff --git a/Source/WebKit2/WebProcess/Downloads/Download.h b/Source/WebKit2/WebProcess/Downloads/Download.h
index bacdd01..ead6a73 100644
--- a/Source/WebKit2/WebProcess/Downloads/Download.h
+++ b/Source/WebKit2/WebProcess/Downloads/Download.h
@@ -33,13 +33,9 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class NSURLDownload;
- at class WKDownloadAsDelegate;
-#else
-class NSURLDownload;
-class WKDownloadAsDelegate;
-#endif
+
+OBJC_CLASS NSPopUpButtonCell;
+OBJC_CLASS WKView;
#endif
#if USE(CFNETWORK)
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProxy.h b/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
index 2c3b052..0ce9abb 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
@@ -33,11 +33,8 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class CALayer;
-#else
-class CALayer;
-#endif
+OBJC_CLASS NSPopUpButtonCell;
+OBJC_CLASS WKView;
#endif
namespace WebCore {
diff --git a/Source/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h b/Source/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
index ed05cc7..400c8c5 100644
--- a/Source/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
+++ b/Source/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
@@ -35,11 +35,8 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class CALayer;
-#else
-class CALayer;
-#endif
+OBJC_CLASS NSPopUpButtonCell;
+OBJC_CLASS WKView;
typedef struct __WKCARemoteLayerClientRef *WKCARemoteLayerClientRef;
#endif
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h
index 873b425..b813011 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h
@@ -56,11 +56,7 @@
#if PLATFORM(MAC)
#include <wtf/RetainPtr.h>
-#ifdef __OBJC__
- at class AccessibilityWebPageObject;
-#else
-class AccessibilityWebPageObject;
-#endif
+OBJC_CLASS AccessibilityWebPageObject;
#endif
namespace CoreIPC {
diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
index 0653973..50411aa 100644
--- a/Source/WebKit2/config.h
+++ b/Source/WebKit2/config.h
@@ -75,6 +75,12 @@ static const type& name() \
#elif defined(__APPLE__)
+#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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list