Changeset 295185 in webkit

Timestamp:

Jun 2, 2022, 11:45:32 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick 8cfadef7857b. rdar://problem/93512736

TextTrackCue should get its document for its ActiveDOMObject base class
​https://bugs.webkit.org/show_bug.cgi?id=240660
<rdar://93512736>

Reviewed by Eric Carlson.

TextTrackCue should get its document for its ActiveDOMObject base class instead
of requiring an extra data member to store it.

• Source/WebCore/html/track/TextTrackCue.cpp: (WebCore::TextTrackCue::TextTrackCue): (WebCore::TextTrackCue::scriptExecutionContext const): (WebCore::TextTrackCue::document const): (WebCore::TextTrackCue::getCueAsHTML): (WebCore::TextTrackCue::rebuildDisplayTree):
• Source/WebCore/html/track/TextTrackCue.h: (WebCore::TextTrackCue::ownerDocument): Deleted.
• Source/WebCore/html/track/TextTrackCueGeneric.cpp: (WebCore::TextTrackCueGeneric::createDisplayTree): (WebCore::TextTrackCueGeneric::setFontSize):
• Source/WebCore/html/track/TextTrackCueGeneric.h:
• Source/WebCore/html/track/VTTCue.cpp: (WebCore::VTTCue::VTTCue): (WebCore::VTTCue::initialize): (WebCore::VTTCue::createDisplayTree): (WebCore::VTTCue::displayTreeInternal): (WebCore::VTTCue::createWebVTTNodeTree): (WebCore::VTTCue::getCueAsHTML): (WebCore::VTTCue::createCueRenderingTree): (WebCore::VTTCue::getDisplayTree): (WebCore::VTTCue::removeDisplayTree):
• Source/WebCore/html/track/VTTCue.h:

Canonical link: ​https://commits.webkit.org/250757@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@294498 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore/html/track

Files:

• TextTrackCue.cpp (modified) (5 diffs)
• TextTrackCue.h (modified) (2 diffs)
• TextTrackCueGeneric.cpp (modified) (2 diffs)
• TextTrackCueGeneric.h (modified) (1 diff)
• VTTCue.cpp (modified) (9 diffs)
• VTTCue.h (modified) (2 diffs)

branches/safari-613-branch/Source/WebCore/html/track/TextTrackCue.cpp

@@ -217 +217 @@
     , m_startTime(start)
     , m_endTime(end)
