summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
Diffstat (limited to 'dom')
-rw-r--r--dom/base/ShadowRoot.cpp2
-rw-r--r--dom/base/ShadowRoot.h3
-rwxr-xr-xdom/base/moz.build1
-rw-r--r--dom/base/nsDocument.h146
-rw-r--r--dom/base/nsIdentifierMapEntry.h170
-rw-r--r--dom/ipc/ContentChild.cpp1
6 files changed, 177 insertions, 146 deletions
diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp
index c4e56f3fb..2383c951a 100644
--- a/dom/base/ShadowRoot.cpp
+++ b/dom/base/ShadowRoot.cpp
@@ -15,7 +15,9 @@
#include "nsIStyleSheetLinkingElement.h"
#include "mozilla/dom/Element.h"
#include "mozilla/dom/HTMLSlotElement.h"
+#include "mozilla/dom/StyleSheetList.h"
#include "nsXBLPrototypeBinding.h"
+#include "mozilla/BasicEvents.h"
#include "mozilla/EventDispatcher.h"
#include "mozilla/StyleSheet.h"
#include "mozilla/StyleSheetInlines.h"
diff --git a/dom/base/ShadowRoot.h b/dom/base/ShadowRoot.h
index a24c8138e..21c6e1733 100644
--- a/dom/base/ShadowRoot.h
+++ b/dom/base/ShadowRoot.h
@@ -12,8 +12,9 @@
#include "nsCOMPtr.h"
#include "nsCycleCollectionParticipant.h"
#include "nsIContentInlines.h"
+#include "nsIdentifierMapEntry.h"
#include "nsTHashtable.h"
-#include "nsDocument.h"
+#include "nsXBLBinding.h"
class nsIAtom;
class nsIContent;
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 5acb49d4e..ab0f0e0ab 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -86,6 +86,7 @@ EXPORTS += [
'nsIContentInlines.h',
'nsIContentIterator.h',
'nsIContentSerializer.h',
+ 'nsIdentifierMapEntry.h',
'nsIDocument.h',
'nsIDocumentInlines.h',
'nsIDocumentObserver.h',
diff --git a/dom/base/nsDocument.h b/dom/base/nsDocument.h
index 6520d905d..6baf40270 100644
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@@ -19,6 +19,7 @@
#include "nsWeakReference.h"
#include "nsWeakPtr.h"
#include "nsTArray.h"
+#include "nsIdentifierMapEntry.h"
#include "nsIDOMDocument.h"
#include "nsIDOMDocumentXBL.h"
#include "nsStubDocumentObserver.h"
@@ -130,151 +131,6 @@ public:
} // namespace dom
} // namespace mozilla
-/**
- * Right now our identifier map entries contain information for 'name'
- * and 'id' mappings of a given string. This is so that
- * nsHTMLDocument::ResolveName only has to do one hash lookup instead
- * of two. It's not clear whether this still matters for performance.
- *
- * We also store the document.all result list here. This is mainly so that
- * when all elements with the given ID are removed and we remove
- * the ID's nsIdentifierMapEntry, the document.all result is released too.
- * Perhaps the document.all results should have their own hashtable
- * in nsHTMLDocument.
- */
-class nsIdentifierMapEntry : public nsStringHashKey
-{
-public:
- typedef mozilla::dom::Element Element;
- typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
-
- explicit nsIdentifierMapEntry(const nsAString& aKey) :
- nsStringHashKey(&aKey), mNameContentList(nullptr)
- {
- }
- explicit nsIdentifierMapEntry(const nsAString* aKey) :
- nsStringHashKey(aKey), mNameContentList(nullptr)
- {
- }
- nsIdentifierMapEntry(const nsIdentifierMapEntry& aOther) :
- nsStringHashKey(&aOther.GetKey())
- {
- NS_ERROR("Should never be called");
- }
- ~nsIdentifierMapEntry();
-
- void AddNameElement(nsINode* aDocument, Element* aElement);
- void RemoveNameElement(Element* aElement);
- bool IsEmpty();
- nsBaseContentList* GetNameContentList() {
- return mNameContentList;
- }
- bool HasNameElement() const {
- return mNameContentList && mNameContentList->Length() != 0;
- }
-
- /**
- * Returns the element if we know the element associated with this
- * id. Otherwise returns null.
- */
- Element* GetIdElement();
- /**
- * Returns the list of all elements associated with this id.
- */
- const nsTArray<Element*>& GetIdElements() const {
- return mIdContentList;
- }
- /**
- * If this entry has a non-null image element set (using SetImageElement),
- * the image element will be returned, otherwise the same as GetIdElement().
- */
- Element* GetImageIdElement();
- /**
- * Append all the elements with this id to aElements
- */
- void AppendAllIdContent(nsCOMArray<nsIContent>* aElements);
- /**
- * This can fire ID change callbacks.
- * @return true if the content could be added, false if we failed due
- * to OOM.
- */
- bool AddIdElement(Element* aElement);
- /**
- * This can fire ID change callbacks.
- */
- void RemoveIdElement(Element* aElement);
- /**
- * Set the image element override for this ID. This will be returned by
- * GetIdElement(true) if non-null.
- */
- void SetImageElement(Element* aElement);
- bool HasIdElementExposedAsHTMLDocumentProperty();
-
- bool HasContentChangeCallback() { return mChangeCallbacks != nullptr; }
- void AddContentChangeCallback(nsIDocument::IDTargetObserver aCallback,
- void* aData, bool aForImage);
- void RemoveContentChangeCallback(nsIDocument::IDTargetObserver aCallback,
- void* aData, bool aForImage);
-
- /**
- * Remove all elements and notify change listeners.
- */
- void ClearAndNotify();
-
- void Traverse(nsCycleCollectionTraversalCallback* aCallback);
-
- struct ChangeCallback {
- nsIDocument::IDTargetObserver mCallback;
- void* mData;
- bool mForImage;
- };
-
- struct ChangeCallbackEntry : public PLDHashEntryHdr {
- typedef const ChangeCallback KeyType;
- typedef const ChangeCallback* KeyTypePointer;
-
- explicit ChangeCallbackEntry(const ChangeCallback* aKey) :
- mKey(*aKey) { }
- ChangeCallbackEntry(const ChangeCallbackEntry& toCopy) :
- mKey(toCopy.mKey) { }
-
- KeyType GetKey() const { return mKey; }
- bool KeyEquals(KeyTypePointer aKey) const {
- return aKey->mCallback == mKey.mCallback &&
- aKey->mData == mKey.mData &&
- aKey->mForImage == mKey.mForImage;
- }
-
- static KeyTypePointer KeyToPointer(KeyType& aKey) { return &aKey; }
- static PLDHashNumber HashKey(KeyTypePointer aKey)
- {
- return mozilla::HashGeneric(aKey->mCallback, aKey->mData);
- }
- enum { ALLOW_MEMMOVE = true };
-
- ChangeCallback mKey;
- };
-
- size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
-
-private:
- void FireChangeCallbacks(Element* aOldElement, Element* aNewElement,
- bool aImageOnly = false);
-
- // empty if there are no elements with this ID.
- // The elements are stored as weak pointers.
- nsTArray<Element*> mIdContentList;
- RefPtr<nsBaseContentList> mNameContentList;
- nsAutoPtr<nsTHashtable<ChangeCallbackEntry> > mChangeCallbacks;
- RefPtr<Element> mImageElement;
-};
-
-namespace mozilla {
-namespace dom {
-
-} // namespace dom
-} // namespace mozilla
-
class nsDocHeaderData
{
public:
diff --git a/dom/base/nsIdentifierMapEntry.h b/dom/base/nsIdentifierMapEntry.h
new file mode 100644
index 000000000..fce506cef
--- /dev/null
+++ b/dom/base/nsIdentifierMapEntry.h
@@ -0,0 +1,170 @@
+/* -*- 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/. */
+
+/*
+ * Base class for all our document implementations.
+ */
+
+#ifndef nsIdentifierMapEntry_h
+#define nsIdentifierMapEntry_h
+
+#include "PLDHashTable.h"
+
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/Move.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/net/ReferrerPolicy.h"
+
+#include "nsCOMArray.h"
+#include "nsCOMPtr.h"
+#include "nsContentList.h"
+#include "nsIAtom.h"
+#include "nsIDocument.h"
+#include "nsTArray.h"
+#include "nsTHashtable.h"
+
+class nsIContent;
+
+/**
+ * Right now our identifier map entries contain information for 'name'
+ * and 'id' mappings of a given string. This is so that
+ * nsHTMLDocument::ResolveName only has to do one hash lookup instead
+ * of two. It's not clear whether this still matters for performance.
+ *
+ * We also store the document.all result list here. This is mainly so that
+ * when all elements with the given ID are removed and we remove
+ * the ID's nsIdentifierMapEntry, the document.all result is released too.
+ * Perhaps the document.all results should have their own hashtable
+ * in nsHTMLDocument.
+ */
+class nsIdentifierMapEntry : public nsStringHashKey
+{
+public:
+ typedef mozilla::dom::Element Element;
+ typedef mozilla::net::ReferrerPolicy ReferrerPolicy;
+
+ explicit nsIdentifierMapEntry(const nsAString& aKey) :
+ nsStringHashKey(&aKey), mNameContentList(nullptr)
+ {
+ }
+ explicit nsIdentifierMapEntry(const nsAString* aKey) :
+ nsStringHashKey(aKey), mNameContentList(nullptr)
+ {
+ }
+ nsIdentifierMapEntry(const nsIdentifierMapEntry& aOther) :
+ nsStringHashKey(&aOther.GetKey())
+ {
+ NS_ERROR("Should never be called");
+ }
+ ~nsIdentifierMapEntry();
+
+ void AddNameElement(nsINode* aDocument, Element* aElement);
+ void RemoveNameElement(Element* aElement);
+ bool IsEmpty();
+ nsBaseContentList* GetNameContentList() {
+ return mNameContentList;
+ }
+ bool HasNameElement() const {
+ return mNameContentList && mNameContentList->Length() != 0;
+ }
+
+ /**
+ * Returns the element if we know the element associated with this
+ * id. Otherwise returns null.
+ */
+ Element* GetIdElement();
+ /**
+ * Returns the list of all elements associated with this id.
+ */
+ const nsTArray<Element*>& GetIdElements() const {
+ return mIdContentList;
+ }
+ /**
+ * If this entry has a non-null image element set (using SetImageElement),
+ * the image element will be returned, otherwise the same as GetIdElement().
+ */
+ Element* GetImageIdElement();
+ /**
+ * Append all the elements with this id to aElements
+ */
+ void AppendAllIdContent(nsCOMArray<nsIContent>* aElements);
+ /**
+ * This can fire ID change callbacks.
+ * @return true if the content could be added, false if we failed due
+ * to OOM.
+ */
+ bool AddIdElement(Element* aElement);
+ /**
+ * This can fire ID change callbacks.
+ */
+ void RemoveIdElement(Element* aElement);
+ /**
+ * Set the image element override for this ID. This will be returned by
+ * GetIdElement(true) if non-null.
+ */
+ void SetImageElement(Element* aElement);
+ bool HasIdElementExposedAsHTMLDocumentProperty();
+
+ bool HasContentChangeCallback() { return mChangeCallbacks != nullptr; }
+ void AddContentChangeCallback(nsIDocument::IDTargetObserver aCallback,
+ void* aData, bool aForImage);
+ void RemoveContentChangeCallback(nsIDocument::IDTargetObserver aCallback,
+ void* aData, bool aForImage);
+
+ /**
+ * Remove all elements and notify change listeners.
+ */
+ void ClearAndNotify();
+
+ void Traverse(nsCycleCollectionTraversalCallback* aCallback);
+
+ struct ChangeCallback {
+ nsIDocument::IDTargetObserver mCallback;
+ void* mData;
+ bool mForImage;
+ };
+
+ struct ChangeCallbackEntry : public PLDHashEntryHdr {
+ typedef const ChangeCallback KeyType;
+ typedef const ChangeCallback* KeyTypePointer;
+
+ explicit ChangeCallbackEntry(const ChangeCallback* aKey) :
+ mKey(*aKey) { }
+ ChangeCallbackEntry(const ChangeCallbackEntry& toCopy) :
+ mKey(toCopy.mKey) { }
+
+ KeyType GetKey() const { return mKey; }
+ bool KeyEquals(KeyTypePointer aKey) const {
+ return aKey->mCallback == mKey.mCallback &&
+ aKey->mData == mKey.mData &&
+ aKey->mForImage == mKey.mForImage;
+ }
+
+ static KeyTypePointer KeyToPointer(KeyType& aKey) { return &aKey; }
+ static PLDHashNumber HashKey(KeyTypePointer aKey)
+ {
+ return mozilla::HashGeneric(aKey->mCallback, aKey->mData);
+ }
+ enum { ALLOW_MEMMOVE = true };
+
+ ChangeCallback mKey;
+ };
+
+ size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
+
+private:
+ void FireChangeCallbacks(Element* aOldElement, Element* aNewElement,
+ bool aImageOnly = false);
+
+ // empty if there are no elements with this ID.
+ // The elements are stored as weak pointers.
+ nsTArray<Element*> mIdContentList;
+ RefPtr<nsBaseContentList> mNameContentList;
+ nsAutoPtr<nsTHashtable<ChangeCallbackEntry> > mChangeCallbacks;
+ RefPtr<Element> mImageElement;
+};
+
+#endif // #ifndef nsIdentifierMapEntry_h
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 6b914372b..69f7a3ba2 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -67,6 +67,7 @@
#include "mozInlineSpellChecker.h"
#include "nsDocShell.h"
#include "nsIConsoleListener.h"
+#include "nsIContentViewer.h"
#include "nsICycleCollectorListener.h"
#include "nsIIdlePeriod.h"
#include "nsIDragService.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 03:42:06 +0000