| OLD | NEW |
| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 , m_native(injectedScriptNative) | 69 , m_native(injectedScriptNative) |
| 70 , m_contextId(contextId) | 70 , m_contextId(contextId) |
| 71 { | 71 { |
| 72 m_context.SetWeak(this, &weakCallback, v8::WeakCallbackType::kParameter); | 72 m_context.SetWeak(this, &weakCallback, v8::WeakCallbackType::kParameter); |
| 73 } | 73 } |
| 74 | 74 |
| 75 InjectedScript::~InjectedScript() | 75 InjectedScript::~InjectedScript() |
| 76 { | 76 { |
| 77 } | 77 } |
| 78 | 78 |
| 79 void InjectedScript::getProperties(ErrorString* errorString, const String16& obj
ectId, bool ownProperties, bool accessorPropertiesOnly, bool generatePreview, Ow
nPtr<Array<PropertyDescriptor>>* properties, Maybe<protocol::Runtime::ExceptionD
etails>* exceptionDetails) | 79 void InjectedScript::getProperties(ErrorString* errorString, v8::Local<v8::Objec
t> object, const String16& groupName, bool ownProperties, bool accessorPropertie
sOnly, bool generatePreview, OwnPtr<Array<PropertyDescriptor>>* properties, Mayb
e<protocol::Runtime::ExceptionDetails>* exceptionDetails) |
| 80 { | 80 { |
| 81 v8::HandleScope handles(m_isolate); | 81 v8::HandleScope handles(m_isolate); |
| 82 V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "getPro
perties"); | 82 V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "getPro
perties"); |
| 83 function.appendArgument(objectId); | 83 function.appendArgument(object); |
| 84 function.appendArgument(groupName); |
| 84 function.appendArgument(ownProperties); | 85 function.appendArgument(ownProperties); |
| 85 function.appendArgument(accessorPropertiesOnly); | 86 function.appendArgument(accessorPropertiesOnly); |
| 86 function.appendArgument(generatePreview); | 87 function.appendArgument(generatePreview); |
| 87 | 88 |
| 88 OwnPtr<protocol::Value> result = makeCallWithExceptionDetails(function, exce
ptionDetails); | 89 OwnPtr<protocol::Value> result = makeCallWithExceptionDetails(function, exce
ptionDetails); |
| 89 if (exceptionDetails->isJust()) { | 90 if (exceptionDetails->isJust()) { |
| 90 // FIXME: make properties optional | 91 // FIXME: make properties optional |
| 91 *properties = Array<PropertyDescriptor>::create(); | 92 *properties = Array<PropertyDescriptor>::create(); |
| 92 return; | 93 return; |
| 93 } | 94 } |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 return; | 426 return; |
| 426 *result = remoteObject.release(); | 427 *result = remoteObject.release(); |
| 427 if (exceptionDetails) | 428 if (exceptionDetails) |
| 428 *exceptionDetails = createExceptionDetails(tryCatch.Message()); | 429 *exceptionDetails = createExceptionDetails(tryCatch.Message()); |
| 429 if (wasThrown) | 430 if (wasThrown) |
| 430 *wasThrown = true; | 431 *wasThrown = true; |
| 431 } | 432 } |
| 432 } | 433 } |
| 433 | 434 |
| 434 } // namespace blink | 435 } // namespace blink |
| OLD | NEW |