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

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

Issue 2004313003: DevTools: migrate from OwnPtr to std::unique_ptr for inspector protocol classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebaselined Created 4 years, 7 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 16 matching lines...) Expand all
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/V8Compat.h" 33 #include "platform/v8_inspector/V8Compat.h"
34 #include "platform/v8_inspector/V8DebuggerImpl.h" 34 #include "platform/v8_inspector/V8DebuggerImpl.h"
35 #include "platform/v8_inspector/V8StringUtil.h" 35 #include "platform/v8_inspector/V8StringUtil.h"
36 #include "platform/v8_inspector/public/V8DebuggerClient.h" 36 #include "platform/v8_inspector/public/V8DebuggerClient.h"
37 #include "wtf/PassOwnPtr.h" 37 #include "wtf/PtrUtil.h"
38 38
39 #include <v8.h> 39 #include <v8.h>
40 40
41 namespace blink { 41 namespace blink {
42 42
43 V8FunctionCall::V8FunctionCall(V8DebuggerImpl* debugger, v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& name) 43 V8FunctionCall::V8FunctionCall(V8DebuggerImpl* debugger, v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& name)
44 : m_debugger(debugger) 44 : m_debugger(debugger)
45 , m_context(context) 45 , m_context(context)
46 , m_name(toV8String(context->GetIsolate(), name)) 46 , m_name(toV8String(context->GetIsolate(), name))
47 , m_value(value) 47 , m_value(value)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 return v8::Local<v8::Value>(); 90 return v8::Local<v8::Value>();
91 91
92 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_value); 92 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_value);
93 v8::Local<v8::Value> value; 93 v8::Local<v8::Value> value;
94 if (!thisObject->Get(m_context, m_name).ToLocal(&value)) 94 if (!thisObject->Get(m_context, m_name).ToLocal(&value))
95 return v8::Local<v8::Value>(); 95 return v8::Local<v8::Value>();
96 96
97 DCHECK(value->IsFunction()); 97 DCHECK(value->IsFunction());
98 98
99 v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value); 99 v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value);
100 OwnPtr<v8::Local<v8::Value>[]> info = adoptArrayPtr(new v8::Local<v8::Value> [m_arguments.size()]); 100 std::unique_ptr<v8::Local<v8::Value>[]> info(new v8::Local<v8::Value>[m_argu ments.size()]);
101 for (size_t i = 0; i < m_arguments.size(); ++i) { 101 for (size_t i = 0; i < m_arguments.size(); ++i) {
102 info[i] = m_arguments[i]; 102 info[i] = m_arguments[i];
103 DCHECK(!info[i].IsEmpty()); 103 DCHECK(!info[i].IsEmpty());
104 } 104 }
105 105
106 v8::MicrotasksScope microtasksScope(m_context->GetIsolate(), v8::MicrotasksS cope::kDoNotRunMicrotasks); 106 v8::MicrotasksScope microtasksScope(m_context->GetIsolate(), v8::MicrotasksS cope::kDoNotRunMicrotasks);
107 v8::Local<v8::Value> result; 107 v8::Local<v8::Value> result;
108 if (!function->Call(m_context, thisObject, m_arguments.size(), info.get()).T oLocal(&result)) 108 if (!function->Call(m_context, thisObject, m_arguments.size(), info.get()).T oLocal(&result))
109 return v8::Local<v8::Value>(); 109 return v8::Local<v8::Value>();
110 return result; 110 return result;
111 } 111 }
112 112
113 v8::Local<v8::Function> V8FunctionCall::function() 113 v8::Local<v8::Function> V8FunctionCall::function()
114 { 114 {
115 v8::TryCatch tryCatch(m_context->GetIsolate()); 115 v8::TryCatch tryCatch(m_context->GetIsolate());
116 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_value); 116 v8::Local<v8::Object> thisObject = v8::Local<v8::Object>::Cast(m_value);
117 v8::Local<v8::Value> value; 117 v8::Local<v8::Value> value;
118 if (!thisObject->Get(m_context, m_name).ToLocal(&value)) 118 if (!thisObject->Get(m_context, m_name).ToLocal(&value))
119 return v8::Local<v8::Function>(); 119 return v8::Local<v8::Function>();
120 120
121 DCHECK(value->IsFunction()); 121 DCHECK(value->IsFunction());
122 return v8::Local<v8::Function>::Cast(value); 122 return v8::Local<v8::Function>::Cast(value);
123 } 123 }
124 124
125 } // namespace blink 125 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698