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

Side by Side Diff: third_party/WebKit/Source/platform/v8_inspector/V8FunctionCall.cpp

Issue 1804043002: Revert of Remove V8RecrusionScope, cleanup call sites. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 /* 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 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "platform/v8_inspector/V8FunctionCall.h" 31 #include "platform/v8_inspector/V8FunctionCall.h"
32 32
33 #include "platform/v8_inspector/V8DebuggerImpl.h"
34 #include "platform/v8_inspector/V8StringUtil.h" 33 #include "platform/v8_inspector/V8StringUtil.h"
35 #include "platform/v8_inspector/public/V8DebuggerClient.h" 34 #include "platform/v8_inspector/public/V8DebuggerClient.h"
36 #include "wtf/PassOwnPtr.h" 35 #include "wtf/PassOwnPtr.h"
37 36
38 #include <v8.h> 37 #include <v8.h>
39 38
40 namespace blink { 39 namespace blink {
41 40
42 V8FunctionCall::V8FunctionCall(V8DebuggerImpl* debugger, v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& name) 41 V8FunctionCall::V8FunctionCall(V8DebuggerClient* client, v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& name)
43 : m_debugger(debugger) 42 : m_client(client)
44 , m_context(context) 43 , m_context(context)
45 , m_name(toV8String(context->GetIsolate(), name)) 44 , m_name(toV8String(context->GetIsolate(), name))
46 , m_value(value) 45 , m_value(value)
47 { 46 {
48 } 47 }
49 48
50 void V8FunctionCall::appendArgument(v8::Local<v8::Value> value) 49 void V8FunctionCall::appendArgument(v8::Local<v8::Value> value)
51 { 50 {
52 m_arguments.append(value); 51 m_arguments.append(value);
53 } 52 }
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 ASSERT(value->IsFunction()); 97 ASSERT(value->IsFunction());
99 98
100 v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value); 99 v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value);
101 OwnPtr<v8::Local<v8::Value>[]> info = adoptArrayPtr(new v8::Local<v8::Value> [m_arguments.size()]); 100 OwnPtr<v8::Local<v8::Value>[]> info = adoptArrayPtr(new v8::Local<v8::Value> [m_arguments.size()]);
102 for (size_t i = 0; i < m_arguments.size(); ++i) { 101 for (size_t i = 0; i < m_arguments.size(); ++i) {
103 info[i] = m_arguments[i]; 102 info[i] = m_arguments[i];
104 ASSERT(!info[i].IsEmpty()); 103 ASSERT(!info[i].IsEmpty());
105 } 104 }
106 105
107 v8::Local<v8::Value> result; 106 v8::Local<v8::Value> result;
108 if (!m_debugger->callFunction(function, m_context, thisObject, m_arguments.s ize(), info.get()).ToLocal(&result)) 107 if (!m_client->callFunction(function, m_context, thisObject, m_arguments.siz e(), info.get()).ToLocal(&result))
109 return v8::Local<v8::Value>(); 108 return v8::Local<v8::Value>();
110 return result; 109 return result;
111 } 110 }
112 111
113 v8::Local<v8::Function> V8FunctionCall::function() 112 v8::Local<v8::Function> V8FunctionCall::function()
114 { 113 {
115 v8::TryCatch tryCatch(m_context->GetIsolate()); 114 v8::TryCatch tryCatch(m_context->GetIsolate());
116 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_value); 115 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_value);
117 v8::Local<v8::Value> value; 116 v8::Local<v8::Value> value;
118 if (!thisObject->Get(m_context, m_name).ToLocal(&value)) 117 if (!thisObject->Get(m_context, m_name).ToLocal(&value))
119 return v8::Local<v8::Function>(); 118 return v8::Local<v8::Function>();
120 119
121 ASSERT(value->IsFunction()); 120 ASSERT(value->IsFunction());
122 return v8::Local<v8::Function>::Cast(value); 121 return v8::Local<v8::Function>::Cast(value);
123 } 122 }
124 123
125 } // namespace blink 124 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698