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

Side by Side Diff: third_party/WebKit/Source/bindings/templates/dictionary_v8.cpp.tmpl

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 years, 10 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
OLDNEW
1 {% filter format_blink_cpp_source_code %} 1 {% filter format_blink_cpp_source_code %}
2 2
3 {% from 'utilities.cpp.tmpl' import declare_enum_validation_variable %} 3 {% from 'utilities.cpp.tmpl' import declare_enum_validation_variable %}
4 {% include 'copyright_block.txt' %} 4 {% include 'copyright_block.txt' %}
5 #include "{{v8_original_class}}.h" 5 #include "{{v8_original_class}}.h"
6 6
7 {% for filename in cpp_includes if filename != '%s.h' % v8_class %} 7 {% for filename in cpp_includes if filename != '%s.h' % v8_class %}
8 #include "{{filename}}" 8 #include "{{filename}}"
9 {% endfor %} 9 {% endfor %}
10 10
11 namespace blink { 11 namespace blink {
12 12
13 {% from 'utilities.cpp.tmpl' import v8_value_to_local_cpp_value %} 13 {% from 'utilities.cpp.tmpl' import v8_value_to_local_cpp_value %}
14 void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{ cpp_class}}& impl, ExceptionState& exceptionState) { 14 void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{ cpp_class}}& impl, ExceptionState& exceptionState) {
15 if (isUndefinedOrNull(v8Value)) { 15 if (IsUndefinedOrNull(v8Value)) {
16 {% if required_member_names %} 16 {% if required_member_names %}
17 exceptionState.throwTypeError("Missing required member(s): {{required_member _names|join(', ')}}."); 17 exceptionState.ThrowTypeError("Missing required member(s): {{required_member _names|join(', ')}}.");
18 {% endif %} 18 {% endif %}
19 return; 19 return;
20 } 20 }
21 if (!v8Value->IsObject()) { 21 if (!v8Value->IsObject()) {
22 {% if use_permissive_dictionary_conversion %} 22 {% if use_permissive_dictionary_conversion %}
23 // Do nothing. 23 // Do nothing.
24 return; 24 return;
25 {% else %} 25 {% else %}
26 exceptionState.throwTypeError("cannot convert to dictionary."); 26 exceptionState.ThrowTypeError("cannot convert to dictionary.");
27 return; 27 return;
28 {% endif %} 28 {% endif %}
29 } 29 }
30 30
31 {% if parent_v8_class %} 31 {% if parent_v8_class %}
32 {{parent_v8_class}}::toImpl(isolate, v8Value, impl, exceptionState); 32 {{parent_v8_class}}::toImpl(isolate, v8Value, impl, exceptionState);
33 if (exceptionState.hadException()) 33 if (exceptionState.HadException())
34 return; 34 return;
35 35
36 {% endif %} 36 {% endif %}
37 {# Declare local variables only when the dictionary has members to avoid unuse d variable warnings. #} 37 {# Declare local variables only when the dictionary has members to avoid unuse d variable warnings. #}
38 {% if members %} 38 {% if members %}
39 v8::TryCatch block(isolate); 39 v8::TryCatch block(isolate);
40 v8::Local<v8::Object> v8Object; 40 v8::Local<v8::Object> v8Object;
41 if (!v8Call(v8Value->ToObject(isolate->GetCurrentContext()), v8Object, block)) { 41 if (!V8Call(v8Value->ToObject(isolate->GetCurrentContext()), v8Object, block)) {
42 exceptionState.rethrowV8Exception(block.Exception()); 42 exceptionState.RethrowV8Exception(block.Exception());
43 return; 43 return;
44 } 44 }
45 {% endif %} 45 {% endif %}
46 {% for member in members %} 46 {% for member in members %}
47 {% filter runtime_enabled(member.runtime_enabled_feature_name) %} 47 {% filter runtime_enabled(member.runtime_enabled_feature_name) %}
48 v8::Local<v8::Value> {{member.name}}Value; 48 v8::Local<v8::Value> {{member.name}}Value;
49 if (!v8Object->Get(isolate->GetCurrentContext(), v8AtomicString(isolate, "{{me mber.name}}")).ToLocal(&{{member.name}}Value)) { 49 if (!v8Object->Get(isolate->GetCurrentContext(), V8AtomicString(isolate, "{{me mber.name}}")).ToLocal(&{{member.name}}Value)) {
50 exceptionState.rethrowV8Exception(block.Exception()); 50 exceptionState.RethrowV8Exception(block.Exception());
51 return; 51 return;
52 } 52 }
53 if ({{member.name}}Value.IsEmpty() || {{member.name}}Value->IsUndefined()) { 53 if ({{member.name}}Value.IsEmpty() || {{member.name}}Value->IsUndefined()) {
54 {% if member.is_required %} 54 {% if member.is_required %}
55 exceptionState.throwTypeError("required member {{member.name}} is undefined. "); 55 exceptionState.ThrowTypeError("required member {{member.name}} is undefined. ");
56 return; 56 return;
57 {% else %} 57 {% else %}
58 // Do nothing. 58 // Do nothing.
59 {% endif %} 59 {% endif %}
60 {% if member.is_nullable %} 60 {% if member.is_nullable %}
61 } else if ({{member.name}}Value->IsNull()) { 61 } else if ({{member.name}}Value->IsNull()) {
62 impl.{{member.null_setter_name}}(); 62 impl.{{member.null_setter_name}}();
63 {% endif %} 63 {% endif %}
64 } else { 64 } else {
65 {% if member.deprecate_as %} 65 {% if member.deprecate_as %}
66 Deprecation::countDeprecation(currentExecutionContext(isolate), UseCounter:: {{member.deprecate_as}}); 66 Deprecation::CountDeprecation(CurrentExecutionContext(isolate), UseCounter:: k{{member.deprecate_as}});
67 {% endif %} 67 {% endif %}
68 {{v8_value_to_local_cpp_value(member) | indent}} 68 {{v8_value_to_local_cpp_value(member) | indent}}
69 {% if member.is_interface_type %} 69 {% if member.is_interface_type %}
70 if (!{{member.name}}) { 70 if (!{{member.name}}) {
71 exceptionState.throwTypeError("member {{member.name}} is not of type {{mem ber.idl_type}}."); 71 exceptionState.ThrowTypeError("member {{member.name}} is not of type {{mem ber.idl_type}}.");
72 return; 72 return;
73 } 73 }
74 {% endif %} 74 {% endif %}
75 {% if member.enum_values %} 75 {% if member.enum_values %}
76 {{declare_enum_validation_variable(member.enum_values) | indent}} 76 {{declare_enum_validation_variable(member.enum_values) | indent}}
77 if (!isValidEnum({{member.name}}, validValues, WTF_ARRAY_LENGTH(validValues) , "{{member.enum_type}}", exceptionState)) 77 if (!IsValidEnum({{member.name}}, validValues, WTF_ARRAY_LENGTH(validValues) , "{{member.enum_type}}", exceptionState))
78 return; 78 return;
79 {% elif member.is_object %} 79 {% elif member.is_object %}
80 if (!{{member.name}}.isObject()) { 80 if (!{{member.name}}.IsObject()) {
81 exceptionState.throwTypeError("member {{member.name}} is not an object."); 81 exceptionState.ThrowTypeError("member {{member.name}} is not an object.");
82 return; 82 return;
83 } 83 }
84 {% endif %} 84 {% endif %}
85 impl.{{member.setter_name}}({{member.name}}); 85 impl.{{member.setter_name}}({{member.name}});
86 } 86 }
87 {% endfilter %} 87 {% endfilter %}
88 88
89 {% endfor %} 89 {% endfor %}
90 } 90 }
91 91
92 v8::Local<v8::Value> {{cpp_class}}::toV8Impl(v8::Local<v8::Object> creationConte xt, v8::Isolate* isolate) const { 92 v8::Local<v8::Value> {{cpp_class}}::ToV8Impl(v8::Local<v8::Object> creationConte xt, v8::Isolate* isolate) const {
93 v8::Local<v8::Object> v8Object = v8::Object::New(isolate); 93 v8::Local<v8::Object> v8Object = v8::Object::New(isolate);
94 if (!toV8{{cpp_class}}(*this, v8Object, creationContext, isolate)) 94 if (!toV8{{cpp_class}}(*this, v8Object, creationContext, isolate))
95 return v8::Undefined(isolate); 95 return v8::Undefined(isolate);
96 return v8Object; 96 return v8Object;
97 } 97 }
98 98
99 bool toV8{{cpp_class}}(const {{cpp_class}}& impl, v8::Local<v8::Object> dictiona ry, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) { 99 bool toV8{{cpp_class}}(const {{cpp_class}}& impl, v8::Local<v8::Object> dictiona ry, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) {
100 {% if parent_v8_class %} 100 {% if parent_v8_class %}
101 if (!toV8{{parent_cpp_class}}(impl, dictionary, creationContext, isolate)) 101 if (!toV8{{parent_cpp_class}}(impl, dictionary, creationContext, isolate))
102 return false; 102 return false;
103 103
104 {% endif %} 104 {% endif %}
105 {% for member in members %} 105 {% for member in members %}
106 if (impl.{{member.has_method_name}}()) { 106 if (impl.{{member.has_method_name}}()) {
107 {% if member.is_object %} 107 {% if member.is_object %}
108 DCHECK(impl.{{member.getter_name}}().isObject()); 108 DCHECK(impl.{{member.getter_name}}().IsObject());
109 {% endif %} 109 {% endif %}
110 if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext (), v8AtomicString(isolate, "{{member.name}}"), {{member.cpp_value_to_v8_value}} ))) 110 if (!V8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext (), V8AtomicString(isolate, "{{member.name}}"), {{member.cpp_value_to_v8_value}} )))
111 return false; 111 return false;
112 {% if member.v8_default_value %} 112 {% if member.v8_default_value %}
113 } else { 113 } else {
114 if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext (), v8AtomicString(isolate, "{{member.name}}"), {{member.v8_default_value}}))) 114 if (!V8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext (), V8AtomicString(isolate, "{{member.name}}"), {{member.v8_default_value}})))
115 return false; 115 return false;
116 {% elif member.is_nullable %} 116 {% elif member.is_nullable %}
117 } else { 117 } else {
118 if (!v8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext (), v8AtomicString(isolate, "{{member.name}}"), v8::Null(isolate)))) 118 if (!V8CallBoolean(dictionary->CreateDataProperty(isolate->GetCurrentContext (), V8AtomicString(isolate, "{{member.name}}"), v8::Null(isolate))))
119 return false; 119 return false;
120 {% elif member.is_required %} 120 {% elif member.is_required %}
121 } else { 121 } else {
122 NOTREACHED(); 122 NOTREACHED();
123 {% endif %} 123 {% endif %}
124 } 124 }
125 125
126 {% endfor %} 126 {% endfor %}
127 return true; 127 return true;
128 } 128 }
129 129
130 {{cpp_class}} NativeValueTraits<{{cpp_class}}>::nativeValue(v8::Isolate* isolate , v8::Local<v8::Value> value, ExceptionState& exceptionState) { 130 {{cpp_class}} NativeValueTraits<{{cpp_class}}>::NativeValue(v8::Isolate* isolate , v8::Local<v8::Value> value, ExceptionState& exceptionState) {
131 {{cpp_class}} impl; 131 {{cpp_class}} impl;
132 {{v8_class}}::toImpl(isolate, value, impl, exceptionState); 132 {{v8_class}}::toImpl(isolate, value, impl, exceptionState);
133 return impl; 133 return impl;
134 } 134 }
135 135
136 } // namespace blink 136 } // namespace blink
137 137
138 {% endfilter %}{# format_blink_cpp_source_code #} 138 {% endfilter %}{# format_blink_cpp_source_code #}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698