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

Unified Diff: Source/core/frame/Console.h

Issue 206093005: Oilpan: move Console objects to the oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 | « no previous file | Source/core/frame/Console.cpp » ('j') | Source/core/frame/ConsoleBase.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Console.h
diff --git a/Source/core/frame/Console.h b/Source/core/frame/Console.h
index a610f488294c19e30351d8b50e1305808e322b70..7cd5ab7529275f3cef405f5acc5dee5d3234c403 100644
--- a/Source/core/frame/Console.h
+++ b/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,16 +45,28 @@ class MemoryInfo;
class Page;
class ScriptArguments;
-class Console FINAL : public RefCounted<Console>, public ConsoleBase, public ScriptWrappable, public DOMWindowProperty {
+class Console FINAL : public ConsoleBase,
+#if !ENABLE(OILPAN)
+ public RefCounted<Console>,
+#endif
+ public ScriptWrappable,
+ public DOMWindowProperty {
public:
+#if !ENABLE(OILPAN)
using RefCounted<Console>::ref;
using RefCounted<Console>::deref;
+#endif
- 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*) OVERRIDE;
+
protected:
virtual ExecutionContext* context() OVERRIDE;
virtual void reportMessageToClient(MessageLevel, const String& message, PassRefPtr<ScriptCallStack>) OVERRIDE;
@@ -61,8 +74,10 @@ protected:
private:
explicit Console(LocalFrame*);
+#if !ENABLE(OILPAN)
virtual void refConsole() OVERRIDE { ref(); }
virtual void derefConsole() OVERRIDE { deref(); }
+#endif
};
} // namespace WebCore
« no previous file with comments | « no previous file | Source/core/frame/Console.cpp » ('j') | Source/core/frame/ConsoleBase.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698