Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: Source/core/dom/Document.h

Issue 262093006: Oilpan: Make the Node hierarchy RefCountedGarbageCollected instead of TreeShared. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Another build fix. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/Document.h
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h
index 3f9fa705b4c84da80450dddbfc7bbadb66160586..b13123eda3febd51c069b1bd96057cc2ba55ba04 100644
--- a/Source/core/dom/Document.h
+++ b/Source/core/dom/Document.h
@@ -834,7 +834,7 @@ public:
void popCurrentScript();
void applyXSLTransform(ProcessingInstruction* pi);
- PassRefPtr<Document> transformSourceDocument() { return m_transformSourceDocument; }
+ PassRefPtrWillBeRawPtr<Document> transformSourceDocument() { return m_transformSourceDocument; }
void setTransformSourceDocument(Document* doc) { m_transformSourceDocument = doc; }
void setTransformSource(PassOwnPtr<TransformSource>);
@@ -1026,7 +1026,7 @@ public:
void addToTopLayer(Element*, const Element* before = 0);
void removeFromTopLayer(Element*);
- const Vector<RefPtr<Element> >& topLayerElements() const { return m_topLayerElements; }
+ const WillBeHeapVector<RefPtrWillBeMember<Element> >& topLayerElements() const { return m_topLayerElements; }
HTMLDialogElement* activeModalDialog() const;
// A non-null m_templateDocumentHost implies that |this| was created by ensureTemplateDocument().
@@ -1045,6 +1045,7 @@ public:
DocumentLifecycle& lifecycle() { return m_lifecycle; }
bool isActive() const { return m_lifecycle.isActive(); }
bool isStopped() const { return m_lifecycle.state() == DocumentLifecycle::Stopped; }
+ bool isDisposed() const { return m_lifecycle.state() == DocumentLifecycle::Disposed; }
enum HttpRefreshType {
HttpRefreshFromHeader,
@@ -1208,10 +1209,10 @@ private:
// Mime-type of the document in case it was cloned or created by XHR.
AtomicString m_mimeType;
- RefPtr<DocumentType> m_docType;
+ RefPtrWillBeMember<DocumentType> m_docType;
OwnPtr<DOMImplementation> m_implementation;
- RefPtrWillBePersistent<CSSStyleSheet> m_elemSheet;
+ RefPtrWillBeMember<CSSStyleSheet> m_elemSheet;
bool m_printing;
bool m_paginatedForScreen;
@@ -1221,11 +1222,11 @@ private:
bool m_hasAutofocused;
Timer<Document> m_clearFocusedElementTimer;
- RefPtr<Element> m_autofocusElement;
- RefPtr<Element> m_focusedElement;
- RefPtr<Node> m_hoverNode;
- RefPtr<Element> m_activeHoverElement;
- RefPtr<Element> m_documentElement;
+ RefPtrWillBeMember<Element> m_autofocusElement;
+ RefPtrWillBeMember<Element> m_focusedElement;
+ RefPtrWillBeMember<Node> m_hoverNode;
+ RefPtrWillBeMember<Element> m_activeHoverElement;
+ RefPtrWillBeMember<Element> m_documentElement;
UserActionElementSet m_userActionElements;
uint64_t m_domTreeVersion;
@@ -1238,7 +1239,7 @@ private:
MutationObserverOptions m_mutationObserverTypes;
- OwnPtrWillBePersistent<StyleEngine> m_styleEngine;
+ OwnPtrWillBeMember<StyleEngine> m_styleEngine;
RefPtrWillBeMember<StyleSheetList> m_styleSheetList;
OwnPtr<FormController> m_formController;
@@ -1263,7 +1264,7 @@ private:
String m_title;
String m_rawTitle;
bool m_titleSetExplicitly;
- RefPtr<Element> m_titleElement;
+ RefPtrWillBeMember<Element> m_titleElement;
OwnPtr<AXObjectCache> m_axObjectCache;
OwnPtr<DocumentMarkerController> m_markers;
@@ -1278,10 +1279,10 @@ private:
OwnPtr<ScriptRunner> m_scriptRunner;
- Vector<RefPtr<HTMLScriptElement> > m_currentScriptStack;
+ WillBeHeapVector<RefPtrWillBeMember<HTMLScriptElement> > m_currentScriptStack;
OwnPtr<TransformSource> m_transformSource;
- RefPtr<Document> m_transformSourceDocument;
+ RefPtrWillBeMember<Document> m_transformSourceDocument;
String m_xmlEncoding;
String m_xmlVersion;
@@ -1303,7 +1304,7 @@ private:
bool m_hasAnnotatedRegions;
bool m_annotatedRegionsDirty;
- HashMap<String, RefPtr<HTMLCanvasElement> > m_cssCanvasElements;
+ WillBeHeapHashMap<String, RefPtrWillBeMember<HTMLCanvasElement> > m_cssCanvasElements;
OwnPtr<SelectorQueryCache> m_selectorQueryCache;
@@ -1323,7 +1324,7 @@ private:
bool m_hasFullscreenElementStack; // For early return in FullscreenElementStack::fromIfExists()
- Vector<RefPtr<Element> > m_topLayerElements;
+ WillBeHeapVector<RefPtrWillBeMember<Element> > m_topLayerElements;
int m_loadEventDelayCount;
Timer<Document> m_loadEventDelayTimer;
@@ -1369,11 +1370,11 @@ private:
RefPtr<DocumentTimeline> m_transitionTimeline;
CompositorPendingAnimations m_compositorPendingAnimations;
- RefPtr<Document> m_templateDocument;
- Document* m_templateDocumentHost; // Manually managed weakref (backpointer from m_templateDocument).
+ RefPtrWillBeMember<Document> m_templateDocument;
+ RawPtrWillBeMember<Document> m_templateDocumentHost; // Manually managed weakref (backpointer from m_templateDocument).
haraken 2014/05/06 15:59:42 Nit: "weakref" is confusing. This is just a back,
Mads Ager (chromium) 2014/05/07 12:13:16 Yeah, I kept the comment for the non-oilpan build.
Timer<Document> m_didAssociateFormControlsTimer;
- HashSet<RefPtr<Element> > m_associatedFormControls;
+ WillBeHeapHashSet<RefPtrWillBeMember<Element> > m_associatedFormControls;
HashSet<SVGUseElement*> m_useElementsNeedingUpdate;
HashSet<Element*> m_layerUpdateElements;

Powered by Google App Engine
This is Rietveld 408576698