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

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

Issue 14373008: Web MIDI: clean up on MIDIPort and MIDIErrorCallback (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: (rebase) Created 7 years, 8 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/MIDIErrorCallback.cpp ('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 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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
33 #include "modules/webmidi/MIDIPort.h" 32 #include "modules/webmidi/MIDIPort.h"
34 33
35 namespace WebCore { 34 namespace WebCore {
36 35
37 PassRefPtr<MIDIPort> MIDIPort::create(ScriptExecutionContext* context, const Str ing& id, const String& manufacturer, const String& name, MIDIPortTypeCode type, const String& version) 36 PassRefPtr<MIDIPort> MIDIPort::create(ScriptExecutionContext* context, const Str ing& id, const String& manufacturer, const String& name, MIDIPortTypeCode type, const String& version)
38 { 37 {
39 RefPtr<MIDIPort> midiPort(adoptRef(new MIDIPort(context, id, manufacturer, n ame, type, version))); 38 RefPtr<MIDIPort> midiPort(adoptRef(new MIDIPort(context, id, manufacturer, n ame, type, version)));
40 midiPort->suspendIfNeeded(); 39 midiPort->suspendIfNeeded();
41 return midiPort.release(); 40 return midiPort.release();
42 } 41 }
(...skipping 11 matching lines...) Expand all
54 53
55 MIDIPort::~MIDIPort() 54 MIDIPort::~MIDIPort()
56 { 55 {
57 stop(); 56 stop();
58 } 57 }
59 58
60 String MIDIPort::type() const 59 String MIDIPort::type() const
61 { 60 {
62 switch (m_type) { 61 switch (m_type) {
63 case MIDIPortTypeInput: 62 case MIDIPortTypeInput:
64 return "input"; 63 return ASCIILiteral("input");
65 case MIDIPortTypeOutput: 64 case MIDIPortTypeOutput:
66 return "output"; 65 return ASCIILiteral("output");
67 default: 66 default:
68 ASSERT_NOT_REACHED(); 67 ASSERT_NOT_REACHED();
69 } 68 }
70 return ""; 69 return emptyString();
71 } 70 }
72 71
73 } // namespace WebCore 72 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webmidi/MIDIErrorCallback.cpp ('k') | Source/modules/webmidi/MIDIPort.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698