Context Navigation

← Previous Changeset
Next Changeset →

Changeset 135882 in webkit

Timestamp:

Nov 27, 2012, 10:58:42 AM (13 years ago)

Author:

psolanki@apple.com

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:

Location:

trunk

Files:

: 33 edited

Source/WTF/ChangeLog (modified) (1 diff)
Source/WTF/wtf/Functional.h (modified) (1 diff)
Source/WTF/wtf/ObjcRuntimeExtras.h (modified) (1 diff)
Source/WebCore/ChangeLog (modified) (1 diff)
Source/WebCore/bridge/objc/objc_header.h (modified) (1 diff)
Source/WebCore/page/mac/EventHandlerMac.mm (modified) (1 diff)
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)
Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm (modified) (1 diff)
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (modified) (1 diff)
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (1 diff)
Source/WebCore/platform/graphics/mac/WebLayer.mm (modified) (1 diff)
Source/WebCore/platform/mac/WebCoreObjCExtras.mm (modified) (1 diff)
Source/WebCore/platform/mac/WebVideoFullscreenController.mm (modified) (1 diff)
Source/WebKit/mac/Carbon/HIWebView.mm (modified) (2 diffs)
Source/WebKit/mac/ChangeLog (modified) (1 diff)
Source/WebKit/mac/Plugins/WebNetscapePluginView.mm (modified) (1 diff)
Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm (modified) (2 diffs)
Source/WebKit/mac/Plugins/WebPluginController.mm (modified) (1 diff)
Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h (modified) (1 diff)
Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm (modified) (1 diff)
Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm (modified) (1 diff)
Source/WebKit/mac/WebView/WebHTMLView.mm (modified) (1 diff)
Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm (modified) (1 diff)
Source/WebKit/mac/WebView/WebPolicyDelegate.mm (modified) (2 diffs)
Source/WebKit/mac/WebView/WebView.mm (modified) (1 diff)
Source/WebKit2/ChangeLog (modified) (1 diff)
Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm (modified) (1 diff)
Source/WebKit2/UIProcess/API/mac/PDFViewController.mm (modified) (1 diff)
Tools/ChangeLog (modified) (1 diff)
Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
Tools/DumpRenderTree/mac/ObjCPlugin.m (modified) (1 diff)
Tools/TestWebKitAPI/mac/InstanceMethodSwizzler.h (modified) (1 diff)
Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/Source/WTF/ChangeLog

-              r135854
+              r135882
+-11-27  Pratik Solanki  <psolanki@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.
 -11-27  Sheriff Bot  <webkit.review.bot@gmail.com>

trunk/Source/WTF/wtf/Functional.h

r127306	r135882
34	34	#if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
35	35	#include <Block.h>
36		~~#include <objc/objc-runtime.h>~~
37	36	#include <wtf/ObjcRuntimeExtras.h>
38	37	#endif

trunk/Source/WTF/wtf/ObjcRuntimeExtras.h

r127306	r135882
25	25	#ifndef WTF_ObjcRuntimeExtras_h
26	26	#define WTF_ObjcRuntimeExtras_h
	27
	28	#include <objc/message.h>
27	29
28	30	template<typename RetType>

trunk/Source/WebCore/ChangeLog

-              r135881
+              r135882
+-11-27  Pratik Solanki  <psolanki@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:
 -11-27  Eberhard Graether  <egraether@google.com>

trunk/Source/WebCore/bridge/objc/objc_header.h

r15071	r135882
31	31	#include <objc/objc.h>
32	32	#include <objc/objc-class.h>
33		#include <objc/~~objc-~~runtime.h>
	33	#include <objc/runtime.h>
34	34
35	35	typedef Class ClassStructPtr;

trunk/Source/WebCore/page/mac/EventHandlerMac.mm

r132551	r135882
49	49	#include "Settings.h"
50	50	#include "WebCoreSystemInterface.h"
51		~~#include <objc/objc-runtime.h>~~
52	51	#include <wtf/MainThread.h>
53	52	#include <wtf/ObjcRuntimeExtras.h>

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

