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

Unified Diff: third_party/WebKit/Source/core/dom/PendingScript.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, 10 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/PendingScript.h
diff --git a/third_party/WebKit/Source/core/dom/PendingScript.h b/third_party/WebKit/Source/core/dom/PendingScript.h
index f7d694a4db1c0a09fbac5bb8e5dc59aa376ee12c..25ae797ba63349af706accd9fbe43d1c288a48c7 100644
--- a/third_party/WebKit/Source/core/dom/PendingScript.h
+++ b/third_party/WebKit/Source/core/dom/PendingScript.h
@@ -45,11 +45,11 @@ class ScriptSourceCode;
// A RefPtr alone does not prevent the underlying Resource
// from purging its data buffer. This class holds a dummy client open for its
// lifetime in order to guarantee that the data buffer will not be purged.
-class CORE_EXPORT PendingScript final : public NoBaseWillBeGarbageCollectedFinalized<PendingScript>, public ResourceOwner<ScriptResource> {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PendingScript);
- WILL_BE_USING_PRE_FINALIZER(PendingScript, dispose);
+class CORE_EXPORT PendingScript final : public GarbageCollectedFinalized<PendingScript>, public ResourceOwner<ScriptResource> {
+ USING_GARBAGE_COLLECTED_MIXIN(PendingScript);
+ USING_PRE_FINALIZER(PendingScript, dispose);
public:
- static PassOwnPtrWillBeRawPtr<PendingScript> create(Element*, ScriptResource*);
+ static RawPtr<PendingScript> create(Element*, ScriptResource*);
~PendingScript() override;
PendingScript& operator=(const PendingScript&);
@@ -62,7 +62,7 @@ public:
Element* element() const { return m_element.get(); }
void setElement(Element*);
- PassRefPtrWillBeRawPtr<Element> releaseElementAndClear();
+ RawPtr<Element> releaseElementAndClear();
void setScriptResource(ScriptResource*);
@@ -74,7 +74,7 @@ public:
ScriptSourceCode getSource(const KURL& documentURL, bool& errorOccurred) const;
- void setStreamer(PassRefPtrWillBeRawPtr<ScriptStreamer>);
+ void setStreamer(RawPtr<ScriptStreamer>);
void streamingFinished();
bool isReady() const;
@@ -85,11 +85,11 @@ private:
PendingScript(Element*, ScriptResource*);
bool m_watchingForLoad;
- RefPtrWillBeMember<Element> m_element;
+ Member<Element> m_element;
TextPosition m_startingPosition; // Only used for inline script tags.
bool m_integrityFailure;
- RefPtrWillBeMember<ScriptStreamer> m_streamer;
+ Member<ScriptStreamer> m_streamer;
ScriptResourceClient* m_client;
};

Powered by Google App Engine
This is Rietveld 408576698