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

Unified Diff: Source/bindings/core/v8/WorkerScriptController.h

Issue 1291313002: [Oilpan] Move WorkerScriptController to Oilpan heap on Oilpan build (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Work for comments Created 5 years, 4 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 | « no previous file | Source/bindings/core/v8/WorkerScriptController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/core/v8/WorkerScriptController.h
diff --git a/Source/bindings/core/v8/WorkerScriptController.h b/Source/bindings/core/v8/WorkerScriptController.h
index ecc540e5704110327c6c70de74f1080026605033..0a2de87c634a908e9dfc96fabd085e3d2af12f17 100644
--- a/Source/bindings/core/v8/WorkerScriptController.h
+++ b/Source/bindings/core/v8/WorkerScriptController.h
@@ -49,10 +49,11 @@ class ExceptionState;
class ScriptSourceCode;
class WorkerGlobalScope;
-class CORE_EXPORT WorkerScriptController {
+class CORE_EXPORT WorkerScriptController : public NoBaseWillBeGarbageCollectedFinalized<WorkerScriptController> {
public:
- WorkerScriptController(WorkerGlobalScope&, v8::Isolate*);
- ~WorkerScriptController();
+ static PassOwnPtrWillBeRawPtr<WorkerScriptController> create(WorkerGlobalScope*, v8::Isolate*);
+ virtual ~WorkerScriptController();
+ void dispose();
bool isExecutionForbidden() const;
bool isExecutionTerminating() const;
@@ -86,7 +87,10 @@ public:
RejectedPromises* rejectedPromises() const { return m_rejectedPromises.get(); }
+ DECLARE_TRACE();
+
private:
+ WorkerScriptController(WorkerGlobalScope*, v8::Isolate*);
class WorkerGlobalScopeExecutionState;
bool isContextInitialized() { return m_scriptState && !!m_scriptState->perContextData(); }
@@ -95,7 +99,7 @@ private:
// Evaluate a script file in the current execution environment.
ScriptValue evaluate(const String& script, const String& fileName, const TextPosition& scriptStartPosition, CachedMetadataHandler*, V8CacheOptions);
- WorkerGlobalScope& m_workerGlobalScope;
+ RawPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope;
RefPtr<ScriptState> m_scriptState;
RefPtr<DOMWrapperWorld> m_world;
String m_disableEvalPending;
@@ -103,7 +107,7 @@ private:
bool m_executionScheduledToTerminate;
mutable Mutex m_scheduledTerminationMutex;
- OwnPtrWillBePersistent<RejectedPromises> m_rejectedPromises;
+ OwnPtrWillBeMember<RejectedPromises> m_rejectedPromises;
// |m_globalScopeExecutionState| refers to a stack object
// that evaluate() allocates; evaluate() ensuring that the
« no previous file with comments | « no previous file | Source/bindings/core/v8/WorkerScriptController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698