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

Side by Side Diff: Source/WebCore/inspector/InspectorInstrumentation.cpp

Issue 9375012: Merge 106662 - inspector/debugger/pause-in-inline-script.html asserts in chromium debug (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 if (InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent()) 105 if (InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent())
106 inspectorAgent->didClearWindowObjectInWorld(frame, world); 106 inspectorAgent->didClearWindowObjectInWorld(frame, world);
107 #if ENABLE(JAVASCRIPT_DEBUGGER) 107 #if ENABLE(JAVASCRIPT_DEBUGGER)
108 if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDe buggerAgent()) { 108 if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDe buggerAgent()) {
109 if (pageAgent && world == mainThreadNormalWorld() && frame == pageAgent- >mainFrame()) 109 if (pageAgent && world == mainThreadNormalWorld() && frame == pageAgent- >mainFrame())
110 debuggerAgent->didClearMainFrameWindowObject(); 110 debuggerAgent->didClearMainFrameWindowObject();
111 } 111 }
112 #endif 112 #endif
113 } 113 }
114 114
115 bool InspectorInstrumentation::isDebuggerPausedImpl(InstrumentingAgents* instrum entingAgents)
116 {
117 #if ENABLE(JAVASCRIPT_DEBUGGER)
118 if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDe buggerAgent())
119 return debuggerAgent->isPaused();
120 #endif
121 return false;
122 }
123
115 void InspectorInstrumentation::willInsertDOMNodeImpl(InstrumentingAgents* instru mentingAgents, Node* node, Node* parent) 124 void InspectorInstrumentation::willInsertDOMNodeImpl(InstrumentingAgents* instru mentingAgents, Node* node, Node* parent)
116 { 125 {
117 #if ENABLE(JAVASCRIPT_DEBUGGER) 126 #if ENABLE(JAVASCRIPT_DEBUGGER)
118 if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspe ctorDOMDebuggerAgent()) 127 if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspe ctorDOMDebuggerAgent())
119 domDebuggerAgent->willInsertDOMNode(node, parent); 128 domDebuggerAgent->willInsertDOMNode(node, parent);
120 #endif 129 #endif
121 } 130 }
122 131
123 void InspectorInstrumentation::didInsertDOMNodeImpl(InstrumentingAgents* instrum entingAgents, Node* node) 132 void InspectorInstrumentation::didInsertDOMNodeImpl(InstrumentingAgents* instrum entingAgents, Node* node)
124 { 133 {
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 { 1033 {
1025 if (!workerContext) 1034 if (!workerContext)
1026 return 0; 1035 return 0;
1027 return instrumentationForWorkerContext(workerContext); 1036 return instrumentationForWorkerContext(workerContext);
1028 } 1037 }
1029 #endif 1038 #endif
1030 1039
1031 } // namespace WebCore 1040 } // namespace WebCore
1032 1041
1033 #endif // !ENABLE(INSPECTOR) 1042 #endif // !ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorInstrumentation.h ('k') | Source/WebCore/loader/MainResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698