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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/core/inspector/InjectedScript.h

Issue 369333002: DevTools: Added error message when the command is invoked from the console with exception (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@add-evaluate-exception-details
Patch Set: Created 6 years, 5 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
« LayoutTests/inspector/console/console-eval-throw-undefined-expected.txt ('K') | « LayoutTests/inspector/console/console-eval-undefined-override-expected.txt ('k') | Source/core/inspector/InjectedScript.cpp » ('j') | Source/core/inspector/InjectedScriptSource.js » ('J')
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 virtual ~InjectedScript() { } 51 virtual ~InjectedScript() { }
52 52
53 void evaluate( 53 void evaluate(
54 ErrorString*, 54 ErrorString*,
55 const String& expression, 55 const String& expression,
56 const String& objectGroup, 56 const String& objectGroup,
57 bool includeCommandLineAPI, 57 bool includeCommandLineAPI,
58 bool returnByValue, 58 bool returnByValue,
59 bool generatePreview, 59 bool generatePreview,
60 RefPtr<TypeBuilder::Runtime::RemoteObject>* result, 60 RefPtr<TypeBuilder::Runtime::RemoteObject>* result,
61 TypeBuilder::OptOutput<bool>* wasThrown); 61 TypeBuilder::OptOutput<bool>* wasThrown,
62 RefPtr<TypeBuilder::Debugger::ExceptionDetails>*);
62 void callFunctionOn( 63 void callFunctionOn(
63 ErrorString*, 64 ErrorString*,
64 const String& objectId, 65 const String& objectId,
65 const String& expression, 66 const String& expression,
66 const String& arguments, 67 const String& arguments,
67 bool returnByValue, 68 bool returnByValue,
68 bool generatePreview, 69 bool generatePreview,
69 RefPtr<TypeBuilder::Runtime::RemoteObject>* result, 70 RefPtr<TypeBuilder::Runtime::RemoteObject>* result,
70 TypeBuilder::OptOutput<bool>* wasThrown); 71 TypeBuilder::OptOutput<bool>* wasThrown);
71 void evaluateOnCallFrame( 72 void evaluateOnCallFrame(
72 ErrorString*, 73 ErrorString*,
73 const ScriptValue& callFrames, 74 const ScriptValue& callFrames,
74 const Vector<ScriptValue>& asyncCallStacks, 75 const Vector<ScriptValue>& asyncCallStacks,
75 const String& callFrameId, 76 const String& callFrameId,
76 const String& expression, 77 const String& expression,
77 const String& objectGroup, 78 const String& objectGroup,
78 bool includeCommandLineAPI, 79 bool includeCommandLineAPI,
79 bool returnByValue, 80 bool returnByValue,
80 bool generatePreview, 81 bool generatePreview,
81 RefPtr<TypeBuilder::Runtime::RemoteObject>* result, 82 RefPtr<TypeBuilder::Runtime::RemoteObject>* result,
82 TypeBuilder::OptOutput<bool>* wasThrown); 83 TypeBuilder::OptOutput<bool>* wasThrown,
84 RefPtr<TypeBuilder::Debugger::ExceptionDetails>*);
83 void restartFrame(ErrorString*, const ScriptValue& callFrames, const String& callFrameId, RefPtr<JSONObject>* result); 85 void restartFrame(ErrorString*, const ScriptValue& callFrames, const String& callFrameId, RefPtr<JSONObject>* result);
84 void getStepInPositions(ErrorString*, const ScriptValue& callFrames, const S tring& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> > & positions); 86 void getStepInPositions(ErrorString*, const ScriptValue& callFrames, const S tring& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> > & positions);
85 void setVariableValue(ErrorString*, const ScriptValue& callFrames, const Str ing* callFrameIdOpt, const String* functionObjectIdOpt, int scopeNumber, const S tring& variableName, const String& newValueStr); 87 void setVariableValue(ErrorString*, const ScriptValue& callFrames, const Str ing* callFrameIdOpt, const String* functionObjectIdOpt, int scopeNumber, const S tring& variableName, const String& newValueStr);
86 void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeB uilder::Debugger::FunctionDetails>* result); 88 void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeB uilder::Debugger::FunctionDetails>* result);
87 void getProperties(ErrorString*, const String& objectId, bool ownProperties, bool accessorPropertiesOnly, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::Pr opertyDescriptor> >* result); 89 void getProperties(ErrorString*, const String& objectId, bool ownProperties, bool accessorPropertiesOnly, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::Pr opertyDescriptor> >* result);
88 void getInternalProperties(ErrorString*, const String& objectId, RefPtr<Type Builder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor> >* result); 90 void getInternalProperties(ErrorString*, const String& objectId, RefPtr<Type Builder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor> >* result);
89 Node* nodeForObjectId(const String& objectId); 91 Node* nodeForObjectId(const String& objectId);
90 void releaseObject(const String& objectId); 92 void releaseObject(const String& objectId);
91 93
92 PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > wrapCallFr ames(const ScriptValue&, int asyncOrdinal); 94 PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > wrapCallFr ames(const ScriptValue&, int asyncOrdinal);
(...skipping 11 matching lines...) Expand all
104 friend InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState*) ; 106 friend InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState*) ;
105 InjectedScript(ScriptValue, InspectedStateAccessCheck); 107 InjectedScript(ScriptValue, InspectedStateAccessCheck);
106 108
107 ScriptValue nodeAsScriptValue(Node*); 109 ScriptValue nodeAsScriptValue(Node*);
108 }; 110 };
109 111
110 112
111 } // namespace WebCore 113 } // namespace WebCore
112 114
113 #endif 115 #endif
OLDNEW
« LayoutTests/inspector/console/console-eval-throw-undefined-expected.txt ('K') | « LayoutTests/inspector/console/console-eval-undefined-override-expected.txt ('k') | Source/core/inspector/InjectedScript.cpp » ('j') | Source/core/inspector/InjectedScriptSource.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698