Skip to content

Commit

Permalink
Deploy more smart pointers in WebProcessCocoa.mm
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=260231

Reviewed by Dan Glastonbury.

Use smart pointers in more places.

* Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::accessibilityFocusedUIElement):
(WebKit::origin):
(WebKit::WebProcess::transformHandlesToObjects):
(WebKit::WebProcess::transformObjectsToHandles):

Canonical link: https://commits.webkit.org/266934@main
  • Loading branch information
rniwa committed Aug 16, 2023
1 parent cf3b8b6 commit 4f68af7
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
}
#endif

WebPage* page = WebProcess::singleton().focusedWebPage();
RefPtr page = WebProcess::singleton().focusedWebPage();
if (!page || !page->accessibilityRemoteObject())
return nil;
return [page->accessibilityRemoteObject() accessibilityFocusedUIElement];
Expand Down Expand Up @@ -904,9 +904,9 @@ static void registerLogHook()

static NSURL *origin(WebPage& page)
{
auto& mainFrame = page.mainWebFrame();
Ref mainFrame = page.mainWebFrame();

URL mainFrameURL = mainFrame.url();
URL mainFrameURL = mainFrame->url();
Ref<SecurityOrigin> mainFrameOrigin = SecurityOrigin::create(mainFrameURL);
String mainFrameOriginString;
if (!mainFrameOrigin->isOpaque())
Expand Down Expand Up @@ -1064,8 +1064,11 @@ bool shouldTransformObject(id object) const override
}

ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object))
return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(WebProcess::singleton().transformHandlesToObjects(toImpl(wrapper.object)).get())]);
if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object)) {
RefPtr impl = toImpl(wrapper.object);
return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(WebProcess::singleton().transformHandlesToObjects(impl.get()).get())]);
}

ALLOW_DEPRECATED_DECLARATIONS_END
return object;
}
Expand Down Expand Up @@ -1095,8 +1098,10 @@ bool shouldTransformObject(id object) const override
return controller.handle;

ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object))
return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(transformObjectsToHandles(toImpl(wrapper.object)).get())]);
if (auto* wrapper = dynamic_objc_cast<WKTypeRefWrapper>(object)) {
RefPtr impl = toImpl(wrapper.object);
return adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(transformObjectsToHandles(impl.get()).get())]);
}
ALLOW_DEPRECATED_DECLARATIONS_END
return object;
}
Expand Down

0 comments on commit 4f68af7

Please sign in to comment.