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 22 matching lines...) Expand all Loading... |
33 | 33 |
34 #include "bindings/core/v8/V8Binding.h" | 34 #include "bindings/core/v8/V8Binding.h" |
35 | 35 |
36 namespace blink { | 36 namespace blink { |
37 | 37 |
38 ScriptString::ScriptString() | 38 ScriptString::ScriptString() |
39 : m_isolate(0) | 39 : m_isolate(0) |
40 { | 40 { |
41 } | 41 } |
42 | 42 |
43 ScriptString::ScriptString(v8::Isolate* isolate, v8::Handle<v8::String> string) | 43 ScriptString::ScriptString(v8::Isolate* isolate, v8::Local<v8::String> string) |
44 : m_isolate(isolate) | 44 : m_isolate(isolate) |
45 , m_string(SharedPersistent<v8::String>::create(string, m_isolate)) | 45 , m_string(SharedPersistent<v8::String>::create(string, m_isolate)) |
46 { | 46 { |
47 } | 47 } |
48 | 48 |
49 ScriptString& ScriptString::operator=(const ScriptString& string) | 49 ScriptString& ScriptString::operator=(const ScriptString& string) |
50 { | 50 { |
51 if (this != &string) { | 51 if (this != &string) { |
52 m_isolate = string.m_isolate; | 52 m_isolate = string.m_isolate; |
53 m_string = string.m_string; | 53 m_string = string.m_string; |
54 } | 54 } |
55 return *this; | 55 return *this; |
56 } | 56 } |
57 | 57 |
58 v8::Handle<v8::String> ScriptString::v8Value() | 58 v8::Local<v8::String> ScriptString::v8Value() |
59 { | 59 { |
60 if (isEmpty()) | 60 if (isEmpty()) |
61 return v8::Handle<v8::String>(); | 61 return v8::Local<v8::String>(); |
62 return m_string->newLocal(isolate()); | 62 return m_string->newLocal(isolate()); |
63 } | 63 } |
64 | 64 |
65 ScriptString ScriptString::concatenateWith(const String& string) | 65 ScriptString ScriptString::concatenateWith(const String& string) |
66 { | 66 { |
67 v8::Isolate* nonNullIsolate = isolate(); | 67 v8::Isolate* nonNullIsolate = isolate(); |
68 v8::HandleScope handleScope(nonNullIsolate); | 68 v8::HandleScope handleScope(nonNullIsolate); |
69 v8::Handle<v8::String> targetString = v8String(nonNullIsolate, string); | 69 v8::Local<v8::String> targetString = v8String(nonNullIsolate, string); |
70 if (isEmpty()) | 70 if (isEmpty()) |
71 return ScriptString(nonNullIsolate, targetString); | 71 return ScriptString(nonNullIsolate, targetString); |
72 return ScriptString(nonNullIsolate, v8::String::Concat(v8Value(), targetStri
ng)); | 72 return ScriptString(nonNullIsolate, v8::String::Concat(v8Value(), targetStri
ng)); |
73 } | 73 } |
74 | 74 |
75 String ScriptString::flattenToString() | 75 String ScriptString::flattenToString() |
76 { | 76 { |
77 if (isEmpty()) | 77 if (isEmpty()) |
78 return String(); | 78 return String(); |
79 v8::HandleScope handleScope(isolate()); | 79 v8::HandleScope handleScope(isolate()); |
80 return v8StringToWebCoreString<String>(v8Value(), Externalize); | 80 return v8StringToWebCoreString<String>(v8Value(), Externalize); |
81 } | 81 } |
82 | 82 |
83 } // namespace blink | 83 } // namespace blink |
OLD | NEW |