| Differences between
and this patch
- a/Source/JavaScriptCore/ChangeLog +9 lines
Lines 1-3 a/Source/JavaScriptCore/ChangeLog_sec1
1
2018-11-09  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 NOBODY (OOPS!).
7
8
        * API/JSValue.mm:
9
1
2018-11-09  Keith Rollin  <krollin@apple.com>
10
2018-11-09  Keith Rollin  <krollin@apple.com>
2
11
3
        Unreviewed build fix after https://bugs.webkit.org/show_bug.cgi?id=191324
12
        Unreviewed build fix after https://bugs.webkit.org/show_bug.cgi?id=191324
- a/Source/WTF/ChangeLog +12 lines
Lines 1-3 a/Source/WTF/ChangeLog_sec1
1
2018-11-09  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 NOBODY (OOPS!).
7
8
        * WTF.xcodeproj/project.pbxproj:
9
        * wtf/CMakeLists.txt:
10
        * wtf/ObjCRuntimeExtras.h: Renamed from Source/WTF/wtf/ObjcRuntimeExtras.h.
11
        (wtfObjCMsgSend):
12
1
2018-11-09  Keith Miller  <keith_miller@apple.com>
13
2018-11-09  Keith Miller  <keith_miller@apple.com>
2
14
3
        LLInt VectorSizeOffset should be based on offset extraction
15
        LLInt VectorSizeOffset should be based on offset extraction
- a/Source/WebCore/ChangeLog +15 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1
2018-11-09  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 NOBODY (OOPS!).
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
1
2018-11-09  Tim Horton  <timothy_horton@apple.com>
16
2018-11-09  Tim Horton  <timothy_horton@apple.com>
2
17
3
        Normal-flow-only flex items don't correctly respect z-index
18
        Normal-flow-only flex items don't correctly respect z-index
- a/Source/WebKit/ChangeLog +15 lines
Lines 1-3 a/Source/WebKit/ChangeLog_sec1
1
2018-11-09  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 NOBODY (OOPS!).
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
1
2018-11-09  Chris Dumez  <cdumez@apple.com>
16
2018-11-09  Chris Dumez  <cdumez@apple.com>
2
17
3
        Suspended page persists even after back/forward list item is gone
18
        Suspended page persists even after back/forward list item is gone
- a/Source/WebKitLegacy/mac/ChangeLog +31 lines
Lines 1-3 a/Source/WebKitLegacy/mac/ChangeLog_sec1
1
2018-11-09  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 NOBODY (OOPS!).
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
1
2018-11-09  Antti Koivisto  <antti@apple.com>
32
2018-11-09  Antti Koivisto  <antti@apple.com>
2
33
3
        Use OptionSet for layout milestones
34
        Use OptionSet for layout milestones
- a/Source/JavaScriptCore/API/JSValue.mm -1 / +1 lines
Lines 45-51 a/Source/JavaScriptCore/API/JSValue.mm_sec1
45
#import <wtf/HashMap.h>
45
#import <wtf/HashMap.h>
46
#import <wtf/HashSet.h>
46
#import <wtf/HashSet.h>
47
#import <wtf/Lock.h>
47
#import <wtf/Lock.h>
48
#import <wtf/ObjcRuntimeExtras.h>
48
#import <wtf/ObjCRuntimeExtras.h>
49
#import <wtf/Vector.h>
49
#import <wtf/Vector.h>
50
#import <wtf/text/WTFString.h>
50
#import <wtf/text/WTFString.h>
51
#import <wtf/text/StringHash.h>
51
#import <wtf/text/StringHash.h>
- a/Source/WTF/WTF.xcodeproj/project.pbxproj -2 / +2 lines
Lines 389-395 a/Source/WTF/WTF.xcodeproj/project.pbxproj_sec1
389
		7CDD7FF7186D291E007433CD /* IteratorAdaptors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorAdaptors.h; sourceTree = "<group>"; };
389
		7CDD7FF7186D291E007433CD /* IteratorAdaptors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorAdaptors.h; sourceTree = "<group>"; };
390
		7CDD7FF9186D2A54007433CD /* IteratorRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorRange.h; sourceTree = "<group>"; };
390
		7CDD7FF9186D2A54007433CD /* IteratorRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorRange.h; sourceTree = "<group>"; };
391
		7CEAE5AC1EA6E10F00DB6890 /* NotFound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotFound.h; sourceTree = "<group>"; };
391
		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 /* ObjCRuntimeExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCRuntimeExtras.h; sourceTree = "<group>"; };
393
		8134013615B092FD001FF0B8 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; sourceTree = "<group>"; };
393
		8134013615B092FD001FF0B8 /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64.cpp; sourceTree = "<group>"; };
394
		8134013715B092FD001FF0B8 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
394
		8134013715B092FD001FF0B8 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
395
		83A8AC3D1FABBE94002064AC /* ObjectIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectIdentifier.h; sourceTree = "<group>"; };
395
		83A8AC3D1FABBE94002064AC /* ObjectIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectIdentifier.h; sourceTree = "<group>"; };
Lines 970-976 a/Source/WTF/WTF.xcodeproj/project.pbxproj_sec2
970
				7CEAE5AC1EA6E10F00DB6890 /* NotFound.h */,
970
				7CEAE5AC1EA6E10F00DB6890 /* NotFound.h */,
971
				A8A472D5151A825B004123FF /* NumberOfCores.cpp */,
971
				A8A472D5151A825B004123FF /* NumberOfCores.cpp */,
972
				A8A472D6151A825B004123FF /* NumberOfCores.h */,
972
				A8A472D6151A825B004123FF /* NumberOfCores.h */,
973
				7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */,
973
				7E29C33D15FFD79B00516D61 /* ObjCRuntimeExtras.h */,
974
				83A8AC3D1FABBE94002064AC /* ObjectIdentifier.h */,
974
				83A8AC3D1FABBE94002064AC /* ObjectIdentifier.h */,
975
				1AFDE6521953B23D00C48FFA /* Optional.h */,
975
				1AFDE6521953B23D00C48FFA /* Optional.h */,
976
				1A4656181C7FC68E00F5920F /* OptionSet.h */,
976
				1A4656181C7FC68E00F5920F /* OptionSet.h */,
