Skip to content

Commit

Permalink
Unreviewed, fix internal Cocoa builds after 262488@main
Browse files Browse the repository at this point in the history
Rename `LookalikeCharacters::Observer` -> `LookalikeCharactersObserver` and move it out of the
`LookalikeCharacters` class namespace, so that it can be forward-declared (and we therefore don't
need to include `NetworkConnectionIntegrityHelpers.h` in `WebPageProxy.h`).

* Source/WebKit/Platform/cocoa/NetworkConnectionIntegrityHelpers.h:
(WebKit::LookalikeCharactersObserver::LookalikeCharactersObserver):
(WebKit::LookalikeCharactersObserver::create):
(WebKit::LookalikeCharactersObserver::invokeCallback):
(WebKit::LookalikeCharacters::cachedStrings const):
(WebKit::LookalikeCharacters::Observer::Observer): Deleted.
(WebKit::LookalikeCharacters::Observer::create): Deleted.
(WebKit::LookalikeCharacters::Observer::invokeCallback): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:

Add a missing include for `Logging.h`.

* Source/WebKit/UIProcess/WebPageProxy.cpp:

Move the `NetworkConnectionIntegrityHelpers.h` include to the source file, and also add a missing
include for `WebCore/LookalikeCharactersSanitizationData.h`, which probably wasn't needed before due
to source unification.

* Source/WebKit/UIProcess/WebPageProxy.h:

Canonical link: https://commits.webkit.org/262495@main
  • Loading branch information
whsieh committed Apr 2, 2023
1 parent 9486a59 commit ce592ae
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 23 deletions.
44 changes: 22 additions & 22 deletions Source/WebKit/Platform/cocoa/NetworkConnectionIntegrityHelpers.h
Expand Up @@ -47,44 +47,44 @@ namespace WebKit {
void configureForNetworkConnectionIntegrity(NSURLSession *);
void requestAllowedLookalikeCharacterStrings(CompletionHandler<void(const Vector<WebCore::LookalikeCharactersSanitizationData>&)>&&);

class LookalikeCharacters {
class LookalikeCharactersObserver : public RefCounted<LookalikeCharactersObserver>, public CanMakeWeakPtr<LookalikeCharactersObserver> {
public:
static LookalikeCharacters& shared();
~LookalikeCharactersObserver() = default;

const Vector<WebCore::LookalikeCharactersSanitizationData>& cachedStrings() const { return m_cachedStrings; }
void updateStrings(CompletionHandler<void()>&&);
private:
friend class LookalikeCharacters;

class Observer : public RefCounted<Observer>, public CanMakeWeakPtr<Observer> {
public:
~Observer() = default;
LookalikeCharactersObserver(Function<void()>&& callback)
: m_callback { WTFMove(callback) }
{
}

private:
friend class LookalikeCharacters;
static Ref<LookalikeCharactersObserver> create(Function<void()>&& callback)
{
return adoptRef(*new LookalikeCharactersObserver(WTFMove(callback)));
}

Observer(Function<void()>&& callback)
: m_callback { WTFMove(callback) }
{
}
void invokeCallback() { m_callback(); }

static Ref<Observer> create(Function<void()>&& callback)
{
return adoptRef(*new Observer(WTFMove(callback)));
}
Function<void()> m_callback;
};

void invokeCallback() { m_callback(); }
class LookalikeCharacters {
public:
static LookalikeCharacters& shared();

Function<void()> m_callback;
};
const Vector<WebCore::LookalikeCharactersSanitizationData>& cachedStrings() const { return m_cachedStrings; }
void updateStrings(CompletionHandler<void()>&&);

Ref<Observer> observeUpdates(Function<void()>&&);
Ref<LookalikeCharactersObserver> observeUpdates(Function<void()>&&);

private:
LookalikeCharacters() = default;
void setCachedStrings(Vector<WebCore::LookalikeCharactersSanitizationData>&&);

RetainPtr<WKNetworkConnectionIntegrityNotificationListener> m_notificationListener;
Vector<WebCore::LookalikeCharactersSanitizationData> m_cachedStrings;
WeakHashSet<Observer> m_observers;
WeakHashSet<LookalikeCharactersObserver> m_observers;
};

void configureForNetworkConnectionIntegrity(NSURLSession *);
Expand Down
Expand Up @@ -29,6 +29,7 @@

#import "LocalAuthenticator.h"
#import "LocalService.h"
#import "Logging.h"
#import "WKError.h"
#import "WebAuthenticationPanelClient.h"
#import "_WKAuthenticationExtensionsClientInputs.h"
Expand Down
2 changes: 2 additions & 0 deletions Source/WebKit/UIProcess/WebPageProxy.cpp
Expand Up @@ -182,6 +182,7 @@
#include <WebCore/GlobalFrameIdentifier.h>
#include <WebCore/GlobalWindowIdentifier.h>
#include <WebCore/LengthBox.h>
#include <WebCore/LookalikeCharactersSanitizationData.h>
#include <WebCore/MIMETypeRegistry.h>
#include <WebCore/MediaDeviceHashSalts.h>
#include <WebCore/MediaStreamRequest.h>
Expand Down Expand Up @@ -233,6 +234,7 @@

#if PLATFORM(COCOA)
#include "InsertTextOptions.h"
#include "NetworkConnectionIntegrityHelpers.h"
#include "NetworkIssueReporter.h"
#include "RemoteLayerTreeDrawingAreaProxy.h"
#include "RemoteLayerTreeScrollingPerformanceData.h"
Expand Down
4 changes: 3 additions & 1 deletion Source/WebKit/UIProcess/WebPageProxy.h
Expand Up @@ -216,6 +216,7 @@ struct HTMLModelElementCamera;
struct ImageBufferBackendParameters;
struct InspectorOverlayHighlight;
struct LinkIcon;
struct LookalikeCharactersSanitizationData;
struct MediaControlsContextMenuItem;
struct MediaDeviceHashSalts;
struct MediaKeySystemRequestIdentifierType;
Expand Down Expand Up @@ -312,6 +313,7 @@ class DrawingAreaProxy;
class GamepadData;
class GeolocationPermissionRequestManagerProxy;
class LayerTreeContext;
class LookalikeCharactersObserver;
class MediaKeySystemPermissionRequestManagerProxy;
class MediaSessionCoordinatorProxyPrivate;
class MediaUsageManager;
Expand Down Expand Up @@ -3214,7 +3216,7 @@ class WebPageProxy final : public API::ObjectImpl<API::Object::Type::Page>, publ
bool m_isLockdownModeExplicitlySet { false };

#if ENABLE(NETWORK_CONNECTION_INTEGRITY)
RefPtr<LookalikeCharacters::Observer> m_lookalikeCharacterUpdateObserver;
RefPtr<LookalikeCharactersObserver> m_lookalikeCharacterUpdateObserver;
bool m_needsInitialLookalikeCharacterStrings { true };
bool m_shouldUpdateAllowedLookalikeCharacterStrings { false };
#endif
Expand Down

0 comments on commit ce592ae

Please sign in to comment.