wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 894104 - Part 1: Retain a document reference for GetCueAsHTML.

Browse Source 
From 447985000db919e2f054012ca10f03d626c401b1 Mon Sep 17 00:00:00 2001
 r=bz
Save a copy of the owning document at creation time instead
of looking it up from mGlobal in each call. This ensures it
is available even if we're called after our window is unlinked
at teardown.

Make the constructors throw if a window is not available,
so we can return an INVALID_STATE_ERR if we're called
in an incomplete environment.
This commit is contained in:
Ralph Giles 2013-07-16 22:14:40 -07:00
parent 003e3d5fe7
commit ac4de9f961
2 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
content/media/TextTrackCue.cpp
View File

@ -17,8 +17,9 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(TextTrackCue,
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_5(TextTrackCue,
mGlobal,
mDocument,
mTrack,
mTrackElement,
mDisplayState)
@ -44,7 +45,8 @@ TextTrackCue::SetDefaultCueSettings()
TextTrackCue::TextTrackCue(nsISupports* aGlobal,
double aStartTime,
double aEndTime,
const nsAString& aText)
const nsAString& aText,
ErrorResult& aRv)
: mGlobal(aGlobal)
, mText(aText)
, mStartTime(aStartTime)
@ -55,6 +57,9 @@ TextTrackCue::TextTrackCue(nsISupports* aGlobal,
SetDefaultCueSettings();
MOZ_ASSERT(aGlobal);
SetIsDOMBinding();
if (NS_FAILED(StashDocument())) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
}
}
TextTrackCue::TextTrackCue(nsISupports* aGlobal,
@ -62,7 +67,8 @@ TextTrackCue::TextTrackCue(nsISupports* aGlobal,
double aEndTime,
const nsAString& aText,
HTMLTrackElement* aTrackElement,
webvtt_node* head)
webvtt_node* head,
ErrorResult& aRv)
: mGlobal(aGlobal)
, mText(aText)
, mStartTime(aStartTime)
@ -75,6 +81,9 @@ TextTrackCue::TextTrackCue(nsISupports* aGlobal,
SetDefaultCueSettings();
MOZ_ASSERT(aGlobal);
SetIsDOMBinding();
if (NS_FAILED(StashDocument())) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
}
}
TextTrackCue::~TextTrackCue()
@ -84,20 +93,29 @@ TextTrackCue::~TextTrackCue()
}
}
/** Save a reference to our creating document so it's available
* even when unlinked during discard/teardown.
*/
nsresult
TextTrackCue::StashDocument()
{
nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(mGlobal));
if (!window) {
return NS_ERROR_NO_INTERFACE;
}
mDocument = window->GetDoc();
if (!mDocument) {
return NS_ERROR_NOT_AVAILABLE;
}
return NS_OK;
}
void
TextTrackCue::CreateCueOverlay()
{
nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(mGlobal));
if(!window) {
return;
}
nsIDocument* document = window->GetDoc();
if(!document) {
return;
}
document->CreateElem(NS_LITERAL_STRING("div"), nullptr,
kNameSpaceID_XHTML,
getter_AddRefs(mDisplayState));
mDocument->CreateElem(NS_LITERAL_STRING("div"), nullptr,
kNameSpaceID_XHTML,
getter_AddRefs(mDisplayState));
nsGenericHTMLElement* cueDiv =
static_cast<nsGenericHTMLElement*>(mDisplayState.get());
cueDiv->SetClassName(NS_LITERAL_STRING("caption-text"));
@ -146,17 +164,8 @@ TextTrackCue::RenderCue()
already_AddRefed<DocumentFragment>
TextTrackCue::GetCueAsHTML()
{
nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(mGlobal));
if(!window) {
return nullptr;
}
nsIDocument* document = window->GetDoc();
if(!document){
return nullptr;
}
nsRefPtr<DocumentFragment> frag =
document->CreateDocumentFragment();
MOZ_ASSERT(mDocument);
nsRefPtr<DocumentFragment> frag = mDocument->CreateDocumentFragment();
ConvertNodeTreeToDOMTree(frag);
return frag.forget();
@ -188,17 +197,9 @@ TextTrackCue::ConvertInternalNodeToContent(const webvtt_node* aWebVTTNode)
nsIAtom* atom = nsGkAtoms::span;
nsCOMPtr<nsIContent> cueTextContent;
nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(mGlobal));
if(!window) {
return nullptr;
}
nsIDocument* document = window->GetDoc();
if(!document){
return nullptr;
}
document->CreateElem(nsDependentAtomString(atom), nullptr,
kNameSpaceID_XHTML,
getter_AddRefs(cueTextContent));
mDocument->CreateElem(nsDependentAtomString(atom), nullptr,
kNameSpaceID_XHTML,
getter_AddRefs(cueTextContent));
return cueTextContent.forget();
}
@ -206,14 +207,8 @@ already_AddRefed<nsIContent>
TextTrackCue::ConvertLeafNodeToContent(const webvtt_node* aWebVTTNode)
{
nsCOMPtr<nsIContent> cueTextContent;
nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(mGlobal));
if(!window) {
return nullptr;
}
nsIDocument* document = window->GetDoc();
if(!document) {
return nullptr;
}
// Use mDocument to create nodes on cueTextContent.
return cueTextContent.forget();
}

9
content/media/TextTrackCue.h
View File

@ -12,6 +12,7 @@
#include "mozilla/dom/TextTrackCueBinding.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDOMEventTargetHelper.h"
#include "nsIDocument.h"
struct webvtt_node;
@ -38,15 +39,15 @@ public:
ErrorResult& aRv)
{
nsRefPtr<TextTrackCue> ttcue = new TextTrackCue(aGlobal.Get(), aStartTime,
aEndTime, aText);
aEndTime, aText, aRv);
return ttcue.forget();
}
TextTrackCue(nsISupports* aGlobal, double aStartTime, double aEndTime,
const nsAString& aText);
const nsAString& aText, ErrorResult& aRv);
TextTrackCue(nsISupports* aGlobal, double aStartTime, double aEndTime,
const nsAString& aText, HTMLTrackElement* aTrackElement,
webvtt_node* head);
webvtt_node* head, ErrorResult& aRv);
~TextTrackCue();
@ -321,8 +322,10 @@ private:
void CueChanged();
void SetDefaultCueSettings();
void CreateCueOverlay();
nsresult StashDocument();
nsCOMPtr<nsISupports> mGlobal;
nsRefPtr<nsIDocument> mDocument;
nsString mText;
double mStartTime;
double mEndTime;