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

Side by Side Diff: Source/modules/webmidi/MIDIPort.cpp

Issue 23609033: Web MIDI: MIDIPort doesn't have to be ActiveDOMObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: revert idl changes Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/webmidi/MIDIPort.h ('k') | Source/modules/webmidi/MIDIPort.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "modules/webmidi/MIDIPort.h" 32 #include "modules/webmidi/MIDIPort.h"
33 33
34 #include "modules/webmidi/MIDIAccess.h"
35
34 namespace WebCore { 36 namespace WebCore {
35 37
36 MIDIPort::MIDIPort(ExecutionContext* context, const String& id, const String& ma nufacturer, const String& name, MIDIPortTypeCode type, const String& version) 38 MIDIPort::MIDIPort(MIDIAccess* access, const String& id, const String& manufactu rer, const String& name, MIDIPortTypeCode type, const String& version)
37 : ActiveDOMObject(context) 39 : m_id(id)
38 , m_id(id)
39 , m_manufacturer(manufacturer) 40 , m_manufacturer(manufacturer)
40 , m_name(name) 41 , m_name(name)
41 , m_type(type) 42 , m_type(type)
42 , m_version(version) 43 , m_version(version)
44 , m_access(access)
43 { 45 {
46 ASSERT(access);
44 ASSERT(type == MIDIPortTypeInput || type == MIDIPortTypeOutput); 47 ASSERT(type == MIDIPortTypeInput || type == MIDIPortTypeOutput);
45 ScriptWrappable::init(this); 48 ScriptWrappable::init(this);
46 } 49 }
47 50
48 MIDIPort::~MIDIPort()
49 {
50 stop();
51 }
52
53 String MIDIPort::type() const 51 String MIDIPort::type() const
54 { 52 {
55 switch (m_type) { 53 switch (m_type) {
56 case MIDIPortTypeInput: 54 case MIDIPortTypeInput:
57 return "input"; 55 return "input";
58 case MIDIPortTypeOutput: 56 case MIDIPortTypeOutput:
59 return "output"; 57 return "output";
60 default: 58 default:
61 ASSERT_NOT_REACHED(); 59 ASSERT_NOT_REACHED();
62 } 60 }
63 return emptyString(); 61 return emptyString();
64 } 62 }
65 63
64 ExecutionContext* MIDIPort::executionContext() const
65 {
66 return m_access->executionContext();
67 }
68
66 } // namespace WebCore 69 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webmidi/MIDIPort.h ('k') | Source/modules/webmidi/MIDIPort.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698