Skip to content

Commit

Permalink
Make bindRemoteAccessibilityFrames declaration consistent
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=271833

Reviewed by Chris Dumez.

In 274955@main the method `bindRemoteAccessibilityFrames` was added to
`RemoteFrameClient`. When overridden in `WebRemoteFrameClient` the
signature didn't match which triggered a warning in MSVC, C4373, due to
`const` qualifiers. This patch just makes the `std::span<const uint8_t>`
parameters consistent across the previous patch.

* Source/WebCore/page/RemoteFrame.cpp:
* Source/WebCore/page/RemoteFrameClient.h:
* Source/WebKit/UIProcess/WebPageProxy.cpp:
* Source/WebKit/WebProcess/WebCoreSupport/WebRemoteFrameClient.cpp:

Canonical link: https://commits.webkit.org/276809@main
  • Loading branch information
donny-dont committed Mar 28, 2024
1 parent 34cb73b commit baf5067
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Source/WebCore/page/RemoteFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void RemoteFrame::unbindRemoteAccessibilityFrames(int processIdentifier)
m_client->unbindRemoteAccessibilityFrames(processIdentifier);
}

void RemoteFrame::bindRemoteAccessibilityFrames(int processIdentifier, std::span<const uint8_t> dataToken, CompletionHandler<void(const std::span<const uint8_t>, int)>&& completionHandler)
void RemoteFrame::bindRemoteAccessibilityFrames(int processIdentifier, std::span<const uint8_t> dataToken, CompletionHandler<void(std::span<const uint8_t>, int)>&& completionHandler)
{
return m_client->bindRemoteAccessibilityFrames(processIdentifier, frameID(), dataToken, WTFMove(completionHandler));
}
Expand Down
2 changes: 1 addition & 1 deletion Source/WebCore/page/RemoteFrameClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class RemoteFrameClient : public FrameLoaderClient {
virtual void changeLocation(FrameLoadRequest&&) = 0;
virtual String renderTreeAsText(size_t baseIndent, OptionSet<RenderAsTextFlag>) = 0;
virtual void closePage() = 0;
virtual void bindRemoteAccessibilityFrames(int processIdentifier, FrameIdentifier target, const std::span<const uint8_t> dataToken, CompletionHandler<void(const std::span<const uint8_t>, int)>&&) = 0;
virtual void bindRemoteAccessibilityFrames(int processIdentifier, FrameIdentifier target, std::span<const uint8_t> dataToken, CompletionHandler<void(std::span<const uint8_t>, int)>&&) = 0;
virtual void updateRemoteFrameAccessibilityOffset(FrameIdentifier target, IntPoint) = 0;
virtual void unbindRemoteAccessibilityFrames(int) = 0;
virtual void focus() = 0;
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit/UIProcess/WebPageProxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13819,7 +13819,7 @@ void WebPageProxy::sendScrollPositionChangedForNode(std::optional<WebCore::Frame
}
#endif

void WebPageProxy::bindRemoteAccessibilityFrames(int processIdentifier, WebCore::FrameIdentifier frameID, const std::span<const uint8_t> dataToken, CompletionHandler<void(std::span<const uint8_t>, int)>&& completionHandler)
void WebPageProxy::bindRemoteAccessibilityFrames(int processIdentifier, WebCore::FrameIdentifier frameID, std::span<const uint8_t> dataToken, CompletionHandler<void(std::span<const uint8_t>, int)>&& completionHandler)
{
auto sendResult = sendSyncToProcessContainingFrame(frameID, Messages::WebPage::BindRemoteAccessibilityFrames(processIdentifier, frameID, dataToken));
if (!sendResult.succeeded())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void WebRemoteFrameClient::updateRemoteFrameAccessibilityOffset(WebCore::FrameId
page->send(Messages::WebPageProxy::UpdateRemoteFrameAccessibilityOffset(frameID, offset));
}

void WebRemoteFrameClient::bindRemoteAccessibilityFrames(int processIdentifier, WebCore::FrameIdentifier frameID, const std::span<const uint8_t> dataToken, CompletionHandler<void(std::span<const uint8_t>, int)>&& completionHandler)
void WebRemoteFrameClient::bindRemoteAccessibilityFrames(int processIdentifier, WebCore::FrameIdentifier frameID, std::span<const uint8_t> dataToken, CompletionHandler<void(std::span<const uint8_t>, int)>&& completionHandler)
{
RefPtr page = m_frame->page();
if (!page) {
Expand Down

0 comments on commit baf5067

Please sign in to comment.