| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 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 |
| 11 * copyright notice, this list of conditions and the following disclaimer | 11 * copyright notice, this list of conditions and the following disclaimer |
| 12 * in the documentation and/or other materials provided with the | 12 * in the documentation and/or other materials provided with the |
| 13 * distribution. | 13 * distribution. |
| 14 * * Neither the name of Google Inc. nor the names of its | 14 * * Neither the name of Google Inc. nor the names of its |
| 15 * contributors may be used to endorse or promote products derived from | 15 * contributors may be used to endorse or promote products derived from |
| 16 * this software without specific prior written permission. | 16 * this software without specific prior written permission. |
| 17 * | 17 * |
| 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 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 "StringCallback.h" | |
| 33 | 32 |
| 34 #include "ScriptExecutionContext.h" | 33 #include "modules/webmidi/MIDIErrorCallback.h" |
| 35 #include <wtf/text/WTFString.h> | 34 |
| 35 #include "core/dom/DOMError.h" |
| 36 #include "core/dom/ScriptExecutionContext.h" |
| 36 | 37 |
| 37 namespace WebCore { | 38 namespace WebCore { |
| 38 | 39 |
| 39 namespace { | 40 namespace { |
| 40 | 41 |
| 41 class DispatchCallbackTask : public ScriptExecutionContext::Task { | 42 class DispatchCallbackTask : public ScriptExecutionContext::Task { |
| 42 public: | 43 public: |
| 43 static PassOwnPtr<DispatchCallbackTask> create(PassRefPtr<StringCallback> ca
llback, const String& data) | 44 static PassOwnPtr<DispatchCallbackTask> create(PassRefPtr<MIDIErrorCallback>
callback, PassRefPtr<DOMError> error) |
| 44 { | 45 { |
| 45 return adoptPtr(new DispatchCallbackTask(callback, data)); | 46 return adoptPtr(new DispatchCallbackTask(callback, error)); |
| 46 } | 47 } |
| 47 | 48 |
| 48 virtual void performTask(ScriptExecutionContext*) | 49 virtual void performTask(ScriptExecutionContext*) |
| 49 { | 50 { |
| 50 m_callback->handleEvent(m_data); | 51 m_callback->handleEvent(m_error.get()); |
| 51 } | 52 } |
| 52 | 53 |
| 53 private: | 54 private: |
| 54 DispatchCallbackTask(PassRefPtr<StringCallback> callback, const String& data
) | 55 DispatchCallbackTask(PassRefPtr<MIDIErrorCallback> callback, PassRefPtr<DOME
rror> error) |
| 55 : m_callback(callback) | 56 : m_callback(callback) |
| 56 , m_data(data) | 57 , m_error(error) |
| 57 { | 58 { |
| 58 } | 59 } |
| 59 | 60 |
| 60 RefPtr<StringCallback> m_callback; | 61 RefPtr<MIDIErrorCallback> m_callback; |
| 61 const String m_data; | 62 RefPtr<DOMError> m_error; |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 } // namespace | 65 } // namespace |
| 65 | 66 |
| 66 void StringCallback::scheduleCallback(ScriptExecutionContext* context, const Str
ing& data) | 67 void MIDIErrorCallback::scheduleCallback(ScriptExecutionContext* context, PassRe
fPtr<DOMError> error) |
| 67 { | 68 { |
| 68 context->postTask(DispatchCallbackTask::create(this, data)); | 69 context->postTask(DispatchCallbackTask::create(this, error)); |
| 69 } | 70 } |
| 70 | 71 |
| 71 } // namespace WebCore | 72 } // namespace WebCore |
| OLD | NEW |