⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 238073 in webkit


Ignore:
Timestamp:
Nov 10, 2018, 10:16:22 PM (8 years ago)
Author:
benjamin@webkit.org
Message:

Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
​https://bugs.webkit.org/show_bug.cgi?id=191492

Reviewed by Alex Christensen.

Source/JavaScriptCore:

  • API/JSValue.mm:

Source/WebCore:

  • 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):

Source/WebKit:

  • 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:

Source/WebKitLegacy/mac:

  • 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:

Source/WTF:

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):

Tools:

  • DumpRenderTree/mac/DumpRenderTree.mm:
  • WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
  • WebKitTestRunner/mac/TestControllerMac.mm:
Location:
trunk
Files:
35 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSValue.mm

    r237009 r238073  
    4646#import <wtf/HashSet.h>
    4747#import <wtf/Lock.h>
    48 #import <wtf/ObjcRuntimeExtras.h>
     48#import <wtf/WTFObjCRuntimeExtras.h>
    4949#import <wtf/Vector.h>
    5050#import <wtf/text/WTFString.h>

  • trunk/Source/JavaScriptCore/ChangeLog

    r238067 r238073  
     12018-11-10  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
     4        https://bugs.webkit.org/show_bug.cgi?id=191492
     5
     6        Reviewed by Alex Christensen.
     7
     8        * API/JSValue.mm:
     9
    1102018-11-10  Michael Catanzaro  <mcatanzaro@igalia.com>
    211

  • trunk/Source/WTF/ChangeLog

    r238031 r238073  
     12018-11-10  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
     4        https://bugs.webkit.org/show_bug.cgi?id=191492
     5
     6        Reviewed by Alex Christensen.
     7
     8        Because renaming ObjcRuntimeExtras.h to ObjCRuntimeExtras.h only changes
     9        the cases, some systems have issues with applying this patch.
     10
     11        To work around the problem, the change is made is two patches, first rename to
     12        WTFObjCRuntimeExtras.h, then back to ObjCRuntimeExtras.h.
     13
     14        * WTF.xcodeproj/project.pbxproj:
     15        * wtf/CMakeLists.txt:
     16        * wtf/WTFObjCRuntimeExtras.h: Renamed from Source/WTF/wtf/ObjcRuntimeExtras.h.
     17        (wtfObjCMsgSend):
     18
    1192018-11-09  Keith Miller  <keith_miller@apple.com>
    220

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r237994 r238073  
    390390                7CDD7FF9186D2A54007433CD /* IteratorRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorRange.h; sourceTree = "<group>"; };
    391391                7CEAE5AC1EA6E10F00DB6890 /* NotFound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotFound.h; sourceTree = "<group>"; };
    392                 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjcRuntimeExtras.h; sourceTree = "<group>"; };
     392                7E29C33D15FFD79B00516D61 /* WTFObjCRuntimeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFObjCRuntimeExtras.h; sourceTree = "<group>"; };
    393393                8134013615B092FD001FF0B8 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; sourceTree = "<group>"; };
    394394                8134013715B092FD001FF0B8 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
    … …  
    971971                                A8A472D5151A825B004123FF /* NumberOfCores.cpp */,
    972972                                A8A472D6151A825B004123FF /* NumberOfCores.h */,
    973                                 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */,
     973                                7E29C33D15FFD79B00516D61 /* WTFObjCRuntimeExtras.h */,
    974974                                83A8AC3D1FABBE94002064AC /* ObjectIdentifier.h */,
    975975                                1AFDE6521953B23D00C48FFA /* Optional.h */,

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r237721 r238073  
    144144    OSObjectPtr.h
    145145    OSRandomSource.h
    146     ObjcRuntimeExtras.h
     146    WTFObjCRuntimeExtras.h
    147147    ObjectIdentifier.h
    148148    OptionSet.h

  • trunk/Source/WTF/wtf/WTFObjCRuntimeExtras.h

    r238072 r238073  
    2525#pragma once
    2626
    27 // FIXME: This file's name and function names refer to Objective-C as Objc with a lowercase C,
    28 // but it should be ObjC with an uppercase C.
    29 
    3027#include <objc/message.h>
    3128
    … …  
    3330
    3431template<typename ReturnType, typename... ArgumentTypes>
    35 inline ReturnType wtfObjcMsgSend(id target, SEL selector, ArgumentTypes... arguments)
     32inline ReturnType wtfObjCMsgSend(id target, SEL selector, ArgumentTypes... arguments)
    3633{
    3734    return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(objc_msgSend)(target, selector, arguments...);

  • trunk/Source/WebCore/ChangeLog

    r238072 r238073  
     12018-11-10  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
     4        https://bugs.webkit.org/show_bug.cgi?id=191492
     5
     6        Reviewed by Alex Christensen.
     7
     8        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     9        * page/mac/EventHandlerMac.mm:
     10        * platform/mac/URLMac.mm:
     11        * platform/mac/WebCoreNSURLExtras.mm:
     12        * platform/mac/WebCoreObjCExtras.mm:
     13        * rendering/RenderThemeMac.mm:
     14        (WebCore::RenderThemeMac::systemColor const):
     15
    1162018-11-10  Megan Gardner  <megan_gardner@apple.com>
    217

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r237647 r238073  
    7979#import <pal/spi/mac/HIServicesSPI.h>
    8080#import <pal/spi/mac/NSAccessibilitySPI.h>
    81 #import <wtf/ObjcRuntimeExtras.h>
     81#import <wtf/WTFObjCRuntimeExtras.h>
    8282#if ENABLE(TREE_DEBUGGING) || ENABLE(METER_ELEMENT)
    8383#import <wtf/text/StringBuilder.h>

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

    r235935 r238073  
    6969#include <wtf/MainThread.h>
    7070#include <wtf/NeverDestroyed.h>
    71 #include <wtf/ObjcRuntimeExtras.h>
     71#include <wtf/WTFObjCRuntimeExtras.h>
    7272#include <wtf/ProcessPrivilege.h>
    7373

  • trunk/Source/WebCore/platform/mac/URLMac.mm

    r232911 r238073  
    3030#import "URLParser.h"
    3131#import "WebCoreNSURLExtras.h"
    32 #import <wtf/ObjcRuntimeExtras.h>
     32#import <wtf/WTFObjCRuntimeExtras.h>
    3333#import <wtf/text/CString.h>
    3434

  • trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm

    r236767 r238073  
    3333#import <wtf/Function.h>
    3434#import <wtf/HexNumber.h>
    35 #import <wtf/ObjcRuntimeExtras.h>
     35#import <wtf/WTFObjCRuntimeExtras.h>
    3636#import <wtf/RetainPtr.h>
    3737#import <wtf/Vector.h>

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

    r234348 r238073  
    3333#include <wtf/Assertions.h>
    3434#include <wtf/MainThread.h>
    35 #include <wtf/ObjcRuntimeExtras.h>
     35#include <wtf/WTFObjCRuntimeExtras.h>
    3636#include <wtf/Threading.h>
    3737

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r238062 r238073  
    7878#import <pal/spi/mac/NSSharingServicePickerSPI.h>
    7979#import <wtf/MathExtras.h>
    80 #import <wtf/ObjcRuntimeExtras.h>
     80#import <wtf/WTFObjCRuntimeExtras.h>
    8181#import <wtf/RetainPtr.h>
    8282#import <wtf/StdLibExtras.h>
    … …  
    633633        auto systemAppearanceColor = [] (Color& color, SEL selector) -> Color {
    634634            if (!color.isValid()) {
    635                 auto systemColor = wtfObjcMsgSend<NSColor *>([NSColor class], selector);
     635                auto systemColor = wtfObjCMsgSend<NSColor *>([NSColor class], selector);
    636636                color = semanticColorFromNSColor(systemColor);
    637637            }
    … …  
    816816
    817817        if (auto selector = selectCocoaColor()) {
    818             if (auto color = wtfObjcMsgSend<NSColor *>([NSColor class], selector))
     818            if (auto color = wtfObjCMsgSend<NSColor *>([NSColor class], selector))
    819819                return semanticColorFromNSColor(color);
    820820        }

  • trunk/Source/WebKit/ChangeLog

    r238070 r238073  
     12018-11-10  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
     4        https://bugs.webkit.org/show_bug.cgi?id=191492
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Platform/mac/StringUtilities.mm:
     9        * UIProcess/ApplicationStateTracker.mm:
     10        (WebKit::ApplicationStateTracker::applicationDidEnterBackground):
     11        (WebKit::ApplicationStateTracker::applicationDidFinishSnapshottingAfterEnteringBackground):
     12        (WebKit::ApplicationStateTracker::applicationWillEnterForeground):
     13        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
     14        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
     15
    1162018-11-10  Ryan Haddad  <ryanhaddad@apple.com>
    217

  • trunk/Source/WebKit/Platform/mac/StringUtilities.mm

    r238015 r238073  
    3030#import "WKStringCF.h"
    3131#import <JavaScriptCore/RegularExpression.h>
    32 #import <wtf/ObjcRuntimeExtras.h>
     32#import <wtf/WTFObjCRuntimeExtras.h>
    3333#import <wtf/SoftLinking.h>
    3434#import <wtf/text/StringBuilder.h>

  • trunk/Source/WebKit/UIProcess/ApplicationStateTracker.mm

    r237266 r238073  
    3232#import "SandboxUtilities.h"
    3333#import "UIKitSPI.h"
    34 #import <wtf/ObjcRuntimeExtras.h>
     34#import <wtf/WTFObjCRuntimeExtras.h>
    3535#import <wtf/cocoa/Entitlements.h>
    3636#import <wtf/spi/cocoa/SecuritySPI.h>
    … …  
    199199
    200200    if (auto view = m_view.get())
    201         wtfObjcMsgSend<void>(view.get(), m_didEnterBackgroundSelector);
     201        wtfObjCMsgSend<void>(view.get(), m_didEnterBackgroundSelector);
    202202}
    203203
    … …  
    205205{
    206206    if (auto view = m_view.get())
    207         wtfObjcMsgSend<void>(view.get(), m_didFinishSnapshottingAfterEnteringBackgroundSelector);
     207        wtfObjCMsgSend<void>(view.get(), m_didFinishSnapshottingAfterEnteringBackgroundSelector);
    208208}
    209209
    … …  
    213213
    214214    if (auto view = m_view.get())
    215         wtfObjcMsgSend<void>(view.get(), m_willEnterForegroundSelector);
     215        wtfObjCMsgSend<void>(view.get(), m_willEnterForegroundSelector);
    216216}
    217217

  • trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm

    r235205 r238073  
    4242#import <WebCore/ScrollView.h>
    4343#import <WebCore/Scrollbar.h>
    44 #import <wtf/ObjcRuntimeExtras.h>
     44#import <wtf/WTFObjCRuntimeExtras.h>
    4545
    4646using namespace WebKit;

  • trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm

    r236902 r238073  
    4747#import <WebCore/WebAccessibilityObjectWrapperMac.h>
    4848#import <pal/spi/mac/NSAccessibilitySPI.h>
    49 #import <wtf/ObjcRuntimeExtras.h>
     49#import <wtf/WTFObjCRuntimeExtras.h>
    5050
    5151using namespace WebCore;

  • trunk/Source/WebKitLegacy/mac/Carbon/HIWebView.mm

    r236849 r238073  
    3939#import <pal/spi/mac/QuickDrawSPI.h>
    4040#import <wtf/Assertions.h>
    41 #import <wtf/ObjcRuntimeExtras.h>
     41#import <wtf/WTFObjCRuntimeExtras.h>
    4242#import <wtf/cf/TypeCastsCF.h>
    4343
    … …  
    11401140                // Can't use -performSelector:withObject: here because the method we're calling returns BOOL, while
    11411141                // -performSelector:withObject:'s return value is assumed to be an id.
    1142                 if (wtfObjcMsgSend<BOOL>(resp, @selector(validateUserInterfaceItem:), proxy))
     1142                if (wtfObjCMsgSend<BOOL>(resp, @selector(validateUserInterfaceItem:), proxy))
    11431143                    EnableMenuItem(inCommand->menu.menuRef, inCommand->menu.menuItemIndex);
    11441144                else

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r238062 r238073  
     12018-11-10  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
     4        https://bugs.webkit.org/show_bug.cgi?id=191492
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Carbon/HIWebView.mm:
     9        (UpdateCommandStatus):
     10        * Misc/WebNSFileManagerExtras.mm:
     11        * Misc/WebNSURLExtras.mm:
     12        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
     13        * Plugins/WebBasePluginPackage.mm:
     14        * Plugins/WebPluginContainerCheck.mm:
     15        (-[WebPluginContainerCheck _continueWithPolicy:]):
     16        * WebCoreSupport/WebCachedFramePlatformData.h:
     17        (WebCachedFramePlatformData::clear):
     18        * WebCoreSupport/WebDeviceOrientationClient.mm:
     19        (WebDeviceOrientationClient::getProvider const):
     20        * WebView/WebDelegateImplementationCaching.mm:
     21        (CallDelegate):
     22        (CallDelegateReturningBoolean):
     23        (CallResourceLoadDelegateReturningBoolean):
     24        (CallFormDelegate):
     25        (CallFormDelegateReturningBoolean):
     26        * WebView/WebHTMLView.mm:
     27        * WebView/WebPDFRepresentation.mm:
     28        * WebView/WebPolicyDelegate.mm:
     29        (-[WebPolicyDecisionListener _usePolicy:]):
     30        * WebView/WebView.mm:
     31
    1322018-11-09  Ryan Haddad  <ryanhaddad@apple.com>
    233

  • trunk/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm

    r237266 r238073  
    3535#import <sys/stat.h>
    3636#import <wtf/Assertions.h>
    37 #import <wtf/ObjcRuntimeExtras.h>
     37#import <wtf/WTFObjCRuntimeExtras.h>
    3838
    3939@implementation NSFileManager (WebNSFileManagerExtras)

  • trunk/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm

    r236674 r238073  
    3838#import <WebCore/TextEncoding.h>
    3939#import <WebCore/WebCoreNSURLExtras.h>
    40 #import <wtf/Assertions.h>
    41 #import <wtf/ObjcRuntimeExtras.h>
    4240#import <unicode/uchar.h>
    4341#import <unicode/uscript.h>
     42#import <wtf/Assertions.h>
     43#import <wtf/WTFObjCRuntimeExtras.h>
    4444
    4545using namespace WebCore;

  • trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm

    r237266 r238073  
    5252#import <wtf/Assertions.h>
    5353#import <wtf/MainThread.h>
    54 #import <wtf/ObjcRuntimeExtras.h>
     54#import <wtf/WTFObjCRuntimeExtras.h>
    5555#import <wtf/RunLoop.h>
    5656

  • trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm

    r237266 r238073  
    4141#import <wtf/Assertions.h>
    4242#import <wtf/MainThread.h>
    43 #import <wtf/ObjcRuntimeExtras.h>
     43#import <wtf/WTFObjCRuntimeExtras.h>
    4444#import <wtf/RunLoop.h>
    4545#import <wtf/Vector.h>

  • trunk/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm

    r237266 r238073  
    4444#import <WebCore/SecurityOrigin.h>
    4545#import <wtf/Assertions.h>
    46 #import <wtf/ObjcRuntimeExtras.h>
     46#import <wtf/WTFObjCRuntimeExtras.h>
    4747
    4848using namespace WebCore;
    … …  
    8888{
    8989    if (_contextInfo)
    90         wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);
     90        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);
    9191    else     
    92         wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));
     92        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));
    9393
    9494    // this will call indirectly call cancel

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h

    r236846 r238073  
    2929#import "WebHTMLViewInternal.h"
    3030#import <WebCore/CachedFramePlatformData.h>
    31 #import <wtf/ObjcRuntimeExtras.h>
     31#import <wtf/WTFObjCRuntimeExtras.h>
    3232#import <wtf/RetainPtr.h>
    3333
    … …  
    3636    WebCachedFramePlatformData(id webDocumentView) : m_webDocumentView(webDocumentView) { }
    3737   
    38     virtual void clear() { wtfObjcMsgSend<void>(m_webDocumentView.get(), @selector(closeIfNotCurrentView)); }
     38    virtual void clear() { wtfObjCMsgSend<void>(m_webDocumentView.get(), @selector(closeIfNotCurrentView)); }
    3939
    4040    id webDocumentView() { return m_webDocumentView.get(); }

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDeviceOrientationClient.mm

    r135882 r238073  
    2929#import "WebDeviceOrientationProvider.h"
    3030#import "WebViewInternal.h"
    31 #import <wtf/ObjcRuntimeExtras.h>
     31#import <wtf/WTFObjCRuntimeExtras.h>
    3232
    3333using namespace WebCore;
    … …  
    7171        m_provider = [m_webView _deviceOrientationProvider];
    7272        if ([m_provider respondsToSelector:@selector(setController:)])
    73             wtfObjcMsgSend<void>(m_provider, @selector(setController:), m_controller);
     73            wtfObjCMsgSend<void>(m_provider, @selector(setController:), m_controller);
    7474    }
    7575    return m_provider;

  • trunk/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm

    r237266 r238073  
    3333#import "WebView.h"
    3434#import "WebViewData.h"
    35 #import <wtf/ObjcRuntimeExtras.h>
     35#import <wtf/WTFObjCRuntimeExtras.h>
    3636
    3737#if PLATFORM(IOS_FAMILY)
    … …  
    9393        return nil;
    9494    @try {
    95         return wtfObjcMsgSend<id>(delegate, selector, self);
     95        return wtfObjCMsgSend<id>(delegate, selector, self);
    9696    } @catch(id exception) {
    9797        ReportDiscardedDelegateException(selector, exception);
    … …  
    126126        return nil;
    127127    @try {
    128         return wtfObjcMsgSend<id>(delegate, selector, self, object);
     128        return wtfObjCMsgSend<id>(delegate, selector, self, object);
    129129    } @catch(id exception) {
    130130        ReportDiscardedDelegateException(selector, exception);
    … …  
    160160        return nil;
    161161    @try {
    162         return wtfObjcMsgSend<id>(delegate, selector, self, rect);
     162        return wtfObjCMsgSend<id>(delegate, selector, self, rect);
    163163    } @catch(id exception) {
    164164        ReportDiscardedDelegateException(selector, exception);
    … …  
    194194        return nil;
    195195    @try {
    196         return wtfObjcMsgSend<id>(delegate, selector, self, object1, object2);
     196        return wtfObjCMsgSend<id>(delegate, selector, self, object1, object2);
    197197    } @catch(id exception) {
    198198        ReportDiscardedDelegateException(selector, exception);
    … …  
    229229        return nil;
    230230    @try {
    231         return wtfObjcMsgSend<id>(delegate, selector, self, object, boolean);
     231        return wtfObjCMsgSend<id>(delegate, selector, self, object, boolean);
    232232    } @catch(id exception) {
    233233        ReportDiscardedDelegateException(selector, exception);
    … …  
    264264        return nil;
    265265    @try {
    266         return wtfObjcMsgSend<id>(delegate, selector, self, object1, object2, object3);
     266        return wtfObjCMsgSend<id>(delegate, selector, self, object1, object2, object3);
    267267    } @catch(id exception) {
    268268        ReportDiscardedDelegateException(selector, exception);
    … …  
    300300        return nil;
    301301    @try {
    302         return wtfObjcMsgSend<id>(delegate, selector, self, object, integer);
     302        return wtfObjCMsgSend<id>(delegate, selector, self, object, integer);
    303303    } @catch(id exception) {
    304304        ReportDiscardedDelegateException(selector, exception);
    … …  
    365365        return result;
    366366    @try {
    367         return wtfObjcMsgSend<BOOL>(delegate, selector, self);
     367        return wtfObjCMsgSend<BOOL>(delegate, selector, self);
    368368    } @catch(id exception) {
    369369        ReportDiscardedDelegateException(selector, exception);
    … …  
    395395        return result;
    396396    @try {
    397         return wtfObjcMsgSend<BOOL>(delegate, selector, self, object);
     397        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object);
    398398    } @catch(id exception) {
    399399        ReportDiscardedDelegateException(selector, exception);
    … …  
    426426        return result;
    427427    @try {
    428         return wtfObjcMsgSend<BOOL>(delegate, selector, self, object, boolean);
     428        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object, boolean);
    429429    } @catch(id exception) {
    430430        ReportDiscardedDelegateException(selector, exception);
    … …  
    457457        return result;
    458458    @try {
    459         return wtfObjcMsgSend<BOOL>(delegate, selector, self, object, boolean, object2);
     459        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object, boolean, object2);
    460460    } @catch(id exception) {
    461461        ReportDiscardedDelegateException(selector, exception);
    … …  
    470470        return result;
    471471    @try {
    472         return wtfObjcMsgSend<BOOL>(delegate, selector, self, object1, object2);
     472        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object1, object2);
    473473    } @catch(id exception) {
    474474        ReportDiscardedDelegateException(selector, exception);
    … …  
    12891289{
    12901290    @try {
    1291         return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1);
     1291        return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1);
    12921292    } @catch(id exception) {
    12931293        ReportDiscardedDelegateException(selector, exception);
    … …  
    12991299{
    13001300    @try {
    1301         return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2);
     1301        return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2);
    13021302    } @catch(id exception) {
    13031303        ReportDiscardedDelegateException(selector, exception);
    … …  
    13091309{
    13101310    @try {
    1311         return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2, object3);
     1311        return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2, object3);
    13121312    } @catch(id exception) {
    13131313        ReportDiscardedDelegateException(selector, exception);
    … …  
    13811381        return nil;
    13821382    @try {
    1383         return wtfObjcMsgSend<id>(delegate, selector, object1, object2);
     1383        return wtfObjCMsgSend<id>(delegate, selector, object1, object2);
    13841384    } @catch(id exception) {
    13851385        ReportDiscardedDelegateException(selector, exception);
    … …  
    14171417        return nil;
    14181418    @try {
    1419         return wtfObjcMsgSend<id>(delegate, selector, object1, object2, object3);
     1419        return wtfObjCMsgSend<id>(delegate, selector, object1, object2, object3);
    14201420    } @catch(id exception) {
    14211421        ReportDiscardedDelegateException(selector, exception);
    … …  
    14541454        return nil;
    14551455    @try {
    1456         return wtfObjcMsgSend<id>(delegate, selector, object1, object2, object3, object4, object5);
     1456        return wtfObjCMsgSend<id>(delegate, selector, object1, object2, object3, object4, object5);
    14571457    } @catch(id exception) {
    14581458        ReportDiscardedDelegateException(selector, exception);
    … …  
    14931493        return result;
    14941494    @try {
    1495         return wtfObjcMsgSend<BOOL>(delegate, selector, object1, selectorArg, object2);
     1495        return wtfObjCMsgSend<BOOL>(delegate, selector, object1, selectorArg, object2);
    14961496    } @catch(id exception) {
    14971497        ReportDiscardedDelegateException(selector, exception);

  • trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm

    r238062 r238073  
    144144#import <wtf/MainThread.h>
    145145#import <wtf/MathExtras.h>
    146 #import <wtf/ObjcRuntimeExtras.h>
     146#import <wtf/WTFObjCRuntimeExtras.h>
    147147#import <wtf/RunLoop.h>
    148148#import <wtf/SystemTracing.h>

  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm

    r237266 r238073  
    4040#import <JavaScriptCore/OpaqueJSString.h>
    4141#import <wtf/Assertions.h>
    42 #import <wtf/ObjcRuntimeExtras.h>
     42#import <wtf/WTFObjCRuntimeExtras.h>
    4343#import <wtf/RetainPtr.h>
    4444

  • trunk/Source/WebKitLegacy/mac/WebView/WebPolicyDelegate.mm

    r222492 r238073  
    3030
    3131#import <WebCore/FrameLoaderTypes.h>
    32 #import <wtf/ObjcRuntimeExtras.h>
     32#import <wtf/WTFObjCRuntimeExtras.h>
    3333
    3434using namespace WebCore;
    … …  
    9292{
    9393    if (_private->target)
    94         wtfObjcMsgSend<void>(_private->target, _private->action, policy);
     94        wtfObjCMsgSend<void>(_private->target, _private->action, policy);
    9595}
    9696

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r238049 r238073  
    232232#import <wtf/HashTraits.h>
    233233#import <wtf/MainThread.h>
    234 #import <wtf/ObjcRuntimeExtras.h>
     234#import <wtf/WTFObjCRuntimeExtras.h>
    235235#import <wtf/ProcessPrivilege.h>
    236236#import <wtf/RAMSize.h>

  • trunk/Tools/ChangeLog

    r238070 r238073  
     12018-11-10  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        Fix a fixme: rename wtfObjcMsgSend to wtfObjCMsgSend
     4        https://bugs.webkit.org/show_bug.cgi?id=191492
     5
     6        Reviewed by Alex Christensen.
     7
     8        * DumpRenderTree/mac/DumpRenderTree.mm:
     9        * WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
     10        * WebKitTestRunner/mac/TestControllerMac.mm:
     11
    1122018-11-10  Ryan Haddad  <ryanhaddad@apple.com>
    213

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r237935 r238073  
    9494#import <wtf/FastMalloc.h>
    9595#import <wtf/LoggingAccumulator.h>
    96 #import <wtf/ObjcRuntimeExtras.h>
     96#import <wtf/WTFObjCRuntimeExtras.h>
    9797#import <wtf/ProcessPrivilege.h>
    9898#import <wtf/RetainPtr.h>

  • trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm

    r233079 r238073  
    3131#import <WebKit/WKStringCF.h>
    3232#import <wtf/NeverDestroyed.h>
    33 #import <wtf/ObjcRuntimeExtras.h>
     33#import <wtf/WTFObjCRuntimeExtras.h>
    3434#import <wtf/RetainPtr.h>
    3535

  • trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm

    r237893 r238073  
    4545#import <WebKit/_WKUserContentExtensionStorePrivate.h>
    4646#import <mach-o/dyld.h>
    47 #import <wtf/ObjcRuntimeExtras.h>
     47#import <wtf/WTFObjCRuntimeExtras.h>
    4848#import <wtf/mac/AppKitCompatibilityDeclarations.h>
    4949
Note: See TracChangeset for help on using the changeset viewer.