| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 | 46 |
| 47 NavigatorWebMIDI::~NavigatorWebMIDI() | 47 NavigatorWebMIDI::~NavigatorWebMIDI() |
| 48 { | 48 { |
| 49 } | 49 } |
| 50 | 50 |
| 51 const char* NavigatorWebMIDI::supplementName() | 51 const char* NavigatorWebMIDI::supplementName() |
| 52 { | 52 { |
| 53 return "NavigatorWebMIDI"; | 53 return "NavigatorWebMIDI"; |
| 54 } | 54 } |
| 55 | 55 |
| 56 NavigatorWebMIDI* NavigatorWebMIDI::from(Navigator* navigator) | 56 NavigatorWebMIDI& NavigatorWebMIDI::from(Navigator& navigator) |
| 57 { | 57 { |
| 58 NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(Supplement<Nav
igator>::from(navigator, supplementName())); | 58 NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(Supplement<Nav
igator>::from(navigator, supplementName())); |
| 59 if (!supplement) { | 59 if (!supplement) { |
| 60 supplement = new NavigatorWebMIDI(navigator->frame()); | 60 supplement = new NavigatorWebMIDI(navigator.frame()); |
| 61 provideTo(navigator, supplementName(), adoptPtr(supplement)); | 61 provideTo(navigator, supplementName(), adoptPtr(supplement)); |
| 62 } | 62 } |
| 63 return supplement; | 63 return *supplement; |
| 64 } | 64 } |
| 65 | 65 |
| 66 PassRefPtrWillBeRawPtr<MIDIAccessPromise> NavigatorWebMIDI::requestMIDIAccess(Na
vigator* navigator, const Dictionary& options) | 66 PassRefPtrWillBeRawPtr<MIDIAccessPromise> NavigatorWebMIDI::requestMIDIAccess(Na
vigator& navigator, const Dictionary& options) |
| 67 { | 67 { |
| 68 return NavigatorWebMIDI::from(navigator)->requestMIDIAccess(options); | 68 return NavigatorWebMIDI::from(navigator).requestMIDIAccess(options); |
| 69 } | 69 } |
| 70 | 70 |
| 71 PassRefPtrWillBeRawPtr<MIDIAccessPromise> NavigatorWebMIDI::requestMIDIAccess(co
nst Dictionary& options) | 71 PassRefPtrWillBeRawPtr<MIDIAccessPromise> NavigatorWebMIDI::requestMIDIAccess(co
nst Dictionary& options) |
| 72 { | 72 { |
| 73 if (!frame()) | 73 if (!frame()) |
| 74 return 0; | 74 return 0; |
| 75 | 75 |
| 76 ExecutionContext* context = frame()->document(); | 76 ExecutionContext* context = frame()->document(); |
| 77 ASSERT(context); | 77 ASSERT(context); |
| 78 | 78 |
| 79 return MIDIAccessPromise::create(context, options); | 79 return MIDIAccessPromise::create(context, options); |
| 80 } | 80 } |
| 81 | 81 |
| 82 } // namespace WebCore | 82 } // namespace WebCore |
| OLD | NEW |