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

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

Issue 1862533002: [DevTools] Speculative chrome os tests fix (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 v8::MaybeLocal<v8::Value> InjectedScript::wrapValue(ErrorString* errorString, v8 ::Local<v8::Value> value, const String16& groupName, bool forceValueType, bool g eneratePreview) const 175 v8::MaybeLocal<v8::Value> InjectedScript::wrapValue(ErrorString* errorString, v8 ::Local<v8::Value> value, const String16& groupName, bool forceValueType, bool g eneratePreview) const
176 { 176 {
177 V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "wrapOb ject"); 177 V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "wrapOb ject");
178 function.appendArgument(value); 178 function.appendArgument(value);
179 function.appendArgument(groupName); 179 function.appendArgument(groupName);
180 function.appendArgument(canAccessInspectedWindow()); 180 function.appendArgument(canAccessInspectedWindow());
181 function.appendArgument(forceValueType); 181 function.appendArgument(forceValueType);
182 function.appendArgument(generatePreview); 182 function.appendArgument(generatePreview);
183 bool hadException = false; 183 bool hadException = false;
184 v8::Local<v8::Value> r = callFunctionWithEvalEnabled(function, hadException) ; 184 v8::Local<v8::Value> r = callFunctionWithEvalEnabled(function, hadException) ;
185 if (hasInternalError(errorString, hadException)) 185 if (hasInternalError(errorString, hadException || r.IsEmpty()))
186 return v8::MaybeLocal<v8::Value>(); 186 return v8::MaybeLocal<v8::Value>();
187 return r; 187 return r;
188 } 188 }
189 189
190 PassOwnPtr<protocol::Runtime::RemoteObject> InjectedScript::wrapTable(v8::Local< v8::Value> table, v8::Local<v8::Value> columns) const 190 PassOwnPtr<protocol::Runtime::RemoteObject> InjectedScript::wrapTable(v8::Local< v8::Value> table, v8::Local<v8::Value> columns) const
191 { 191 {
192 v8::HandleScope handles(m_isolate); 192 v8::HandleScope handles(m_isolate);
193 V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "wrapTa ble"); 193 V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "wrapTa ble");
194 function.appendArgument(canAccessInspectedWindow()); 194 function.appendArgument(canAccessInspectedWindow());
195 function.appendArgument(table); 195 function.appendArgument(table);
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 438
439 InjectedScript::ScopedGlobalObjectExtension::~ScopedGlobalObjectExtension() 439 InjectedScript::ScopedGlobalObjectExtension::~ScopedGlobalObjectExtension()
440 { 440 {
441 v8::Local<v8::Object> global; 441 v8::Local<v8::Object> global;
442 if (!m_global.ToLocal(&global)) 442 if (!m_global.ToLocal(&global))
443 return; 443 return;
444 global->Delete(m_context, m_symbol); 444 global->Delete(m_context, m_symbol);
445 } 445 }
446 446
447 } // namespace blink 447 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698