| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 | 173 |
| 174 if (caught_exception || !result->IsString()) { | 174 if (caught_exception || !result->IsString()) { |
| 175 return factory->InternalizeOneByteString(STATIC_ASCII_VECTOR("<error>")); | 175 return factory->InternalizeOneByteString(STATIC_ASCII_VECTOR("<error>")); |
| 176 } | 176 } |
| 177 Handle<String> result_string = Handle<String>::cast(result); | 177 Handle<String> result_string = Handle<String>::cast(result); |
| 178 // A string that has been obtained from JS code in this way is | 178 // A string that has been obtained from JS code in this way is |
| 179 // likely to be a complicated ConsString of some sort. We flatten it | 179 // likely to be a complicated ConsString of some sort. We flatten it |
| 180 // here to improve the efficiency of converting it to a C string and | 180 // here to improve the efficiency of converting it to a C string and |
| 181 // other operations that are likely to take place (see GetLocalizedMessage | 181 // other operations that are likely to take place (see GetLocalizedMessage |
| 182 // for example). | 182 // for example). |
| 183 FlattenString(result_string); | 183 result_string = String::Flatten(result_string); |
| 184 return result_string; | 184 return result_string; |
| 185 } | 185 } |
| 186 | 186 |
| 187 | 187 |
| 188 SmartArrayPointer<char> MessageHandler::GetLocalizedMessage( | 188 SmartArrayPointer<char> MessageHandler::GetLocalizedMessage( |
| 189 Isolate* isolate, | 189 Isolate* isolate, |
| 190 Handle<Object> data) { | 190 Handle<Object> data) { |
| 191 HandleScope scope(isolate); | 191 HandleScope scope(isolate); |
| 192 return GetMessage(isolate, data)->ToCString(DISALLOW_NULLS); | 192 return GetMessage(isolate, data)->ToCString(DISALLOW_NULLS); |
| 193 } | 193 } |
| 194 | 194 |
| 195 | 195 |
| 196 } } // namespace v8::internal | 196 } } // namespace v8::internal |
| OLD | NEW |