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

Side by Side Diff: third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp

Issue 2578193004: Remove ActiveScriptWrappableBase::m_scriptWrappable (Closed)
Patch Set: temp Created 4 years 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
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 return state; 57 return state;
58 } 58 }
59 59
60 } // namespace 60 } // namespace
61 61
62 MIDIAccess::MIDIAccess( 62 MIDIAccess::MIDIAccess(
63 std::unique_ptr<MIDIAccessor> accessor, 63 std::unique_ptr<MIDIAccessor> accessor,
64 bool sysexEnabled, 64 bool sysexEnabled,
65 const Vector<MIDIAccessInitializer::PortDescriptor>& ports, 65 const Vector<MIDIAccessInitializer::PortDescriptor>& ports,
66 ExecutionContext* executionContext) 66 ExecutionContext* executionContext)
67 : ActiveScriptWrappable<MIDIAccess>(this), 67 : SuspendableObject(executionContext),
68 SuspendableObject(executionContext),
69 m_accessor(std::move(accessor)), 68 m_accessor(std::move(accessor)),
70 m_sysexEnabled(sysexEnabled), 69 m_sysexEnabled(sysexEnabled),
71 m_hasPendingActivity(false) { 70 m_hasPendingActivity(false) {
72 m_accessor->setClient(this); 71 m_accessor->setClient(this);
73 for (size_t i = 0; i < ports.size(); ++i) { 72 for (size_t i = 0; i < ports.size(); ++i) {
74 const MIDIAccessInitializer::PortDescriptor& port = ports[i]; 73 const MIDIAccessInitializer::PortDescriptor& port = ports[i];
75 if (port.type == MIDIPort::TypeInput) { 74 if (port.type == MIDIPort::TypeInput) {
76 m_inputs.append(MIDIInput::create(this, port.id, port.manufacturer, 75 m_inputs.append(MIDIInput::create(this, port.id, port.manufacturer,
77 port.name, port.version, 76 port.name, port.version,
78 ToDeviceState(port.state))); 77 ToDeviceState(port.state)));
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 } 230 }
232 231
233 DEFINE_TRACE(MIDIAccess) { 232 DEFINE_TRACE(MIDIAccess) {
234 visitor->trace(m_inputs); 233 visitor->trace(m_inputs);
235 visitor->trace(m_outputs); 234 visitor->trace(m_outputs);
236 EventTargetWithInlineData::trace(visitor); 235 EventTargetWithInlineData::trace(visitor);
237 SuspendableObject::trace(visitor); 236 SuspendableObject::trace(visitor);
238 } 237 }
239 238
240 } // namespace blink 239 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698