Diff
Modified: trunk/Source/WebCore/Headers.cmake (294398 => 294399)
--- trunk/Source/WebCore/Headers.cmake 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Headers.cmake 2022-05-18 16:00:15 UTC (rev 294399)
@@ -1130,6 +1130,7 @@
page/FocusDirection.h
page/Frame.h
page/FrameDestructionObserver.h
+ page/FrameDestructionObserverInlines.h
page/FrameFlattening.h
page/FrameIdentifier.h
page/FrameSnapshotting.h
Modified: trunk/Source/WebCore/Modules/applepay/PaymentSession.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/applepay/PaymentSession.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/applepay/PaymentSession.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -31,6 +31,7 @@
#include "Document.h"
#include "DocumentLoader.h"
#include "FeaturePolicy.h"
+#include "FrameDestructionObserverInlines.h"
#include "SecurityOrigin.h"
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/beacon/NavigatorBeacon.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/beacon/NavigatorBeacon.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/beacon/NavigatorBeacon.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -31,6 +31,7 @@
#include "Document.h"
#include "DocumentLoader.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "HTTPParsers.h"
#include "Navigator.h"
#include "Page.h"
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -27,6 +27,7 @@
#include "IDBFactory.h"
#include "Document.h"
+#include "FrameDestructionObserverInlines.h"
#include "IDBBindingUtilities.h"
#include "IDBConnectionProxy.h"
#include "IDBDatabaseIdentifier.h"
Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -38,6 +38,7 @@
#include "Event.h"
#include "EventNames.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "JSDOMPromiseDeferred.h"
#include "JSMediaDeviceInfo.h"
#include "Logging.h"
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -40,6 +40,7 @@
#include "Event.h"
#include "EventNames.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "JSDOMPromiseDeferred.h"
#include "JSRTCPeerConnection.h"
#include "JSRTCSessionDescriptionInit.h"
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -31,6 +31,7 @@
#include "CachedResourceLoader.h"
#include "DOMPromiseProxy.h"
#include "Document.h"
+#include "DocumentInlines.h"
#include "ElementChildIterator.h"
#include "ElementInlines.h"
#include "EventHandler.h"
Modified: trunk/Source/WebCore/Modules/notifications/Notification.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/notifications/Notification.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/notifications/Notification.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -38,6 +38,7 @@
#include "DOMWindow.h"
#include "Event.h"
#include "EventNames.h"
+#include "FrameDestructionObserverInlines.h"
#include "JSDOMPromiseDeferred.h"
#include "MessagePort.h"
#include "NotificationClient.h"
Modified: trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -31,6 +31,7 @@
#include "ApplePayPaymentHandler.h"
#include "Document.h"
#include "EventNames.h"
+#include "FrameDestructionObserverInlines.h"
#include "JSDOMPromise.h"
#include "JSDOMPromiseDeferred.h"
#include "JSPaymentDetailsUpdate.h"
Modified: trunk/Source/WebCore/Modules/permissions/PermissionStatus.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/permissions/PermissionStatus.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/permissions/PermissionStatus.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -28,6 +28,7 @@
#include "ClientOrigin.h"
#include "Document.h"
+#include "DocumentInlines.h"
#include "EventNames.h"
#include "PermissionController.h"
#include "SecurityOrigin.h"
Modified: trunk/Source/WebCore/Modules/speech/SpeechRecognition.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/speech/SpeechRecognition.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/speech/SpeechRecognition.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -29,6 +29,7 @@
#include "ClientOrigin.h"
#include "Document.h"
#include "EventNames.h"
+#include "FrameDestructionObserverInlines.h"
#include "Page.h"
#include "SpeechRecognitionError.h"
#include "SpeechRecognitionErrorEvent.h"
Modified: trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -31,6 +31,7 @@
#include "Document.h"
#include "EventNames.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "Page.h"
#include "PlatformSpeechSynthesisVoice.h"
#include "PlatformSpeechSynthesizer.h"
Modified: trunk/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/webauthn/AuthenticatorCoordinator.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -35,6 +35,7 @@
#include "AuthenticatorResponseData.h"
#include "Document.h"
#include "FeaturePolicy.h"
+#include "FrameDestructionObserverInlines.h"
#include "JSBasicCredential.h"
#include "JSCredentialRequestOptions.h"
#include "JSDOMPromiseDeferred.h"
Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -41,6 +41,7 @@
#include "EventListener.h"
#include "EventNames.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "InspectorInstrumentation.h"
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -39,6 +39,7 @@
#include "ExceptionCode.h"
#include "FileReaderLoader.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "InspectorInstrumentation.h"
#include "Logging.h"
Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (294398 => 294399)
--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -34,6 +34,7 @@
#include "Blob.h"
#include "Document.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "MixedContentChecker.h"
#include "ScriptExecutionContext.h"
#include "SocketProvider.h"
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (294398 => 294399)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-05-18 16:00:15 UTC (rev 294399)
@@ -1325,6 +1325,7 @@
45830D4E1679B4F800ACF8C3 /* AutoscrollController.h in Headers */ = {isa = PBXBuildFile; fileRef = 45830D4C1679B4F800ACF8C3 /* AutoscrollController.h */; settings = {ATTRIBUTES = (Private, ); }; };
458FE40A1589DF0B005609E6 /* RenderSearchField.h in Headers */ = {isa = PBXBuildFile; fileRef = 458FE4081589DF0B005609E6 /* RenderSearchField.h */; };
45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 46014ACC28333F65004C0B84 /* FrameDestructionObserverInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 46014ACB28333F52004C0B84 /* FrameDestructionObserverInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
460BB52227A9FC3700CB782F /* WorkerFetchResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 460BB52127A9FC2E00CB782F /* WorkerFetchResult.h */; settings = {ATTRIBUTES = (Private, ); }; };
460BB6161D0A1BF000221812 /* Base64Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 460BB6141D0A1BEC00221812 /* Base64Utilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
460C745926DD69BB00427D3E /* WindowOrWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 460C745826DD699D00427D3E /* WindowOrWorkerGlobalScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -9230,6 +9231,7 @@
458FE4081589DF0B005609E6 /* RenderSearchField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSearchField.h; sourceTree = "<group>"; };
45FEA5CD156DDE8C00654101 /* Decimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decimal.cpp; sourceTree = "<group>"; };
45FEA5CE156DDE8C00654101 /* Decimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decimal.h; sourceTree = "<group>"; };
+ 46014ACB28333F52004C0B84 /* FrameDestructionObserverInlines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameDestructionObserverInlines.h; sourceTree = "<group>"; };
460BB52127A9FC2E00CB782F /* WorkerFetchResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerFetchResult.h; sourceTree = "<group>"; };
460BB6131D0A1BEC00221812 /* Base64Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Base64Utilities.cpp; sourceTree = "<group>"; };
460BB6141D0A1BEC00221812 /* Base64Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64Utilities.h; sourceTree = "<group>"; };
@@ -24293,6 +24295,7 @@
65BF022A0974816300C43196 /* Frame.h */,
974A862014B7ADBB003FDC76 /* FrameDestructionObserver.cpp */,
974A862114B7ADBB003FDC76 /* FrameDestructionObserver.h */,
+ 46014ACB28333F52004C0B84 /* FrameDestructionObserverInlines.h */,
BC4A532A2560566E0028C592 /* FrameFlattening.h */,
0F11781622E3C47E008BD570 /* FrameIdentifier.h */,
C4CD629818383766007EBAF1 /* FrameSnapshotting.cpp */,
@@ -38224,6 +38227,7 @@
E152551516FD2350003D7ADB /* WebCoreResourceHandleAsOperationQueueDelegate.h in Headers */,
A14832C7187F66C800DA63A6 /* WebCoreThread.h in Headers */,
A14832C9187F676B00DA63A6 /* WebCoreThreadInternal.h in Headers */,
+ 46014ACC28333F65004C0B84 /* FrameDestructionObserverInlines.h in Headers */,
A14832CA187F678000DA63A6 /* WebCoreThreadMessage.h in Headers */,
A14832CC187F67C400DA63A6 /* WebCoreThreadRun.h in Headers */,
A14832CF187F684700DA63A6 /* WebCoreThreadSystemInterface.h in Headers */,
Modified: trunk/Source/WebCore/bindings/js/JSDOMBindingSecurity.cpp (294398 => 294399)
--- trunk/Source/WebCore/bindings/js/JSDOMBindingSecurity.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/bindings/js/JSDOMBindingSecurity.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -25,6 +25,7 @@
#include "DOMWindow.h"
#include "Document.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "HTTPParsers.h"
#include "JSDOMExceptionHandling.h"
#include "JSDOMWindowBase.h"
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (294398 => 294399)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -31,6 +31,7 @@
#include "DOMWindow.h"
#include "Document.h"
#include "FetchResponse.h"
+#include "FrameDestructionObserverInlines.h"
#include "JSAbortAlgorithm.h"
#include "JSAbortSignal.h"
#include "JSDOMPromiseDeferred.h"
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (294398 => 294399)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -23,6 +23,7 @@
#include "DOMWindowWebDatabase.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "HTMLDocument.h"
#include "HTMLFrameOwnerElement.h"
#include "HTTPParsers.h"
Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (294398 => 294399)
--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -21,6 +21,7 @@
#include "JSDocument.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "JSDOMWindowCustom.h"
#include "JSHTMLDocument.h"
#include "JSXMLDocument.h"
Modified: trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp (294398 => 294399)
--- trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -32,6 +32,7 @@
#include "Document.h"
#include "DocumentFragment.h"
#include "DocumentType.h"
+#include "FrameDestructionObserverInlines.h"
#include "HTMLElement.h"
#include "HTMLNames.h"
#include "JSAttr.h"
Modified: trunk/Source/WebCore/css/FontFaceSet.cpp (294398 => 294399)
--- trunk/Source/WebCore/css/FontFaceSet.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/css/FontFaceSet.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -30,6 +30,7 @@
#include "Document.h"
#include "EventLoop.h"
#include "FontFace.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "JSDOMBinding.h"
#include "JSDOMPromiseDeferred.h"
Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (294398 => 294399)
--- trunk/Source/WebCore/dom/DataTransfer.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -36,6 +36,7 @@
#include "Editor.h"
#include "FileList.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "HTMLImageElement.h"
#include "HTMLParserIdioms.h"
Modified: trunk/Source/WebCore/dom/DataTransferMac.mm (294398 => 294399)
--- trunk/Source/WebCore/dom/DataTransferMac.mm 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/dom/DataTransferMac.mm 2022-05-18 16:00:15 UTC (rev 294399)
@@ -32,6 +32,7 @@
#import "Document.h"
#import "DragImage.h"
#import "Element.h"
+#import "FrameDestructionObserverInlines.h"
namespace WebCore {
Modified: trunk/Source/WebCore/dom/Document.h (294398 => 294399)
--- trunk/Source/WebCore/dom/Document.h 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/dom/Document.h 2022-05-18 16:00:15 UTC (rev 294399)
@@ -881,7 +881,7 @@
// In DOM Level 2, the Document's DOMWindow is called the defaultView.
WEBCORE_EXPORT WindowProxy* windowProxy() const;
- bool hasBrowsingContext() const { return !!frame(); }
+ inline bool hasBrowsingContext() const; // Defined in DocumentInlines.h.
Document& contextDocument() const;
void setContextDocument(Document& document) { m_contextDocument = document; }
Modified: trunk/Source/WebCore/dom/DocumentInlines.h (294398 => 294399)
--- trunk/Source/WebCore/dom/DocumentInlines.h 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/dom/DocumentInlines.h 2022-05-18 16:00:15 UTC (rev 294399)
@@ -26,6 +26,7 @@
#pragma once
#include "Document.h"
+#include "FrameDestructionObserverInlines.h"
#include "MediaProducer.h"
#include "SecurityOrigin.h"
#include "TextResourceDecoder.h"
@@ -86,5 +87,9 @@
return &document().contextDocument();
}
+inline bool Document::hasBrowsingContext() const
+{
+ return !!frame();
+}
}
Modified: trunk/Source/WebCore/dom/DocumentTouch.cpp (294398 => 294399)
--- trunk/Source/WebCore/dom/DocumentTouch.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/dom/DocumentTouch.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -30,6 +30,7 @@
#include "Document.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "Touch.h"
#include "TouchList.h"
#include "WindowProxy.h"
Modified: trunk/Source/WebCore/dom/FullscreenManager.h (294398 => 294399)
--- trunk/Source/WebCore/dom/FullscreenManager.h 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/dom/FullscreenManager.h 2022-05-18 16:00:15 UTC (rev 294399)
@@ -28,6 +28,7 @@
#if ENABLE(FULLSCREEN_API)
#include "Document.h"
+#include "FrameDestructionObserverInlines.h"
#include "LayoutRect.h"
#include <wtf/Deque.h>
#include <wtf/WeakPtr.h>
Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (294398 => 294399)
--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -30,6 +30,7 @@
#include "Document.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "IntSize.h"
#include "ScriptableDocumentParser.h"
#include "Settings.h"
Modified: trunk/Source/WebCore/editing/win/EditorWin.cpp (294398 => 294399)
--- trunk/Source/WebCore/editing/win/EditorWin.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/editing/win/EditorWin.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -29,6 +29,7 @@
#include "ClipboardUtilitiesWin.h"
#include "DocumentFragment.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameSelection.h"
#include "Pasteboard.h"
#include "Range.h"
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (294398 => 294399)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -49,6 +49,7 @@
#include "DiagnosticLoggingClient.h"
#include "DiagnosticLoggingKeys.h"
#include "Document.h"
+#include "DocumentInlines.h"
#include "DocumentLoader.h"
#include "ElementChildIterator.h"
#include "EventLoop.h"
Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (294398 => 294399)
--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -33,6 +33,7 @@
#include "DocumentFragment.h"
#include "DocumentType.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "HTMLElementFactory.h"
Modified: trunk/Source/WebCore/inspector/InspectorAuditResourcesObject.cpp (294398 => 294399)
--- trunk/Source/WebCore/inspector/InspectorAuditResourcesObject.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/inspector/InspectorAuditResourcesObject.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -33,6 +33,7 @@
#include "CachedResource.h"
#include "CachedSVGDocument.h"
#include "Document.h"
+#include "FrameDestructionObserverInlines.h"
#include "InspectorPageAgent.h"
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp (294398 => 294399)
--- trunk/Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -29,6 +29,7 @@
#include "Document.h"
#include "DocumentLoader.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "InstrumentingAgents.h"
#include "Page.h"
#include "PageConsoleClient.h"
Modified: trunk/Source/WebCore/loader/ApplicationManifestLoader.cpp (294398 => 294399)
--- trunk/Source/WebCore/loader/ApplicationManifestLoader.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/loader/ApplicationManifestLoader.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -34,6 +34,7 @@
#include "CachedResourceRequestInitiators.h"
#include "DocumentLoader.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
namespace WebCore {
Modified: trunk/Source/WebCore/loader/CookieJar.cpp (294398 => 294399)
--- trunk/Source/WebCore/loader/CookieJar.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/loader/CookieJar.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -30,6 +30,7 @@
#include "Document.h"
#include "DocumentLoader.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "HTTPCookieAcceptPolicy.h"
#include "NetworkStorageSession.h"
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (294398 => 294399)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -38,6 +38,7 @@
#include "DiagnosticLoggingKeys.h"
#include "DocumentLoader.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "HTMLFrameOwnerElement.h"
Modified: trunk/Source/WebCore/page/FrameDestructionObserver.cpp (294398 => 294399)
--- trunk/Source/WebCore/page/FrameDestructionObserver.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/page/FrameDestructionObserver.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -42,11 +42,6 @@
}
-Frame* FrameDestructionObserver::frame() const
-{
- return m_frame.get();
-}
-
void FrameDestructionObserver::observeFrame(Frame* frame)
{
if (m_frame)
Modified: trunk/Source/WebCore/page/FrameDestructionObserver.h (294398 => 294399)
--- trunk/Source/WebCore/page/FrameDestructionObserver.h 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/page/FrameDestructionObserver.h 2022-05-18 16:00:15 UTC (rev 294399)
@@ -38,7 +38,7 @@
WEBCORE_EXPORT virtual void frameDestroyed();
WEBCORE_EXPORT virtual void willDetachPage();
- WEBCORE_EXPORT Frame* frame() const;
+ inline Frame* frame() const; // Defined in FrameDestructionObserverInlines.h.
protected:
WEBCORE_EXPORT virtual ~FrameDestructionObserver();
Copied: trunk/Source/WebCore/page/FrameDestructionObserverInlines.h (from rev 294398, trunk/Source/WebCore/page/FrameDestructionObserver.h) (0 => 294399)
--- trunk/Source/WebCore/page/FrameDestructionObserverInlines.h (rev 0)
+++ trunk/Source/WebCore/page/FrameDestructionObserverInlines.h 2022-05-18 16:00:15 UTC (rev 294399)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 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 GOOGLE INC. ``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
+ * 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.
+ */
+
+#pragma once
+
+#include "Frame.h"
+#include "FrameDestructionObserver.h"
+
+namespace WebCore {
+
+inline Frame* FrameDestructionObserver::frame() const
+{
+ return m_frame.get();
+}
+
+}
Modified: trunk/Source/WebCore/page/UserMessageHandlersNamespace.cpp (294398 => 294399)
--- trunk/Source/WebCore/page/UserMessageHandlersNamespace.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/page/UserMessageHandlersNamespace.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -30,6 +30,7 @@
#include "DOMWrapperWorld.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "Page.h"
#include "UserContentController.h"
#include "UserMessageHandler.h"
Modified: trunk/Source/WebCore/rendering/RenderObject.h (294398 => 294399)
--- trunk/Source/WebCore/rendering/RenderObject.h 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2022-05-18 16:00:15 UTC (rev 294399)
@@ -29,6 +29,7 @@
#include "Element.h"
#include "FloatQuad.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "HTMLNames.h"
#include "LayoutRect.h"
#include "Page.h"
Modified: trunk/Source/WebCore/style/StyleBuilderConverter.h (294398 => 294399)
--- trunk/Source/WebCore/style/StyleBuilderConverter.h 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/style/StyleBuilderConverter.h 2022-05-18 16:00:15 UTC (rev 294399)
@@ -50,6 +50,7 @@
#include "FontPalette.h"
#include "FontSelectionValueInlines.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "GridPositionsResolver.h"
#include "Length.h"
#include "Pair.h"
Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (294398 => 294399)
--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -29,6 +29,7 @@
#include "DeprecatedGlobalSettings.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "InternalSettings.h"
#include "Internals.h"
#include "JSDocument.h"
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerClientData.cpp (294398 => 294399)
--- trunk/Source/WebCore/workers/service/ServiceWorkerClientData.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerClientData.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -32,6 +32,7 @@
#include "Document.h"
#include "DocumentLoader.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "SWClientConnection.h"
#include "WorkerGlobalScope.h"
#include <wtf/CrossThreadCopier.h>
Modified: trunk/Source/WebCore/xml/XMLTreeViewer.cpp (294398 => 294399)
--- trunk/Source/WebCore/xml/XMLTreeViewer.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/xml/XMLTreeViewer.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -35,6 +35,7 @@
#include "Document.h"
#include "Element.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "ScriptController.h"
#include "ScriptSourceCode.h"
#include "SecurityOrigin.h"
Modified: trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (294398 => 294399)
--- trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -36,6 +36,7 @@
#include "DocumentFragment.h"
#include "DocumentType.h"
#include "Frame.h"
+#include "FrameDestructionObserverInlines.h"
#include "FrameLoader.h"
#include "HTMLEntityParser.h"
#include "HTMLHtmlElement.h"
Modified: trunk/Source/WebKit/Shared/WebsitePoliciesData.cpp (294398 => 294399)
--- trunk/Source/WebKit/Shared/WebsitePoliciesData.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKit/Shared/WebsitePoliciesData.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -29,6 +29,7 @@
#include "ArgumentCoders.h"
#include "WebProcess.h"
#include <WebCore/Frame.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/Page.h>
namespace WebKit {
Modified: trunk/Source/WebKit/WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.cpp (294398 => 294399)
--- trunk/Source/WebKit/WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKit/WebProcess/EncryptedMedia/MediaKeySystemPermissionRequestManager.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -35,6 +35,7 @@
#include "WebPageProxyMessages.h"
#include <WebCore/Document.h>
#include <WebCore/Frame.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/FrameLoader.h>
#include <WebCore/SecurityOrigin.h>
#include <WebCore/SecurityOriginData.h>
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/DOMObjectCache.cpp (294398 => 294399)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/DOMObjectCache.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/DOMObjectCache.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -23,6 +23,7 @@
#include <WebCore/Document.h>
#include <WebCore/Frame.h>
#include <WebCore/FrameDestructionObserver.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/Node.h>
#include <glib-object.h>
#include <wtf/HashMap.h>
Modified: trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (294398 => 294399)
--- trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKit/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -30,6 +30,7 @@
#include <WebCore/CaptureDevice.h>
#include <WebCore/Document.h>
#include <WebCore/Frame.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/FrameLoader.h>
#include <WebCore/MediaConstraints.h>
#include <WebCore/SecurityOrigin.h>
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (294398 => 294399)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -57,6 +57,7 @@
#include <WebCore/DocumentLoader.h>
#include <WebCore/FetchOptions.h>
#include <WebCore/Frame.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/FrameLoader.h>
#include <WebCore/HTMLFrameOwnerElement.h>
#include <WebCore/InspectorInstrumentationWebKit.h>
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp (294398 => 294399)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -36,6 +36,7 @@
#include "WebProcess.h"
#include <WebCore/DeprecatedGlobalSettings.h>
#include <WebCore/Frame.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/FrameLoader.h>
#include <WebCore/FrameLoaderClient.h>
#include <WebCore/HTMLFrameOwnerElement.h>
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp (294398 => 294399)
--- trunk/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -35,6 +35,7 @@
#include <WebCore/DeprecatedGlobalSettings.h>
#include <WebCore/Document.h>
#include <WebCore/Frame.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/FrameLoader.h>
#include <WebCore/FrameLoaderClient.h>
#include <WebCore/Settings.h>
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMInternal.mm (294398 => 294399)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMInternal.mm 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMInternal.mm 2022-05-18 16:00:15 UTC (rev 294399)
@@ -28,6 +28,7 @@
#import "DOMNodeInternal.h"
#import <WebCore/Document.h>
#import <WebCore/Frame.h>
+#import <WebCore/FrameDestructionObserverInlines.h>
#import <WebCore/JSNode.h>
#import <WebCore/ScriptController.h>
#import <WebCore/WebScriptObjectPrivate.h>
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDocumentLoaderMac.mm (294398 => 294399)
--- trunk/Source/WebKitLegacy/mac/WebView/WebDocumentLoaderMac.mm 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDocumentLoaderMac.mm 2022-05-18 16:00:15 UTC (rev 294399)
@@ -30,6 +30,7 @@
#import "WebKitVersionChecks.h"
#import "WebView.h"
+#import <WebCore/FrameDestructionObserverInlines.h>
using namespace WebCore;
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp (294398 => 294399)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp 2022-05-18 15:49:40 UTC (rev 294398)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebEditorClient.cpp 2022-05-18 16:00:15 UTC (rev 294399)
@@ -34,6 +34,7 @@
#include <comutil.h>
#include <WebCore/BString.h>
#include <WebCore/Document.h>
+#include <WebCore/FrameDestructionObserverInlines.h>
#include <WebCore/HTMLElement.h>
#include <WebCore/HTMLInputElement.h>
#include <WebCore/HTMLNames.h>