r134802	r135882
44	44	#import "WebCoreAVFResourceLoader.h"
45	45	#import "WebCoreSystemInterface.h"
46		#import <objc/~~objc-~~runtime.h>
	46	#import <objc/runtime.h>
47	47	#import <wtf/UnusedParam.h>
48	48	#import <wtf/Uint8Array.h>

trunk/Source/WebCore/platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm

r134814	r135882
39	39	#import "UTIUtilities.h"
40	40	#import <AVFoundation/AVAssetResourceLoader.h>
41		#import <objc/~~objc-~~runtime.h>
	41	#import <objc/runtime.h>
42	42	#import <wtf/text/CString.h>
43	43

trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm

r132982	r135882
41	41	#import "WebTileCacheLayer.h"
42	42	#import <objc/objc-auto.h>
43		#import <objc/~~objc-~~runtime.h>
	43	#import <objc/runtime.h>
44	44	#import <QuartzCore/QuartzCore.h>
45	45	#import <wtf/CurrentTime.h>

trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

r131502	r135882
44	44	#import "WebCoreSystemInterface.h"
45	45	#import <QTKit/QTKit.h>
46		#import <objc/~~objc-~~runtime.h>
	46	#import <objc/runtime.h>
47	47	#import <wtf/UnusedParam.h>
48	48

trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm

r134755	r135882
34	34	#import "PlatformCALayer.h"
35	35	#import "ThemeMac.h"
36		#import <objc/~~objc-~~runtime.h>
	36	#import <objc/runtime.h>
37	37	#import <QuartzCore/QuartzCore.h>
38	38	#import <wtf/UnusedParam.h>

trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm

r127193	r135882
36	36
37	37	#include <objc/objc-auto.h>
38		~~#include <objc/objc-runtime.h>~~
39	38	#include <utility>
40	39	#include <wtf/Assertions.h>

trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm

r122400	r135882
37	37	#import <WebCore/HTMLMediaElement.h>
38	38	#import <WebCore/SoftLinking.h>
39		#import <objc/~~objc-~~runtime.h>
	39	#import <objc/runtime.h>
40	40	#import <wtf/UnusedParam.h>
41	41

trunk/Source/WebKit/mac/Carbon/HIWebView.mm

-              r85036
+              r135882
 #import "WebKit.h"
 #import <WebKitSystemInterface.h>
 #import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
 @interface NSWindow (AppKitSecretsHIWebViewKnows)
 …
                         // 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

trunk/Source/WebKit/mac/ChangeLog

-              r135837
+              r135882
+-11-27  Pratik Solanki  <psolanki@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:
 -11-27  Sheriff Bot  <webkit.review.bot@gmail.com>

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm

r130612	r135882
78	78	#import <WebKit/DOMPrivate.h>
79	79	#import <WebKit/WebUIDelegate.h>
80		#import <objc/~~objc-~~runtime.h>
	80	#import <objc/runtime.h>
81	81	#import <runtime/InitializeThreading.h>
82	82	#import <runtime/JSLock.h>

trunk/Source/WebKit/mac/Plugins/WebPluginContainerCheck.mm

-              r67316
+              r135882
 #import <WebCore/SecurityOrigin.h>
 #import <wtf/Assertions.h>
 #import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
 using namespace WebCore;
 …
