Title: [135882] trunk
Revision
135882
Author
psola...@apple.com
Date
2012-11-27 10:58:42 -0800 (Tue, 27 Nov 2012)

Log Message

objc/objc-runtime.h does not exist on all PLATFORM(MAC)
https://bugs.webkit.org/show_bug.cgi?id=101780

Reviewed by Brent Fulgham.

Clean up header includes so we don't include objc/objc-runtime.h.

Source/WebCore:

No new tests because no functional changes.

* bridge/objc/objc_header.h:
* page/mac/EventHandlerMac.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
* platform/graphics/mac/WebLayer.mm:
* platform/mac/WebCoreObjCExtras.mm:
* platform/mac/WebVideoFullscreenController.mm:

Source/WebKit/mac:

* Carbon/HIWebView.mm:
(UpdateCommandStatus): Use wtfObjcMsgSend template instead of objc_msgSend.
* Plugins/WebNetscapePluginView.mm:
* Plugins/WebPluginContainerCheck.mm:
(-[WebPluginContainerCheck _continueWithPolicy:]): Use wtfObjcMsgSend template instead of objc_msgSend.
* Plugins/WebPluginController.mm:
* WebCoreSupport/WebCachedFramePlatformData.h:
* WebCoreSupport/WebDeviceOrientationClient.mm:
* WebView/WebDelegateImplementationCaching.mm:
* WebView/WebHTMLView.mm:
* WebView/WebPDFDocumentExtras.mm:
* WebView/WebPolicyDelegate.mm:
(-[WebPolicyDecisionListener _usePolicy:]): Use wtfObjcMsgSend template instead of objc_msgSend.
* WebView/WebView.mm:

Source/WebKit2:

* PluginProcess/mac/PluginProcessShim.mm:
* UIProcess/API/mac/PDFViewController.mm:

Source/WTF:

* wtf/Functional.h:
* wtf/ObjcRuntimeExtras.h: Include objc/message.h here so we don't rely on proper ordering
of includes in files that include this header.

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:
* DumpRenderTree/mac/ObjCPlugin.m:
* TestWebKitAPI/mac/InstanceMethodSwizzler.h:
* WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (135881 => 135882)


--- trunk/Source/WTF/ChangeLog	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WTF/ChangeLog	2012-11-27 18:58:42 UTC (rev 135882)
@@ -1,3 +1,16 @@
+2012-11-27  Pratik Solanki  <psola...@apple.com>
+
+        objc/objc-runtime.h does not exist on all PLATFORM(MAC)
+        https://bugs.webkit.org/show_bug.cgi?id=101780
+
+        Reviewed by Brent Fulgham.
+
+        Clean up header includes so we don't include objc/objc-runtime.h.
+
+        * wtf/Functional.h:
+        * wtf/ObjcRuntimeExtras.h: Include objc/message.h here so we don't rely on proper ordering
+        of includes in files that include this header.
+
 2012-11-27  Sheriff Bot  <webkit.review....@gmail.com>
 
         Unreviewed, rolling out r135828.

Modified: trunk/Source/WTF/wtf/Functional.h (135881 => 135882)


--- trunk/Source/WTF/wtf/Functional.h	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WTF/wtf/Functional.h	2012-11-27 18:58:42 UTC (rev 135882)
@@ -33,7 +33,6 @@
 
 #if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
 #include <Block.h>
-#include <objc/objc-runtime.h>
 #include <wtf/ObjcRuntimeExtras.h>
 #endif
 

Modified: trunk/Source/WTF/wtf/ObjcRuntimeExtras.h (135881 => 135882)


--- trunk/Source/WTF/wtf/ObjcRuntimeExtras.h	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WTF/wtf/ObjcRuntimeExtras.h	2012-11-27 18:58:42 UTC (rev 135882)
@@ -25,6 +25,8 @@
 #ifndef WTF_ObjcRuntimeExtras_h
 #define WTF_ObjcRuntimeExtras_h
 