- a/Source/WTF/wtf/CMakeLists.txt -1 / +1 lines
Lines 143-149 set(WTF_PUBLIC_HEADERS a/Source/WTF/wtf/CMakeLists.txt_sec1
143
    OSAllocator.h
143
    OSAllocator.h
144
    OSObjectPtr.h
144
    OSObjectPtr.h
145
    OSRandomSource.h
145
    OSRandomSource.h
146
    ObjcRuntimeExtras.h
146
    ObjCRuntimeExtras.h
147
    ObjectIdentifier.h
147
    ObjectIdentifier.h
148
    OptionSet.h
148
    OptionSet.h
149
    Optional.h
149
    Optional.h
- a/Source/WTF/wtf/ObjCRuntimeExtras.h +43 lines
Line 0 a/Source/WTF/wtf/ObjCRuntimeExtras.h_sec1
1
/*
2
 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1.  Redistributions of source code must retain the above copyright
8
 *     notice, this list of conditions and the following disclaimer.
9
 * 2.  Redistributions in binary form must reproduce the above copyright
10
 *     notice, this list of conditions and the following disclaimer in the
11
 *     documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
14
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16
 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
17
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
20
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23
 */
24
25
#pragma once
26
27
#include <objc/message.h>
28
29
#ifdef __cplusplus
30
31
template<typename ReturnType, typename... ArgumentTypes>
32
inline ReturnType wtfObjCMsgSend(id target, SEL selector, ArgumentTypes... arguments)
33
{
34
    return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(objc_msgSend)(target, selector, arguments...);
35
}
36
37
template<typename ReturnType, typename... ArgumentTypes>
38
inline ReturnType wtfCallIMP(IMP implementation, id target, SEL selector, ArgumentTypes... arguments)
39
{
40
    return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(implementation)(target, selector, arguments...);
41
}
42
43
#endif // __cplusplus
- a/Source/WTF/wtf/ObjcRuntimeExtras.h -46 lines
Lines 1-46 a/Source/WTF/wtf/ObjcRuntimeExtras.h_sec1
1
/*
2
 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 * 1.  Redistributions of source code must retain the above copyright
8
 *     notice, this list of conditions and the following disclaimer.
9
 * 2.  Redistributions in binary form must reproduce the above copyright
10
 *     notice, this list of conditions and the following disclaimer in the
11
 *     documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
14
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16
 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
17
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
20
 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23
 */
24
25
#pragma once
26
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
30
#include <objc/message.h>
31
32
#ifdef __cplusplus
33
34
template<typename ReturnType, typename... ArgumentTypes>
35
inline ReturnType wtfObjcMsgSend(id target, SEL selector, ArgumentTypes... arguments)
36
{
37
    return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(objc_msgSend)(target, selector, arguments...);
38
}
39
40
template<typename ReturnType, typename... ArgumentTypes>
41
inline ReturnType wtfCallIMP(IMP implementation, id target, SEL selector, ArgumentTypes... arguments)
42
{
43
    return reinterpret_cast<ReturnType (*)(id, SEL, ArgumentTypes...)>(implementation)(target, selector, arguments...);
44
}
45
46
#endif // __cplusplus
- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm -1 / +1 lines
Lines 78-84 a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm_sec1
78
#import "WebCoreFrameView.h"
78
#import "WebCoreFrameView.h"
79
#import <pal/spi/mac/HIServicesSPI.h>
79
#import <pal/spi/mac/HIServicesSPI.h>
80
#import <pal/spi/mac/NSAccessibilitySPI.h>
80
#import <pal/spi/mac/NSAccessibilitySPI.h>
81
#import <wtf/ObjcRuntimeExtras.h>
81
#import <wtf/ObjCRuntimeExtras.h>
82
#if ENABLE(TREE_DEBUGGING) || ENABLE(METER_ELEMENT)
82
#if ENABLE(TREE_DEBUGGING) || ENABLE(METER_ELEMENT)
83
#import <wtf/text/StringBuilder.h>
83
#import <wtf/text/StringBuilder.h>
84
#endif
84
#endif
- a/Source/WebCore/page/mac/EventHandlerMac.mm -1 / +1 lines
Lines 68-74 a/Source/WebCore/page/mac/EventHandlerMac.mm_sec1
68
#include <wtf/BlockObjCExceptions.h>
68
#include <wtf/BlockObjCExceptions.h>
69
#include <wtf/MainThread.h>
69
#include <wtf/MainThread.h>
70
#include <wtf/NeverDestroyed.h>
70
#include <wtf/NeverDestroyed.h>
71
#include <wtf/ObjcRuntimeExtras.h>
71
#include <wtf/ObjCRuntimeExtras.h>
72
#include <wtf/ProcessPrivilege.h>
72
#include <wtf/ProcessPrivilege.h>
73
73
74
#if ENABLE(MAC_GESTURE_EVENTS)
74
#if ENABLE(MAC_GESTURE_EVENTS)
- a/Source/WebCore/platform/mac/URLMac.mm -1 / +1 lines
Lines 29-35 a/Source/WebCore/platform/mac/URLMac.mm_sec1
29
#import "CFURLExtras.h"
29
#import "CFURLExtras.h"
30
#import "URLParser.h"
30
#import "URLParser.h"
31
#import "WebCoreNSURLExtras.h"
31
#import "WebCoreNSURLExtras.h"
32
#import <wtf/ObjcRuntimeExtras.h>
32
#import <wtf/ObjCRuntimeExtras.h>
33
#import <wtf/text/CString.h>
33
#import <wtf/text/CString.h>
34
34
35
@interface NSString (WebCoreNSURLExtras)
35
@interface NSString (WebCoreNSURLExtras)
- a/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm -1 / +1 lines
Lines 32-38 a/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm_sec1
32
#import <pal/spi/cf/CFNetworkSPI.h>
32
#import <pal/spi/cf/CFNetworkSPI.h>
33
#import <wtf/Function.h>
33
#import <wtf/Function.h>
34
#import <wtf/HexNumber.h>
34
#import <wtf/HexNumber.h>
35
#import <wtf/ObjcRuntimeExtras.h>
35
#import <wtf/ObjCRuntimeExtras.h>
36
#import <wtf/RetainPtr.h>
36
#import <wtf/RetainPtr.h>
37
#import <wtf/Vector.h>
37
#import <wtf/Vector.h>
38
#import <unicode/uchar.h>
38
#import <unicode/uchar.h>
- a/Source/WebCore/platform/mac/WebCoreObjCExtras.mm -1 / +1 lines
Lines 32-38 a/Source/WebCore/platform/mac/WebCoreObjCExtras.mm_sec1
32
#include <utility>
32
#include <utility>
33
#include <wtf/Assertions.h>
33
#include <wtf/Assertions.h>
34
#include <wtf/MainThread.h>
34
#include <wtf/MainThread.h>
35
#include <wtf/ObjcRuntimeExtras.h>
35
#include <wtf/ObjCRuntimeExtras.h>
36
#include <wtf/Threading.h>
36
#include <wtf/Threading.h>
37
37
38
bool WebCoreObjCScheduleDeallocateOnMainThread(Class cls, id object)
38
bool WebCoreObjCScheduleDeallocateOnMainThread(Class cls, id object)
- a/Source/WebCore/rendering/RenderThemeMac.mm -3 / +3 lines
Lines 77-83 a/Source/WebCore/rendering/RenderThemeMac.mm_sec1
77
#import <pal/spi/mac/NSCellSPI.h>
77
#import <pal/spi/mac/NSCellSPI.h>
78
#import <pal/spi/mac/NSSharingServicePickerSPI.h>
78
#import <pal/spi/mac/NSSharingServicePickerSPI.h>
79
#import <wtf/MathExtras.h>
79
#import <wtf/MathExtras.h>
80
#import <wtf/ObjcRuntimeExtras.h>
80
#import <wtf/ObjCRuntimeExtras.h>
81
#import <wtf/RetainPtr.h>
81
#import <wtf/RetainPtr.h>
82
#import <wtf/StdLibExtras.h>
82
#import <wtf/StdLibExtras.h>
83
#import <wtf/text/StringBuilder.h>
83
#import <wtf/text/StringBuilder.h>
Lines 632-638 Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O a/Source/WebCore/rendering/RenderThemeMac.mm_sec2
632
        // Special handling for links and other system colors when the system appearance is desired.
632
        // Special handling for links and other system colors when the system appearance is desired.
633
        auto systemAppearanceColor = [] (Color& color, SEL selector) -> Color {
633
        auto systemAppearanceColor = [] (Color& color, SEL selector) -> Color {
634
            if (!color.isValid()) {
634
            if (!color.isValid()) {
635
                auto systemColor = wtfObjcMsgSend<NSColor *>([NSColor class], selector);
635
                auto systemColor = wtfObjCMsgSend<NSColor *>([NSColor class], selector);
636
                color = semanticColorFromNSColor(systemColor);
636
                color = semanticColorFromNSColor(systemColor);
637
            }
637
            }
638
638
Lines 815-821 Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::O a/Source/WebCore/rendering/RenderThemeMac.mm_sec3
815
        };
815
        };
816
816
817
        if (auto selector = selectCocoaColor()) {
817
        if (auto selector = selectCocoaColor()) {
818
            if (auto color = wtfObjcMsgSend<NSColor *>([NSColor class], selector))
818
            if (auto color = wtfObjCMsgSend<NSColor *>([NSColor class], selector))
819
                return semanticColorFromNSColor(color);
819
                return semanticColorFromNSColor(color);
820
        }
820
        }
821
821
- a/Source/WebKit/Platform/mac/StringUtilities.mm -1 / +1 lines
Lines 29-35 a/Source/WebKit/Platform/mac/StringUtilities.mm_sec1
29
#import "WKSharedAPICast.h"
29
#import "WKSharedAPICast.h"
30
#import "WKStringCF.h"
30
#import "WKStringCF.h"
31
#import <JavaScriptCore/RegularExpression.h>
31
#import <JavaScriptCore/RegularExpression.h>
32
#import <wtf/ObjcRuntimeExtras.h>
32
#import <wtf/ObjCRuntimeExtras.h>
33
#import <wtf/SoftLinking.h>
33
#import <wtf/SoftLinking.h>
34
#import <wtf/text/StringBuilder.h>
34
#import <wtf/text/StringBuilder.h>
35
35
- a/Source/WebKit/UIProcess/ApplicationStateTracker.mm -4 / +4 lines
Lines 31-37 a/Source/WebKit/UIProcess/ApplicationStateTracker.mm_sec1
31
#import "AssertionServicesSPI.h"
31
#import "AssertionServicesSPI.h"
32
#import "SandboxUtilities.h"
32
#import "SandboxUtilities.h"
33
#import "UIKitSPI.h"
33
#import "UIKitSPI.h"
34
#import <wtf/ObjcRuntimeExtras.h>
34
#import <wtf/ObjCRuntimeExtras.h>
35
#import <wtf/cocoa/Entitlements.h>
35
#import <wtf/cocoa/Entitlements.h>
36
#import <wtf/spi/cocoa/SecuritySPI.h>
36
#import <wtf/spi/cocoa/SecuritySPI.h>
37
37
Lines 198-210 void ApplicationStateTracker::applicationDidEnterBackground() a/Source/WebKit/UIProcess/ApplicationStateTracker.mm_sec2
198
    m_isInBackground = true;
198
    m_isInBackground = true;
199
199
200
    if (auto view = m_view.get())
200
    if (auto view = m_view.get())
201
        wtfObjcMsgSend<void>(view.get(), m_didEnterBackgroundSelector);
201
        wtfObjCMsgSend<void>(view.get(), m_didEnterBackgroundSelector);
202
}
202
}
203
203
204
void ApplicationStateTracker::applicationDidFinishSnapshottingAfterEnteringBackground()
204
void ApplicationStateTracker::applicationDidFinishSnapshottingAfterEnteringBackground()
205
{
205
{
206
    if (auto view = m_view.get())
206
    if (auto view = m_view.get())
207
        wtfObjcMsgSend<void>(view.get(), m_didFinishSnapshottingAfterEnteringBackgroundSelector);
207
        wtfObjCMsgSend<void>(view.get(), m_didFinishSnapshottingAfterEnteringBackgroundSelector);
208
}
208
}
209
209
210
void ApplicationStateTracker::applicationWillEnterForeground()
210
void ApplicationStateTracker::applicationWillEnterForeground()
Lines 212-218 void ApplicationStateTracker::applicationWillEnterForeground() a/Source/WebKit/UIProcess/ApplicationStateTracker.mm_sec3
212
    m_isInBackground = false;
