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

Unified Diff: third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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: third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h
diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h
index cf17ea363e54f0f07374f9bb32d0c8975b42d9c6..8f253cc5c71a9c887423302e8f707f0e3e0ff5c0 100644
--- a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h
+++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.h
@@ -53,15 +53,15 @@ enum class ShadowRootType {
class CORE_EXPORT ShadowRoot final : public DocumentFragment, public TreeScope, public DoublyLinkedListNode<ShadowRoot> {
DEFINE_WRAPPERTYPEINFO();
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ShadowRoot);
+ USING_GARBAGE_COLLECTED_MIXIN(ShadowRoot);
friend class WTF::DoublyLinkedListNode<ShadowRoot>;
public:
// FIXME: Current implementation does not work well if a shadow root is dynamically created.
// So multiple shadow subtrees in several elements are prohibited.
// See https://github.com/w3c/webcomponents/issues/102 and http://crbug.com/234020
- static PassRefPtrWillBeRawPtr<ShadowRoot> create(Document& document, ShadowRootType type)
+ static RawPtr<ShadowRoot> create(Document& document, ShadowRootType type)
{
- return adoptRefWillBeNoop(new ShadowRoot(document, type));
+ return new ShadowRoot(document, type);
}
void recalcStyle(StyleRecalcChange);
@@ -106,17 +106,17 @@ public:
unsigned numberOfStyles() const { return m_numberOfStyles; }
HTMLShadowElement* shadowInsertionPointOfYoungerShadowRoot() const;
- void setShadowInsertionPointOfYoungerShadowRoot(PassRefPtrWillBeRawPtr<HTMLShadowElement>);
+ void setShadowInsertionPointOfYoungerShadowRoot(RawPtr<HTMLShadowElement>);
void didAddInsertionPoint(InsertionPoint*);
void didRemoveInsertionPoint(InsertionPoint*);
- const WillBeHeapVector<RefPtrWillBeMember<InsertionPoint>>& descendantInsertionPoints();
+ const HeapVector<Member<InsertionPoint>>& descendantInsertionPoints();
ShadowRootType type() const { return static_cast<ShadowRootType>(m_type); }
void didAddSlot();
void didRemoveSlot();
- const WillBeHeapVector<RefPtrWillBeMember<HTMLSlotElement>>& descendantSlots();
+ const HeapVector<Member<HTMLSlotElement>>& descendantSlots();
// Make protected methods from base class public here.
using TreeScope::setDocument;
@@ -130,7 +130,7 @@ public:
String innerHTML() const;
void setInnerHTML(const String&, ExceptionState&);
- PassRefPtrWillBeRawPtr<Node> cloneNode(bool, ExceptionState&);
+ RawPtr<Node> cloneNode(bool, ExceptionState&);
StyleSheetList* styleSheets();
@@ -156,7 +156,7 @@ private:
void invalidateDescendantInsertionPoints();
// ShadowRoots should never be cloned.
- PassRefPtrWillBeRawPtr<Node> cloneNode(bool) override { return nullptr; }
+ RawPtr<Node> cloneNode(bool) override { return nullptr; }
// FIXME: This shouldn't happen. https://bugs.webkit.org/show_bug.cgi?id=88834
bool isOrphan() const { return !host(); }
@@ -164,9 +164,9 @@ private:
void invalidateDescendantSlots();
unsigned descendantSlotCount() const;
- RawPtrWillBeMember<ShadowRoot> m_prev;
- RawPtrWillBeMember<ShadowRoot> m_next;
- OwnPtrWillBeMember<ShadowRootRareData> m_shadowRootRareData;
+ Member<ShadowRoot> m_prev;
+ Member<ShadowRoot> m_next;
+ Member<ShadowRootRareData> m_shadowRootRareData;
unsigned m_numberOfStyles : 26;
unsigned m_type : 2;
unsigned m_registeredWithParentShadowRoot : 1;
« no previous file with comments | « third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp ('k') | third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698