Title: [108472] branches/chromium/1025/Source/WebCore/inspector/InspectorInstrumentation.cpp
- Revision
- 108472
- Author
- [email protected]
- Date
- 2012-02-22 02:20:21 -0800 (Wed, 22 Feb 2012)
Log Message
Merge 106347 - Web Inspector: DOMDebugger.setEventListenerBreakpoint should accept regular DOM event names.
https://bugs.webkit.org/show_bug.cgi?id=77409
(Fixing merge 2)
Reviewed by Yury Semikhatsky.
* inspector/Inspector.json:
* inspector/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::setEventListenerBreakpoint):
(WebCore):
(WebCore::InspectorDOMDebuggerAgent::setInstrumentationBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::setBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeEventListenerBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeInstrumentationBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
* inspector/InspectorDOMDebuggerAgent.h:
(InspectorDOMDebuggerAgent):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didInstallTimerImpl):
(WebCore::InspectorInstrumentation::didRemoveTimerImpl):
(WebCore::InspectorInstrumentation::willHandleEventImpl):
(WebCore::InspectorInstrumentation::willFireTimerImpl):
(WebCore::InspectorInstrumentation::pauseOnNativeEventIfNeeded):
* inspector/InspectorInstrumentation.h:
(InspectorInstrumentation):
* inspector/front-end/BreakpointsSidebarPane.js:
(WebInspector.EventListenerBreakpointsSidebarPane.prototype._setBreakpoint):
(WebInspector.EventListenerBreakpointsSidebarPane.prototype._removeBreakpoint):
[email protected]
Review URL: https://chromiumcodereview.appspot.com/9429046
Modified Paths
Diff
Modified: branches/chromium/1025/Source/WebCore/inspector/InspectorInstrumentation.cpp (108471 => 108472)
--- branches/chromium/1025/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-02-22 10:17:16 UTC (rev 108471)
+++ branches/chromium/1025/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-02-22 10:20:21 UTC (rev 108472)
@@ -306,7 +306,7 @@
InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEventOnWindowImpl(InstrumentingAgents* instrumentingAgents, const Event& event, DOMWindow* window)
{
- pauseOnNativeEventIfNeeded(instrumentingAgents, listenerEventCategoryType, event.type(), false);
+ pauseOnNativeEventIfNeeded(instrumentingAgents, true, event.type(), false);
int timelineAgentId = 0;
InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
