Index: Source/core/workers/WorkerConsole.h |
diff --git a/Source/core/workers/WorkerConsole.h b/Source/core/workers/WorkerConsole.h |
index 8a644c6aff39276c0c157387ac27c0f9ee667157..6a546d0a9145460ca716f79cd8be185b4201122e 100644 |
--- a/Source/core/workers/WorkerConsole.h |
+++ b/Source/core/workers/WorkerConsole.h |
@@ -44,18 +44,24 @@ namespace WebCore { |
class ScriptArguments; |
-class WorkerConsole FINAL : public RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>, public ConsoleBase, public ScriptWrappable { |
+class WorkerConsole FINAL : public ConsoleBase, |
+#if !ENABLE(OILPAN) |
+ public RefCounted<WorkerConsole>, |
Mads Ager (chromium)
2014/03/20 14:20:01
You used a 4-space indent in the other files. Cons
|
+#endif |
+ public ScriptWrappable { |
public: |
- using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::ref; |
- using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::deref; |
+#if !ENABLE(OILPAN) |
+ using RefCounted<WorkerConsole>::ref; |
+ using RefCounted<WorkerConsole>::deref; |
+#endif |
static PassRefPtrWillBeRawPtr<WorkerConsole> create(WorkerGlobalScope* scope) |
{ |
- return adoptRefWillBeRefCountedGarbageCollected(new WorkerConsole(scope)); |
+ return adoptRefWillBeNoop(new WorkerConsole(scope)); |
} |
virtual ~WorkerConsole(); |
- void trace(Visitor*); |
+ void trace(Visitor*) OVERRIDE; |
protected: |
virtual ExecutionContext* context() OVERRIDE; |
@@ -64,8 +70,10 @@ protected: |
private: |
explicit WorkerConsole(WorkerGlobalScope*); |
+#if !ENABLE(OILPAN) |
virtual void refConsole() OVERRIDE { ref(); } |
virtual void derefConsole() OVERRIDE { deref(); } |
+#endif |
RawPtrWillBeMember<WorkerGlobalScope> m_scope; |
}; |