diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-08-25 21:59:08 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-08-25 21:59:08 -0500 |
| commit | d6f18548a664b82489daeebf18fd3051f3edc8ac (patch) | |
| tree | 865369a2ddc822f92758edfdb7647348f490b174 /dom/base/WebSocket.cpp | |
| parent | bbc3e455b064320170be03996a87a493f3c18106 (diff) | |
| download | uxp-d6f18548a664b82489daeebf18fd3051f3edc8ac.tar.gz | |
Issue #1990 - Part 5 - Common up the skippability implementations that are basically copy/pastes of the DOMEventTargetHelper one.
Mozilla Bug Bug 1333540. Skipped the renamed of various functions, but otherwise a direct port.
Diffstat (limited to 'dom/base/WebSocket.cpp')
| -rw-r--r-- | dom/base/WebSocket.cpp | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/dom/base/WebSocket.cpp b/dom/base/WebSocket.cpp index 19a687cba3..fe06bc93a4 100644 --- a/dom/base/WebSocket.cpp +++ b/dom/base/WebSocket.cpp @@ -1402,32 +1402,6 @@ WebSocket::ConstructorCommon(const GlobalObject& aGlobal, NS_IMPL_CYCLE_COLLECTION_CLASS(WebSocket) -NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(WebSocket) - bool isBlack = tmp->IsBlack(); - if (isBlack || tmp->mKeepingAlive) { - if (tmp->mListenerManager) { - tmp->mListenerManager->MarkForCC(); - } - if (!isBlack && tmp->PreservingWrapper()) { - // This marks the wrapper black. - tmp->GetWrapper(); - } - return true; - } -NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_END - -NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_BEGIN(WebSocket) - return tmp->IsBlack(); -NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_END - -NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(WebSocket) - return tmp->IsBlack(); -NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END - -NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(WebSocket, - DOMEventTargetHelper) -NS_IMPL_CYCLE_COLLECTION_TRACE_END - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WebSocket, DOMEventTargetHelper) if (tmp->mImpl) { @@ -1444,6 +1418,12 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(WebSocket, } NS_IMPL_CYCLE_COLLECTION_UNLINK_END +bool +WebSocket::IsCertainlyAliveForCC() const +{ + return mKeepingAlive; +} + NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(WebSocket) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) |