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

Unified Diff: Source/core/workers/WorkerConsole.h

Issue 178663004: Oilpan: move WorkerGlobalScope to oilpan's heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 6 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
« no previous file with comments | « Source/core/workers/SharedWorkerThread.cpp ('k') | Source/core/workers/WorkerConsole.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/workers/WorkerConsole.h
diff --git a/Source/core/workers/WorkerConsole.h b/Source/core/workers/WorkerConsole.h
index a2ef40d2042cdc7696932104c27853836dd107d8..8a644c6aff39276c0c157387ac27c0f9ee667157 100644
--- a/Source/core/workers/WorkerConsole.h
+++ b/Source/core/workers/WorkerConsole.h
@@ -34,6 +34,7 @@
#include "core/inspector/ConsoleAPITypes.h"
#include "core/frame/ConsoleBase.h"
#include "core/frame/ConsoleTypes.h"
+#include "heap/Handle.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefCounted.h"
#include "wtf/RefPtr.h"
@@ -43,14 +44,19 @@ namespace WebCore {
class ScriptArguments;
-class WorkerConsole FINAL : public RefCounted<WorkerConsole>, public ConsoleBase, public ScriptWrappable {
+class WorkerConsole FINAL : public RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>, public ConsoleBase, public ScriptWrappable {
public:
- using RefCounted<WorkerConsole>::ref;
- using RefCounted<WorkerConsole>::deref;
+ using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::ref;
+ using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::deref;
- static PassRefPtr<WorkerConsole> create(WorkerGlobalScope* scope) { return adoptRef(new WorkerConsole(scope)); }
+ static PassRefPtrWillBeRawPtr<WorkerConsole> create(WorkerGlobalScope* scope)
+ {
+ return adoptRefWillBeRefCountedGarbageCollected(new WorkerConsole(scope));
+ }
virtual ~WorkerConsole();
+ void trace(Visitor*);
+
protected:
virtual ExecutionContext* context() OVERRIDE;
virtual void reportMessageToClient(MessageLevel, const String& message, PassRefPtr<ScriptCallStack>) OVERRIDE;
@@ -61,7 +67,7 @@ private:
virtual void refConsole() OVERRIDE { ref(); }
virtual void derefConsole() OVERRIDE { deref(); }
- WorkerGlobalScope* m_scope;
+ RawPtrWillBeMember<WorkerGlobalScope> m_scope;
};
} // namespace WebCore
« no previous file with comments | « Source/core/workers/SharedWorkerThread.cpp ('k') | Source/core/workers/WorkerConsole.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698