Oilpan: move Console objects to the oilpan heap.

Turn the ConsoleBase object into a garbage collected object if Oilpan
is enabled, avoiding its ref forwarding to either Console or WorkerConsole.

R=haraken@chromium.org,ager@chromium.org
BUG=340522

Review URL: https://codereview.chromium.org/206093005

git-svn-id: svn://svn.chromium.org/blink/trunk@169670 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/frame/Console.h

@@ -33,6 +33,7 @@
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/frame/ConsoleBase.h"
 #include "core/frame/DOMWindowProperty.h"
+#include "heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
@@ -44,25 +45,24 @@ class MemoryInfo;
 class Page;
 class ScriptArguments;
 
-class Console FINAL : public RefCounted<Console>, public ConsoleBase, public ScriptWrappable, public DOMWindowProperty {
+class Console FINAL : public ConsoleBase, public ScriptWrappable, public DOMWindowProperty {
 public:
-    using RefCounted<Console>::ref;
-    using RefCounted<Console>::deref;
-
-    static PassRefPtr<Console> create(LocalFrame* frame) { return adoptRef(new Console(frame)); }
+    static PassRefPtrWillBeRawPtr<Console> create(LocalFrame* frame)
+    {
+        return adoptRefWillBeNoop(new Console(frame));
+    }
     virtual ~Console();
 
     PassRefPtrWillBeRawPtr<MemoryInfo> memory() const;
 
+    void trace(Visitor*) { }
+
 protected:
     virtual ExecutionContext* context() OVERRIDE;
     virtual void reportMessageToClient(MessageLevel, const String& message, PassRefPtr<ScriptCallStack>) OVERRIDE;
 
 private:
     explicit Console(LocalFrame*);
-
-    virtual void refConsole() OVERRIDE { ref(); }
-    virtual void derefConsole() OVERRIDE { deref(); }
 };
 
 } // namespace WebCore

third_party/WebKit/Source/core/frame/ConsoleBase.h

@@ -36,6 +36,7 @@
 #include "core/inspector/ScriptCallStack.h"
 #include "core/frame/ConsoleTypes.h"
 #include "core/frame/DOMWindowProperty.h"
+#include "heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
@@ -44,11 +45,8 @@ namespace WebCore {
 
 class ScriptArguments;
 
-class ConsoleBase {
+class ConsoleBase : public RefCountedWillBeGarbageCollectedFinalized<ConsoleBase> {
 public:
-    void ref() { refConsole(); }
-    void deref() { derefConsole(); }
-
     void debug(ScriptState*, PassRefPtr<ScriptArguments>);
     void error(ScriptState*, PassRefPtr<ScriptArguments>);
     void info(ScriptState*, PassRefPtr<ScriptArguments>);
@@ -73,15 +71,15 @@ public:
     void groupCollapsed(ScriptState*, PassRefPtr<ScriptArguments>);
     void groupEnd();
 
-protected:
+    virtual void trace(Visitor*) = 0;
+
     virtual ~ConsoleBase();
+
+protected:
     virtual ExecutionContext* context() = 0;
     virtual void reportMessageToClient(MessageLevel, const String& message, PassRefPtr<ScriptCallStack>) = 0;
 
 private:
-    virtual void refConsole() = 0;
-    virtual void derefConsole() = 0;
-
     void internalAddMessage(MessageType, MessageLevel, ScriptState*, PassRefPtr<ScriptArguments>, bool acceptNoArguments = false, bool printTrace = false);
 };
 

third_party/WebKit/Source/core/frame/ConsoleBase.idl

@@ -29,6 +29,7 @@
 
 [
     NoInterfaceObject,
+    WillBeGarbageCollected,
 ] interface ConsoleBase {
     [CallWith=ScriptArguments&ScriptState] void debug();
     [CallWith=ScriptArguments&ScriptState] void error();

third_party/WebKit/Source/core/frame/DOMWindow.h

@@ -351,7 +351,7 @@ enum PageshowEventPersistence {
         mutable RefPtr<BarProp> m_scrollbars;
         mutable RefPtr<BarProp> m_statusbar;
         mutable RefPtr<BarProp> m_toolbar;
-        mutable RefPtr<Console> m_console;
+        mutable RefPtrWillBePersistent<Console> m_console;
         mutable RefPtrWillBePersistent<Navigator> m_navigator;
         mutable RefPtrWillBePersistent<Location> m_location;
         mutable RefPtr<StyleMedia> m_media;

third_party/WebKit/Source/core/workers/WorkerConsole.h

@@ -44,14 +44,11 @@ namespace WebCore {
 
 class ScriptArguments;
 
-class WorkerConsole FINAL : public RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>, public ConsoleBase, public ScriptWrappable {
+class WorkerConsole FINAL : public ConsoleBase, public ScriptWrappable {
 public:
-    using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::ref;
-    using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::deref;
-
     static PassRefPtrWillBeRawPtr<WorkerConsole> create(WorkerGlobalScope* scope)
     {
-        return adoptRefWillBeRefCountedGarbageCollected(new WorkerConsole(scope));
+        return adoptRefWillBeNoop(new WorkerConsole(scope));
     }
     virtual ~WorkerConsole();
 
@@ -64,9 +61,6 @@ protected:
 private:
     explicit WorkerConsole(WorkerGlobalScope*);
 
-    virtual void refConsole() OVERRIDE { ref(); }
-    virtual void derefConsole() OVERRIDE { deref(); }
-
     RawPtrWillBeMember<WorkerGlobalScope> m_scope;
 };
 

third_party/WebKit/Source/core/workers/WorkerConsole.idl

@@ -27,7 +27,6 @@
  */
 
 [
-    NoInterfaceObject,
-    WillBeGarbageCollected
+    NoInterfaceObject
 ] interface WorkerConsole : ConsoleBase {
 };