Changeset 95941 in webkit
- Timestamp:
- Sep 26, 2011 5:12:34 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r95937 r95941 1 2011-09-23 Ilya Tikhonovsky <loislo@chromium.org> 2 3 Web Inspector: Timeline: record root event for the function calls enforced by console eval. 4 https://bugs.webkit.org/show_bug.cgi?id=68695 5 6 In a complex web application developer might want to timeline a specific piece of code. 7 8 In this case he can do the next steps: 9 1) start timeline; 10 2) eval a command in console; 11 3) stop timeline. 12 13 I think it'd be nice to have a root event for the all the events that happened as the result of such eval. 14 15 Reviewed by Yury Semikhatsky. 16 17 * inspector/timeline/timeline-injected-script-eval-expected.txt: Added. 18 * inspector/timeline/timeline-injected-script-eval.html: Added. 19 * platform/chromium/inspector/timeline/timeline-injected-script-eval-expected.txt: Added. 20 * platform/chromium/inspector/timeline/timeline-receive-response-event-expected.txt: 21 1 22 2011-09-26 James Robinson <jamesr@chromium.org> 2 23 -
trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-receive-response-event-expected.txt
r91567 r95941 1 1 Tests the Timeline API instrumentation of a SendRequest, ReceiveResponse etc. 2 2 3 FunctionCall 3 4 ResourceSendRequest 4 5 ResourceReceiveResponse 5 6 ResourceReceivedData 6 7 ResourceFinish 8 FunctionCall 7 9 ResourceSendRequest 8 10 ResourceReceiveResponse -
trunk/Source/WebCore/ChangeLog
r95939 r95941 1 2011-09-23 Ilya Tikhonovsky <loislo@chromium.org> 2 3 Web Inspector: Timeline: record root event for the function calls enforced by console eval. 4 https://bugs.webkit.org/show_bug.cgi?id=68695 5 6 In a complex web application developer might want to timeline a specific piece of code. 7 8 In this case he can do the next steps: 9 1) start timeline; 10 2) eval a command in console; 11 3) stop timeline. 12 13 I think it'd be nice to have a root event for the all the events that happened as the result of such eval. 14 15 Reviewed by Yury Semikhatsky. 16 17 Test: inspector/timeline/timeline-injected-script-eval.html 18 19 * bindings/v8/ScriptFunctionCall.cpp: 20 * inspector/InjectedScript.cpp: 21 (WebCore::InjectedScript::makeCall): 22 * inspector/InspectorInstrumentation.cpp: 23 (WebCore::InspectorInstrumentation::willCallFunctionImpl): 24 1 25 2011-09-26 No'am Rosenthal <noam.rosenthal@nokia.com> 2 26 -
trunk/Source/WebCore/inspector/InjectedScript.cpp
r95901 r95941 34 34 #if ENABLE(INSPECTOR) 35 35 36 #include "DOMWindow.h" 36 37 #include "Frame.h" 37 38 #include "InjectedScriptHost.h" 38 39 #include "InjectedScriptManager.h" 40 #include "InspectorInstrumentation.h" 39 41 #include "InspectorValues.h" 40 42 #include "Node.h" … … 190 192 } 191 193 194 DOMWindow* domWindow = domWindowFromScriptState(m_injectedScriptObject.scriptState()); 195 InspectorInstrumentationCookie cookie = domWindow && domWindow->frame() ? InspectorInstrumentation::willCallFunction(domWindow->frame()->page(), "InjectedScript", 1) : InspectorInstrumentationCookie(); 192 196 bool hadException = false; 193 197 ScriptValue resultValue = function.call(hadException); 198 InspectorInstrumentation::didCallFunction(cookie); 194 199 195 200 ASSERT(!hadException); -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r95919 r95941 225 225 InspectorInstrumentationCookie InspectorInstrumentation::willCallFunctionImpl(InstrumentingAgents* instrumentingAgents, const String& scriptName, int scriptLine) 226 226 { 227 #if USE(JSC) // It is disabled for JSC see WK-BUG 40119 228 return InspectorInstrumentationCookie(); 229 #else 227 230 int timelineAgentId = 0; 228 231 if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent()) { … … 231 234 } 232 235 return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId); 236 #endif 233 237 } 234 238
Note: See TracChangeset
for help on using the changeset viewer.