-    , m_document(document)
     , m_cueNode(WTFMove(cueFragment))
 {
@@ -226 +225 @@
     , m_startTime(start)
     , m_endTime(end)
-    , m_document(document)
 {
 }
@@ -232 +230 @@
 ScriptExecutionContext* TextTrackCue::scriptExecutionContext() const
 {
-    return &m_document;
+    return ActiveDOMObject::scriptExecutionContext();
+}
+
+Document* TextTrackCue::document() const
+{
+    return downcast<Document>(scriptExecutionContext());
 }
 
@@ -437 +440 @@
         return nullptr;
 
-    auto clonedFragment = DocumentFragment::create(ownerDocument());
+    auto* document = this->document();
+    if (!document)
+        return nullptr;
+
+    auto clonedFragment = DocumentFragment::create(*document);
     m_cueNode->cloneChildNodes(clonedFragment);
 
@@ -486 +493 @@
         return;
 
+    RefPtr document = this->document();
+    if (!document)
+        return;
+
     ScriptDisallowedScope::EventAllowedScope allowedScopeForReferenceTree(*m_cueNode);
 
     if (!m_displayTree) {
-        m_displayTree = TextTrackCueBox::create(ownerDocument(), *this);
+        m_displayTree = TextTrackCueBox::create(*document, *this);
         m_displayTree->setPseudo(ShadowPseudoIds::webkitGenericCueRoot());
     }
 
     m_displayTree->removeChildren();
-    auto clonedFragment = DocumentFragment::create(ownerDocument());
+    auto clonedFragment = DocumentFragment::create(*document);
     m_cueNode->cloneChildNodes(clonedFragment);
     m_displayTree->appendChild(clonedFragment);
 
     if (m_fontSize) {
-        if (auto page = ownerDocument().page()) {
-            auto style = HTMLStyleElement::create(HTMLNames::styleTag, ownerDocument(), false);
+        if (auto page = document->page()) {
+            auto style = HTMLStyleElement::create(HTMLNames::styleTag, *document, false);
             style->setTextContent(makeString(page->captionUserPreferencesStyleSheet(),
                 " ::", ShadowPseudoIds::cue(), "{font-size:", m_fontSize, m_fontSizeIsImportant ? "px !important}" : "px}"));

branches/safari-613-branch/Source/WebCore/html/track/TextTrackCue.h

@@ -127 +127 @@
     TextTrackCue(Document&, const MediaTime& start, const MediaTime& end);
 
-    Document& ownerDocument() { return m_document; }
+    Document* document() const;
 
     virtual bool cueContentsMatch(const TextTrackCue&) const;
@@ -154 +154 @@
 
     TextTrack* m_track { nullptr };
-
-    Document& m_document;
 
     RefPtr<DocumentFragment> m_cueNode;

branches/safari-613-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp

@@ -172 +172 @@
 }
 
-Ref<VTTCueBox> TextTrackCueGeneric::createDisplayTree()
-{
-    return TextTrackCueGenericBoxElement::create(ownerDocument(), *this);
+RefPtr<VTTCueBox> TextTrackCueGeneric::createDisplayTree()
+{
+    if (auto* document = this->document())
+        return TextTrackCueGenericBoxElement::create(*document, *this);
+    return nullptr;
 }
 
@@ -206 +208 @@
     if (fontSizeMultiplier())
         size *= fontSizeMultiplier() / 100;
-    displayTreeInternal().setInlineStyleProperty(CSSPropertyFontSize, lround(size), CSSUnitType::CSS_PX);
+    if (auto* displayTree = displayTreeInternal())
+        displayTree->setInlineStyleProperty(CSSPropertyFontSize, lround(size), CSSUnitType::CSS_PX);
 }
 

branches/safari-613-branch/Source/WebCore/html/track/TextTrackCueGeneric.h

@@ -70 +70 @@
     bool isPositionedAbove(const TextTrackCue*) const final;
 
-    Ref<VTTCueBox> createDisplayTree() final;
+    RefPtr<VTTCueBox> createDisplayTree() final;
 
     bool cueContentsMatch(const TextTrackCue&) const final;

branches/safari-613-branch/Source/WebCore/html/track/VTTCue.cpp

@@ -272 +272 @@
     , m_originalStartTime(MediaTime::zeroTime())
 {
-    initialize();
+    initialize(document);
 }
 
@@ -279 +279 @@
     , m_originalStartTime(cueData.originalStartTime())
 {
-    initialize();
+    initialize(document);
     setText(cueData.content());
     setStartTime(cueData.startTime());
@@ -291 +291 @@
 }
 
-void VTTCue::initialize()
-{
-    m_cueBackdropBox = HTMLDivElement::create(ownerDocument());
-    m_cueHighlightBox = HTMLSpanElement::create(spanTag, ownerDocument());
+void VTTCue::initialize(Document& document)
+{
+    m_cueBackdropBox = HTMLDivElement::create(document);
+    m_cueHighlightBox = HTMLSpanElement::create(spanTag, document);
     m_snapToLines = true;
     m_displayTreeShouldChange = true;
@@ -300 +300 @@
 }
 
-Ref<VTTCueBox> VTTCue::createDisplayTree()
-{
-    return VTTCueBox::create(ownerDocument(), *this);
-}
-
-VTTCueBox& VTTCue::displayTreeInternal()
+RefPtr<VTTCueBox> VTTCue::createDisplayTree()
+{
+    if (auto* document = this->document())
+        return VTTCueBox::create(*document, *this);
+    return nullptr;
+}
+
+VTTCueBox* VTTCue::displayTreeInternal()
 {
     if (!m_displayTree)
         m_displayTree = createDisplayTree();
-    return *m_displayTree;
+    return m_displayTree.get();
 }
 
@@ -594 +596 @@
 void VTTCue::createWebVTTNodeTree()
 {
-    if (!m_webVTTNodeTree)
-        m_webVTTNodeTree = WebVTTParser::createDocumentFragmentFromCueText(ownerDocument(), m_content);
+    if (!m_webVTTNodeTree && document())
+        m_webVTTNodeTree = WebVTTParser::createDocumentFragmentFromCueText(*document(), m_content);
 }
 
@@ -618 +620 @@
         return nullptr;
 
-    auto clonedFragment = DocumentFragment::create(ownerDocument());
+    auto* document = this->document();
+    if (!document)
+        return nullptr;
+
+    auto clonedFragment = DocumentFragment::create(*document);
     copyWebVTTNodeToDOMTree(*m_webVTTNodeTree, clonedFragment);
     return clonedFragment;
@@ -629 +635 @@
         return nullptr;
 
-    auto clonedFragment = DocumentFragment::create(ownerDocument());
+    auto* document = this->document();
+    if (!document)
+        return nullptr;
+
+    auto clonedFragment = DocumentFragment::create(*document);
 
     // The cloned fragment is never exposed to author scripts so it's safe to dispatch events here.
@@ -967 +977 @@
 RefPtr<TextTrackCueBox> VTTCue::getDisplayTree(const IntSize& videoSize, int fontSize)
 {
-    Ref<VTTCueBox> displayTree = displayTreeInternal();
-    if (!m_displayTreeShouldChange || !track()->isRendered())
+    RefPtr displayTree = displayTreeInternal();
+    if (!displayTree || !m_displayTreeShouldChange || !track()->isRendered())
         return displayTree;
 
@@ -1041 +1051 @@
     }
 
+    RefPtr displayTree = displayTreeInternal();
+    if (!displayTree)
+        return;
+
     // The display tree is never exposed to author scripts so it's safe to dispatch events here.
-    ScriptDisallowedScope::EventAllowedScope allowedScope(displayTreeInternal());
-    displayTreeInternal().remove();
+    ScriptDisallowedScope::EventAllowedScope allowedScope(*displayTree);
+    displayTree->remove();
 }
 

branches/safari-613-branch/Source/WebCore/html/track/VTTCue.h

@@ -196 +196 @@
     bool cueContentsMatch(const TextTrackCue&) const override;
 
-    virtual Ref<VTTCueBox> createDisplayTree();
-    VTTCueBox& displayTreeInternal();
+    virtual RefPtr<VTTCueBox> createDisplayTree();
+    VTTCueBox* displayTreeInternal();
 
     void toJSON(JSON::Object&) const override;
@@ -204 +204 @@
     VTTCue(Document&, const WebVTTCueData&);
 
-    void initialize();
+    void initialize(Document&);
     void createWebVTTNodeTree();