Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Ericsson AB. All rights reserved. | 3 * Copyright (C) 2012 Ericsson AB. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 384 WrapperWorldType worldTypeInMainThread(v8::Isolate*); | 384 WrapperWorldType worldTypeInMainThread(v8::Isolate*); |
| 385 | 385 |
| 386 DOMWrapperWorld* isolatedWorldForIsolate(v8::Isolate*); | 386 DOMWrapperWorld* isolatedWorldForIsolate(v8::Isolate*); |
| 387 | 387 |
| 388 template<class T> struct NativeValueTraits; | 388 template<class T> struct NativeValueTraits; |
| 389 | 389 |
| 390 template<> | 390 template<> |
| 391 struct NativeValueTraits<String> { | 391 struct NativeValueTraits<String> { |
| 392 static inline String nativeValue(const v8::Handle<v8::Value>& value) | 392 static inline String nativeValue(const v8::Handle<v8::Value>& value) |
| 393 { | 393 { |
| 394 return toWebCoreString(value); | 394 V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringVal ue, value, String()); |
|
haraken
2013/09/12 17:33:52
This change wouldn't be helpful until you fix all
do-not-use
2013/09/13 14:55:49
The reason I used V8TRYCATCH_FOR_V8STRINGRESOURCE_
| |
| 395 return stringValue; | |
| 395 } | 396 } |
| 396 }; | 397 }; |
| 397 | 398 |
| 398 template<> | 399 template<> |
| 399 struct NativeValueTraits<unsigned> { | 400 struct NativeValueTraits<unsigned> { |
| 400 static inline unsigned nativeValue(const v8::Handle<v8::Value>& value) | 401 static inline unsigned nativeValue(const v8::Handle<v8::Value>& value) |
| 401 { | 402 { |
| 402 return toUInt32(value); | 403 return toUInt32(value); |
| 403 } | 404 } |
| 404 }; | 405 }; |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 633 return v8::FunctionTemplate::New(function, environment)->GetFunction(); | 634 return v8::FunctionTemplate::New(function, environment)->GetFunction(); |
| 634 } | 635 } |
| 635 | 636 |
| 636 v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate*, Script Wrappable*, v8::Handle<v8::String> key); | 637 v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate*, Script Wrappable*, v8::Handle<v8::String> key); |
| 637 | 638 |
| 638 v8::Isolate* getIsolateFromScriptExecutionContext(ScriptExecutionContext*); | 639 v8::Isolate* getIsolateFromScriptExecutionContext(ScriptExecutionContext*); |
| 639 | 640 |
| 640 } // namespace WebCore | 641 } // namespace WebCore |
| 641 | 642 |
| 642 #endif // V8Binding_h | 643 #endif // V8Binding_h |
| OLD | NEW |