Chromium Code Reviews| Index: Source/core/frame/Screen.h |
| diff --git a/Source/core/frame/Screen.h b/Source/core/frame/Screen.h |
| index 83a69eff9ba2b93eb78c0650779f15acd16423c2..a86867e22deaa39cf17b6b74fcb3732fe6e13bec 100644 |
| --- a/Source/core/frame/Screen.h |
| +++ b/Source/core/frame/Screen.h |
| @@ -34,20 +34,19 @@ |
| #include "core/frame/DOMWindowProperty.h" |
| #include "platform/Supplementable.h" |
| #include "platform/heap/Handle.h" |
| -#include "wtf/PassRefPtr.h" |
| -#include "wtf/RefCounted.h" |
| namespace blink { |
| class LocalFrame; |
| -class Screen final : public RefCountedWillBeGarbageCollected<Screen>, public ScriptWrappable, public DOMWindowProperty, public WillBeHeapSupplementable<Screen> { |
| +// TODO(Oilpan): when ~DOMWindowProperty is removed, derive from GarbageCollected<> instead. |
|
haraken
2015/04/24 08:51:11
TODO(sof)? I'm not sure if people want to have "Oi
sof
2015/04/24 08:53:27
I prefer using team/topic labels (if any) to simpl
|
| +class Screen final : public GarbageCollectedFinalized<Screen>, public ScriptWrappable, public DOMWindowProperty, public HeapSupplementable<Screen> { |
| DEFINE_WRAPPERTYPEINFO(); |
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Screen); |
| + USING_GARBAGE_COLLECTED_MIXIN(Screen); |
| public: |
| - static PassRefPtrWillBeRawPtr<Screen> create(LocalFrame* frame) |
| + static Screen* create(LocalFrame* frame) |
| { |
| - return adoptRefWillBeNoop(new Screen(frame)); |
| + return new Screen(frame); |
| } |
| unsigned height() const; |