Chromium Code Reviews| Index: Source/modules/webmidi/MIDIController.h |
| diff --git a/Source/modules/webmidi/MIDIController.h b/Source/modules/webmidi/MIDIController.h |
| index 5a93bd853403139eda52d640bcdde8514f9c5e33..dcd47516ecad3ffe07b67e9027fd6a8cabaede69 100644 |
| --- a/Source/modules/webmidi/MIDIController.h |
| +++ b/Source/modules/webmidi/MIDIController.h |
| @@ -31,7 +31,7 @@ |
| #ifndef MIDIController_h |
| #define MIDIController_h |
| -#include "core/page/Page.h" |
| +#include "core/frame/LocalFrame.h" |
| #include "platform/heap/Handle.h" |
| namespace WebCore { |
| @@ -39,7 +39,7 @@ namespace WebCore { |
| class MIDIAccess; |
| class MIDIClient; |
| -class MIDIController FINAL : public NoBaseWillBeGarbageCollectedFinalized<MIDIController>, public WillBeHeapSupplement<Page> { |
| +class MIDIController FINAL : public NoBaseWillBeGarbageCollectedFinalized<MIDIController>, public WillBeHeapSupplement<LocalFrame> { |
|
jam
2014/06/06 18:23:52
not sure if I need to remove all the oilpan stuff
sof
2014/06/06 19:32:55
That's right (for now.) Consequently, simplify thi
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MIDIController); |
| public: |
| virtual ~MIDIController(); |
| @@ -49,9 +49,9 @@ public: |
| static PassOwnPtrWillBeRawPtr<MIDIController> create(PassOwnPtr<MIDIClient>); |
| static const char* supplementName(); |
| - static MIDIController* from(Page* page) { return static_cast<MIDIController*>(WillBeHeapSupplement<Page>::from(page, supplementName())); } |
| + static MIDIController* from(LocalFrame* frame) { return static_cast<MIDIController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName())); } |
|
sof
2014/06/06 19:32:55
s/WillBeHeapSupplement/Supplement/
|
| - virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Page>::trace(visitor); } |
| + virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<LocalFrame>::trace(visitor); } |
|
sof
2014/06/06 19:32:55
You can remove this trace() OVERRIDE.
|
| protected: |
| explicit MIDIController(PassOwnPtr<MIDIClient>); |