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

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

Issue 24070002: Web MIDI: MIDIInput/MIDIOutput should not have reference to MIDIAccess (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: (rebase) Created 7 years, 3 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/MIDIInput.h ('k') | Source/modules/webmidi/MIDIInput.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 16 matching lines...) Expand all
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/MIDIInput.h" 32 #include "modules/webmidi/MIDIInput.h"
33 #include "modules/webmidi/MIDIMessageEvent.h" 33 #include "modules/webmidi/MIDIMessageEvent.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 PassRefPtr<MIDIInput> MIDIInput::create(ScriptExecutionContext* context, const S tring& id, const String& manufacturer, const String& name, const String& version ) 37 PassRefPtr<MIDIInput> MIDIInput::create(MIDIAccess* access, ScriptExecutionConte xt* context, const String& id, const String& manufacturer, const String& name, c onst String& version)
38 { 38 {
39 return adoptRef(new MIDIInput(context, id, manufacturer, name, version)); 39 ASSERT(access);
40 return adoptRef(new MIDIInput(access, context, id, manufacturer, name, versi on));
40 } 41 }
41 42
42 MIDIInput::MIDIInput(ScriptExecutionContext* context, const String& id, const St ring& manufacturer, const String& name, const String& version) 43 MIDIInput::MIDIInput(MIDIAccess* access, ScriptExecutionContext* context, const String& id, const String& manufacturer, const String& name, const String& versio n)
43 : MIDIPort(context, id, manufacturer, name, MIDIPortTypeInput, version) 44 : MIDIPort(context, id, manufacturer, name, MIDIPortTypeInput, version)
45 , m_access(access)
44 { 46 {
45 ScriptWrappable::init(this); 47 ScriptWrappable::init(this);
46 } 48 }
47 49
48 void MIDIInput::didReceiveMIDIData(unsigned portIndex, const unsigned char* data , size_t length, double timeStamp) 50 void MIDIInput::didReceiveMIDIData(unsigned portIndex, const unsigned char* data , size_t length, double timeStamp)
49 { 51 {
50 ASSERT(isMainThread()); 52 ASSERT(isMainThread());
51 53
52 // The received MIDI data may contain one or more messages. 54 // The received MIDI data may contain one or more messages.
53 // The Web MIDI API requires that a separate event be dispatched for each me ssage, 55 // The Web MIDI API requires that a separate event be dispatched for each me ssage,
(...skipping 15 matching lines...) Expand all
69 array->setRange(data + i, totalMessageSize, 0); 71 array->setRange(data + i, totalMessageSize, 0);
70 72
71 dispatchEvent(MIDIMessageEvent::create(timeStamp, array)); 73 dispatchEvent(MIDIMessageEvent::create(timeStamp, array));
72 } 74 }
73 75
74 i += totalMessageSize; 76 i += totalMessageSize;
75 } 77 }
76 } 78 }
77 79
78 } // namespace WebCore 80 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/webmidi/MIDIInput.h ('k') | Source/modules/webmidi/MIDIInput.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698