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

Side by Side Diff: Source/bindings/core/v8/ScriptFunctionCall.cpp

Issue 1067763002: bindings: Use Maybe version of Get in bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/bindings/core/v8/ScriptController.cpp ('k') | Source/bindings/core/v8/ScriptState.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 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 { 98 {
99 } 99 }
100 100
101 ScriptValue ScriptFunctionCall::call(bool& hadException, bool reportExceptions) 101 ScriptValue ScriptFunctionCall::call(bool& hadException, bool reportExceptions)
102 { 102 {
103 ScriptState::Scope scope(m_scriptState.get()); 103 ScriptState::Scope scope(m_scriptState.get());
104 v8::TryCatch tryCatch; 104 v8::TryCatch tryCatch;
105 tryCatch.SetVerbose(reportExceptions); 105 tryCatch.SetVerbose(reportExceptions);
106 106
107 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_thisObject. v8Value()); 107 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_thisObject. v8Value());
108 v8::Local<v8::Value> value = thisObject->Get(v8String(m_scriptState->isolate (), m_name)); 108 v8::Local<v8::Value> value;
109 if (tryCatch.HasCaught()) { 109 if (!thisObject->Get(m_scriptState->context(), v8String(m_scriptState->isola te(), m_name)).ToLocal(&value)) {
110 hadException = true; 110 hadException = true;
111 return ScriptValue(); 111 return ScriptValue();
112 } 112 }
113 113
114 ASSERT(value->IsFunction()); 114 ASSERT(value->IsFunction());
115 115
116 v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value); 116 v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value);
117 OwnPtr<v8::Local<v8::Value>[]> info = adoptArrayPtr(new v8::Local<v8::Value> [m_arguments.size()]); 117 OwnPtr<v8::Local<v8::Value>[]> info = adoptArrayPtr(new v8::Local<v8::Value> [m_arguments.size()]);
118 for (size_t i = 0; i < m_arguments.size(); ++i) { 118 for (size_t i = 0; i < m_arguments.size(); ++i) {
119 info[i] = m_arguments[i].v8Value(); 119 info[i] = m_arguments[i].v8Value();
120 ASSERT(!info[i].IsEmpty()); 120 ASSERT(!info[i].IsEmpty());
121 } 121 }
122 122
123 v8::Local<v8::Value> result = V8ScriptRunner::callFunction(function, m_scrip tState->executionContext(), thisObject, m_arguments.size(), info.get(), m_script State->isolate()); 123 v8::Local<v8::Value> result = V8ScriptRunner::callFunction(function, m_scrip tState->executionContext(), thisObject, m_arguments.size(), info.get(), m_script State->isolate());
124 if (tryCatch.HasCaught()) { 124 if (tryCatch.HasCaught()) {
125 hadException = true; 125 hadException = true;
126 return ScriptValue(); 126 return ScriptValue();
127 } 127 }
128 128
129 return ScriptValue(m_scriptState.get(), result); 129 return ScriptValue(m_scriptState.get(), result);
130 } 130 }
131 131
132 ScriptValue ScriptFunctionCall::call() 132 ScriptValue ScriptFunctionCall::call()
133 { 133 {
134 bool hadException = false; 134 bool hadException = false;
135 return call(hadException); 135 return call(hadException);
136 } 136 }
137 137
138 } // namespace blink 138 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ScriptController.cpp ('k') | Source/bindings/core/v8/ScriptState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698