Index: third_party/WebKit/Source/core/testing/Internals.h |
diff --git a/third_party/WebKit/Source/core/testing/Internals.h b/third_party/WebKit/Source/core/testing/Internals.h |
index 08d794ac7bddbcc6ad0cd2845fecb0126e0c1721..c4ac2a5fd8ec74f28ae5b45b26b0fba19ff3c286 100644 |
--- a/third_party/WebKit/Source/core/testing/Internals.h |
+++ b/third_party/WebKit/Source/core/testing/Internals.h |
@@ -75,7 +75,7 @@ typedef StaticNodeTypeList<Node> StaticNodeList; |
class Internals final : public GarbageCollectedFinalized<Internals>, public ScriptWrappable, public ContextLifecycleObserver, public ValueIterable<int> { |
DEFINE_WRAPPERTYPEINFO(); |
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Internals); |
+ USING_GARBAGE_COLLECTED_MIXIN(Internals); |
public: |
static Internals* create(ScriptState*); |
virtual ~Internals(); |
@@ -94,9 +94,9 @@ public: |
bool isSharingStyle(Element*, Element*) const; |
- PassRefPtrWillBeRawPtr<CSSStyleDeclaration> computedStyleIncludingVisitedInfo(Node*) const; |
+ RawPtr<CSSStyleDeclaration> computedStyleIncludingVisitedInfo(Node*) const; |
- PassRefPtrWillBeRawPtr<ShadowRoot> createUserAgentShadowRoot(Element* host); |
+ RawPtr<ShadowRoot> createUserAgentShadowRoot(Element* host); |
ShadowRoot* shadowRoot(Element* host); |
ShadowRoot* youngestShadowRoot(Element* host); |
@@ -159,7 +159,7 @@ public: |
unsigned markerCountForNode(Node*, const String&, ExceptionState&); |
unsigned activeMarkerCountForNode(Node*); |
- PassRefPtrWillBeRawPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionState&); |
+ RawPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionState&); |
String markerDescriptionForNode(Node*, const String& markerType, unsigned index, ExceptionState&); |
void addTextMatchMarker(const Range*, bool isActive); |
void setMarkersActive(Node*, unsigned startOffset, unsigned endOffset, bool); |
@@ -174,7 +174,7 @@ public: |
void setEditingValue(Element* inputElement, const String&, ExceptionState&); |
void setAutofilled(Element*, bool enabled, ExceptionState&); |
- PassRefPtrWillBeRawPtr<Range> rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength); |
+ RawPtr<Range> rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength); |
unsigned locationFromRange(Element* scope, const Range*); |
unsigned lengthFromRange(Element* scope, const Range*); |
String rangeAsText(const Range*); |
@@ -205,7 +205,7 @@ public: |
Vector<AtomicString> svgTags(); |
// This is used to test rect based hit testing like what's done on touch screens. |
- PassRefPtrWillBeRawPtr<StaticNodeList> nodesFromRect(Document*, int x, int y, unsigned topPadding, unsigned rightPadding, |
+ RawPtr<StaticNodeList> nodesFromRect(Document*, int x, int y, unsigned topPadding, unsigned rightPadding, |
unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowChildFrameContent, ExceptionState&) const; |
bool hasSpellingMarker(Document*, int from, int length); |
@@ -244,7 +244,7 @@ public: |
unsigned numberOfLiveDocuments() const; |
String dumpRefCountedInstanceCounts() const; |
Vector<String> consoleMessageArgumentCounts(Document*) const; |
- PassRefPtrWillBeRawPtr<LocalDOMWindow> openDummyInspectorFrontend(const String& url); |
+ RawPtr<LocalDOMWindow> openDummyInspectorFrontend(const String& url); |
void closeDummyInspectorFrontend(); |
Vector<unsigned long> setMemoryCacheCapacities(unsigned long minDeadBytes, unsigned long maxDeadBytes, unsigned long totalBytes); |
@@ -355,7 +355,7 @@ public: |
bool isInCanvasFontCache(Document*, const String&); |
unsigned canvasFontCacheMaxFonts(); |
- void setScrollChain(ScrollState*, const WillBeHeapVector<RefPtrWillBeMember<Element>>& elements, ExceptionState&); |
+ void setScrollChain(ScrollState*, const HeapVector<Member<Element>>& elements, ExceptionState&); |
// Schedule a forced Blink GC run (Oilpan) at the end of event loop. |
// Note: This is designed to be only used from PerformanceTests/BlinkGC to explicitly measure only Blink GC time. |