Index: Source/core/frame/Screen.h |
diff --git a/Source/core/frame/Screen.h b/Source/core/frame/Screen.h |
index 8d31b2b0900df50923e72cefb3b202447de8634d..d03653e14bfafa21a69033a3e36b64cde265522e 100644 |
--- a/Source/core/frame/Screen.h |
+++ b/Source/core/frame/Screen.h |
@@ -33,6 +33,7 @@ |
#include "bindings/v8/ScriptWrappable.h" |
#include "core/events/EventTarget.h" |
#include "core/frame/DOMWindowProperty.h" |
+#include "heap/Handle.h" |
#include "platform/Supplementable.h" |
#include "wtf/PassRefPtr.h" |
#include "wtf/RefCounted.h" |
@@ -41,10 +42,14 @@ namespace WebCore { |
class LocalFrame; |
- class Screen FINAL : public ScriptWrappable, public RefCounted<Screen>, public EventTargetWithInlineData, public DOMWindowProperty, public Supplementable<Screen> { |
- REFCOUNTED_EVENT_TARGET(Screen); |
+ class Screen FINAL : public RefCountedWillBeRefCountedGarbageCollected<Screen>, public ScriptWrappable, public EventTargetWithInlineData, public DOMWindowProperty, public WillBeHeapSupplementable<Screen> { |
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Screen); |
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<Screen>); |
public: |
- static PassRefPtr<Screen> create(LocalFrame* frame) { return adoptRef(new Screen(frame)); } |
+ static PassRefPtrWillBeRawPtr<Screen> create(LocalFrame* frame) |
+ { |
+ return adoptRefWillBeRefCountedGarbageCollected(new Screen(frame)); |
+ } |
unsigned height() const; |
unsigned width() const; |
@@ -59,6 +64,8 @@ namespace WebCore { |
virtual const AtomicString& interfaceName() const OVERRIDE; |
virtual ExecutionContext* executionContext() const OVERRIDE; |
+ void trace(Visitor*); |
+ |
private: |
explicit Screen(LocalFrame*); |
}; |