1426494 - Share more code between nsIDocument and ShadowRoot.
parent
29dd0b47ce
commit
a3008768e1
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "mozilla/dom/ChromeNodeList.h"
|
#include "mozilla/dom/ChromeNodeList.h"
|
||||||
#include "mozilla/dom/ChromeNodeListBinding.h"
|
#include "mozilla/dom/ChromeNodeListBinding.h"
|
||||||
|
#include "nsPIDOMWindow.h"
|
||||||
|
|
||||||
using namespace mozilla;
|
using namespace mozilla;
|
||||||
using namespace mozilla::dom;
|
using namespace mozilla::dom;
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "nsCOMArray.h"
|
#include "nsCOMArray.h"
|
||||||
#include "nsContentList.h"
|
#include "nsContentList.h"
|
||||||
|
#include "nsIDocument.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
class ErrorResult;
|
class ErrorResult;
|
||||||
|
|
|
@ -0,0 +1,104 @@
|
||||||
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||||
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
#include "DocumentOrShadowRoot.h"
|
||||||
|
#include "mozilla/dom/StyleSheetList.h"
|
||||||
|
#include "ShadowRoot.h"
|
||||||
|
#include "XULDocument.h"
|
||||||
|
|
||||||
|
class nsINode;
|
||||||
|
class nsIDocument;
|
||||||
|
class ShadowRoot;
|
||||||
|
|
||||||
|
namespace mozilla {
|
||||||
|
namespace dom {
|
||||||
|
|
||||||
|
DocumentOrShadowRoot::DocumentOrShadowRoot(mozilla::dom::ShadowRoot* aShadowRoot)
|
||||||
|
: mAsNode(aShadowRoot)
|
||||||
|
, mKind(Kind::ShadowRoot)
|
||||||
|
{
|
||||||
|
MOZ_ASSERT(mAsNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
DocumentOrShadowRoot::DocumentOrShadowRoot(nsIDocument* aDoc)
|
||||||
|
: mAsNode(aDoc)
|
||||||
|
, mKind(Kind::Document)
|
||||||
|
{
|
||||||
|
MOZ_ASSERT(mAsNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
StyleSheetList&
|
||||||
|
DocumentOrShadowRoot::EnsureDOMStyleSheets()
|
||||||
|
{
|
||||||
|
if (!mDOMStyleSheets) {
|
||||||
|
mDOMStyleSheets = new StyleSheetList(*this);
|
||||||
|
}
|
||||||
|
return *mDOMStyleSheets;
|
||||||
|
}
|
||||||
|
|
||||||
|
Element*
|
||||||
|
DocumentOrShadowRoot::GetElementById(const nsAString& aElementId)
|
||||||
|
{
|
||||||
|
if (MOZ_UNLIKELY(aElementId.IsEmpty())) {
|
||||||
|
nsContentUtils::ReportEmptyGetElementByIdArg(AsNode().OwnerDoc());
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nsIdentifierMapEntry* entry = mIdentifierMap.GetEntry(aElementId)) {
|
||||||
|
if (Element* el = entry->GetIdElement()) {
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MOZ_UNLIKELY(mKind == Kind::Document &&
|
||||||
|
static_cast<nsIDocument&>(AsNode()).IsXULDocument())) {
|
||||||
|
return static_cast<XULDocument&>(AsNode()).GetRefById(aElementId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
already_AddRefed<nsContentList>
|
||||||
|
DocumentOrShadowRoot::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
||||||
|
const nsAString& aLocalName)
|
||||||
|
{
|
||||||
|
ErrorResult rv;
|
||||||
|
RefPtr<nsContentList> list =
|
||||||
|
GetElementsByTagNameNS(aNamespaceURI, aLocalName, rv);
|
||||||
|
if (rv.Failed()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
return list.forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
already_AddRefed<nsContentList>
|
||||||
|
DocumentOrShadowRoot::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
||||||
|
const nsAString& aLocalName,
|
||||||
|
mozilla::ErrorResult& aResult)
|
||||||
|
{
|
||||||
|
int32_t nameSpaceId = kNameSpaceID_Wildcard;
|
||||||
|
|
||||||
|
if (!aNamespaceURI.EqualsLiteral("*")) {
|
||||||
|
aResult =
|
||||||
|
nsContentUtils::NameSpaceManager()->RegisterNameSpace(aNamespaceURI,
|
||||||
|
nameSpaceId);
|
||||||
|
if (aResult.Failed()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NS_ASSERTION(nameSpaceId != kNameSpaceID_Unknown, "Unexpected namespace ID!");
|
||||||
|
return NS_GetContentList(&AsNode(), nameSpaceId, aLocalName);
|
||||||
|
}
|
||||||
|
|
||||||
|
already_AddRefed<nsContentList>
|
||||||
|
DocumentOrShadowRoot::GetElementsByClassName(const nsAString& aClasses)
|
||||||
|
{
|
||||||
|
return nsContentUtils::GetElementsByClassName(&AsNode(), aClasses);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,151 @@
|
||||||
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||||
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
#ifndef mozilla_dom_DocumentOrShadowRoot_h__
|
||||||
|
#define mozilla_dom_DocumentOrShadowRoot_h__
|
||||||
|
|
||||||
|
#include "nsTArray.h"
|
||||||
|
#include "nsIdentifierMapEntry.h"
|
||||||
|
#include "nsContentListDeclarations.h"
|
||||||
|
#include "nsNameSpaceManager.h"
|
||||||
|
#include "mozilla/dom/NameSpaceConstants.h"
|
||||||
|
|
||||||
|
class nsContentList;
|
||||||
|
class nsINode;
|
||||||
|
|
||||||
|
namespace mozilla {
|
||||||
|
class StyleSheet;
|
||||||
|
|
||||||
|
namespace dom {
|
||||||
|
|
||||||
|
class StyleSheetList;
|
||||||
|
class ShadowRoot;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A class meant to be shared by ShadowRoot and Document, that holds a list of
|
||||||
|
* stylesheets.
|
||||||
|
*
|
||||||
|
* TODO(emilio, bug 1418159): In the future this should hold most of the
|
||||||
|
* relevant style state, this should allow us to fix bug 548397.
|
||||||
|
*/
|
||||||
|
class DocumentOrShadowRoot
|
||||||
|
{
|
||||||
|
enum class Kind {
|
||||||
|
Document,
|
||||||
|
ShadowRoot,
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit DocumentOrShadowRoot(nsIDocument*);
|
||||||
|
explicit DocumentOrShadowRoot(mozilla::dom::ShadowRoot*);
|
||||||
|
|
||||||
|
nsINode& AsNode()
|
||||||
|
{
|
||||||
|
return *mAsNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
const nsINode& AsNode() const
|
||||||
|
{
|
||||||
|
return *mAsNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
StyleSheet* SheetAt(size_t aIndex) const
|
||||||
|
{
|
||||||
|
return mStyleSheets.SafeElementAt(aIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t SheetCount() const
|
||||||
|
{
|
||||||
|
return mStyleSheets.Length();
|
||||||
|
}
|
||||||
|
|
||||||
|
int32_t IndexOfSheet(const StyleSheet& aSheet) const
|
||||||
|
{
|
||||||
|
return mStyleSheets.IndexOf(&aSheet);
|
||||||
|
}
|
||||||
|
|
||||||
|
void InsertSheetAt(size_t aIndex, StyleSheet& aSheet)
|
||||||
|
{
|
||||||
|
mStyleSheets.InsertElementAt(aIndex, &aSheet);
|
||||||
|
}
|
||||||
|
|
||||||
|
void RemoveSheet(StyleSheet& aSheet)
|
||||||
|
{
|
||||||
|
mStyleSheets.RemoveElement(&aSheet);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AppendStyleSheet(StyleSheet& aSheet)
|
||||||
|
{
|
||||||
|
mStyleSheets.AppendElement(&aSheet);
|
||||||
|
}
|
||||||
|
|
||||||
|
StyleSheetList& EnsureDOMStyleSheets();
|
||||||
|
|
||||||
|
Element* GetElementById(const nsAString& aElementId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method returns _all_ the elements in this scope which have id
|
||||||
|
* aElementId, if there are any. Otherwise it returns null.
|
||||||
|
*
|
||||||
|
* This is useful for stuff like QuerySelector optimization and such.
|
||||||
|
*/
|
||||||
|
inline const nsTArray<Element*>*
|
||||||
|
GetAllElementsForId(const nsAString& aElementId) const;
|
||||||
|
|
||||||
|
already_AddRefed<nsContentList>
|
||||||
|
GetElementsByTagName(const nsAString& aTagName)
|
||||||
|
{
|
||||||
|
return NS_GetContentList(&AsNode(), kNameSpaceID_Unknown, aTagName);
|
||||||
|
}
|
||||||
|
|
||||||
|
already_AddRefed<nsContentList>
|
||||||
|
GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
||||||
|
const nsAString& aLocalName);
|
||||||
|
|
||||||
|
already_AddRefed<nsContentList>
|
||||||
|
GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
||||||
|
const nsAString& aLocalName,
|
||||||
|
mozilla::ErrorResult&);
|
||||||
|
|
||||||
|
already_AddRefed<nsContentList>
|
||||||
|
GetElementsByClassName(const nsAString& aClasses);
|
||||||
|
|
||||||
|
~DocumentOrShadowRoot() = default;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
nsTArray<RefPtr<mozilla::StyleSheet>> mStyleSheets;
|
||||||
|
RefPtr<mozilla::dom::StyleSheetList> mDOMStyleSheets;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* mIdentifierMap works as follows for IDs:
|
||||||
|
* 1) Attribute changes affect the table immediately (removing and adding
|
||||||
|
* entries as needed).
|
||||||
|
* 2) Removals from the DOM affect the table immediately
|
||||||
|
* 3) Additions to the DOM always update existing entries for names, and add
|
||||||
|
* new ones for IDs.
|
||||||
|
*/
|
||||||
|
nsTHashtable<nsIdentifierMapEntry> mIdentifierMap;
|
||||||
|
|
||||||
|
nsINode* mAsNode;
|
||||||
|
const Kind mKind;
|
||||||
|
};
|
||||||
|
|
||||||
|
inline const nsTArray<Element*>*
|
||||||
|
DocumentOrShadowRoot::GetAllElementsForId(const nsAString& aElementId) const
|
||||||
|
{
|
||||||
|
if (aElementId.IsEmpty()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
nsIdentifierMapEntry* entry = mIdentifierMap.GetEntry(aElementId);
|
||||||
|
return entry ? &entry->GetIdElements() : nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -139,6 +139,7 @@ class EventStateManager;
|
||||||
|
|
||||||
namespace dom {
|
namespace dom {
|
||||||
|
|
||||||
|
struct CustomElementDefinition;
|
||||||
class Animation;
|
class Animation;
|
||||||
class CustomElementRegistry;
|
class CustomElementRegistry;
|
||||||
class Link;
|
class Link;
|
||||||
|
|
|
@ -58,6 +58,7 @@ ShadowRoot::ShadowRoot(Element* aElement, bool aClosed,
|
||||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
|
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
|
||||||
nsXBLPrototypeBinding* aProtoBinding)
|
nsXBLPrototypeBinding* aProtoBinding)
|
||||||
: DocumentFragment(aNodeInfo)
|
: DocumentFragment(aNodeInfo)
|
||||||
|
, DocumentOrShadowRoot(this)
|
||||||
, mProtoBinding(aProtoBinding)
|
, mProtoBinding(aProtoBinding)
|
||||||
, mInsertionPointChanged(false)
|
, mInsertionPointChanged(false)
|
||||||
, mIsComposedDocParticipant(false)
|
, mIsComposedDocParticipant(false)
|
||||||
|
@ -240,7 +241,7 @@ ShadowRoot::InsertSheet(StyleSheet* aSheet,
|
||||||
|
|
||||||
linkingElement->SetStyleSheet(aSheet); // This sets the ownerNode on the sheet
|
linkingElement->SetStyleSheet(aSheet); // This sets the ownerNode on the sheet
|
||||||
|
|
||||||
MOZ_DIAGNOSTIC_ASSERT(mProtoBinding->SheetCount() == StyleScope::SheetCount());
|
MOZ_DIAGNOSTIC_ASSERT(mProtoBinding->SheetCount() == DocumentOrShadowRoot::SheetCount());
|
||||||
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
|
||||||
// FIXME(emilio, bug 1425759): For now we keep them duplicated, the proto
|
// FIXME(emilio, bug 1425759): For now we keep them duplicated, the proto
|
||||||
// binding will disappear soon (tm).
|
// binding will disappear soon (tm).
|
||||||
|
@ -278,44 +279,13 @@ void
|
||||||
ShadowRoot::RemoveSheet(StyleSheet* aSheet)
|
ShadowRoot::RemoveSheet(StyleSheet* aSheet)
|
||||||
{
|
{
|
||||||
mProtoBinding->RemoveStyleSheet(aSheet);
|
mProtoBinding->RemoveStyleSheet(aSheet);
|
||||||
StyleScope::RemoveSheet(*aSheet);
|
DocumentOrShadowRoot::RemoveSheet(*aSheet);
|
||||||
|
|
||||||
if (aSheet->IsApplicable()) {
|
if (aSheet->IsApplicable()) {
|
||||||
StyleSheetChanged();
|
StyleSheetChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Element*
|
|
||||||
ShadowRoot::GetElementById(const nsAString& aElementId)
|
|
||||||
{
|
|
||||||
nsIdentifierMapEntry *entry = mIdentifierMap.GetEntry(aElementId);
|
|
||||||
return entry ? entry->GetIdElement() : nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
ShadowRoot::GetElementsByTagName(const nsAString& aTagName)
|
|
||||||
{
|
|
||||||
return NS_GetContentList(this, kNameSpaceID_Unknown, aTagName);
|
|
||||||
}
|
|
||||||
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
ShadowRoot::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
|
||||||
const nsAString& aLocalName)
|
|
||||||
{
|
|
||||||
int32_t nameSpaceId = kNameSpaceID_Wildcard;
|
|
||||||
|
|
||||||
if (!aNamespaceURI.EqualsLiteral("*")) {
|
|
||||||
nsresult rv =
|
|
||||||
nsContentUtils::NameSpaceManager()->RegisterNameSpace(aNamespaceURI,
|
|
||||||
nameSpaceId);
|
|
||||||
NS_ENSURE_SUCCESS(rv, nullptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_ASSERTION(nameSpaceId != kNameSpaceID_Unknown, "Unexpected namespace ID!");
|
|
||||||
|
|
||||||
return NS_GetContentList(this, nameSpaceId, aLocalName);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ShadowRoot::AddToIdTable(Element* aElement, nsIAtom* aId)
|
ShadowRoot::AddToIdTable(Element* aElement, nsIAtom* aId)
|
||||||
{
|
{
|
||||||
|
@ -337,12 +307,6 @@ ShadowRoot::RemoveFromIdTable(Element* aElement, nsIAtom* aId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
ShadowRoot::GetElementsByClassName(const nsAString& aClasses)
|
|
||||||
{
|
|
||||||
return nsContentUtils::GetElementsByClassName(this, aClasses);
|
|
||||||
}
|
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
ShadowRoot::GetEventTargetParent(EventChainPreVisitor& aVisitor)
|
ShadowRoot::GetEventTargetParent(EventChainPreVisitor& aVisitor)
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#define mozilla_dom_shadowroot_h__
|
#define mozilla_dom_shadowroot_h__
|
||||||
|
|
||||||
#include "mozilla/dom/DocumentFragment.h"
|
#include "mozilla/dom/DocumentFragment.h"
|
||||||
#include "mozilla/dom/StyleScope.h"
|
#include "mozilla/dom/DocumentOrShadowRoot.h"
|
||||||
#include "nsCOMPtr.h"
|
#include "nsCOMPtr.h"
|
||||||
#include "nsCycleCollectionParticipant.h"
|
#include "nsCycleCollectionParticipant.h"
|
||||||
#include "nsIContentInlines.h"
|
#include "nsIContentInlines.h"
|
||||||
|
@ -29,7 +29,7 @@ namespace dom {
|
||||||
class Element;
|
class Element;
|
||||||
|
|
||||||
class ShadowRoot final : public DocumentFragment,
|
class ShadowRoot final : public DocumentFragment,
|
||||||
public StyleScope,
|
public DocumentOrShadowRoot,
|
||||||
public nsStubMutationObserver
|
public nsStubMutationObserver
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -57,22 +57,14 @@ public:
|
||||||
return mMode == ShadowRootMode::Closed;
|
return mMode == ShadowRootMode::Closed;
|
||||||
}
|
}
|
||||||
|
|
||||||
// StyleScope.
|
|
||||||
nsINode& AsNode() final
|
|
||||||
{
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
// [deprecated] Shadow DOM v0
|
// [deprecated] Shadow DOM v0
|
||||||
void AddToIdTable(Element* aElement, nsIAtom* aId);
|
|
||||||
void RemoveFromIdTable(Element* aElement, nsIAtom* aId);
|
|
||||||
void InsertSheet(StyleSheet* aSheet, nsIContent* aLinkingContent);
|
void InsertSheet(StyleSheet* aSheet, nsIContent* aLinkingContent);
|
||||||
void RemoveSheet(StyleSheet* aSheet);
|
void RemoveSheet(StyleSheet* aSheet);
|
||||||
bool ApplyAuthorStyles();
|
bool ApplyAuthorStyles();
|
||||||
void SetApplyAuthorStyles(bool aApplyAuthorStyles);
|
void SetApplyAuthorStyles(bool aApplyAuthorStyles);
|
||||||
StyleSheetList* StyleSheets()
|
StyleSheetList* StyleSheets()
|
||||||
{
|
{
|
||||||
return &StyleScope::EnsureDOMStyleSheets();
|
return &DocumentOrShadowRoot::EnsureDOMStyleSheets();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -123,15 +115,11 @@ public:
|
||||||
|
|
||||||
static ShadowRoot* FromNode(nsINode* aNode);
|
static ShadowRoot* FromNode(nsINode* aNode);
|
||||||
|
|
||||||
|
void AddToIdTable(Element* aElement, nsIAtom* aId);
|
||||||
|
void RemoveFromIdTable(Element* aElement, nsIAtom* aId);
|
||||||
|
|
||||||
// WebIDL methods.
|
// WebIDL methods.
|
||||||
Element* GetElementById(const nsAString& aElementId);
|
using mozilla::dom::DocumentOrShadowRoot::GetElementById;
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
GetElementsByTagName(const nsAString& aNamespaceURI);
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
|
||||||
const nsAString& aLocalName);
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
GetElementsByClassName(const nsAString& aClasses);
|
|
||||||
void GetInnerHTML(nsAString& aInnerHTML);
|
void GetInnerHTML(nsAString& aInnerHTML);
|
||||||
void SetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError);
|
void SetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError);
|
||||||
void StyleSheetChanged();
|
void StyleSheetChanged();
|
||||||
|
@ -154,7 +142,6 @@ protected:
|
||||||
// are in the shadow tree and should be kept alive by its parent.
|
// are in the shadow tree and should be kept alive by its parent.
|
||||||
nsClassHashtable<nsStringHashKey, nsTArray<mozilla::dom::HTMLSlotElement*>> mSlotMap;
|
nsClassHashtable<nsStringHashKey, nsTArray<mozilla::dom::HTMLSlotElement*>> mSlotMap;
|
||||||
|
|
||||||
nsTHashtable<nsIdentifierMapEntry> mIdentifierMap;
|
|
||||||
nsXBLPrototypeBinding* mProtoBinding;
|
nsXBLPrototypeBinding* mProtoBinding;
|
||||||
|
|
||||||
// It is necessary to hold a reference to the associated nsXBLBinding
|
// It is necessary to hold a reference to the associated nsXBLBinding
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
||||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
#include "StyleScope.h"
|
|
||||||
#include "mozilla/dom/StyleSheetList.h"
|
|
||||||
|
|
||||||
namespace mozilla {
|
|
||||||
namespace dom {
|
|
||||||
|
|
||||||
StyleScope::~StyleScope()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
StyleSheetList&
|
|
||||||
StyleScope::EnsureDOMStyleSheets()
|
|
||||||
{
|
|
||||||
if (!mDOMStyleSheets) {
|
|
||||||
mDOMStyleSheets = new StyleSheetList(*this);
|
|
||||||
}
|
|
||||||
return *mDOMStyleSheets;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,81 +0,0 @@
|
||||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
||||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
#ifndef mozilla_dom_StyleScope_h__
|
|
||||||
#define mozilla_dom_StyleScope_h__
|
|
||||||
|
|
||||||
#include "nsTArray.h"
|
|
||||||
|
|
||||||
class nsINode;
|
|
||||||
|
|
||||||
namespace mozilla {
|
|
||||||
class StyleSheet;
|
|
||||||
|
|
||||||
namespace dom {
|
|
||||||
|
|
||||||
class StyleSheetList;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A class meant to be shared by ShadowRoot and Document, that holds a list of
|
|
||||||
* stylesheets.
|
|
||||||
*
|
|
||||||
* TODO(emilio, bug 1418159): In the future this should hold most of the
|
|
||||||
* relevant style state, this should allow us to fix bug 548397.
|
|
||||||
*/
|
|
||||||
class StyleScope
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
virtual nsINode& AsNode() = 0;
|
|
||||||
|
|
||||||
const nsINode& AsNode() const
|
|
||||||
{
|
|
||||||
return const_cast<StyleScope&>(*this).AsNode();
|
|
||||||
}
|
|
||||||
|
|
||||||
StyleSheet* SheetAt(size_t aIndex) const
|
|
||||||
{
|
|
||||||
return mStyleSheets.SafeElementAt(aIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t SheetCount() const
|
|
||||||
{
|
|
||||||
return mStyleSheets.Length();
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t IndexOfSheet(const StyleSheet& aSheet) const
|
|
||||||
{
|
|
||||||
return mStyleSheets.IndexOf(&aSheet);
|
|
||||||
}
|
|
||||||
|
|
||||||
void InsertSheetAt(size_t aIndex, StyleSheet& aSheet)
|
|
||||||
{
|
|
||||||
mStyleSheets.InsertElementAt(aIndex, &aSheet);
|
|
||||||
}
|
|
||||||
|
|
||||||
void RemoveSheet(StyleSheet& aSheet)
|
|
||||||
{
|
|
||||||
mStyleSheets.RemoveElement(&aSheet);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AppendStyleSheet(StyleSheet& aSheet)
|
|
||||||
{
|
|
||||||
mStyleSheets.AppendElement(&aSheet);
|
|
||||||
}
|
|
||||||
|
|
||||||
StyleSheetList& EnsureDOMStyleSheets();
|
|
||||||
|
|
||||||
~StyleScope();
|
|
||||||
|
|
||||||
protected:
|
|
||||||
nsTArray<RefPtr<mozilla::StyleSheet>> mStyleSheets;
|
|
||||||
RefPtr<mozilla::dom::StyleSheetList> mDOMStyleSheets;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -48,19 +48,19 @@ StyleSheetList::SlowItem(uint32_t aIndex, nsIDOMStyleSheet** aItem)
|
||||||
void
|
void
|
||||||
StyleSheetList::NodeWillBeDestroyed(const nsINode* aNode)
|
StyleSheetList::NodeWillBeDestroyed(const nsINode* aNode)
|
||||||
{
|
{
|
||||||
mStyleScope = nullptr;
|
mDocumentOrShadowRoot = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
StyleSheetList::StyleSheetList(StyleScope& aScope)
|
StyleSheetList::StyleSheetList(DocumentOrShadowRoot& aScope)
|
||||||
: mStyleScope(&aScope)
|
: mDocumentOrShadowRoot(&aScope)
|
||||||
{
|
{
|
||||||
mStyleScope->AsNode().AddMutationObserver(this);
|
mDocumentOrShadowRoot->AsNode().AddMutationObserver(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
StyleSheetList::~StyleSheetList()
|
StyleSheetList::~StyleSheetList()
|
||||||
{
|
{
|
||||||
if (mStyleScope) {
|
if (mDocumentOrShadowRoot) {
|
||||||
mStyleScope->AsNode().RemoveMutationObserver(this);
|
mDocumentOrShadowRoot->AsNode().RemoveMutationObserver(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#ifndef mozilla_dom_StyleSheetList_h
|
#ifndef mozilla_dom_StyleSheetList_h
|
||||||
#define mozilla_dom_StyleSheetList_h
|
#define mozilla_dom_StyleSheetList_h
|
||||||
|
|
||||||
#include "mozilla/dom/StyleScope.h"
|
#include "mozilla/dom/DocumentOrShadowRoot.h"
|
||||||
#include "nsIDOMStyleSheetList.h"
|
#include "nsIDOMStyleSheetList.h"
|
||||||
#include "nsWrapperCache.h"
|
#include "nsWrapperCache.h"
|
||||||
#include "nsStubDocumentObserver.h"
|
#include "nsStubDocumentObserver.h"
|
||||||
|
@ -31,28 +31,28 @@ public:
|
||||||
|
|
||||||
NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED
|
NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED
|
||||||
|
|
||||||
explicit StyleSheetList(StyleScope& aScope);
|
explicit StyleSheetList(DocumentOrShadowRoot& aScope);
|
||||||
|
|
||||||
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override final;
|
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override final;
|
||||||
|
|
||||||
nsINode* GetParentObject() const
|
nsINode* GetParentObject() const
|
||||||
{
|
{
|
||||||
return mStyleScope ? &mStyleScope->AsNode() : nullptr;
|
return mDocumentOrShadowRoot ? &mDocumentOrShadowRoot->AsNode() : nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t Length() const
|
uint32_t Length() const
|
||||||
{
|
{
|
||||||
return mStyleScope ? mStyleScope->SheetCount() : 0;
|
return mDocumentOrShadowRoot ? mDocumentOrShadowRoot->SheetCount() : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
StyleSheet* IndexedGetter(uint32_t aIndex, bool& aFound) const
|
StyleSheet* IndexedGetter(uint32_t aIndex, bool& aFound) const
|
||||||
{
|
{
|
||||||
if (!mStyleScope) {
|
if (!mDocumentOrShadowRoot) {
|
||||||
aFound = false;
|
aFound = false;
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
StyleSheet* sheet = mStyleScope->SheetAt(aIndex);
|
StyleSheet* sheet = mDocumentOrShadowRoot->SheetAt(aIndex);
|
||||||
aFound = !!sheet;
|
aFound = !!sheet;
|
||||||
return sheet;
|
return sheet;
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ public:
|
||||||
protected:
|
protected:
|
||||||
virtual ~StyleSheetList();
|
virtual ~StyleSheetList();
|
||||||
|
|
||||||
StyleScope* mStyleScope; // Weak, cleared on "NodeWillBeDestroyed".
|
DocumentOrShadowRoot* mDocumentOrShadowRoot; // Weak, cleared on "NodeWillBeDestroyed".
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace dom
|
} // namespace dom
|
||||||
|
|
|
@ -161,6 +161,7 @@ EXPORTS.mozilla.dom += [
|
||||||
'DirectionalityUtils.h',
|
'DirectionalityUtils.h',
|
||||||
'DocGroup.h',
|
'DocGroup.h',
|
||||||
'DocumentFragment.h',
|
'DocumentFragment.h',
|
||||||
|
'DocumentOrShadowRoot.h',
|
||||||
'DocumentType.h',
|
'DocumentType.h',
|
||||||
'DOMCursor.h',
|
'DOMCursor.h',
|
||||||
'DOMError.h',
|
'DOMError.h',
|
||||||
|
@ -210,7 +211,6 @@ EXPORTS.mozilla.dom += [
|
||||||
'SimpleTreeIterator.h',
|
'SimpleTreeIterator.h',
|
||||||
'StructuredCloneHolder.h',
|
'StructuredCloneHolder.h',
|
||||||
'StructuredCloneTags.h',
|
'StructuredCloneTags.h',
|
||||||
'StyleScope.h',
|
|
||||||
'StyleSheetList.h',
|
'StyleSheetList.h',
|
||||||
'SubtleCrypto.h',
|
'SubtleCrypto.h',
|
||||||
'TabGroup.h',
|
'TabGroup.h',
|
||||||
|
@ -239,6 +239,7 @@ SOURCES += [
|
||||||
'DirectionalityUtils.cpp',
|
'DirectionalityUtils.cpp',
|
||||||
'DocGroup.cpp',
|
'DocGroup.cpp',
|
||||||
'DocumentFragment.cpp',
|
'DocumentFragment.cpp',
|
||||||
|
'DocumentOrShadowRoot.cpp',
|
||||||
'DocumentType.cpp',
|
'DocumentType.cpp',
|
||||||
'DOMCursor.cpp',
|
'DOMCursor.cpp',
|
||||||
'DOMError.cpp',
|
'DOMError.cpp',
|
||||||
|
@ -353,7 +354,6 @@ SOURCES += [
|
||||||
'ScreenOrientation.cpp',
|
'ScreenOrientation.cpp',
|
||||||
'ShadowRoot.cpp',
|
'ShadowRoot.cpp',
|
||||||
'StructuredCloneHolder.cpp',
|
'StructuredCloneHolder.cpp',
|
||||||
'StyleScope.cpp',
|
|
||||||
'StyleSheetList.cpp',
|
'StyleSheetList.cpp',
|
||||||
'SubtleCrypto.cpp',
|
'SubtleCrypto.cpp',
|
||||||
'TabGroup.cpp',
|
'TabGroup.cpp',
|
||||||
|
|
|
@ -3658,6 +3658,14 @@ nsContentUtils::ReportToConsole(uint32_t aErrorFlags,
|
||||||
aLineNumber, aColumnNumber);
|
aLineNumber, aColumnNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* static */ void
|
||||||
|
nsContentUtils::ReportEmptyGetElementByIdArg(const nsIDocument* aDoc)
|
||||||
|
{
|
||||||
|
ReportToConsole(nsIScriptError::warningFlag,
|
||||||
|
NS_LITERAL_CSTRING("DOM"), aDoc,
|
||||||
|
nsContentUtils::eDOM_PROPERTIES,
|
||||||
|
"EmptyGetElementByIdParam");
|
||||||
|
}
|
||||||
|
|
||||||
/* static */ nsresult
|
/* static */ nsresult
|
||||||
nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText,
|
nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText,
|
||||||
|
|
|
@ -941,6 +941,8 @@ public:
|
||||||
uint32_t aLineNumber = 0,
|
uint32_t aLineNumber = 0,
|
||||||
uint32_t aColumnNumber = 0);
|
uint32_t aColumnNumber = 0);
|
||||||
|
|
||||||
|
static void ReportEmptyGetElementByIdArg(const nsIDocument* aDoc);
|
||||||
|
|
||||||
static void LogMessageToConsole(const char* aMsg);
|
static void LogMessageToConsole(const char* aMsg);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -300,9 +300,24 @@ GetHttpChannelHelper(nsIChannel* aChannel, nsIHttpChannel** aHttpChannel)
|
||||||
|
|
||||||
#define NAME_NOT_VALID ((nsSimpleContentList*)1)
|
#define NAME_NOT_VALID ((nsSimpleContentList*)1)
|
||||||
|
|
||||||
|
nsIdentifierMapEntry::nsIdentifierMapEntry(const nsIdentifierMapEntry::AtomOrString& aKey)
|
||||||
|
: mKey(aKey)
|
||||||
|
{}
|
||||||
|
|
||||||
|
nsIdentifierMapEntry::nsIdentifierMapEntry(const nsIdentifierMapEntry::AtomOrString* aKey)
|
||||||
|
: mKey(aKey ? *aKey : nullptr)
|
||||||
|
{}
|
||||||
|
|
||||||
nsIdentifierMapEntry::~nsIdentifierMapEntry()
|
nsIdentifierMapEntry::~nsIdentifierMapEntry()
|
||||||
{
|
{}
|
||||||
}
|
|
||||||
|
nsIdentifierMapEntry::nsIdentifierMapEntry(nsIdentifierMapEntry&& aOther)
|
||||||
|
: mKey(mozilla::Move(aOther.mKey))
|
||||||
|
, mIdContentList(mozilla::Move(aOther.mIdContentList))
|
||||||
|
, mNameContentList(mozilla::Move(aOther.mNameContentList))
|
||||||
|
, mChangeCallbacks(mozilla::Move(aOther.mChangeCallbacks))
|
||||||
|
, mImageElement(mozilla::Move(aOther.mImageElement))
|
||||||
|
{}
|
||||||
|
|
||||||
void
|
void
|
||||||
nsIdentifierMapEntry::Traverse(nsCycleCollectionTraversalCallback* aCallback)
|
nsIdentifierMapEntry::Traverse(nsCycleCollectionTraversalCallback* aCallback)
|
||||||
|
@ -326,6 +341,12 @@ nsIdentifierMapEntry::IsEmpty()
|
||||||
!mChangeCallbacks && !mImageElement;
|
!mChangeCallbacks && !mImageElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
nsIdentifierMapEntry::HasNameElement() const
|
||||||
|
{
|
||||||
|
return mNameContentList && mNameContentList->Length() != 0;
|
||||||
|
}
|
||||||
|
|
||||||
Element*
|
Element*
|
||||||
nsIdentifierMapEntry::GetIdElement()
|
nsIdentifierMapEntry::GetIdElement()
|
||||||
{
|
{
|
||||||
|
@ -1226,6 +1247,7 @@ static already_AddRefed<mozilla::dom::NodeInfo> nullNodeInfo;
|
||||||
// ==================================================================
|
// ==================================================================
|
||||||
nsIDocument::nsIDocument()
|
nsIDocument::nsIDocument()
|
||||||
: nsINode(nullNodeInfo),
|
: nsINode(nullNodeInfo),
|
||||||
|
DocumentOrShadowRoot(this),
|
||||||
mReferrerPolicySet(false),
|
mReferrerPolicySet(false),
|
||||||
mReferrerPolicy(mozilla::net::RP_Default),
|
mReferrerPolicy(mozilla::net::RP_Default),
|
||||||
mBlockAllMixedContent(false),
|
mBlockAllMixedContent(false),
|
||||||
|
@ -3234,12 +3256,6 @@ nsDocument::GetElementsByClassName(const nsAString& aClasses,
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
nsIDocument::GetElementsByClassName(const nsAString& aClasses)
|
|
||||||
{
|
|
||||||
return nsContentUtils::GetElementsByClassName(this, aClasses);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDocument::ReleaseCapture()
|
nsDocument::ReleaseCapture()
|
||||||
{
|
{
|
||||||
|
@ -4729,32 +4745,7 @@ nsDocument::BeginLoad()
|
||||||
void
|
void
|
||||||
nsDocument::ReportEmptyGetElementByIdArg()
|
nsDocument::ReportEmptyGetElementByIdArg()
|
||||||
{
|
{
|
||||||
nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
|
nsContentUtils::ReportEmptyGetElementByIdArg(this);
|
||||||
NS_LITERAL_CSTRING("DOM"), this,
|
|
||||||
nsContentUtils::eDOM_PROPERTIES,
|
|
||||||
"EmptyGetElementByIdParam");
|
|
||||||
}
|
|
||||||
|
|
||||||
Element*
|
|
||||||
nsDocument::GetElementById(const nsAString& aElementId)
|
|
||||||
{
|
|
||||||
if (!CheckGetElementByIdArg(aElementId)) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsIdentifierMapEntry *entry = mIdentifierMap.GetEntry(aElementId);
|
|
||||||
return entry ? entry->GetIdElement() : nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
const nsTArray<Element*>*
|
|
||||||
nsDocument::GetAllElementsForId(const nsAString& aElementId) const
|
|
||||||
{
|
|
||||||
if (aElementId.IsEmpty()) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsIdentifierMapEntry *entry = mIdentifierMap.GetEntry(aElementId);
|
|
||||||
return entry ? &entry->GetIdElements() : nullptr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
|
@ -5646,27 +5637,6 @@ nsDocument::BlockedTrackingNodes() const
|
||||||
return list.forget();
|
return list.forget();
|
||||||
}
|
}
|
||||||
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
nsIDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
|
||||||
const nsAString& aLocalName,
|
|
||||||
ErrorResult& aResult)
|
|
||||||
{
|
|
||||||
int32_t nameSpaceId = kNameSpaceID_Wildcard;
|
|
||||||
|
|
||||||
if (!aNamespaceURI.EqualsLiteral("*")) {
|
|
||||||
aResult =
|
|
||||||
nsContentUtils::NameSpaceManager()->RegisterNameSpace(aNamespaceURI,
|
|
||||||
nameSpaceId);
|
|
||||||
if (aResult.Failed()) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_ASSERTION(nameSpaceId != kNameSpaceID_Unknown, "Unexpected namespace ID!");
|
|
||||||
|
|
||||||
return NS_GetContentList(this, nameSpaceId, aLocalName);
|
|
||||||
}
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
nsDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
||||||
const nsAString& aLocalName,
|
const nsAString& aLocalName,
|
||||||
|
@ -5674,7 +5644,7 @@ nsDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
||||||
{
|
{
|
||||||
ErrorResult rv;
|
ErrorResult rv;
|
||||||
RefPtr<nsContentList> list =
|
RefPtr<nsContentList> list =
|
||||||
nsIDocument::GetElementsByTagNameNS(aNamespaceURI, aLocalName, rv);
|
GetElementsByTagNameNS(aNamespaceURI, aLocalName, rv);
|
||||||
if (rv.Failed()) {
|
if (rv.Failed()) {
|
||||||
return rv.StealNSResult();
|
return rv.StealNSResult();
|
||||||
}
|
}
|
||||||
|
|
|
@ -333,7 +333,6 @@ class nsDocument : public nsIDocument,
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef mozilla::dom::Element Element;
|
typedef mozilla::dom::Element Element;
|
||||||
using nsIDocument::GetElementsByTagName;
|
|
||||||
typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
|
typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
|
||||||
|
|
||||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||||
|
@ -631,6 +630,11 @@ public:
|
||||||
// nsIDOMDocumentXBL
|
// nsIDOMDocumentXBL
|
||||||
NS_DECL_NSIDOMDOCUMENTXBL
|
NS_DECL_NSIDOMDOCUMENTXBL
|
||||||
|
|
||||||
|
using mozilla::dom::DocumentOrShadowRoot::GetElementById;
|
||||||
|
using mozilla::dom::DocumentOrShadowRoot::GetElementsByTagName;
|
||||||
|
using mozilla::dom::DocumentOrShadowRoot::GetElementsByTagNameNS;
|
||||||
|
using mozilla::dom::DocumentOrShadowRoot::GetElementsByClassName;
|
||||||
|
|
||||||
// nsIDOMEventTarget
|
// nsIDOMEventTarget
|
||||||
virtual nsresult GetEventTargetParent(
|
virtual nsresult GetEventTargetParent(
|
||||||
mozilla::EventChainPreVisitor& aVisitor) override;
|
mozilla::EventChainPreVisitor& aVisitor) override;
|
||||||
|
@ -819,10 +823,7 @@ public:
|
||||||
virtual void ResetScrolledToRefAlready() override;
|
virtual void ResetScrolledToRefAlready() override;
|
||||||
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) override;
|
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) override;
|
||||||
|
|
||||||
virtual Element *GetElementById(const nsAString& aElementId) override;
|
virtual Element* LookupImageElement(const nsAString& aElementId) override;
|
||||||
virtual const nsTArray<Element*>* GetAllElementsForId(const nsAString& aElementId) const override;
|
|
||||||
|
|
||||||
virtual Element *LookupImageElement(const nsAString& aElementId) override;
|
|
||||||
virtual void MozSetImageElement(const nsAString& aImageElementId,
|
virtual void MozSetImageElement(const nsAString& aImageElementId,
|
||||||
Element* aElement) override;
|
Element* aElement) override;
|
||||||
|
|
||||||
|
@ -1206,14 +1207,6 @@ public:
|
||||||
RefPtr<nsDOMStyleSheetSetList> mStyleSheetSetList;
|
RefPtr<nsDOMStyleSheetSetList> mStyleSheetSetList;
|
||||||
RefPtr<mozilla::dom::ScriptLoader> mScriptLoader;
|
RefPtr<mozilla::dom::ScriptLoader> mScriptLoader;
|
||||||
nsDocHeaderData* mHeaderData;
|
nsDocHeaderData* mHeaderData;
|
||||||
/* mIdentifierMap works as follows for IDs:
|
|
||||||
* 1) Attribute changes affect the table immediately (removing and adding
|
|
||||||
* entries as needed).
|
|
||||||
* 2) Removals from the DOM affect the table immediately
|
|
||||||
* 3) Additions to the DOM always update existing entries for names, and add
|
|
||||||
* new ones for IDs.
|
|
||||||
*/
|
|
||||||
nsTHashtable<nsIdentifierMapEntry> mIdentifierMap;
|
|
||||||
|
|
||||||
nsClassHashtable<nsStringHashKey, nsRadioGroupStruct> mRadioGroups;
|
nsClassHashtable<nsStringHashKey, nsRadioGroupStruct> mRadioGroups;
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include "prclist.h"
|
#include "prclist.h"
|
||||||
#include "mozilla/UniquePtr.h"
|
#include "mozilla/UniquePtr.h"
|
||||||
#include "mozilla/CORSMode.h"
|
#include "mozilla/CORSMode.h"
|
||||||
#include "mozilla/dom/StyleScope.h"
|
#include "mozilla/dom/DocumentOrShadowRoot.h"
|
||||||
#include "mozilla/LinkedList.h"
|
#include "mozilla/LinkedList.h"
|
||||||
#include "mozilla/StyleBackendType.h"
|
#include "mozilla/StyleBackendType.h"
|
||||||
#include "mozilla/StyleSheet.h"
|
#include "mozilla/StyleSheet.h"
|
||||||
|
@ -198,7 +198,7 @@ class nsContentList;
|
||||||
// Document interface. This is implemented by all document objects in
|
// Document interface. This is implemented by all document objects in
|
||||||
// Gecko.
|
// Gecko.
|
||||||
class nsIDocument : public nsINode,
|
class nsIDocument : public nsINode,
|
||||||
public mozilla::dom::StyleScope
|
public mozilla::dom::DocumentOrShadowRoot
|
||||||
{
|
{
|
||||||
typedef mozilla::dom::GlobalObject GlobalObject;
|
typedef mozilla::dom::GlobalObject GlobalObject;
|
||||||
|
|
||||||
|
@ -1071,14 +1071,9 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void EnsureOnDemandBuiltInUASheet(mozilla::StyleSheet* aSheet) = 0;
|
virtual void EnsureOnDemandBuiltInUASheet(mozilla::StyleSheet* aSheet) = 0;
|
||||||
|
|
||||||
nsINode& AsNode() final
|
|
||||||
{
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
mozilla::dom::StyleSheetList* StyleSheets()
|
mozilla::dom::StyleSheetList* StyleSheets()
|
||||||
{
|
{
|
||||||
return &StyleScope::EnsureDOMStyleSheets();
|
return &DocumentOrShadowRoot::EnsureDOMStyleSheets();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2362,19 +2357,10 @@ public:
|
||||||
virtual void ResetScrolledToRefAlready() = 0;
|
virtual void ResetScrolledToRefAlready() = 0;
|
||||||
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) = 0;
|
virtual void SetChangeScrollPosWhenScrollingToRef(bool aValue) = 0;
|
||||||
|
|
||||||
/**
|
using mozilla::dom::DocumentOrShadowRoot::GetElementById;
|
||||||
* This method is similar to GetElementById() from nsIDOMDocument but it
|
using mozilla::dom::DocumentOrShadowRoot::GetElementsByTagName;
|
||||||
* returns a mozilla::dom::Element instead of a nsIDOMElement.
|
using mozilla::dom::DocumentOrShadowRoot::GetElementsByTagNameNS;
|
||||||
* It prevents converting nsIDOMElement to mozilla::dom::Element which is
|
using mozilla::dom::DocumentOrShadowRoot::GetElementsByClassName;
|
||||||
* already converted from mozilla::dom::Element.
|
|
||||||
*/
|
|
||||||
virtual Element* GetElementById(const nsAString& aElementId) = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This method returns _all_ the elements in this document which
|
|
||||||
* have id aElementId, if there are any. Otherwise it returns null.
|
|
||||||
*/
|
|
||||||
virtual const nsTArray<Element*>* GetAllElementsForId(const nsAString& aElementId) const = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lookup an image element using its associated ID, which is usually provided
|
* Lookup an image element using its associated ID, which is usually provided
|
||||||
|
@ -2574,18 +2560,6 @@ public:
|
||||||
|
|
||||||
nsIDocument* GetTopLevelContentDocument();
|
nsIDocument* GetTopLevelContentDocument();
|
||||||
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
GetElementsByTagName(const nsAString& aTagName)
|
|
||||||
{
|
|
||||||
return NS_GetContentList(this, kNameSpaceID_Unknown, aTagName);
|
|
||||||
}
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
GetElementsByTagNameNS(const nsAString& aNamespaceURI,
|
|
||||||
const nsAString& aLocalName,
|
|
||||||
mozilla::ErrorResult& aResult);
|
|
||||||
already_AddRefed<nsContentList>
|
|
||||||
GetElementsByClassName(const nsAString& aClasses);
|
|
||||||
// GetElementById defined above
|
|
||||||
virtual already_AddRefed<Element>
|
virtual already_AddRefed<Element>
|
||||||
CreateElement(const nsAString& aTagName,
|
CreateElement(const nsAString& aTagName,
|
||||||
const mozilla::dom::ElementCreationOptionsOrString& aOptions,
|
const mozilla::dom::ElementCreationOptionsOrString& aOptions,
|
||||||
|
|
|
@ -15,18 +15,24 @@
|
||||||
|
|
||||||
#include "mozilla/MemoryReporting.h"
|
#include "mozilla/MemoryReporting.h"
|
||||||
#include "mozilla/Move.h"
|
#include "mozilla/Move.h"
|
||||||
#include "mozilla/dom/Element.h"
|
|
||||||
#include "mozilla/net/ReferrerPolicy.h"
|
#include "mozilla/net/ReferrerPolicy.h"
|
||||||
|
|
||||||
#include "nsCOMArray.h"
|
#include "nsCOMArray.h"
|
||||||
#include "nsCOMPtr.h"
|
#include "nsCOMPtr.h"
|
||||||
#include "nsContentList.h"
|
|
||||||
#include "nsIAtom.h"
|
#include "nsIAtom.h"
|
||||||
#include "nsIDocument.h"
|
|
||||||
#include "nsTArray.h"
|
#include "nsTArray.h"
|
||||||
#include "nsTHashtable.h"
|
#include "nsTHashtable.h"
|
||||||
|
#include "nsHashKeys.h"
|
||||||
|
|
||||||
class nsIContent;
|
class nsIContent;
|
||||||
|
class nsContentList;
|
||||||
|
class nsBaseContentList;
|
||||||
|
|
||||||
|
namespace mozilla {
|
||||||
|
namespace dom {
|
||||||
|
class Element;
|
||||||
|
} // namespace dom
|
||||||
|
} // namespace mozilla
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Right now our identifier map entries contain information for 'name'
|
* Right now our identifier map entries contain information for 'name'
|
||||||
|
@ -42,6 +48,16 @@ class nsIContent;
|
||||||
*/
|
*/
|
||||||
class nsIdentifierMapEntry : public PLDHashEntryHdr
|
class nsIdentifierMapEntry : public PLDHashEntryHdr
|
||||||
{
|
{
|
||||||
|
typedef mozilla::dom::Element Element;
|
||||||
|
typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see nsIDocument::IDTargetObserver, this is just here to avoid include
|
||||||
|
* hell.
|
||||||
|
*/
|
||||||
|
typedef bool (* IDTargetObserver)(Element* aOldElement,
|
||||||
|
Element* aNewelement, void* aData);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
struct AtomOrString
|
struct AtomOrString
|
||||||
{
|
{
|
||||||
|
@ -66,25 +82,9 @@ public:
|
||||||
typedef const AtomOrString& KeyType;
|
typedef const AtomOrString& KeyType;
|
||||||
typedef const AtomOrString* KeyTypePointer;
|
typedef const AtomOrString* KeyTypePointer;
|
||||||
|
|
||||||
typedef mozilla::dom::Element Element;
|
explicit nsIdentifierMapEntry(const AtomOrString& aKey);
|
||||||
typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
|
explicit nsIdentifierMapEntry(const AtomOrString* aKey);
|
||||||
|
nsIdentifierMapEntry(nsIdentifierMapEntry&& aOther);
|
||||||
explicit nsIdentifierMapEntry(const AtomOrString& aKey)
|
|
||||||
: mKey(aKey)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
explicit nsIdentifierMapEntry(const AtomOrString* aKey)
|
|
||||||
: mKey(aKey ? *aKey : nullptr)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
nsIdentifierMapEntry(nsIdentifierMapEntry&& aOther) :
|
|
||||||
mKey(mozilla::Move(aOther.GetKey())),
|
|
||||||
mIdContentList(mozilla::Move(aOther.mIdContentList)),
|
|
||||||
mNameContentList(aOther.mNameContentList.forget()),
|
|
||||||
mChangeCallbacks(aOther.mChangeCallbacks.forget()),
|
|
||||||
mImageElement(aOther.mImageElement.forget())
|
|
||||||
{
|
|
||||||
}
|
|
||||||
~nsIdentifierMapEntry();
|
~nsIdentifierMapEntry();
|
||||||
|
|
||||||
KeyType GetKey() const { return mKey; }
|
KeyType GetKey() const { return mKey; }
|
||||||
|
@ -131,9 +131,7 @@ public:
|
||||||
nsBaseContentList* GetNameContentList() {
|
nsBaseContentList* GetNameContentList() {
|
||||||
return mNameContentList;
|
return mNameContentList;
|
||||||
}
|
}
|
||||||
bool HasNameElement() const {
|
bool HasNameElement() const;
|
||||||
return mNameContentList && mNameContentList->Length() != 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the element if we know the element associated with this
|
* Returns the element if we know the element associated with this
|
||||||
|
@ -173,9 +171,9 @@ public:
|
||||||
bool HasIdElementExposedAsHTMLDocumentProperty();
|
bool HasIdElementExposedAsHTMLDocumentProperty();
|
||||||
|
|
||||||
bool HasContentChangeCallback() { return mChangeCallbacks != nullptr; }
|
bool HasContentChangeCallback() { return mChangeCallbacks != nullptr; }
|
||||||
void AddContentChangeCallback(nsIDocument::IDTargetObserver aCallback,
|
void AddContentChangeCallback(IDTargetObserver aCallback,
|
||||||
void* aData, bool aForImage);
|
void* aData, bool aForImage);
|
||||||
void RemoveContentChangeCallback(nsIDocument::IDTargetObserver aCallback,
|
void RemoveContentChangeCallback(IDTargetObserver aCallback,
|
||||||
void* aData, bool aForImage);
|
void* aData, bool aForImage);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -186,7 +184,7 @@ public:
|
||||||
void Traverse(nsCycleCollectionTraversalCallback* aCallback);
|
void Traverse(nsCycleCollectionTraversalCallback* aCallback);
|
||||||
|
|
||||||
struct ChangeCallback {
|
struct ChangeCallback {
|
||||||
nsIDocument::IDTargetObserver mCallback;
|
IDTargetObserver mCallback;
|
||||||
void* mData;
|
void* mData;
|
||||||
bool mForImage;
|
bool mForImage;
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,13 +10,13 @@
|
||||||
#include "nsDataHashtable.h"
|
#include "nsDataHashtable.h"
|
||||||
#include "nsHashKeys.h"
|
#include "nsHashKeys.h"
|
||||||
#include "nsIAtom.h"
|
#include "nsIAtom.h"
|
||||||
#include "nsIDocument.h"
|
|
||||||
#include "nsIObserver.h"
|
#include "nsIObserver.h"
|
||||||
#include "nsTArray.h"
|
#include "nsTArray.h"
|
||||||
|
|
||||||
#include "mozilla/StaticPtr.h"
|
#include "mozilla/StaticPtr.h"
|
||||||
|
|
||||||
class nsAString;
|
class nsAString;
|
||||||
|
class nsIDocument;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Name Space Manager tracks the association between a NameSpace
|
* The Name Space Manager tracks the association between a NameSpace
|
||||||
|
|
|
@ -155,10 +155,7 @@ public:
|
||||||
|
|
||||||
virtual void RemovedFromDocShell() override;
|
virtual void RemovedFromDocShell() override;
|
||||||
|
|
||||||
virtual mozilla::dom::Element *GetElementById(const nsAString& aElementId) override
|
using mozilla::dom::DocumentOrShadowRoot::GetElementById;
|
||||||
{
|
|
||||||
return nsDocument::GetElementById(aElementId);
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void DocAddSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const override;
|
virtual void DocAddSizeOfExcludingThis(nsWindowSizes* aWindowSizes) const override;
|
||||||
// DocAddSizeOfIncludingThis is inherited from nsIDocument.
|
// DocAddSizeOfIncludingThis is inherited from nsIDocument.
|
||||||
|
|
|
@ -1578,24 +1578,13 @@ XULDocument::GetCommandDispatcher(nsIDOMXULCommandDispatcher** aTracker)
|
||||||
}
|
}
|
||||||
|
|
||||||
Element*
|
Element*
|
||||||
XULDocument::GetElementById(const nsAString& aId)
|
XULDocument::GetRefById(const nsAString& aID)
|
||||||
{
|
{
|
||||||
if (!CheckGetElementByIdArg(aId))
|
if (nsRefMapEntry* refEntry = mRefMap.GetEntry(aID)) {
|
||||||
return nullptr;
|
MOZ_ASSERT(refEntry->GetFirstElement());
|
||||||
|
|
||||||
nsIdentifierMapEntry *entry = mIdentifierMap.GetEntry(aId);
|
|
||||||
if (entry) {
|
|
||||||
Element* element = entry->GetIdElement();
|
|
||||||
if (element)
|
|
||||||
return element;
|
|
||||||
}
|
|
||||||
|
|
||||||
nsRefMapEntry* refEntry = mRefMap.GetEntry(aId);
|
|
||||||
if (refEntry) {
|
|
||||||
NS_ASSERTION(refEntry->GetFirstElement(),
|
|
||||||
"nsRefMapEntries should have nonempty content lists");
|
|
||||||
return refEntry->GetFirstElement();
|
return refEntry->GetFirstElement();
|
||||||
}
|
}
|
||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -148,6 +148,7 @@ public:
|
||||||
using nsDocument::CreateElementNS;
|
using nsDocument::CreateElementNS;
|
||||||
NS_FORWARD_NSIDOMDOCUMENT(XMLDocument::)
|
NS_FORWARD_NSIDOMDOCUMENT(XMLDocument::)
|
||||||
// And explicitly import the things from nsDocument that we just shadowed
|
// And explicitly import the things from nsDocument that we just shadowed
|
||||||
|
using mozilla::dom::DocumentOrShadowRoot::GetElementById;
|
||||||
using nsDocument::GetImplementation;
|
using nsDocument::GetImplementation;
|
||||||
using nsDocument::GetTitle;
|
using nsDocument::GetTitle;
|
||||||
using nsDocument::SetTitle;
|
using nsDocument::SetTitle;
|
||||||
|
@ -156,8 +157,8 @@ public:
|
||||||
using nsDocument::GetMozFullScreenElement;
|
using nsDocument::GetMozFullScreenElement;
|
||||||
using nsIDocument::GetLocation;
|
using nsIDocument::GetLocation;
|
||||||
|
|
||||||
// nsDocument interface overrides
|
// Helper for StyleScope::GetElementById.
|
||||||
virtual Element* GetElementById(const nsAString & elementId) override;
|
Element* GetRefById(const nsAString & elementId);
|
||||||
|
|
||||||
// nsIDOMXULDocument interface
|
// nsIDOMXULDocument interface
|
||||||
NS_DECL_NSIDOMXULDOCUMENT
|
NS_DECL_NSIDOMXULDOCUMENT
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "nsCharTraits.h"
|
#include "nsCharTraits.h"
|
||||||
#include "nsComponentManagerUtils.h"
|
#include "nsComponentManagerUtils.h"
|
||||||
#include "nsContentCID.h"
|
#include "nsContentCID.h"
|
||||||
|
#include "nsContentList.h"
|
||||||
#include "nsCopySupport.h"
|
#include "nsCopySupport.h"
|
||||||
#include "nsDebug.h"
|
#include "nsDebug.h"
|
||||||
#include "nsDependentSubstring.h"
|
#include "nsDependentSubstring.h"
|
||||||
|
|
Loading…
Reference in New Issue