+#include <objc/message.h>
+
 template<typename RetType>
 RetType wtfObjcMsgSend(id target, SEL selector)
 {

Modified: trunk/Source/WebCore/ChangeLog (135881 => 135882)


--- trunk/Source/WebCore/ChangeLog	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/ChangeLog	2012-11-27 18:58:42 UTC (rev 135882)
@@ -1,3 +1,24 @@
+2012-11-27  Pratik Solanki  <psola...@apple.com>
+
+        objc/objc-runtime.h does not exist on all PLATFORM(MAC)
+        https://bugs.webkit.org/show_bug.cgi?id=101780
+
+        Reviewed by Brent Fulgham.
+
+        Clean up header includes so we don't include objc/objc-runtime.h.
+
+        No new tests because no functional changes.
+
+        * bridge/objc/objc_header.h:
+        * page/mac/EventHandlerMac.mm:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        * platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        * platform/graphics/mac/WebLayer.mm:
+        * platform/mac/WebCoreObjCExtras.mm:
+        * platform/mac/WebVideoFullscreenController.mm:
+
 2012-11-27  Eberhard Graether  <egraet...@google.com>
 
         Plumbing showPaintRects out of InspectorPageAgent to use a different drawing implementation if available.

Modified: trunk/Source/WebCore/bridge/objc/objc_header.h (135881 => 135882)


--- trunk/Source/WebCore/bridge/objc/objc_header.h	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/bridge/objc/objc_header.h	2012-11-27 18:58:42 UTC (rev 135882)
@@ -30,7 +30,7 @@
 
 #include <objc/objc.h>
 #include <objc/objc-class.h>
-#include <objc/objc-runtime.h>
+#include <objc/runtime.h>
 
 typedef Class ClassStructPtr;
 typedef id ObjectStructPtr;

Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (135881 => 135882)


--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -48,7 +48,6 @@
 #include "Scrollbar.h"
 #include "Settings.h"
 #include "WebCoreSystemInterface.h"
-#include <objc/objc-runtime.h>
 #include <wtf/MainThread.h>
 #include <wtf/ObjcRuntimeExtras.h>
 #include <wtf/StdLibExtras.h>

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (135881 => 135882)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -43,7 +43,7 @@
 #import "UUID.h"
 #import "WebCoreAVFResourceLoader.h"
 #import "WebCoreSystemInterface.h"
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <wtf/UnusedParam.h>
 #import <wtf/Uint8Array.h>
 #import <wtf/Uint16Array.h>

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (135881 => 135882)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -38,7 +38,7 @@
 #import "SoftLinking.h"
 #import "UTIUtilities.h"
 #import <AVFoundation/AVAssetResourceLoader.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <wtf/text/CString.h>
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (135881 => 135882)


--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -40,7 +40,7 @@
 #import "WebTiledLayer.h"
 #import "WebTileCacheLayer.h"
 #import <objc/objc-auto.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <QuartzCore/QuartzCore.h>
 #import <wtf/CurrentTime.h>
 #import <wtf/MathExtras.h>

Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (135881 => 135882)


--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -43,7 +43,7 @@
 #import "TimeRanges.h"
 #import "WebCoreSystemInterface.h"
 #import <QTKit/QTKit.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <wtf/UnusedParam.h>
 
 #if USE(ACCELERATED_COMPOSITING)

Modified: trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm (135881 => 135882)


--- trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -33,7 +33,7 @@
 #import "GraphicsLayerCA.h"
 #import "PlatformCALayer.h"
 #import "ThemeMac.h"
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <QuartzCore/QuartzCore.h>
 #import <wtf/UnusedParam.h>
 #import "WebCoreSystemInterface.h"

Modified: trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm (135881 => 135882)


--- trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -35,7 +35,6 @@
 #include "WebCoreObjCExtras.h"
 
 #include <objc/objc-auto.h>
-#include <objc/objc-runtime.h>
 #include <utility>
 #include <wtf/Assertions.h>
 #include <wtf/MainThread.h>

Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (135881 => 135882)


--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -36,7 +36,7 @@
 #import <WebCore/DisplaySleepDisabler.h>
 #import <WebCore/HTMLMediaElement.h>
 #import <WebCore/SoftLinking.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <wtf/UnusedParam.h>
 
 #if USE(GSTREAMER)

Modified: trunk/Source/WebKit/mac/Carbon/HIWebView.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/Carbon/HIWebView.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/Carbon/HIWebView.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -36,7 +36,7 @@
 #import "WebHTMLViewInternal.h"
 #import "WebKit.h"
 #import <WebKitSystemInterface.h>
-#import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
 
 @interface NSWindow (AppKitSecretsHIWebViewKnows)
 - (void)_removeWindowRef;
@@ -1166,8 +1166,7 @@
 						
                         // Can't use -performSelector:withObject: here because the method we're calling returns BOOL, while
                         // -performSelector:withObject:'s return value is assumed to be an id.
-                        BOOL (*validationFunction)(id, SEL, id) = (BOOL (*)(id, SEL, id))objc_msgSend;
-                        if (validationFunction(resp, @selector(validateUserInterfaceItem:), proxy))
+                        if (wtfObjcMsgSend<BOOL>(resp, @selector(validateUserInterfaceItem:), proxy))
 							EnableMenuItem( inCommand->menu.menuRef, inCommand->menu.menuItemIndex );
 						else
 							DisableMenuItem( inCommand->menu.menuRef, inCommand->menu.menuItemIndex );

Modified: trunk/Source/WebKit/mac/ChangeLog (135881 => 135882)


--- trunk/Source/WebKit/mac/ChangeLog	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-11-27 18:58:42 UTC (rev 135882)
@@ -1,3 +1,27 @@
+2012-11-27  Pratik Solanki  <psola...@apple.com>
+
+        objc/objc-runtime.h does not exist on all PLATFORM(MAC)
+        https://bugs.webkit.org/show_bug.cgi?id=101780
+
+        Reviewed by Brent Fulgham.
+
+        Clean up header includes so we don't include objc/objc-runtime.h.
+
+        * Carbon/HIWebView.mm:
+        (UpdateCommandStatus): Use wtfObjcMsgSend template instead of objc_msgSend.
+        * Plugins/WebNetscapePluginView.mm:
+        * Plugins/WebPluginContainerCheck.mm:
+        (-[WebPluginContainerCheck _continueWithPolicy:]): Use wtfObjcMsgSend template instead of objc_msgSend.
+        * Plugins/WebPluginController.mm:
+        * WebCoreSupport/WebCachedFramePlatformData.h:
+        * WebCoreSupport/WebDeviceOrientationClient.mm:
+        * WebView/WebDelegateImplementationCaching.mm:
+        * WebView/WebHTMLView.mm:
+        * WebView/WebPDFDocumentExtras.mm:
+        * WebView/WebPolicyDelegate.mm:
+        (-[WebPolicyDecisionListener _usePolicy:]): Use wtfObjcMsgSend template instead of objc_msgSend.
+        * WebView/WebView.mm:
+
 2012-11-27  Sheriff Bot  <webkit.review....@gmail.com>
 
         Unreviewed, rolling out r135786.

Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -77,7 +77,7 @@
 #import <WebCore/npruntime_impl.h>
 #import <WebKit/DOMPrivate.h>
 #import <WebKit/WebUIDelegate.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <runtime/InitializeThreading.h>
 #import <runtime/JSLock.h>
 #import <wtf/Assertions.h>

Modified: trunk/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -42,7 +42,7 @@
 #import <WebCore/FrameLoaderTypes.h>
 #import <WebCore/SecurityOrigin.h>
 #import <wtf/Assertions.h>
-#import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
 
 using namespace WebCore;
 
@@ -87,9 +87,9 @@
 - (void)_continueWithPolicy:(PolicyAction)policy
 {
     if (_contextInfo)
-        ((void (*)(id, SEL, BOOL, id))objc_msgSend)(_resultObject, _resultSelector, (policy == PolicyUse), _contextInfo);
+        wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyUse), _contextInfo);
     else     
