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

Unified Diff: third_party/WebKit/Source/core/dom/ScriptLoader.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/ScriptLoader.h
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.h b/third_party/WebKit/Source/core/dom/ScriptLoader.h
index 99d47c3a112fe95911e5ffa487289412100a094f..2b79d305860151bcc0f487d735b3e87d1e570357 100644
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.h
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.h
@@ -36,12 +36,11 @@ class ScriptLoaderClient;
class ScriptSourceCode;
class LocalFrame;
-class CORE_EXPORT ScriptLoader : public NoBaseWillBeGarbageCollectedFinalized<ScriptLoader>, public ScriptResourceClient {
- USING_FAST_MALLOC_WILL_BE_REMOVED(ScriptLoader);
+class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>, public ScriptResourceClient {
public:
- static PassOwnPtrWillBeRawPtr<ScriptLoader> create(Element* element, bool createdByParser, bool isEvaluated)
+ static RawPtr<ScriptLoader> create(Element* element, bool createdByParser, bool isEvaluated)
{
- return adoptPtrWillBeNoop(new ScriptLoader(element, createdByParser, isEvaluated));
+ return new ScriptLoader(element, createdByParser, isEvaluated);
}
~ScriptLoader() override;
@@ -102,8 +101,8 @@ private:
void notifyFinished(Resource*) override;
String debugName() const override { return "ScriptLoader"; }
- RawPtrWillBeMember<Element> m_element;
- RefPtrWillBeMember<ScriptResource> m_resource;
+ Member<Element> m_element;
+ Member<ScriptResource> m_resource;
WTF::OrdinalNumber m_startLineNumber;
String m_characterEncoding;
String m_fallbackCharacterEncoding;
@@ -118,7 +117,7 @@ private:
bool m_willExecuteWhenDocumentFinishedParsing : 1;
bool m_forceAsync : 1;
- OwnPtrWillBeMember<PendingScript> m_pendingScript;
+ Member<PendingScript> m_pendingScript;
};
ScriptLoader* toScriptLoaderIfPossible(Element*);

Powered by Google App Engine
This is Rietveld 408576698