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 | 32 #include "bindings/v8/ScriptString.h" |
33 #include "modules/quota/StorageErrorCallback.h" | |
34 | |
35 #include "DOMException.h" | |
36 #include "core/dom/DOMCoreException.h" | |
37 | 33 |
38 namespace WebCore { | 34 namespace WebCore { |
39 | 35 |
40 StorageErrorCallback::CallbackTask::CallbackTask(PassRefPtr<StorageErrorCallback
> callback, ExceptionCode ec) | 36 ScriptString ScriptString::concatenateWith(const String& string) |
41 : m_callback(callback) | |
42 , m_ec(ec) | |
43 { | 37 { |
| 38 v8::HandleScope handleScope; |
| 39 v8::Handle<v8::String> b = v8String(string, v8::Isolate::GetCurrent()); |
| 40 if (hasNoValue()) |
| 41 return ScriptString(b); |
| 42 v8::Handle<v8::String> a = v8::Handle<v8::String>::Cast(v8Value()); |
| 43 return ScriptString(v8::String::Concat(a, b)); |
44 } | 44 } |
45 | 45 |
46 void StorageErrorCallback::CallbackTask::performTask(ScriptExecutionContext*) | 46 String ScriptString::flattenToString() const |
47 { | 47 { |
48 if (!m_callback) | 48 if (hasNoValue()) |
49 return; | 49 return String(); |
50 ExceptionCodeDescription description(m_ec); | 50 v8::HandleScope handleScope; |
51 m_callback->handleEvent(DOMCoreException::create(description).get()); | 51 v8::Handle<v8::String> value = v8::Handle<v8::String>::Cast(v8Value()); |
| 52 return v8StringToWebCoreString<String>(value, Externalize); |
52 } | 53 } |
53 | 54 |
54 } // namespace WebCore | 55 } // namespace WebCore |
OLD | NEW |