212
    m_isInBackground = false;
213
213
214
    if (auto view = m_view.get())
214
    if (auto view = m_view.get())
215
        wtfObjcMsgSend<void>(view.get(), m_willEnterForegroundSelector);
215
        wtfObjCMsgSend<void>(view.get(), m_willEnterForegroundSelector);
216
}
216
}
217
217
218
}
218
}
- a/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm -1 / +1 lines
Lines 41-47 a/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm_sec1
41
#import <WebCore/Page.h>
41
#import <WebCore/Page.h>
42
#import <WebCore/ScrollView.h>
42
#import <WebCore/ScrollView.h>
43
#import <WebCore/Scrollbar.h>
43
#import <WebCore/Scrollbar.h>
44
#import <wtf/ObjcRuntimeExtras.h>
44
#import <wtf/ObjCRuntimeExtras.h>
45
45
46
using namespace WebKit;
46
using namespace WebKit;
47
47
- a/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm -1 / +1 lines
Lines 46-52 a/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm_sec1
46
#import <WebCore/Scrollbar.h>
46
#import <WebCore/Scrollbar.h>
47
#import <WebCore/WebAccessibilityObjectWrapperMac.h>
47
#import <WebCore/WebAccessibilityObjectWrapperMac.h>
48
#import <pal/spi/mac/NSAccessibilitySPI.h>
48
#import <pal/spi/mac/NSAccessibilitySPI.h>
49
#import <wtf/ObjcRuntimeExtras.h>
49
#import <wtf/ObjCRuntimeExtras.h>
50
50
51
using namespace WebCore;
51
using namespace WebCore;
52
using namespace WebKit;
52
using namespace WebKit;
- a/Source/WebKitLegacy/mac/Carbon/HIWebView.mm -2 / +2 lines
Lines 38-44 a/Source/WebKitLegacy/mac/Carbon/HIWebView.mm_sec1
38
#import <pal/spi/mac/NSGraphicsSPI.h>
38
#import <pal/spi/mac/NSGraphicsSPI.h>
39
#import <pal/spi/mac/QuickDrawSPI.h>
39
#import <pal/spi/mac/QuickDrawSPI.h>
40
#import <wtf/Assertions.h>
40
#import <wtf/Assertions.h>
41
#import <wtf/ObjcRuntimeExtras.h>
41
#import <wtf/ObjCRuntimeExtras.h>
42
#import <wtf/cf/TypeCastsCF.h>
42
#import <wtf/cf/TypeCastsCF.h>
43
43
44
WTF_DECLARE_CF_TYPE_TRAIT(CFRunLoop);
44
WTF_DECLARE_CF_TYPE_TRAIT(CFRunLoop);
Lines 1139-1145 UpdateCommandStatus(HIWebView* inView, const HICommand* inCommand) a/Source/WebKitLegacy/mac/Carbon/HIWebView.mm_sec2
1139
                    