-        ((void (*)(id, SEL, BOOL))objc_msgSend)(_resultObject, _resultSelector, (policy == PolicyUse));
+        wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyUse));
 
     // this will call indirectly call cancel
     [_controller _webPluginContainerCancelCheckIfAllowedToLoadRequest:self];

Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/Plugins/WebPluginController.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -57,7 +57,7 @@
 #import <WebCore/ResourceRequest.h>
 #import <WebCore/ScriptController.h>
 #import <WebCore/WebCoreURLResponse.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <runtime/JSLock.h>
 #import <wtf/text/WTFString.h>
 

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h (135881 => 135882)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h	2012-11-27 18:58:42 UTC (rev 135882)
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <objc/objc-runtime.h>
 #import <WebCore/CachedFramePlatformData.h>
 #import <wtf/ObjcRuntimeExtras.h>
 #import <wtf/RetainPtr.h>

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -28,7 +28,6 @@
 #import "WebDeviceOrientationInternal.h"
 #import "WebDeviceOrientationProvider.h"
 #import "WebViewInternal.h"
-#import <objc/objc-runtime.h>
 #import <wtf/ObjcRuntimeExtras.h>
 
 using namespace WebCore;

Modified: trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -32,7 +32,6 @@
 #import "WebKitLogging.h"
 #import "WebView.h"
 #import "WebViewData.h"
