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 17 matching lines...) Expand all Loading... |
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 "bindings/v8/ScriptString.h" | 32 #include "bindings/v8/ScriptString.h" |
33 | 33 |
34 namespace WebCore { | 34 namespace WebCore { |
35 | 35 |
36 ScriptString ScriptString::concatenateWith(const String& string) | 36 ScriptString ScriptString::concatenateWith(const String& string) |
37 { | 37 { |
38 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 38 v8::Isolate* nonNullIsolate = isolate(); |
39 v8::HandleScope handleScope(isolate); | 39 v8::HandleScope handleScope(nonNullIsolate); |
40 v8::Handle<v8::String> b = v8String(string, isolate); | 40 v8::Handle<v8::String> b = v8String(string, nonNullIsolate); |
41 if (hasNoValue()) | 41 if (hasNoValue()) |
42 return ScriptString(b); | 42 return ScriptString(b, nonNullIsolate); |
43 v8::Handle<v8::String> a = v8::Handle<v8::String>::Cast(v8Value()); | 43 v8::Handle<v8::String> a = v8::Handle<v8::String>::Cast(v8Value()); |
44 return ScriptString(v8::String::Concat(a, b)); | 44 return ScriptString(v8::String::Concat(a, b), nonNullIsolate); |
45 } | 45 } |
46 | 46 |
47 String ScriptString::flattenToString() const | 47 String ScriptString::flattenToString() const |
48 { | 48 { |
49 if (hasNoValue()) | 49 if (hasNoValue()) |
50 return String(); | 50 return String(); |
51 v8::HandleScope handleScope(v8::Isolate::GetCurrent()); | 51 v8::HandleScope handleScope(isolate()); |
52 v8::Handle<v8::String> value = v8::Handle<v8::String>::Cast(v8Value()); | 52 v8::Handle<v8::String> value = v8::Handle<v8::String>::Cast(v8Value()); |
53 return v8StringToWebCoreString<String>(value, Externalize); | 53 return v8StringToWebCoreString<String>(value, Externalize); |
54 } | 54 } |
55 | 55 |
56 } // namespace WebCore | 56 } // namespace WebCore |
OLD | NEW |