1139
                    
1140
                // Can't use -performSelector:withObject: here because the method we're calling returns BOOL, while
1140
                // Can't use -performSelector:withObject: here because the method we're calling returns BOOL, while
1141
                // -performSelector:withObject:'s return value is assumed to be an id.
1141
                // -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))
1143
                    EnableMenuItem(inCommand->menu.menuRef, inCommand->menu.menuItemIndex);
1143
                    EnableMenuItem(inCommand->menu.menuRef, inCommand->menu.menuItemIndex);
1144
                else
1144
                else
1145
                    DisableMenuItem(inCommand->menu.menuRef, inCommand->menu.menuItemIndex);
1145
                    DisableMenuItem(inCommand->menu.menuRef, inCommand->menu.menuItemIndex);
- a/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm -1 / +1 lines
Lines 34-40 a/Source/WebKitLegacy/mac/Misc/WebNSFileManagerExtras.mm_sec1
34
#import <WebCore/LoaderNSURLExtras.h>
34
#import <WebCore/LoaderNSURLExtras.h>
35
#import <sys/stat.h>
35
#import <sys/stat.h>
36
#import <wtf/Assertions.h>
36
#import <wtf/Assertions.h>
37
#import <wtf/ObjcRuntimeExtras.h>
37
#import <wtf/ObjCRuntimeExtras.h>
38
38
39
@implementation NSFileManager (WebNSFileManagerExtras)
39
@implementation NSFileManager (WebNSFileManagerExtras)
40
40
- a/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm -2 / +2 lines
Lines 37-46 a/Source/WebKitLegacy/mac/Misc/WebNSURLExtras.mm_sec1
37
#import <WebCore/LoaderNSURLExtras.h>
37
#import <WebCore/LoaderNSURLExtras.h>
38
#import <WebCore/TextEncoding.h>
38
#import <WebCore/TextEncoding.h>
39
#import <WebCore/WebCoreNSURLExtras.h>
39
#import <WebCore/WebCoreNSURLExtras.h>
40
#import <wtf/Assertions.h>
41
#import <wtf/ObjcRuntimeExtras.h>
42
#import <unicode/uchar.h>
40
#import <unicode/uchar.h>
43
#import <unicode/uscript.h>
41
#import <unicode/uscript.h>
42
#import <wtf/Assertions.h>
43
#import <wtf/ObjCRuntimeExtras.h>
44
44
45
using namespace WebCore;
45
using namespace WebCore;
46
using namespace WTF;
46
using namespace WTF;
- a/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm -1 / +1 lines
Lines 51-57 a/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm_sec1
51
#import <pal/spi/cocoa/QuartzCoreSPI.h>
51
#import <pal/spi/cocoa/QuartzCoreSPI.h>
52
#import <wtf/Assertions.h>
52
#import <wtf/Assertions.h>
53
#import <wtf/MainThread.h>
53
#import <wtf/MainThread.h>
54
#import <wtf/ObjcRuntimeExtras.h>
54
#import <wtf/ObjCRuntimeExtras.h>
55
#import <wtf/RunLoop.h>
55
#import <wtf/RunLoop.h>
56
56
57
using namespace WebCore;
57
using namespace WebCore;
- a/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm -1 / +1 lines
Lines 40-46 a/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm_sec1
40
#import <mach-o/loader.h>
40
#import <mach-o/loader.h>
41
#import <wtf/Assertions.h>
41
#import <wtf/Assertions.h>
42
#import <wtf/MainThread.h>
42
#import <wtf/MainThread.h>
43
#import <wtf/ObjcRuntimeExtras.h>
43
#import <wtf/ObjCRuntimeExtras.h>
44
#import <wtf/RunLoop.h>
44
#import <wtf/RunLoop.h>
45
#import <wtf/Vector.h>
45
#import <wtf/Vector.h>
46
#import <wtf/text/CString.h>
46
#import <wtf/text/CString.h>
- a/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm -3 / +3 lines
Lines 43-49 a/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm_sec1
43
#import <WebCore/FrameLoaderTypes.h>
43
#import <WebCore/FrameLoaderTypes.h>
44
#import <WebCore/SecurityOrigin.h>
44
#import <WebCore/SecurityOrigin.h>
45
#import <wtf/Assertions.h>
45
#import <wtf/Assertions.h>
46
#import <wtf/ObjcRuntimeExtras.h>
46
#import <wtf/ObjCRuntimeExtras.h>
47
47
48
using namespace WebCore;
48
using namespace WebCore;
49
49
Lines 87-95 using namespace WebCore; a/Source/WebKitLegacy/mac/Plugins/WebPluginContainerCheck.mm_sec2
87
- (void)_continueWithPolicy:(PolicyAction)policy
87
- (void)_continueWithPolicy:(PolicyAction)policy
88
{
88
{
89
    if (_contextInfo)
89
    if (_contextInfo)
90
        wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);
90
        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use), _contextInfo);