-#import <objc/objc-runtime.h>
 #import <wtf/ObjcRuntimeExtras.h>
 
 @implementation WebView (WebDelegateImplementationCaching)

Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -125,7 +125,6 @@
 #import <WebKitSystemInterface.h>
 #import <dlfcn.h>
 #import <limits>
-#import <objc/objc-runtime.h>
 #import <runtime/InitializeThreading.h>
 #import <wtf/MainThread.h>
 #import <wtf/ObjcRuntimeExtras.h>

Modified: trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -29,7 +29,6 @@
 #import <wtf/Vector.h>
 #import <wtf/RetainPtr.h>
 #import <PDFKit/PDFDocument.h>
-#import <objc/objc-runtime.h>
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
 @interface PDFDocument (Internal)

Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -29,7 +29,7 @@
 #import "WebPolicyDelegatePrivate.h"
 
 #import <WebCore/FrameLoaderTypes.h>
-#import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
 
 using namespace WebCore;
 
@@ -91,7 +91,7 @@
 - (void)_usePolicy:(PolicyAction)policy
 {
     if (_private->target)
-        ((void (*)(id, SEL, PolicyAction))objc_msgSend)(_private->target, _private->action, policy);
+        wtfObjcMsgSend<void>(_private->target, _private->action, policy);
 }
 
 - (void)_invalidate

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (135881 => 135882)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -181,7 +181,7 @@
 #import <WebKitSystemInterface.h>
 #import <mach-o/dyld.h>
 #import <objc/objc-auto.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 #import <runtime/ArrayPrototype.h>
 #import <runtime/DateInstance.h>
 #import <runtime/InitializeThreading.h>

Modified: trunk/Source/WebKit2/ChangeLog (135881 => 135882)


--- trunk/Source/WebKit2/ChangeLog	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-27 18:58:42 UTC (rev 135882)
@@ -1,3 +1,15 @@
+2012-11-27  Pratik Solanki  <psola...@apple.com>
+
+        objc/objc-runtime.h does not exist on all PLATFORM(MAC)
+        https://bugs.webkit.org/show_bug.cgi?id=101780
+
+        Reviewed by Brent Fulgham.
+
+        Clean up header includes so we don't include objc/objc-runtime.h.
+
+        * PluginProcess/mac/PluginProcessShim.mm:
+        * UIProcess/API/mac/PDFViewController.mm:
+
 2012-11-27  Alexey Proskuryakov  <a...@apple.com>
 
         [WK2] WebPageProxy::relatedPages() cannot assume that this page is known to process

Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (135881 => 135882)


