Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(984)

Side by Side Diff: Source/bindings/templates/dictionary_v8.cpp

Issue 556273003: In generated dictionary toImpl(), throw all exceptions via ExceptionState (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: added FIXME comment Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/bindings/tests/results/core/V8TestDictionary.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file has been auto-generated by {{code_generator}}. DO NOT MODIFY! 5 // This file has been auto-generated by {{code_generator}}. DO NOT MODIFY!
6 6
7 #include "config.h" 7 #include "config.h"
8 #include "{{v8_class}}.h" 8 #include "{{v8_class}}.h"
9 9
10 {% for filename in cpp_includes if filename != '%s.h' % v8_class %} 10 {% for filename in cpp_includes if filename != '%s.h' % v8_class %}
11 #include "{{filename}}" 11 #include "{{filename}}"
12 {% endfor %} 12 {% endfor %}
13 13
14 namespace blink { 14 namespace blink {
15 15
16 {{cpp_class}}* {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Handle<v8::Value> v8Value, ExceptionState& exceptionState) 16 {{cpp_class}}* {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Handle<v8::Value> v8Value, ExceptionState& exceptionState)
17 { 17 {
18 {{cpp_class}}* impl = {{cpp_class}}::create(); 18 {{cpp_class}}* impl = {{cpp_class}}::create();
19 // FIXME: Do not use Dictionary and DictionaryHelper 19 // FIXME: Do not use Dictionary and DictionaryHelper
20 // https://crbug.com/321462 20 // https://crbug.com/321462
21 Dictionary dictionary(v8Value, isolate); 21 Dictionary dictionary(v8Value, isolate);
22 // FIXME: Remove this v8::TryCatch once the code is switched from
23 // Dictionary/DictionaryHelper to something that uses ExceptionState.
24 v8::TryCatch block;
22 {% for member in members %} 25 {% for member in members %}
23 {{member.cpp_type}} {{member.name}}; 26 {{member.cpp_type}} {{member.name}};
24 if (DictionaryHelper::getWithUndefinedOrNullCheck(dictionary, "{{member.name }}", {{member.name}})) { 27 if (DictionaryHelper::getWithUndefinedOrNullCheck(dictionary, "{{member.name }}", {{member.name}})) {
25 {% if member.enum_validation_expression %} 28 {% if member.enum_validation_expression %}
26 String string = {{member.name}}; 29 String string = {{member.name}};
27 if (!({{member.enum_validation_expression}})) { 30 if (!({{member.enum_validation_expression}})) {
28 exceptionState.throwTypeError("member {{member.name}} ('" + string + "') is not a valid enum value."); 31 exceptionState.throwTypeError("member {{member.name}} ('" + string + "') is not a valid enum value.");
29 return 0; 32 return 0;
30 } 33 }
31 {% endif %} 34 {% endif %}
32 impl->{{member.setter_name}}({{member.name}}); 35 impl->{{member.setter_name}}({{member.name}});
36 } else if (block.HasCaught()) {
37 exceptionState.rethrowV8Exception(block.Exception());
38 return 0;
33 } 39 }
34 {% endfor %} 40 {% endfor %}
35 return impl; 41 return impl;
36 } 42 }
37 43
38 v8::Handle<v8::Value> toV8({{cpp_class}}* impl, v8::Handle<v8::Object> creationC ontext, v8::Isolate* isolate) 44 v8::Handle<v8::Value> toV8({{cpp_class}}* impl, v8::Handle<v8::Object> creationC ontext, v8::Isolate* isolate)
39 { 45 {
40 v8::Handle<v8::Object> v8Object = v8::Object::New(isolate); 46 v8::Handle<v8::Object> v8Object = v8::Object::New(isolate);
41 {% for member in members %} 47 {% for member in members %}
42 if (impl->{{member.has_method_name}}()) 48 if (impl->{{member.has_method_name}}())
43 v8Object->Set(v8String(isolate, "{{member.name}}"), {{member.cpp_value_t o_v8_value}}); 49 v8Object->Set(v8String(isolate, "{{member.name}}"), {{member.cpp_value_t o_v8_value}});
44 {% if member.v8_default_value %} 50 {% if member.v8_default_value %}
45 else 51 else
46 v8Object->Set(v8String(isolate, "{{member.name}}"), {{member.v8_default_ value}}); 52 v8Object->Set(v8String(isolate, "{{member.name}}"), {{member.v8_default_ value}});
47 {% endif %} 53 {% endif %}
48 {% endfor %} 54 {% endfor %}
49 return v8Object; 55 return v8Object;
50 } 56 }
51 57
52 } // namespace blink 58 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/bindings/tests/results/core/V8TestDictionary.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698