91
    else     
91
    else     
92
        wtfObjcMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));
92
        wtfObjCMsgSend<void>(_resultObject, _resultSelector, (policy == PolicyAction::Use));
93
93
94
    // this will call indirectly call cancel
94
    // this will call indirectly call cancel
95
    [_controller _webPluginContainerCancelCheckIfAllowedToLoadRequest:self];
95
    [_controller _webPluginContainerCancelCheckIfAllowedToLoadRequest:self];
- a/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h -2 / +2 lines
Lines 28-41 a/Source/WebKitLegacy/mac/WebCoreSupport/WebCachedFramePlatformData.h_sec1
28
28
29
#import "WebHTMLViewInternal.h"
29
#import "WebHTMLViewInternal.h"
30
#import <WebCore/CachedFramePlatformData.h>
30
#import <WebCore/CachedFramePlatformData.h>
31
#import <wtf/ObjcRuntimeExtras.h>
31
#import <wtf/ObjCRuntimeExtras.h>
32
#import <wtf/RetainPtr.h>
32
#import <wtf/RetainPtr.h>
33
33
34
class WebCachedFramePlatformData : public WebCore::CachedFramePlatformData {
34
class WebCachedFramePlatformData : public WebCore::CachedFramePlatformData {
35
public:
35
public:
36
    WebCachedFramePlatformData(id webDocumentView) : m_webDocumentView(webDocumentView) { }
36
    WebCachedFramePlatformData(id webDocumentView) : m_webDocumentView(webDocumentView) { }
37
    
37
    
38
    virtual void clear() { wtfObjcMsgSend<void>(m_webDocumentView.get(), @selector(closeIfNotCurrentView)); }
38
    virtual void clear() { wtfObjCMsgSend<void>(m_webDocumentView.get(), @selector(closeIfNotCurrentView)); }
39
39
40
    id webDocumentView() { return m_webDocumentView.get(); }
40
    id webDocumentView() { return m_webDocumentView.get(); }
41
private:
41
private:
- a/Source/WebKitLegacy/mac/WebCoreSupport/WebDeviceOrientationClient.mm -2 / +2 lines
Lines 28-34 a/Source/WebKitLegacy/mac/WebCoreSupport/WebDeviceOrientationClient.mm_sec1
28
#import "WebDeviceOrientationInternal.h"
28
#import "WebDeviceOrientationInternal.h"
29
#import "WebDeviceOrientationProvider.h"
29
#import "WebDeviceOrientationProvider.h"
30
#import "WebViewInternal.h"
30
#import "WebViewInternal.h"
31
#import <wtf/ObjcRuntimeExtras.h>
31
#import <wtf/ObjCRuntimeExtras.h>
32
32
33
using namespace WebCore;
33
using namespace WebCore;
34
34
Lines 70-76 id<WebDeviceOrientationProvider> WebDeviceOrientationClient::getProvider() const a/Source/WebKitLegacy/mac/WebCoreSupport/WebDeviceOrientationClient.mm_sec2
70
    if (!m_provider) {
70
    if (!m_provider) {
71
        m_provider = [m_webView _deviceOrientationProvider];
71
        m_provider = [m_webView _deviceOrientationProvider];
72
        if ([m_provider respondsToSelector:@selector(setController:)])
72
        if ([m_provider respondsToSelector:@selector(setController:)])
73
            wtfObjcMsgSend<void>(m_provider, @selector(setController:), m_controller);
73
            wtfObjCMsgSend<void>(m_provider, @selector(setController:), m_controller);
74
    }
74
    }
75
    return m_provider;
75
    return m_provider;
76
}
76
}
- a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm -20 / +20 lines
Lines 32-38 a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec1
32
#import "WebKitLogging.h"
32
#import "WebKitLogging.h"
33
#import "WebView.h"
33
#import "WebView.h"
34
#import "WebViewData.h"
34
#import "WebViewData.h"
35
#import <wtf/ObjcRuntimeExtras.h>
35
#import <wtf/ObjCRuntimeExtras.h>
36
36
37
#if PLATFORM(IOS_FAMILY)
37
#if PLATFORM(IOS_FAMILY)
38
#import "WebViewInternal.h"
38
#import "WebViewInternal.h"
Lines 92-98 static inline id CallDelegate(WebView *self, id delegate, SEL selector) a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec2
92
    if (!delegate || ![delegate respondsToSelector:selector])
92
    if (!delegate || ![delegate respondsToSelector:selector])
93
        return nil;
93
        return nil;
94
    @try {
94
    @try {
95
        return wtfObjcMsgSend<id>(delegate, selector, self);
95
        return wtfObjCMsgSend<id>(delegate, selector, self);
96
    } @catch(id exception) {
96
    } @catch(id exception) {
97
        ReportDiscardedDelegateException(selector, exception);
97
        ReportDiscardedDelegateException(selector, exception);
98
    }
98
    }