--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -30,7 +30,7 @@
 #import <Carbon/Carbon.h>
 #import <WebKitSystemInterface.h>
 #import <stdio.h>
-#import <objc/objc-runtime.h>
+#import <objc/message.h>
 
 #define DYLD_INTERPOSE(_replacement,_replacee) \
     __attribute__((used)) static struct{ const void* replacement; const void* replacee; } _interpose_##_replacee \

Modified: trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm (135881 => 135882)


--- trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -36,7 +36,6 @@
 #import "WebPreferences.h"
 #import <PDFKit/PDFKit.h>
 #import <WebCore/LocalizedStrings.h>
-#import <objc/objc-runtime.h>
 #import <wtf/ObjcRuntimeExtras.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>

Modified: trunk/Tools/ChangeLog (135881 => 135882)


--- trunk/Tools/ChangeLog	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Tools/ChangeLog	2012-11-27 18:58:42 UTC (rev 135882)
@@ -1,3 +1,17 @@
+2012-11-27  Pratik Solanki  <psola...@apple.com>
+
+        objc/objc-runtime.h does not exist on all PLATFORM(MAC)
+        https://bugs.webkit.org/show_bug.cgi?id=101780
+
+        Reviewed by Brent Fulgham.
+
+        Clean up header includes so we don't include objc/objc-runtime.h.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        * DumpRenderTree/mac/ObjCPlugin.m:
+        * TestWebKitAPI/mac/InstanceMethodSwizzler.h:
+        * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
+
 2012-11-27  Marja Hölttä  <ma...@chromium.org>
 
         Add callbacks to the FrameLoaderClient when a resource is requested

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (135881 => 135882)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -87,7 +87,6 @@
 #import <WebKit/WebTypesInternal.h>
 #import <WebKit/WebViewPrivate.h>
 #import <getopt.h>
-#import <objc/objc-runtime.h>
 #import <wtf/Assertions.h>
 #import <wtf/FastMalloc.h>
 #import <wtf/RetainPtr.h>

Modified: trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m (135881 => 135882)


--- trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m	2012-11-27 18:58:42 UTC (rev 135882)
@@ -28,7 +28,7 @@
 #import "ObjCPlugin.h"
 
 #import <WebKit/WebKit.h>
-#import <objc/objc-runtime.h>
+#import <objc/runtime.h>
 
 // === NSObject category to expose almost everything to _javascript_ ===
 

Modified: trunk/Tools/TestWebKitAPI/mac/InstanceMethodSwizzler.h (135881 => 135882)


--- trunk/Tools/TestWebKitAPI/mac/InstanceMethodSwizzler.h	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Tools/TestWebKitAPI/mac/InstanceMethodSwizzler.h	2012-11-27 18:58:42 UTC (rev 135882)
@@ -26,7 +26,7 @@
 #ifndef InstanceMethodSwizzler_h
 #define InstanceMethodSwizzler_h
 
-#include <objc/objc-runtime.h>
+#include <objc/runtime.h>
 #include <wtf/Noncopyable.h>
 
 namespace TestWebKitAPI {

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm (135881 => 135882)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm	2012-11-27 18:52:30 UTC (rev 135881)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm	2012-11-27 18:58:42 UTC (rev 135882)
@@ -28,7 +28,6 @@
 
 #import <AppKit/AppKit.h>
 #import <CoreFoundation/CoreFoundation.h>
-#import <objc/objc-runtime.h>
 #import <wtf/ObjcRuntimeExtras.h>
 #import <wtf/RetainPtr.h>
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to