Diff
Modified: trunk/Source/WebKit2/ChangeLog (190630 => 190631)
--- trunk/Source/WebKit2/ChangeLog 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-06 19:11:24 UTC (rev 190631)
@@ -1,3 +1,32 @@
+2015-10-06 Anders Carlsson <ander...@apple.com>
+
+ WKPage needs to expose a KVO-compliant object, similar to WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=149851
+ rdar://problem/22382022
+
+ Reviewed by Dan Bernstein.
+
+ Move the PageLoadStateObserver object from WKBrowsingContextController out into a separate file and make it
+ work with any Objective-C object. Use it in WKObservablePageState and add a WKPageCreateObservableState function.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm: Renamed from Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp.
+ (-[WKObservablePageState initWithPage:]):
+ (-[WKObservablePageState dealloc]):
+ (-[WKObservablePageState isLoading]):
+ (-[WKObservablePageState title]):
+ (-[WKObservablePageState URL]):
+ (-[WKObservablePageState hasOnlySecureContent]):
+ (-[WKObservablePageState estimatedProgress]):
+ (WKPageCreateObservableState):
+ (WKPageGetProcessIdentifier):
+ (WKPageIsURLKnownHSTSHost):
+ * UIProcess/API/Cocoa/PageLoadStateObserver.h: Added.
+ (WebKit::PageLoadStateObserver::PageLoadStateObserver):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (PageLoadStateObserver::PageLoadStateObserver): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2015-10-06 Daniel Bates <dba...@webkit.org>
Enable XSLT when building WebKit for iOS using the public iOS SDK
Deleted: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp (190630 => 190631)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2015-10-06 19:11:24 UTC (rev 190631)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WKPagePrivateMac.h"
-
-#include "WKAPICast.h"
-#include "WebPageGroup.h"
-#include "WebPageProxy.h"
-#include "WebPreferences.h"
-#include "WebProcessPool.h"
-
-using namespace WebKit;
-
-pid_t WKPageGetProcessIdentifier(WKPageRef pageRef)
-{
- return toImpl(pageRef)->processIdentifier();
-}
-
-bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
-{
- WebPageProxy* webPageProxy = toImpl(page);
- bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences().privateBrowsingEnabled();
-
- return webPageProxy->process().processPool().isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
-}
Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (190630 => 190631)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-10-06 19:11:24 UTC (rev 190631)
@@ -33,6 +33,22 @@
extern "C" {
#endif
+#ifdef __OBJC__
+
+@protocol _WKObservablePageState
+
+@property (nonatomic, readonly, copy) NSString *title;
+@property (nonatomic, readonly, copy) NSURL *URL;
+@property (nonatomic, readonly, getter=isLoading) BOOL loading;
+@property (nonatomic, readonly) double estimatedProgress;
+@property (nonatomic, readonly) BOOL hasOnlySecureContent;
+
+@end
+
+WK_EXPORT id <_WKObservablePageState> WKPageCreateObservableState(WKPageRef page) NS_RETURNS_RETAINED;
+
+#endif
+
WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
WK_EXPORT bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url);
Copied: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (from rev 190620, trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp) (0 => 190631)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-10-06 19:11:24 UTC (rev 190631)
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WKPagePrivateMac.h"
+
+#import "PageLoadStateObserver.h"
+#import "WKAPICast.h"
+#import "WKNSURLExtras.h"
+#import "WebPageGroup.h"
+#import "WebPageProxy.h"
+#import "WebPreferences.h"
+#import "WebProcessPool.h"
+
+using namespace WebKit;
+
+@interface WKObservablePageState : NSObject <_WKObservablePageState>
+@end
+
+@implementation WKObservablePageState {
+ RefPtr<WebPageProxy> _page;
+ std::unique_ptr<PageLoadStateObserver> _observer;
+};
+
+- (id)initWithPage:(RefPtr<WebPageProxy>&&)page
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _page = WTF::move(page);
+ _observer = std::make_unique<PageLoadStateObserver>(self, @"URL");
+ _page->pageLoadState().addObserver(*_observer);
+
+ return self;
+}
+
+- (void)dealloc
+{
+ _page->pageLoadState().removeObserver(*_observer);
+
+ [super dealloc];
+}
+
+- (BOOL)isLoading
+{
+ return _page->pageLoadState().isLoading();
+}
+
+- (NSString *)title
+{
+ return _page->pageLoadState().title();
+}
+
+- (NSURL *)URL
+{
+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
+}
+
+- (BOOL)hasOnlySecureContent
+{
+ return _page->pageLoadState().hasOnlySecureContent();
+}
+
+- (double)estimatedProgress
+{
+ return _page->estimatedProgress();
+}
+
+@end
+
+id <_WKObservablePageState> WKPageCreateObservableState(WKPageRef pageRef)
+{
+ return [[WKObservablePageState alloc] initWithPage:toImpl(pageRef)];
+}
+
+pid_t WKPageGetProcessIdentifier(WKPageRef pageRef)
+{
+ return toImpl(pageRef)->processIdentifier();
+}
+
+bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
+{
+ WebPageProxy* webPageProxy = toImpl(page);
+ bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences().privateBrowsingEnabled();
+
+ return webPageProxy->process().processPool().isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
+}
Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h (0 => 190631)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h 2015-10-06 19:11:24 UTC (rev 190631)
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef PageLoadStateObserver_h
+#define PageLoadStateObserver_h
+
+#import "PageLoadState.h"
+
+namespace WebKit {
+
+class PageLoadStateObserver : public PageLoadState::Observer {
+public:
+ PageLoadStateObserver(id object, NSString *activeURLKey = @"activeURL")
+ : m_object(object)
+ , m_activeURLKey(adoptNS([activeURLKey copy]))
+ {
+ }
+
+private:
+ virtual void willChangeIsLoading() override
+ {
+ [m_object willChangeValueForKey:@"loading"];
+ }
+
+ virtual void didChangeIsLoading() override
+ {
+ [m_object didChangeValueForKey:@"loading"];
+ }
+
+ virtual void willChangeTitle() override
+ {
+ [m_object willChangeValueForKey:@"title"];
+ }
+
+ virtual void didChangeTitle() override
+ {
+ [m_object didChangeValueForKey:@"title"];
+ }
+
+ virtual void willChangeActiveURL() override
+ {
+ [m_object willChangeValueForKey:m_activeURLKey.get()];
+ }
+
+ virtual void didChangeActiveURL() override
+ {
+ [m_object didChangeValueForKey:m_activeURLKey.get()];
+ }
+
+ virtual void willChangeHasOnlySecureContent() override
+ {
+ [m_object willChangeValueForKey:@"hasOnlySecureContent"];
+ }
+
+ virtual void didChangeHasOnlySecureContent() override
+ {
+ [m_object didChangeValueForKey:@"hasOnlySecureContent"];
+ }
+
+ virtual void willChangeEstimatedProgress() override
+ {
+ [m_object willChangeValueForKey:@"estimatedProgress"];
+ }
+
+ virtual void didChangeEstimatedProgress() override
+ {
+ [m_object didChangeValueForKey:@"estimatedProgress"];
+ }
+
+ virtual void willChangeCanGoBack() override { }
+ virtual void didChangeCanGoBack() override { }
+ virtual void willChangeCanGoForward() override { }
+ virtual void didChangeCanGoForward() override { }
+ virtual void willChangeNetworkRequestsInProgress() override { }
+ virtual void didChangeNetworkRequestsInProgress() override { }
+ virtual void willChangeCertificateInfo() override { }
+ virtual void didChangeCertificateInfo() override { }
+
+ id m_object;
+ RetainPtr<NSString> m_activeURLKey;
+};
+
+}
+
+#endif // PageLoadStateObserver_h
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (190630 => 190631)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-06 19:11:24 UTC (rev 190631)
@@ -30,6 +30,7 @@
#import "APIData.h"
#import "ObjCObjectGraph.h"
+#import "PageLoadStateObserver.h"
#import "RemoteObjectRegistry.h"
#import "RemoteObjectRegistryMessages.h"
#import "WKBackForwardListInternal.h"
@@ -61,76 +62,6 @@
using namespace WebCore;
using namespace WebKit;
-class PageLoadStateObserver : public PageLoadState::Observer {
-public:
- PageLoadStateObserver(WKBrowsingContextController *controller)
- : m_controller(controller)
- {
- }
-
-private:
- virtual void willChangeIsLoading() override
- {
- [m_controller willChangeValueForKey:@"loading"];
- }
-
- virtual void didChangeIsLoading() override
- {
- [m_controller didChangeValueForKey:@"loading"];
- }
-
- virtual void willChangeTitle() override
- {
- [m_controller willChangeValueForKey:@"title"];
- }
-
- virtual void didChangeTitle() override
- {
- [m_controller didChangeValueForKey:@"title"];
- }
-
- virtual void willChangeActiveURL() override
- {
- [m_controller willChangeValueForKey:@"activeURL"];
- }
-
- virtual void didChangeActiveURL() override
- {
- [m_controller didChangeValueForKey:@"activeURL"];
- }
-
- virtual void willChangeHasOnlySecureContent() override
- {
- [m_controller willChangeValueForKey:@"hasOnlySecureContent"];
- }
-
- virtual void didChangeHasOnlySecureContent() override
- {
- [m_controller didChangeValueForKey:@"hasOnlySecureContent"];
- }
-
- virtual void willChangeEstimatedProgress() override
- {
- [m_controller willChangeValueForKey:@"estimatedProgress"];
- }
-
- virtual void didChangeEstimatedProgress() override
- {
- [m_controller didChangeValueForKey:@"estimatedProgress"];
- }
-
- virtual void willChangeCanGoBack() override { }
- virtual void didChangeCanGoBack() override { }
- virtual void willChangeCanGoForward() override { }
- virtual void didChangeCanGoForward() override { }
- virtual void willChangeNetworkRequestsInProgress() override { }
- virtual void didChangeNetworkRequestsInProgress() override { }
- virtual void willChangeCertificateInfo() override { }
- virtual void didChangeCertificateInfo() override { }
-
- WKBrowsingContextController *m_controller;
-};
-
NSString * const WKActionIsMainFrameKey = @"WKActionIsMainFrameKey";
NSString * const WKActionNavigationTypeKey = @"WKActionNavigationTypeKey";
NSString * const WKActionMouseButtonKey = @"WKActionMouseButtonKey";
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (190630 => 190631)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-06 19:11:24 UTC (rev 190631)
@@ -314,6 +314,7 @@
1A81B38018BD66AD0007FDAC /* _WKVisitedLinkStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */; };
1A81B38118BD66AD0007FDAC /* _WKVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A81B38518BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */; };
+ 1A8B66B01BC43C860082DF77 /* PageLoadStateObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */; settings = {ASSET_TAGS = (); }; };
1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */; };
1A8C728D1738477C000A6554 /* LocalStorageDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C728B1738477C000A6554 /* LocalStorageDatabaseTracker.h */; };
1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */; };
@@ -1578,7 +1579,7 @@
BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE0937514FB128B001138D9 /* LayerHostingContext.mm */; };
BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0937614FB128B001138D9 /* LayerHostingContext.h */; };
BCE0E425168B7A280057E66A /* WebProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0E424168B7A280057E66A /* WebProcessSupplement.h */; };
- BCE17B7D1381F1170012A641 /* WKPagePrivateMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */; };
+ BCE17B7D1381F1170012A641 /* WKPagePrivateMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE17B7B1381F1170012A641 /* WKPagePrivateMac.mm */; };
BCE17B7E1381F1170012A641 /* WKPagePrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE2315B122C30CA00D5C35A /* APIURLRequest.h */; };
BCE2315E122C30CA00D5C35A /* APIURLRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */; };
@@ -2419,6 +2420,7 @@
1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkStore.mm; sourceTree = "<group>"; };
1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkStore.h; sourceTree = "<group>"; };
1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkStoreInternal.h; sourceTree = "<group>"; };
+ 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageLoadStateObserver.h; sourceTree = "<group>"; };
1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageDatabaseTracker.cpp; sourceTree = "<group>"; };
1A8C728B1738477C000A6554 /* LocalStorageDatabaseTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDatabaseTracker.h; sourceTree = "<group>"; };
1A8E7D3818C150BF005A702A /* VisitedLinkTableController.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VisitedLinkTableController.messages.in; sourceTree = "<group>"; };
@@ -3802,7 +3804,7 @@
BCE0937514FB128B001138D9 /* LayerHostingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerHostingContext.mm; sourceTree = "<group>"; };
BCE0937614FB128B001138D9 /* LayerHostingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerHostingContext.h; sourceTree = "<group>"; };
BCE0E424168B7A280057E66A /* WebProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessSupplement.h; sourceTree = "<group>"; };
- BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WKPagePrivateMac.cpp; path = mac/WKPagePrivateMac.cpp; sourceTree = "<group>"; };
+ BCE17B7B1381F1170012A641 /* WKPagePrivateMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPagePrivateMac.mm; path = mac/WKPagePrivateMac.mm; sourceTree = "<group>"; };
BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPagePrivateMac.h; path = mac/WKPagePrivateMac.h; sourceTree = "<group>"; };
BCE2315B122C30CA00D5C35A /* APIURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIURLRequest.h; sourceTree = "<group>"; };
BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIURLRequest.cpp; sourceTree = "<group>"; };
@@ -4398,6 +4400,7 @@
1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */,
1AFB4C6F1ADF155D00B33339 /* _WKWebsiteDataStore.mm */,
1A4A93B61AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h */,
+ 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */,
BC59548815C7868500FD1E3E /* WebKit2.h */,
BCBAAC6C144E61910053F82F /* WKBrowsingContextController.h */,
BCBAAC6D144E61920053F82F /* WKBrowsingContextController.mm */,
@@ -5825,7 +5828,7 @@
9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */,
9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */,
6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */,
- BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */,
+ BCE17B7B1381F1170012A641 /* WKPagePrivateMac.mm */,
BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */,
);
name = mac;
@@ -8275,6 +8278,7 @@
BCBAACEB145225E30053F82F /* WKProcessGroup.h in Headers */,
BCBAACED145225E30053F82F /* WKProcessGroupPrivate.h in Headers */,
1A15841A189044F50017616C /* WKProcessPool.h in Headers */,
+ 1A8B66B01BC43C860082DF77 /* PageLoadStateObserver.h in Headers */,
1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */,
1A6509CE18B4146200614332 /* WKProcessPoolPrivate.h in Headers */,
512F58FC12A88A5400629530 /* WKProtectionSpace.h in Headers */,
@@ -10042,7 +10046,7 @@
BCD597D6112B56DC00EC8C23 /* WKPage.cpp in Sources */,
7C89D29B1A67837B003A5FDE /* WKPageConfigurationRef.cpp in Sources */,
BC7B633812A45ABA00D174A4 /* WKPageGroup.cpp in Sources */,
- BCE17B7D1381F1170012A641 /* WKPagePrivateMac.cpp in Sources */,
+ BCE17B7D1381F1170012A641 /* WKPagePrivateMac.mm in Sources */,
2D6AB542192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm in Sources */,
2DA1E4FF18C02B6A00DBC929 /* WKPDFView.mm in Sources */,
7C135AA8173B0BCA00586AE2 /* WKPluginInformation.cpp in Sources */,