Lines 125-131 static inline id CallDelegate(WebView *self, id delegate, SEL selector, id objec a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec3
125
    if (!delegate || ![delegate respondsToSelector:selector])
125
    if (!delegate || ![delegate respondsToSelector:selector])
126
        return nil;
126
        return nil;
127
    @try {
127
    @try {
128
        return wtfObjcMsgSend<id>(delegate, selector, self, object);
128
        return wtfObjCMsgSend<id>(delegate, selector, self, object);
129
    } @catch(id exception) {
129
    } @catch(id exception) {
130
        ReportDiscardedDelegateException(selector, exception);
130
        ReportDiscardedDelegateException(selector, exception);
131
    }
131
    }
Lines 159-165 static inline id CallDelegate(WebView *self, id delegate, SEL selector, NSRect r a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec4
159
    if (!delegate || ![delegate respondsToSelector:selector])
159
    if (!delegate || ![delegate respondsToSelector:selector])
160
        return nil;
160
        return nil;
161
    @try {
161
    @try {
162
        return wtfObjcMsgSend<id>(delegate, selector, self, rect);
162
        return wtfObjCMsgSend<id>(delegate, selector, self, rect);
163
    } @catch(id exception) {
163
    } @catch(id exception) {
164
        ReportDiscardedDelegateException(selector, exception);
164
        ReportDiscardedDelegateException(selector, exception);
165
    }
165
    }
Lines 193-199 static inline id CallDelegate(WebView *self, id delegate, SEL selector, id objec a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec5
193
    if (!delegate || ![delegate respondsToSelector:selector])
193
    if (!delegate || ![delegate respondsToSelector:selector])
194
        return nil;
194
        return nil;
195
    @try {
195
    @try {
196
        return wtfObjcMsgSend<id>(delegate, selector, self, object1, object2);
196
        return wtfObjCMsgSend<id>(delegate, selector, self, object1, object2);
197
    } @catch(id exception) {
197
    } @catch(id exception) {
198
        ReportDiscardedDelegateException(selector, exception);
198
        ReportDiscardedDelegateException(selector, exception);
199
    }
199
    }
Lines 228-234 static inline id CallDelegate(WebView *self, id delegate, SEL selector, id objec a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec6
228
    if (!delegate || ![delegate respondsToSelector:selector])
228
    if (!delegate || ![delegate respondsToSelector:selector])
229
        return nil;
229
        return nil;
230
    @try {
230
    @try {
231
        return wtfObjcMsgSend<id>(delegate, selector, self, object, boolean);
231
        return wtfObjCMsgSend<id>(delegate, selector, self, object, boolean);
232
    } @catch(id exception) {
232
    } @catch(id exception) {
233
        ReportDiscardedDelegateException(selector, exception);
233
        ReportDiscardedDelegateException(selector, exception);
234
    }
234
    }
Lines 263-269 static inline id CallDelegate(WebView *self, id delegate, SEL selector, id objec a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec7
263
    if (!delegate || ![delegate respondsToSelector:selector])
263
    if (!delegate || ![delegate respondsToSelector:selector])
264
        return nil;
264
        return nil;
265
    @try {
265
    @try {
266
        return wtfObjcMsgSend<id>(delegate, selector, self, object1, object2, object3);
266
        return wtfObjCMsgSend<id>(delegate, selector, self, object1, object2, object3);
267
    } @catch(id exception) {
267
    } @catch(id exception) {
268
        ReportDiscardedDelegateException(selector, exception);
268
        ReportDiscardedDelegateException(selector, exception);
269
    }
269
    }
Lines 299-305 static inline id CallDelegate(WebView *self, id delegate, SEL selector, id objec a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec8
299
    if (!delegate || ![delegate respondsToSelector:selector])
299
    if (!delegate || ![delegate respondsToSelector:selector])
300
        return nil;
300
        return nil;
301
    @try {
301
    @try {
302
        return wtfObjcMsgSend<id>(delegate, selector, self, object, integer);
302
        return wtfObjCMsgSend<id>(delegate, selector, self, object, integer);
303
    } @catch(id exception) {
303
    } @catch(id exception) {
304
        ReportDiscardedDelegateException(selector, exception);
304
        ReportDiscardedDelegateException(selector, exception);
305
    }
305
    }
Lines 364-370 static inline BOOL CallDelegateReturningBoolean(BOOL result, WebView *self, id d a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec9
364
    if (!delegate || ![delegate respondsToSelector:selector])
364
    if (!delegate || ![delegate respondsToSelector:selector])
365
        return result;
365
        return result;
366
    @try {
366
    @try {
367
        return wtfObjcMsgSend<BOOL>(delegate, selector, self);
367
        return wtfObjCMsgSend<BOOL>(delegate, selector, self);
368
    } @catch(id exception) {
368
    } @catch(id exception) {
369
        ReportDiscardedDelegateException(selector, exception);
369
        ReportDiscardedDelegateException(selector, exception);
370
    }
370
    }
Lines 394-400 static inline BOOL CallDelegateReturningBoolean(BOOL result, WebView *self, id d a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec10
394
    if (!delegate || ![delegate respondsToSelector:selector])
394
    if (!delegate || ![delegate respondsToSelector:selector])
395
        return result;
395
        return result;
396
    @try {
396
    @try {
397
        return wtfObjcMsgSend<BOOL>(delegate, selector, self, object);
397
        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object);
398
    } @catch(id exception) {
398
    } @catch(id exception) {
399
        ReportDiscardedDelegateException(selector, exception);
399
        ReportDiscardedDelegateException(selector, exception);
400
    }
400
    }
Lines 425-431 static inline BOOL CallDelegateReturningBoolean(BOOL result, WebView *self, id d a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec11
425
    if (!delegate || ![delegate respondsToSelector:selector])
425
    if (!delegate || ![delegate respondsToSelector:selector])
426
        return result;
426
        return result;
427
    @try {
427
    @try {
428
        return wtfObjcMsgSend<BOOL>(delegate, selector, self, object, boolean);
428
        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object, boolean);
429
    } @catch(id exception) {
429
    } @catch(id exception) {
430
        ReportDiscardedDelegateException(selector, exception);
430
        ReportDiscardedDelegateException(selector, exception);
431
    }
431
    }
Lines 456-462 static inline BOOL CallDelegateReturningBoolean(BOOL result, WebView *self, id d a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec12
456
    if (!delegate || ![delegate respondsToSelector:selector])
456
    if (!delegate || ![delegate respondsToSelector:selector])
457
        return result;
457
        return result;
458
    @try {
458
    @try {
459
        return wtfObjcMsgSend<BOOL>(delegate, selector, self, object, boolean, object2);
459
        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object, boolean, object2);
460
    } @catch(id exception) {
460
    } @catch(id exception) {
461
        ReportDiscardedDelegateException(selector, exception);
461
        ReportDiscardedDelegateException(selector, exception);
462
    }
462
    }
Lines 469-475 static inline BOOL CallDelegateReturningBoolean(BOOL result, WebView *self, id d a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec13
469
    if (!delegate || ![delegate respondsToSelector:selector])
469
    if (!delegate || ![delegate respondsToSelector:selector])
470
        return result;
470
        return result;
471
    @try {
471
    @try {
472
        return wtfObjcMsgSend<BOOL>(delegate, selector, self, object1, object2);
472
        return wtfObjCMsgSend<BOOL>(delegate, selector, self, object1, object2);
473
    } @catch(id exception) {
473
    } @catch(id exception) {
474
        ReportDiscardedDelegateException(selector, exception);
474
        ReportDiscardedDelegateException(selector, exception);
475
    }
475
    }
Lines 1288-1294 id CallFrameLoadDelegateInWebThread(IMP implementation, WebView *self, SEL selec a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec14
1288
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1)
1288
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1)
1289
{
1289
{
1290
    @try {
1290
    @try {
1291
        return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1);
1291
        return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1);
1292
    } @catch(id exception) {
1292
    } @catch(id exception) {
1293
        ReportDiscardedDelegateException(selector, exception);
1293
        ReportDiscardedDelegateException(selector, exception);
1294
    }
1294
    }
Lines 1298-1304 BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, W a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec15
1298
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1, id object2)
1298
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1, id object2)
1299
{
1299
{
1300
    @try {
1300
    @try {
1301
        return wtfObjcMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2);
1301
        return wtfObjCMsgSend<BOOL>(self->_private->resourceProgressDelegate, selector, self, object1, object2);
1302
    } @catch(id exception) {
1302
    } @catch(id exception) {
1303
        ReportDiscardedDelegateException(selector, exception);
1303
        ReportDiscardedDelegateException(selector, exception);
1304
    }
1304
    }
Lines 1308-1314 BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, W a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec16
1308
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1, id object2, id object3)
1308
BOOL CallResourceLoadDelegateReturningBoolean(BOOL result, IMP implementation, WebView *self, SEL selector, id object1, id object2, id object3)
1309
{
1309
{
1310
    @try {
1310
    @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);
1312
    } @catch(id exception) {
1312
    } @catch(id exception) {
1313
        ReportDiscardedDelegateException(selector, exception);
1313
        ReportDiscardedDelegateException(selector, exception);
1314
    }
1314
    }
Lines 1380-1386 id CallFormDelegate(WebView *self, SEL selector, id object1, id object2) a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec17
1380
    if (!delegate || ![delegate respondsToSelector:selector])
1380
    if (!delegate || ![delegate respondsToSelector:selector])
1381
        return nil;
1381
        return nil;
1382
    @try {
1382
    @try {
1383
        return wtfObjcMsgSend<id>(delegate, selector, object1, object2);
1383
        return wtfObjCMsgSend<id>(delegate, selector, object1, object2);
1384
    } @catch(id exception) {
1384
    } @catch(id exception) {
1385
        ReportDiscardedDelegateException(selector, exception);
1385
        ReportDiscardedDelegateException(selector, exception);
1386
    }
1386
    }
Lines 1416-1422 id CallFormDelegate(WebView *self, SEL selector, id object1, id object2, id obje a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec18
1416
    if (!delegate || ![delegate respondsToSelector:selector])
1416
    if (!delegate || ![delegate respondsToSelector:selector])
1417
        return nil;
1417
        return nil;
1418
    @try {
1418
    @try {
1419
        return wtfObjcMsgSend<id>(delegate, selector, object1, object2, object3);
1419
        return wtfObjCMsgSend<id>(delegate, selector, object1, object2, object3);
1420
    } @catch(id exception) {
1420
    } @catch(id exception) {
1421
        ReportDiscardedDelegateException(selector, exception);
1421
        ReportDiscardedDelegateException(selector, exception);
1422
    }
1422
    }
Lines 1453-1459 id CallFormDelegate(WebView *self, SEL selector, id object1, id object2, id obje a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec19
1453
    if (!delegate || ![delegate respondsToSelector:selector])
1453
    if (!delegate || ![delegate respondsToSelector:selector])
1454
        return nil;
1454
        return nil;
1455
    @try {
1455
    @try {
1456
        return wtfObjcMsgSend<id>(delegate, selector, object1, object2, object3, object4, object5);
1456
        return wtfObjCMsgSend<id>(delegate, selector, object1, object2, object3, object4, object5);
1457
    } @catch(id exception) {
1457
    } @catch(id exception) {
1458
        ReportDiscardedDelegateException(selector, exception);
1458
        ReportDiscardedDelegateException(selector, exception);
1459
    }
1459
    }
Lines 1492-1498 BOOL CallFormDelegateReturningBoolean(BOOL result, WebView *self, SEL selector, a/Source/WebKitLegacy/mac/WebView/WebDelegateImplementationCaching.mm_sec20
1492
    if (!delegate || ![delegate respondsToSelector:selector])
1492
    if (!delegate || ![delegate respondsToSelector:selector])
1493
        return result;
1493
        return result;
1494
    @try {
1494
    @try {
1495
        return wtfObjcMsgSend<BOOL>(delegate, selector, object1, selectorArg, object2);
1495
        return wtfObjCMsgSend<BOOL>(delegate, selector, object1, selectorArg, object2);
1496
    } @catch(id exception) {
1496
    } @catch(id exception) {
1497
        ReportDiscardedDelegateException(selector, exception);
1497
        ReportDiscardedDelegateException(selector, exception);
1498
    }
1498
    }
- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -1 / +1 lines
Lines 143-149 a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm_sec1
143
#import <wtf/BlockObjCExceptions.h>
143
#import <wtf/BlockObjCExceptions.h>
144
#import <wtf/MainThread.h>
144
#import <wtf/MainThread.h>
145
#import <wtf/MathExtras.h>
145
#import <wtf/MathExtras.h>
146
#import <wtf/ObjcRuntimeExtras.h>
146
#import <wtf/ObjCRuntimeExtras.h>
147
#import <wtf/RunLoop.h>
147
#import <wtf/RunLoop.h>
148
#import <wtf/SystemTracing.h>
148
#import <wtf/SystemTracing.h>
149
149
- a/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm -1 / +1 lines
Lines 39-45 a/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm_sec1
39
#import <JavaScriptCore/JSContextRef.h>
39
#import <JavaScriptCore/JSContextRef.h>
40
#import <JavaScriptCore/OpaqueJSString.h>
40
#import <JavaScriptCore/OpaqueJSString.h>
41
#import <wtf/Assertions.h>
41
#import <wtf/Assertions.h>
42
#import <wtf/ObjcRuntimeExtras.h>
42
#import <wtf/ObjCRuntimeExtras.h>
43
#import <wtf/RetainPtr.h>
43
#import <wtf/RetainPtr.h>
44
44
45
@implementation WebPDFRepresentation
45
@implementation WebPDFRepresentation
- a/Source/WebKitLegacy/mac/WebView/WebPolicyDelegate.mm -2 / +2 lines
Lines 29-35 a/Source/WebKitLegacy/mac/WebView/WebPolicyDelegate.mm_sec1
29
#import "WebPolicyDelegatePrivate.h"
29
#import "WebPolicyDelegatePrivate.h"
30
30
31
#import <WebCore/FrameLoaderTypes.h>
31
#import <WebCore/FrameLoaderTypes.h>
32
#import <wtf/ObjcRuntimeExtras.h>
32
#import <wtf/ObjCRuntimeExtras.h>
33
33
34
using namespace WebCore;
34
using namespace WebCore;
35
35
Lines 91-97 NSString *WebActionOriginalURLKey = @"WebActionOriginalURLKey"; a/Source/WebKitLegacy/mac/WebView/WebPolicyDelegate.mm_sec2
91
- (void)_usePolicy:(PolicyAction)policy
91
- (void)_usePolicy:(PolicyAction)policy
92
{
92
{
93
    if (_private->target)
93
    if (_private->target)
94
        wtfObjcMsgSend<void>(_private->target, _private->action, policy);
94
        wtfObjCMsgSend<void>(_private->target, _private->action, policy);
95
}
95
}
96
96
97
- (void)_invalidate
97
- (void)_invalidate
- a/Source/WebKitLegacy/mac/WebView/WebView.mm -1 / +1 lines
Lines 231-237 a/Source/WebKitLegacy/mac/WebView/WebView.mm_sec1
231
#import <wtf/Assertions.h>
231
#import <wtf/Assertions.h>
232
#import <wtf/HashTraits.h>
232
#import <wtf/HashTraits.h>
233
#import <wtf/MainThread.h>
233
#import <wtf/MainThread.h>
234
#import <wtf/ObjcRuntimeExtras.h>
234
#import <wtf/ObjCRuntimeExtras.h>
235
#import <wtf/ProcessPrivilege.h>
235
#import <wtf/ProcessPrivilege.h>
236
#import <wtf/RAMSize.h>
236
#import <wtf/RAMSize.h>
237
#import <wtf/RefCountedLeakCounter.h>
237
#import <wtf/RefCountedLeakCounter.h>
- a/Tools/ChangeLog +11 lines
Lines 1-3 a/Tools/ChangeLog_sec1
1
2018-11-09  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 NOBODY (OOPS!).
7
8
        * DumpRenderTree/mac/DumpRenderTree.mm:
9
        * WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm:
10
        * WebKitTestRunner/mac/TestControllerMac.mm:
11
1
2018-11-09  Chris Dumez  <cdumez@apple.com>
12
2018-11-09  Chris Dumez  <cdumez@apple.com>
2
13
3
        Suspended page persists even after back/forward list item is gone
14
        Suspended page persists even after back/forward list item is gone
- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm -1 / +1 lines
Lines 93-99 a/Tools/DumpRenderTree/mac/DumpRenderTree.mm_sec1
93
#import <wtf/Assertions.h>
93
#import <wtf/Assertions.h>
94
#import <wtf/FastMalloc.h>
94
#import <wtf/FastMalloc.h>
95
#import <wtf/LoggingAccumulator.h>
95
#import <wtf/LoggingAccumulator.h>
96
#import <wtf/ObjcRuntimeExtras.h>
96
#import <wtf/ObjCRuntimeExtras.h>
97
#import <wtf/ProcessPrivilege.h>
97
#import <wtf/ProcessPrivilege.h>
98
#import <wtf/RetainPtr.h>
98
#import <wtf/RetainPtr.h>
99
#import <wtf/Threading.h>
99
#import <wtf/Threading.h>
- a/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm -1 / +1 lines
Lines 30-36 a/Tools/WebKitTestRunner/InjectedBundle/cocoa/ActivateFontsCocoa.mm_sec1
30
#import <CoreText/CTFontManager.h>
30
#import <CoreText/CTFontManager.h>
31
#import <WebKit/WKStringCF.h>
31
#import <WebKit/WKStringCF.h>
32
#import <wtf/NeverDestroyed.h>
32
#import <wtf/NeverDestroyed.h>
33
#import <wtf/ObjcRuntimeExtras.h>
33
#import <wtf/ObjCRuntimeExtras.h>
34
#import <wtf/RetainPtr.h>
34
#import <wtf/RetainPtr.h>
35
35
36
#if USE(APPKIT)
36
#if USE(APPKIT)
- a/Tools/WebKitTestRunner/mac/TestControllerMac.mm -1 / +1 lines
Lines 44-50 a/Tools/WebKitTestRunner/mac/TestControllerMac.mm_sec1
44
#import <WebKit/_WKUserContentExtensionStore.h>
44
#import <WebKit/_WKUserContentExtensionStore.h>
45
#import <WebKit/_WKUserContentExtensionStorePrivate.h>
45
#import <WebKit/_WKUserContentExtensionStorePrivate.h>
46
#import <mach-o/dyld.h>
46
#import <mach-o/dyld.h>
47
#import <wtf/ObjcRuntimeExtras.h>
47
#import <wtf/ObjCRuntimeExtras.h>
48
#import <wtf/mac/AppKitCompatibilityDeclarations.h>
48
#import <wtf/mac/AppKitCompatibilityDeclarations.h>
49
49
50
@interface NSSound ()
50
@interface NSSound ()

Return to Bug 191492