+{
     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

trunk/Source/WebKit/mac/Plugins/WebPluginController.mm

r135837	r135882
58	58	#import <WebCore/ScriptController.h>
59	59	#import <WebCore/WebCoreURLResponse.h>
60		#import <objc/~~objc-~~runtime.h>
	60	#import <objc/runtime.h>
61	61	#import <runtime/JSLock.h>
62	62	#import <wtf/text/WTFString.h>

trunk/Source/WebKit/mac/WebCoreSupport/WebCachedFramePlatformData.h

r127193	r135882
27	27	*/
28	28
29		~~#import <objc/objc-runtime.h>~~
30	29	#import <WebCore/CachedFramePlatformData.h>
31	30	#import <wtf/ObjcRuntimeExtras.h>

trunk/Source/WebKit/mac/WebCoreSupport/WebDeviceOrientationClient.mm

r127193	r135882
29	29	#import "WebDeviceOrientationProvider.h"
30	30	#import "WebViewInternal.h"
31		~~#import <objc/objc-runtime.h>~~
32	31	#import <wtf/ObjcRuntimeExtras.h>
33	32

trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.mm

r129545	r135882
33	33	#import "WebView.h"
34	34	#import "WebViewData.h"
35		~~#import <objc/objc-runtime.h>~~
36	35	#import <wtf/ObjcRuntimeExtras.h>
37	36

trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

r130947	r135882
126	126	#import <dlfcn.h>
127	127	#import <limits>
128		~~#import <objc/objc-runtime.h>~~
129	128	#import <runtime/InitializeThreading.h>
130	129	#import <wtf/MainThread.h>

trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm

r122400	r135882
30	30	#import <wtf/RetainPtr.h>
31	31	#import <PDFKit/PDFDocument.h>
32		~~#import <objc/objc-runtime.h>~~
33	32
34	33	#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050

trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.mm

-              r34523
+              r135882
 #import <WebCore/FrameLoaderTypes.h>
 #import <objc/objc-runtime.h>
+#import <wtf/ObjcRuntimeExtras.h>
 using namespace WebCore;
 …
+{
     if (_private->target)
         ((void (*)(id, SEL, PolicyAction))objc_msgSend)(_private->target, _private->action, policy);
+        wtfObjcMsgSend<void>(_private->target, _private->action, policy);
+}

trunk/Source/WebKit/mac/WebView/WebView.mm

r134960	r135882
182	182	#import <mach-o/dyld.h>
183	183	#import <objc/objc-auto.h>
184		#import <objc/~~objc-~~runtime.h>
	184	#import <objc/runtime.h>
185	185	#import <runtime/ArrayPrototype.h>
186	186	#import <runtime/DateInstance.h>

trunk/Source/WebKit2/ChangeLog

-              r135879
+              r135882
+-11-27  Pratik Solanki  <psolanki@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:
 -11-27  Alexey Proskuryakov  <ap@apple.com>

trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm

r128236	r135882
31	31	#import <WebKitSystemInterface.h>
32	32	#import <stdio.h>
33		#import <objc/~~objc-runtim~~e.h>
	33	#import <objc/message.h>
34	34
35	35	#define DYLD_INTERPOSE(_replacement,_replacee) \

trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm

r127313	r135882
37	37	#import <PDFKit/PDFKit.h>
38	38	#import <WebCore/LocalizedStrings.h>
39		~~#import <objc/objc-runtime.h>~~
40	39	#import <wtf/ObjcRuntimeExtras.h>
41	40	#import <wtf/text/CString.h>

trunk/Tools/ChangeLog

-              r135872
+              r135882
+-11-27  Pratik Solanki  <psolanki@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:
 -11-27  Marja Hölttä  <marja@chromium.org>

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

r134960	r135882
88	88	#import <WebKit/WebViewPrivate.h>
89	89	#import <getopt.h>
90		~~#import <objc/objc-runtime.h>~~
91	90	#import <wtf/Assertions.h>
92	91	#import <wtf/FastMalloc.h>

trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m

r115358	r135882
29	29
30	30	#import <WebKit/WebKit.h>
31		#import <objc/~~objc-~~runtime.h>
	31	#import <objc/runtime.h>
32	32
33	33	// === NSObject category to expose almost everything to JavaScript ===

trunk/Tools/TestWebKitAPI/mac/InstanceMethodSwizzler.h

r93417	r135882
27	27	#define InstanceMethodSwizzler_h
28	28
29		#include <objc/~~objc-~~runtime.h>
	29	#include <objc/runtime.h>
30	30	#include <wtf/Noncopyable.h>
31	31

trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm

r132264	r135882
29	29	#import <AppKit/AppKit.h>
30	30	#import <CoreFoundation/CoreFoundation.h>
31		~~#import <objc/objc-runtime.h>~~
32	31	#import <wtf/ObjcRuntimeExtras.h>
33	32	#import <wtf/RetainPtr.h>

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 135882 in webkit

Legend:

Download in other formats: