From ce592ae3d17e56cb77982e985c56bbdf88e24204 Mon Sep 17 00:00:00 2001
From: Wenson Hsieh <wenson_hsieh@apple.com>
Date: Sun, 2 Apr 2023 16:18:52 -0700
Subject: [PATCH] Unreviewed, fix internal Cocoa builds after 262488@main

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
---
 .../cocoa/NetworkConnectionIntegrityHelpers.h | 44 +++++++++----------
 .../API/Cocoa/_WKWebAuthenticationPanel.mm    |  1 +
 Source/WebKit/UIProcess/WebPageProxy.cpp      |  2 +
 Source/WebKit/UIProcess/WebPageProxy.h        |  4 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/Source/WebKit/Platform/cocoa/NetworkConnectionIntegrityHelpers.h b/Source/WebKit/Platform/cocoa/NetworkConnectionIntegrityHelpers.h
index 5fb16d4da300..d1fd7bae271d 100644
--- a/Source/WebKit/Platform/cocoa/NetworkConnectionIntegrityHelpers.h
+++ b/Source/WebKit/Platform/cocoa/NetworkConnectionIntegrityHelpers.h
@@ -47,36 +47,36 @@ 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;
@@ -84,7 +84,7 @@ class LookalikeCharacters {
 
     RetainPtr<WKNetworkConnectionIntegrityNotificationListener> m_notificationListener;
     Vector<WebCore::LookalikeCharactersSanitizationData> m_cachedStrings;
-    WeakHashSet<Observer> m_observers;
+    WeakHashSet<LookalikeCharactersObserver> m_observers;
 };
 
 void configureForNetworkConnectionIntegrity(NSURLSession *);
diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm
index 9f88e5654c7a..12bcb38e2db7 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm
@@ -29,6 +29,7 @@
 
 #import "LocalAuthenticator.h"
 #import "LocalService.h"
+#import "Logging.h"
 #import "WKError.h"
 #import "WebAuthenticationPanelClient.h"
 #import "_WKAuthenticationExtensionsClientInputs.h"
diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
index 0cefdd6a3b75..49d45dad29af 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -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>
@@ -233,6 +234,7 @@
 
 #if PLATFORM(COCOA)
 #include "InsertTextOptions.h"
+#include "NetworkConnectionIntegrityHelpers.h"
 #include "NetworkIssueReporter.h"
 #include "RemoteLayerTreeDrawingAreaProxy.h"
 #include "RemoteLayerTreeScrollingPerformanceData.h"
diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
index 5e16ca149249..07d67c9b7434 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -216,6 +216,7 @@ struct HTMLModelElementCamera;
 struct ImageBufferBackendParameters;
 struct InspectorOverlayHighlight;
 struct LinkIcon;
+struct LookalikeCharactersSanitizationData;
 struct MediaControlsContextMenuItem;
 struct MediaDeviceHashSalts;
 struct MediaKeySystemRequestIdentifierType;
@@ -312,6 +313,7 @@ class DrawingAreaProxy;
 class GamepadData;
 class GeolocationPermissionRequestManagerProxy;
 class LayerTreeContext;
+class LookalikeCharactersObserver;
 class MediaKeySystemPermissionRequestManagerProxy;
 class MediaSessionCoordinatorProxyPrivate;
 class MediaUsageManager;
@@ -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