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

Unified Diff: third_party/WebKit/Source/core/dom/ClassicPendingScript.h

Issue 2844583002: 4. Do not call Dispose() as ClassicPendingScript's prefinalizer (Closed)
Patch Set: Created 3 years, 8 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/ClassicPendingScript.h
diff --git a/third_party/WebKit/Source/core/dom/ClassicPendingScript.h b/third_party/WebKit/Source/core/dom/ClassicPendingScript.h
index 0405f5b99bafc6797e818c2cb045d1a8da683cac..aa78d17141ae8353edc8616ccb0b6ea86f2bfb4f 100644
--- a/third_party/WebKit/Source/core/dom/ClassicPendingScript.h
+++ b/third_party/WebKit/Source/core/dom/ClassicPendingScript.h
@@ -27,11 +27,7 @@ class CORE_EXPORT ClassicPendingScript final
public ResourceOwner<ScriptResource>,
public MemoryCoordinatorClient {
USING_GARBAGE_COLLECTED_MIXIN(ClassicPendingScript);
-
- // In order to call Dispose() before ResourceOwner's prefinalizer, we
- // also register ClassicPendingScript::Dispose() as the prefinalizer of
- // ClassicPendingScript here. https://crbug.com/711703
- USING_PRE_FINALIZER(ClassicPendingScript, Dispose);
+ USING_PRE_FINALIZER(ClassicPendingScript, Prefinalize);
haraken 2017/04/26 01:06:23 Nit: We normally use "Dispose".
kouhei (in TOK) 2017/04/26 01:09:35 We have PendingScript::Dispose, which is no longer
public:
// For script from an external file.
@@ -61,11 +57,7 @@ class CORE_EXPORT ClassicPendingScript final
void RemoveFromMemoryCache() override;
void DisposeInternal() override;
- // Just used as the prefinalizer, does the same as PendingScript::Dispose().
- // We define Dispose() with NOINLINE in ClassicPendingScript just to make
- // the prefinalizers of PendingScript and ClassicPendingScript have
- // different addresses to avoid assertion failures on Windows test bots.
- void Dispose();
+ void Prefinalize();
private:
ClassicPendingScript(ScriptElementBase*,

Powered by Google App Engine
This is Rietveld 408576698