Diff
Modified: trunk/Source/_javascript_Core/API/JSValue.mm (238072 => 238073)
--- trunk/Source/_javascript_Core/API/JSValue.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/_javascript_Core/API/JSValue.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -45,7 +45,7 @@
#import <wtf/HashMap.h>
#import <wtf/HashSet.h>
#import <wtf/Lock.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/Vector.h>
#import <wtf/text/WTFString.h>
#import <wtf/text/StringHash.h>
Modified: trunk/Source/_javascript_Core/ChangeLog (238072 => 238073)
--- trunk/Source/_javascript_Core/ChangeLog 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-11-11 06:16:22 UTC (rev 238073)
@@ -1,3 +1,12 @@
+2018-11-10 Benjamin Poulain <[email protected]>
+
+ Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
+ https://bugs.webkit.org/show_bug.cgi?id=191492
+
+ Reviewed by Alex Christensen.
+
+ * API/JSValue.mm:
+
2018-11-10 Michael Catanzaro <[email protected]>
Unreviewed, silence -Wunused-variable warning
Modified: trunk/Source/WTF/ChangeLog (238072 => 238073)
--- trunk/Source/WTF/ChangeLog 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WTF/ChangeLog 2018-11-11 06:16:22 UTC (rev 238073)
@@ -1,3 +1,21 @@
+2018-11-10 Benjamin Poulain <[email protected]>
+
+ Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
+ https://bugs.webkit.org/show_bug.cgi?id=191492
+
+ Reviewed by Alex Christensen.
+
+ Because renaming ObjcRuntimeExtras.h to ObjCRuntimeExtras.h only changes
+ the cases, some systems have issues with applying this patch.
+
+ To work around the problem, the change is made is two patches, first rename to
+ WTFObjCRuntimeExtras.h, then back to ObjCRuntimeExtras.h.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+ * wtf/WTFObjCRuntimeExtras.h: Renamed from Source/WTF/wtf/ObjcRuntimeExtras.h.
+ (wtfObjCMsgSend):
+
2018-11-09 Keith Miller <[email protected]>
LLInt VectorSizeOffset should be based on offset extraction
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (238072 => 238073)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-11-11 06:16:22 UTC (rev 238073)
@@ -389,7 +389,7 @@
7CDD7FF7186D291E007433CD /* IteratorAdaptors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorAdaptors.h; sourceTree = "<group>"; };
7CDD7FF9186D2A54007433CD /* IteratorRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorRange.h; sourceTree = "<group>"; };
7CEAE5AC1EA6E10F00DB6890 /* NotFound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotFound.h; sourceTree = "<group>"; };
- 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjcRuntimeExtras.h; sourceTree = "<group>"; };
+ 7E29C33D15FFD79B00516D61 /* WTFObjCRuntimeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFObjCRuntimeExtras.h; sourceTree = "<group>"; };
8134013615B092FD001FF0B8 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; sourceTree = "<group>"; };
8134013715B092FD001FF0B8 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
83A8AC3D1FABBE94002064AC /* ObjectIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectIdentifier.h; sourceTree = "<group>"; };
@@ -970,7 +970,7 @@
7CEAE5AC1EA6E10F00DB6890 /* NotFound.h */,
A8A472D5151A825B004123FF /* NumberOfCores.cpp */,
A8A472D6151A825B004123FF /* NumberOfCores.h */,
- 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */,
+ 7E29C33D15FFD79B00516D61 /* WTFObjCRuntimeExtras.h */,
83A8AC3D1FABBE94002064AC /* ObjectIdentifier.h */,
1AFDE6521953B23D00C48FFA /* Optional.h */,
1A4656181C7FC68E00F5920F /* OptionSet.h */,
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (238072 => 238073)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2018-11-11 06:16:22 UTC (rev 238073)
@@ -143,7 +143,7 @@
OSAllocator.h
OSObjectPtr.h
OSRandomSource.h
- ObjcRuntimeExtras.h
+ WTFObjCRuntimeExtras.h
ObjectIdentifier.h
OptionSet.h
Optional.h
Deleted: trunk/Source/WTF/wtf/ObjcRuntimeExtras.h (238072 => 238073)
--- trunk/Source/WTF/wtf/ObjcRuntimeExtras.h 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WTF/wtf/ObjcRuntimeExtras.h 2018-11-11 06:16:22 UTC (rev 238073)
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-// FIXME: This file's name and function names refer to Objective-C as Objc with a lowercase C,
-// but it should be ObjC with an uppercase C.
-
-#include <objc/message.h>
-
-#ifdef __cplusplus
-
-template<typename ReturnType, typename... ArgumentTypes>
-inline ReturnType wtfObjcMsgSend(id target, SEL selector, ArgumentTypes... arguments)
-{
- return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(objc_msgSend)(target, selector, arguments...);
-}
-
-template<typename ReturnType, typename... ArgumentTypes>
-inline ReturnType wtfCallIMP(IMP implementation, id target, SEL selector, ArgumentTypes... arguments)
-{
- return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(implementation)(target, selector, arguments...);
-}
-
-#endif // __cplusplus
Copied: trunk/Source/WTF/wtf/WTFObjCRuntimeExtras.h (from rev 238072, trunk/Source/WTF/wtf/ObjcRuntimeExtras.h) (0 => 238073)
--- trunk/Source/WTF/wtf/WTFObjCRuntimeExtras.h (rev 0)
+++ trunk/Source/WTF/wtf/WTFObjCRuntimeExtras.h 2018-11-11 06:16:22 UTC (rev 238073)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <objc/message.h>
+
+#ifdef __cplusplus
+
+template<typename ReturnType, typename... ArgumentTypes>
+inline ReturnType wtfObjCMsgSend(id target, SEL selector, ArgumentTypes... arguments)
+{
+ return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(objc_msgSend)(target, selector, arguments...);
+}
+
+template<typename ReturnType, typename... ArgumentTypes>
+inline ReturnType wtfCallIMP(IMP implementation, id target, SEL selector, ArgumentTypes... arguments)
+{
+ return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(implementation)(target, selector, arguments...);
+}
+
+#endif // __cplusplus
Modified: trunk/Source/WebCore/ChangeLog (238072 => 238073)
--- trunk/Source/WebCore/ChangeLog 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebCore/ChangeLog 2018-11-11 06:16:22 UTC (rev 238073)
@@ -1,3 +1,18 @@
+2018-11-10 Benjamin Poulain <[email protected]>
+
+ Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
+ https://bugs.webkit.org/show_bug.cgi?id=191492
+
+ Reviewed by Alex Christensen.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ * page/mac/EventHandlerMac.mm:
+ * platform/mac/URLMac.mm:
+ * platform/mac/WebCoreNSURLExtras.mm:
+ * platform/mac/WebCoreObjCExtras.mm:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::systemColor const):
+
2018-11-10 Megan Gardner <[email protected]>
Fix build for 32bit Mac
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (238072 => 238073)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -78,7 +78,7 @@
#import "WebCoreFrameView.h"
#import <pal/spi/mac/HIServicesSPI.h>
#import <pal/spi/mac/NSAccessibilitySPI.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#if ENABLE(TREE_DEBUGGING) || ENABLE(METER_ELEMENT)
#import <wtf/text/StringBuilder.h>
#endif
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (238072 => 238073)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -68,7 +68,7 @@
#include <wtf/BlockObjCExceptions.h>
#include <wtf/MainThread.h>
#include <wtf/NeverDestroyed.h>
-#include <wtf/ObjcRuntimeExtras.h>
+#include <wtf/WTFObjCRuntimeExtras.h>
#include <wtf/ProcessPrivilege.h>
#if ENABLE(MAC_GESTURE_EVENTS)
Modified: trunk/Source/WebCore/platform/mac/URLMac.mm (238072 => 238073)
--- trunk/Source/WebCore/platform/mac/URLMac.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebCore/platform/mac/URLMac.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -29,7 +29,7 @@
#import "CFURLExtras.h"
#import "URLParser.h"
#import "WebCoreNSURLExtras.h"
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/text/CString.h>
@interface NSString (WebCoreNSURLExtras)
Modified: trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm (238072 => 238073)
--- trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -32,7 +32,7 @@
#import <pal/spi/cf/CFNetworkSPI.h>
#import <wtf/Function.h>
#import <wtf/HexNumber.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RetainPtr.h>
#import <wtf/Vector.h>
#import <unicode/uchar.h>
Modified: trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm (238072 => 238073)
--- trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebCore/platform/mac/WebCoreObjCExtras.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -32,7 +32,7 @@
#include <utility>
#include <wtf/Assertions.h>
#include <wtf/MainThread.h>
-#include <wtf/ObjcRuntimeExtras.h>
+#include <wtf/WTFObjCRuntimeExtras.h>
#include <wtf/Threading.h>
bool WebCoreObjCScheduleDeallocateOnMainThread(Class cls, id object)
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (238072 => 238073)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -77,7 +77,7 @@
#import <pal/spi/mac/NSCellSPI.h>
#import <pal/spi/mac/NSSharingServicePickerSPI.h>
#import <wtf/MathExtras.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RetainPtr.h>
#import <wtf/StdLibExtras.h>
#import <wtf/text/StringBuilder.h>
@@ -632,7 +632,7 @@
// Special handling for links and other system colors when the system appearance is desired.
auto systemAppearanceColor = [] (Color& color, SEL selector) -> Color {
if (!color.isValid()) {
- auto systemColor = wtfObjcMsgSend<NSColor *>([NSColor class], selector);
+ auto systemColor = wtfObjCMsgSend<NSColor *>([NSColor class], selector);
color = semanticColorFromNSColor(systemColor);
}
@@ -815,7 +815,7 @@
};
if (auto selector = selectCocoaColor()) {
- if (auto color = wtfObjcMsgSend<NSColor *>([NSColor class], selector))
+ if (auto color = wtfObjCMsgSend<NSColor *>([NSColor class], selector))
return semanticColorFromNSColor(color);
}
Modified: trunk/Source/WebKit/ChangeLog (238072 => 238073)
--- trunk/Source/WebKit/ChangeLog 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKit/ChangeLog 2018-11-11 06:16:22 UTC (rev 238073)
@@ -1,3 +1,18 @@
+2018-11-10 Benjamin Poulain <[email protected]>
+
+ Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
+ https://bugs.webkit.org/show_bug.cgi?id=191492
+
+ Reviewed by Alex Christensen.
+
+ * Platform/mac/StringUtilities.mm:
+ * UIProcess/ApplicationStateTracker.mm:
+ (WebKit::ApplicationStateTracker::applicationDidEnterBackground):
+ (WebKit::ApplicationStateTracker::applicationDidFinishSnapshottingAfterEnteringBackground):
+ (WebKit::ApplicationStateTracker::applicationWillEnterForeground):
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
+ * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+
2018-11-10 Ryan Haddad <[email protected]>
Unreviewed, rolling out r238065.
Modified: trunk/Source/WebKit/Platform/mac/StringUtilities.mm (238072 => 238073)
--- trunk/Source/WebKit/Platform/mac/StringUtilities.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKit/Platform/mac/StringUtilities.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -29,7 +29,7 @@
#import "WKSharedAPICast.h"
#import "WKStringCF.h"
#import <_javascript_Core/RegularExpression.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/SoftLinking.h>
#import <wtf/text/StringBuilder.h>
Modified: trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm (238072 => 238073)
--- trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -31,7 +31,7 @@
#import "AssertionServicesSPI.h"
#import "SandboxUtilities.h"
#import "UIKitSPI.h"
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/cocoa/Entitlements.h>
#import <wtf/spi/cocoa/SecuritySPI.h>
@@ -198,13 +198,13 @@
m_isInBackground = true;
if (auto view = m_view.get())
- wtfObjcMsgSend<void>(view.get(), m_didEnterBackgroundSelector);
+ wtfObjCMsgSend<void>(view.get(), m_didEnterBackgroundSelector);
}
void ApplicationStateTracker::applicationDidFinishSnapshottingAfterEnteringBackground()
{
if (auto view = m_view.get())
- wtfObjcMsgSend<void>(view.get(), m_didFinishSnapshottingAfterEnteringBackgroundSelector);
+ wtfObjCMsgSend<void>(view.get(), m_didFinishSnapshottingAfterEnteringBackgroundSelector);
}
void ApplicationStateTracker::applicationWillEnterForeground()
@@ -212,7 +212,7 @@
m_isInBackground = false;
if (auto view = m_view.get())
- wtfObjcMsgSend<void>(view.get(), m_willEnterForegroundSelector);
+ wtfObjCMsgSend<void>(view.get(), m_willEnterForegroundSelector);
}
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm (238072 => 238073)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -41,7 +41,7 @@
#import <WebCore/Page.h>
#import <WebCore/ScrollView.h>
#import <WebCore/Scrollbar.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
using namespace WebKit;
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (238072 => 238073)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -46,7 +46,7 @@
#import <WebCore/Scrollbar.h>
#import <WebCore/WebAccessibilityObjectWrapperMac.h>
#import <pal/spi/mac/NSAccessibilitySPI.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
using namespace WebCore;
using namespace WebKit;
Modified: trunk/Source/WebKitLegacy/mac/Carbon/HIWebView.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/Carbon/HIWebView.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/Carbon/HIWebView.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -38,7 +38,7 @@
#import <pal/spi/mac/NSGraphicsSPI.h>
#import <pal/spi/mac/QuickDrawSPI.h>
#import <wtf/Assertions.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/cf/TypeCastsCF.h>
WTF_DECLARE_CF_TYPE_TRAIT(CFRunLoop);
@@ -1139,7 +1139,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.
- if (wtfObjcMsgSend<BOOL>(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/WebKitLegacy/mac/ChangeLog (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-11-11 06:16:22 UTC (rev 238073)
@@ -1,3 +1,34 @@
+2018-11-10 Benjamin Poulain <[email protected]>
+
+ Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
+ https://bugs.webkit.org/show_bug.cgi?id=191492
+
+ Reviewed by Alex Christensen.
+
+ * Carbon/HIWebView.mm:
+ (UpdateCommandStatus):
+ * Misc/WebNSFileManagerExtras.mm:
+ * Misc/WebNSURLExtras.mm:
+ * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+ * Plugins/WebBasePluginPackage.mm:
+ * Plugins/WebPluginContainerCheck.mm:
+ (-[WebPluginContainerCheck _continueWithPolicy:]):
+ * WebCoreSupport/WebCachedFramePlatformData.h:
+ (WebCachedFramePlatformData::clear):
+ * WebCoreSupport/WebDeviceOrientationClient.mm:
+ (WebDeviceOrientationClient::getProvider const):
+ * WebView/WebDelegateImplementationCaching.mm:
+ (CallDelegate):
+ (CallDelegateReturningBoolean):
+ (CallResourceLoadDelegateReturningBoolean):
+ (CallFormDelegate):
+ (CallFormDelegateReturningBoolean):
+ * WebView/WebHTMLView.mm:
+ * WebView/WebPDFRepresentation.mm:
+ * WebView/WebPolicyDelegate.mm:
+ (-[WebPolicyDecisionListener _usePolicy:]):
+ * WebView/WebView.mm:
+
2018-11-09 Ryan Haddad <[email protected]>
Unreviewed, rolling out r238047.
Modified: trunk/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -34,7 +34,7 @@
#import <WebCore/LoaderNSURLExtras.h>
#import <sys/stat.h>
#import <wtf/Assertions.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
@implementation NSFileManager (WebNSFileManagerExtras)
Modified: trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -37,10 +37,10 @@
#import <WebCore/LoaderNSURLExtras.h>
#import <WebCore/TextEncoding.h>
#import <WebCore/WebCoreNSURLExtras.h>
-#import <wtf/Assertions.h>
-#import <wtf/ObjcRuntimeExtras.h>
#import <unicode/uchar.h>
#import <unicode/uscript.h>
+#import <wtf/Assertions.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
using namespace WebCore;
using namespace WTF;
Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -51,7 +51,7 @@
#import <pal/spi/cocoa/QuartzCoreSPI.h>
#import <wtf/Assertions.h>
#import <wtf/MainThread.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RunLoop.h>
using namespace WebCore;
Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -40,7 +40,7 @@
#import <mach-o/loader.h>
#import <wtf/Assertions.h>
#import <wtf/MainThread.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RunLoop.h>
#import <wtf/Vector.h>
#import <wtf/text/CString.h>
Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -43,7 +43,7 @@
#import <WebCore/FrameLoaderTypes.h>
#import <WebCore/SecurityOrigin.h>
#import <wtf/Assertions.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
using namespace WebCore;
@@ -87,9 +87,9 @@
- (void)_continueWithPolicy:(PolicyAction)policy
{
if (_contextInfo)
- wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);
+ wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);
else
- wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));
+ wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));
// this will call indirectly call cancel
[_controller _webPluginContainerCancelCheckIfAllowedToLoadRequest:self];
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h 2018-11-11 06:16:22 UTC (rev 238073)
@@ -28,7 +28,7 @@
#import "WebHTMLViewInternal.h"
#import <WebCore/CachedFramePlatformData.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RetainPtr.h>
class WebCachedFramePlatformData : public WebCore::CachedFramePlatformData {
@@ -35,7 +35,7 @@
public:
WebCachedFramePlatformData(id webDocumentView) : m_webDocumentView(webDocumentView) { }
- virtual void clear() { wtfObjcMsgSend<void>(m_webDocumentView.get(), @selector(closeIfNotCurrentView)); }
+ virtual void clear() { wtfObjCMsgSend<void>(m_webDocumentView.get(), @selector(closeIfNotCurrentView)); }
id webDocumentView() { return m_webDocumentView.get(); }
private:
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDeviceOrientationClient.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDeviceOrientationClient.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDeviceOrientationClient.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -28,7 +28,7 @@
#import "WebDeviceOrientationInternal.h"
#import "WebDeviceOrientationProvider.h"
#import "WebViewInternal.h"
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
using namespace WebCore;
@@ -70,7 +70,7 @@
if (!m_provider) {
m_provider = [m_webView _deviceOrientationProvider];
if ([m_provider respondsToSelector:@selector(setController:)])
- wtfObjcMsgSend<void>(m_provider, @selector(setController:), m_controller);
+ wtfObjCMsgSend<void>(m_provider, @selector(setController:), m_controller);
}
return m_provider;
}
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -32,7 +32,7 @@
#import "WebKitLogging.h"
#import "WebView.h"
#import "WebViewData.h"
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#if PLATFORM(IOS_FAMILY)
#import "WebViewInternal.h"
@@ -92,7 +92,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, self);
+ return wtfObjCMsgSend<id>(delegate, selector, self);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -125,7 +125,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, self, object);
+ return wtfObjCMsgSend<id>(delegate, selector, self, object);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -159,7 +159,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, self, rect);
+ return wtfObjCMsgSend<id>(delegate, selector, self, rect);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -193,7 +193,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, self, object1, object2);
+ return wtfObjCMsgSend<id>(delegate, selector, self, object1, object2);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -228,7 +228,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, self, object, boolean);
+ return wtfObjCMsgSend<id>(delegate, selector, self, object, boolean);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -263,7 +263,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, self, object1, object2, object3);
+ return wtfObjCMsgSend<id>(delegate, selector, self, object1, object2, object3);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -299,7 +299,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, self, object, integer);
+ return wtfObjCMsgSend<id>(delegate, selector, self, object, integer);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -364,7 +364,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return result;
@try {
- return wtfObjcMsgSend<BOOL>(delegate, selector, self);
+ return wtfObjCMsgSend<BOOL>(delegate, selector, self);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -394,7 +394,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return result;
@try {
- return wtfObjcMsgSend<BOOL>(delegate, selector, self, object);
+ return wtfObjCMsgSend<BOOL>(delegate, selector, self, object);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -425,7 +425,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return result;
@try {
- return wtfObjcMsgSend<BOOL>(delegate, selector, self, object, boolean);
+ return wtfObjCMsgSend<BOOL>(delegate, selector, self, object, boolean);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -456,7 +456,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return result;
@try {
- return wtfObjcMsgSend<BOOL>(delegate, selector, self, object, boolean, object2);
+ return wtfObjCMsgSend<BOOL>(delegate, selector, self, object, boolean, object2);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -469,7 +469,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return result;
@try {
- return wtfObjcMsgSend<BOOL>(delegate, selector, self, object1, object2);
+ return wtfObjCMsgSend<BOOL>(delegate, selector, self, object1, object2);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -1288,7 +1288,7 @@
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1)
{
@try {
- return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1);
+ return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -1298,7 +1298,7 @@
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1, id object2)
{
@try {
- return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2);
+ return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -1308,7 +1308,7 @@
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1, id object2, id object3)
{
@try {
- return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2, object3);
+ return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2, object3);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -1380,7 +1380,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, object1, object2);
+ return wtfObjCMsgSend<id>(delegate, selector, object1, object2);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -1416,7 +1416,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, object1, object2, object3);
+ return wtfObjCMsgSend<id>(delegate, selector, object1, object2, object3);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -1453,7 +1453,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return nil;
@try {
- return wtfObjcMsgSend<id>(delegate, selector, object1, object2, object3, object4, object5);
+ return wtfObjCMsgSend<id>(delegate, selector, object1, object2, object3, object4, object5);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
@@ -1492,7 +1492,7 @@
if (!delegate || ![delegate respondsToSelector:selector])
return result;
@try {
- return wtfObjcMsgSend<BOOL>(delegate, selector, object1, selectorArg, object2);
+ return wtfObjCMsgSend<BOOL>(delegate, selector, object1, selectorArg, object2);
} @catch(id exception) {
ReportDiscardedDelegateException(selector, exception);
}
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -143,7 +143,7 @@
#import <wtf/BlockObjCExceptions.h>
#import <wtf/MainThread.h>
#import <wtf/MathExtras.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RunLoop.h>
#import <wtf/SystemTracing.h>
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -39,7 +39,7 @@
#import <_javascript_Core/JSContextRef.h>
#import <_javascript_Core/OpaqueJSString.h>
#import <wtf/Assertions.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RetainPtr.h>
@implementation WebPDFRepresentation
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPolicyDelegate.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPolicyDelegate.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPolicyDelegate.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -29,7 +29,7 @@
#import "WebPolicyDelegatePrivate.h"
#import <WebCore/FrameLoaderTypes.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
using namespace WebCore;
@@ -91,7 +91,7 @@
- (void)_usePolicy:(PolicyAction)policy
{
if (_private->target)
- wtfObjcMsgSend<void>(_private->target, _private->action, policy);
+ wtfObjCMsgSend<void>(_private->target, _private->action, policy);
}
- (void)_invalidate
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (238072 => 238073)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -231,7 +231,7 @@
#import <wtf/Assertions.h>
#import <wtf/HashTraits.h>
#import <wtf/MainThread.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/ProcessPrivilege.h>
#import <wtf/RAMSize.h>
#import <wtf/RefCountedLeakCounter.h>
Modified: trunk/Tools/ChangeLog (238072 => 238073)
--- trunk/Tools/ChangeLog 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Tools/ChangeLog 2018-11-11 06:16:22 UTC (rev 238073)
@@ -1,3 +1,14 @@
+2018-11-10 Benjamin Poulain <[email protected]>
+
+ Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
+ https://bugs.webkit.org/show_bug.cgi?id=191492
+
+ Reviewed by Alex Christensen.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ * WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+
2018-11-10 Ryan Haddad <[email protected]>
Unreviewed, rolling out r238065.
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (238072 => 238073)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -93,7 +93,7 @@
#import <wtf/Assertions.h>
#import <wtf/FastMalloc.h>
#import <wtf/LoggingAccumulator.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/ProcessPrivilege.h>
#import <wtf/RetainPtr.h>
#import <wtf/Threading.h>
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm (238072 => 238073)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -30,7 +30,7 @@
#import <CoreText/CTFontManager.h>
#import <WebKit/WKStringCF.h>
#import <wtf/NeverDestroyed.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/RetainPtr.h>
#if USE(APPKIT)
Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (238072 => 238073)
--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2018-11-11 06:13:33 UTC (rev 238072)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2018-11-11 06:16:22 UTC (rev 238073)
@@ -44,7 +44,7 @@
#import <WebKit/_WKUserContentExtensionStore.h>
#import <WebKit/_WKUserContentExtensionStorePrivate.h>
#import <mach-o/dyld.h>
-#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/WTFObjCRuntimeExtras.h>
#import <wtf/mac/AppKitCompatibilityDeclarations.h>
@interface NSSound ()
