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

Unified Diff: third_party/WebKit/Source/core/dom/Range.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
« no previous file with comments | « third_party/WebKit/Source/core/dom/PseudoElement.cpp ('k') | third_party/WebKit/Source/core/dom/Range.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/Range.h
diff --git a/third_party/WebKit/Source/core/dom/Range.h b/third_party/WebKit/Source/core/dom/Range.h
index a8f9781f9d8cc1c3a11c3900deb5d071a09256a8..9dafd6d55de5e57115f5c8ac9b43ea4df41af182 100644
--- a/third_party/WebKit/Source/core/dom/Range.h
+++ b/third_party/WebKit/Source/core/dom/Range.h
@@ -50,17 +50,17 @@ class Text;
class CORE_EXPORT Range final
#ifndef NDEBUG
- : public RefCountedWillBeGarbageCollectedFinalized<Range>
+ : public GarbageCollectedFinalized<Range>
#else
- : public RefCountedWillBeGarbageCollected<Range>
+ : public GarbageCollected<Range>
#endif
, public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO();
public:
- static PassRefPtrWillBeRawPtr<Range> create(Document&);
- static PassRefPtrWillBeRawPtr<Range> create(Document&, Node* startContainer, int startOffset, Node* endContainer, int endOffset);
- static PassRefPtrWillBeRawPtr<Range> create(Document&, const Position&, const Position&);
- static PassRefPtrWillBeRawPtr<Range> createAdjustedToTreeScope(const TreeScope&, const Position&);
+ static RawPtr<Range> create(Document&);
+ static RawPtr<Range> create(Document&, Node* startContainer, int startOffset, Node* endContainer, int endOffset);
+ static RawPtr<Range> create(Document&, const Position&, const Position&);
+ static RawPtr<Range> createAdjustedToTreeScope(const TreeScope&, const Position&);
#if !ENABLE(OILPAN) || !defined(NDEBUG)
~Range();
#endif
@@ -77,8 +77,8 @@ public:
Node* commonAncestorContainer() const;
static Node* commonAncestorContainer(const Node* containerA, const Node* containerB);
- void setStart(PassRefPtrWillBeRawPtr<Node> container, int offset, ExceptionState& = ASSERT_NO_EXCEPTION);
- void setEnd(PassRefPtrWillBeRawPtr<Node> container, int offset, ExceptionState& = ASSERT_NO_EXCEPTION);
+ void setStart(RawPtr<Node> container, int offset, ExceptionState& = ASSERT_NO_EXCEPTION);
+ void setEnd(RawPtr<Node> container, int offset, ExceptionState& = ASSERT_NO_EXCEPTION);
void collapse(bool toStart);
bool isNodeFullyContained(Node&) const;
bool isPointInRange(Node* refNode, int offset, ExceptionState&) const;
@@ -92,17 +92,17 @@ public:
bool intersectsNode(Node* refNode, ExceptionState&);
static bool intersectsNode(Node* refNode, const Position& start, const Position& end, ExceptionState&);
void deleteContents(ExceptionState&);
- PassRefPtrWillBeRawPtr<DocumentFragment> extractContents(ExceptionState&);
- PassRefPtrWillBeRawPtr<DocumentFragment> cloneContents(ExceptionState&);
- void insertNode(PassRefPtrWillBeRawPtr<Node>, ExceptionState&);
+ RawPtr<DocumentFragment> extractContents(ExceptionState&);
+ RawPtr<DocumentFragment> cloneContents(ExceptionState&);
+ void insertNode(RawPtr<Node>, ExceptionState&);
String toString() const;
String text() const;
- PassRefPtrWillBeRawPtr<DocumentFragment> createContextualFragment(const String& html, ExceptionState&);
+ RawPtr<DocumentFragment> createContextualFragment(const String& html, ExceptionState&);
void detach();
- PassRefPtrWillBeRawPtr<Range> cloneRange() const;
+ RawPtr<Range> cloneRange() const;
void setStartAfter(Node*, ExceptionState& = ASSERT_NO_EXCEPTION);
void setEndBefore(Node*, ExceptionState& = ASSERT_NO_EXCEPTION);
@@ -110,7 +110,7 @@ public:
void selectNode(Node*, ExceptionState& = ASSERT_NO_EXCEPTION);
void selectNodeContents(Node*, ExceptionState&);
static bool selectNodeContents(Node*, Position&, Position&);
- void surroundContents(PassRefPtrWillBeRawPtr<Node>, ExceptionState&);
+ void surroundContents(RawPtr<Node>, ExceptionState&);
void setStartBefore(Node*, ExceptionState& = ASSERT_NO_EXCEPTION);
const Position startPosition() const { return m_start.toPosition(); }
@@ -167,13 +167,13 @@ private:
void checkExtractPrecondition(ExceptionState&);
enum ActionType { DELETE_CONTENTS, EXTRACT_CONTENTS, CLONE_CONTENTS };
- PassRefPtrWillBeRawPtr<DocumentFragment> processContents(ActionType, ExceptionState&);
- static PassRefPtrWillBeRawPtr<Node> processContentsBetweenOffsets(ActionType, PassRefPtrWillBeRawPtr<DocumentFragment>, Node*, unsigned startOffset, unsigned endOffset, ExceptionState&);
- static void processNodes(ActionType, WillBeHeapVector<RefPtrWillBeMember<Node>>&, PassRefPtrWillBeRawPtr<Node> oldContainer, PassRefPtrWillBeRawPtr<Node> newContainer, ExceptionState&);
+ RawPtr<DocumentFragment> processContents(ActionType, ExceptionState&);
+ static RawPtr<Node> processContentsBetweenOffsets(ActionType, RawPtr<DocumentFragment>, Node*, unsigned startOffset, unsigned endOffset, ExceptionState&);
+ static void processNodes(ActionType, HeapVector<Member<Node>>&, RawPtr<Node> oldContainer, RawPtr<Node> newContainer, ExceptionState&);
enum ContentsProcessDirection { ProcessContentsForward, ProcessContentsBackward };
- static PassRefPtrWillBeRawPtr<Node> processAncestorsAndTheirSiblings(ActionType, Node* container, ContentsProcessDirection, PassRefPtrWillBeRawPtr<Node> clonedContainer, Node* commonRoot, ExceptionState&);
+ static RawPtr<Node> processAncestorsAndTheirSiblings(ActionType, Node* container, ContentsProcessDirection, RawPtr<Node> clonedContainer, Node* commonRoot, ExceptionState&);
- RefPtrWillBeMember<Document> m_ownerDocument; // Cannot be null.
+ Member<Document> m_ownerDocument; // Cannot be null.
RangeBoundaryPoint m_start;
RangeBoundaryPoint m_end;
};
« no previous file with comments | « third_party/WebKit/Source/core/dom/PseudoElement.cpp ('k') | third_party/WebKit/Source/core/dom/Range.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698