Chromium Code Reviews| 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 11 matching lines...) Expand all Loading... | |
| 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 #include "modules/inputmethod/Composition.h" | 32 #include "modules/webmidi/MIDIInput.h" |
| 33 | |
| 34 #include "core/dom/Node.h" | |
| 35 #include "core/dom/Range.h" | |
| 36 | 33 |
| 37 namespace WebCore { | 34 namespace WebCore { |
| 38 | 35 |
| 39 Composition::~Composition() | 36 PassRefPtr<MIDIInput> MIDIInput::create(ScriptExecutionContext* context, const S tring& id, const String& manufacturer, const String& name, const String& version ) |
| 37 { | |
| 38 return adoptRef(new MIDIInput(context, id, manufacturer, name, version)); | |
| 39 } | |
| 40 | |
| 41 PassRefPtr<MIDIInput> MIDIInput::create(PassRefPtr<MIDIPort> src) | |
| 42 { | |
| 43 ASSERT(src->m_type == MIDIPortTypeInput); | |
|
Chris Rogers
2013/04/26 19:55:39
Please make a typeCode() method and use that inste
Takashi Toyoshima
2013/05/02 08:55:25
Done.
Takashi Toyoshima
2013/05/02 08:55:25
Oops. I don't need it any more because I removed c
| |
| 44 return adoptRef(new MIDIInput(src->scriptExecutionContext(), src->id(), src- >manufacturer(), src->name(), src->version())); | |
| 45 } | |
| 46 | |
| 47 MIDIInput::MIDIInput(ScriptExecutionContext* context, const String& id, const St ring& manufacturer, const String& name, const String& version) | |
| 48 : MIDIPort(context, id, manufacturer, name, MIDIPortTypeInput, version) | |
| 40 { | 49 { |
| 41 } | 50 } |
| 42 | 51 |
| 43 PassRefPtr<Composition> Composition::create(Node* text, Range* caret) | |
| 44 { | |
| 45 return adoptRef(new Composition(text, caret)); | |
| 46 } | |
| 47 | |
| 48 Composition::Composition(Node* text, Range* caret) | |
| 49 : m_text(text) | |
| 50 , m_caret(caret) | |
| 51 { | |
| 52 } | |
| 53 | |
| 54 } // namespace WebCore | 52 } // namespace WebCore |
| OLD | NEW |