From 8334201cf258dfdefc962b2b210eae586802ee51 Mon Sep 17 00:00:00 2001 From: caseq Date: Wed, 22 Feb 2017 19:10:56 -0800 Subject: [PATCH] Revert of DevTools: do not use RAII for sync native breakpoints, reuse AsyncTask where possible. (patchset #6 id:100001 of https://codereview.chromium.org/2700293002/ ) Reason for revert: This broke build according to #39 Original issue's description: > DevTools: do not use RAII for sync native breakpoints, reuse AsyncTask where possible. > > BUG=693803 > > Review-Url: https://codereview.chromium.org/2700293002 > Cr-Commit-Position: refs/heads/master@{#452355} > Committed: https://chromium.googlesource.com/chromium/src/+/c0ff4c0d40a8b9ab8ed809a446aa298450c23462 TBR=kozyatinskiy@chromium.org,dgozman@chromium.org,alph@chromium.org,pfeldman@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=693803 Review-Url: https://codereview.chromium.org/2713613003 Cr-Commit-Position: refs/heads/master@{#452367} --- .../sources/EventListenerBreakpointsSidebarPane.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/front_end/sources/EventListenerBreakpointsSidebarPane.js b/front_end/sources/EventListenerBreakpointsSidebarPane.js index c3a0c34077..92761c6e28 100644 --- a/front_end/sources/EventListenerBreakpointsSidebarPane.js +++ b/front_end/sources/EventListenerBreakpointsSidebarPane.js @@ -23,7 +23,8 @@ Sources.EventListenerBreakpointsSidebarPane = class extends UI.VBox { // Otherwise, inspector page reacts on drop event and tries to load the event data. // this._createCategory(Common.UIString("Drag"), ["drag", "drop", "dragstart", "dragend", "dragenter", "dragleave", "dragover"]); this._createCategory( - Common.UIString('Animation'), ['requestAnimationFrame', 'cancelAnimationFrame', 'animationFrameFired'], true); + Common.UIString('Animation'), + ['DOMWindow.requestAnimationFrame', 'DOMWindow.cancelAnimationFrame', 'animationFrameFired'], true); this._createCategory( Common.UIString('Canvas'), ['canvasContextCreated', 'webglErrorFired', 'webglWarningFired'], true); this._createCategory( @@ -63,8 +64,7 @@ Sources.EventListenerBreakpointsSidebarPane = class extends UI.VBox { 'pointercancel', 'gotpointercapture', 'lostpointercapture' ]); this._createCategory(Common.UIString('Script'), ['scriptFirstStatement', 'scriptBlockedByCSP'], true); - this._createCategory( - Common.UIString('Timer'), ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval', 'timerFired'], true); + this._createCategory(Common.UIString('Timer'), ['setTimer', 'clearTimer', 'timerFired'], true); this._createCategory(Common.UIString('Touch'), ['touchstart', 'touchmove', 'touchend', 'touchcancel']); this._createCategory(Common.UIString('Window'), ['DOMWindow.close'], true); this._createCategory( @@ -86,12 +86,14 @@ Sources.EventListenerBreakpointsSidebarPane = class extends UI.VBox { static eventNameForUI(eventName, auxData) { if (!Sources.EventListenerBreakpointsSidebarPane._eventNamesForUI) { Sources.EventListenerBreakpointsSidebarPane._eventNamesForUI = { + 'instrumentation:setTimer': Common.UIString('Set Timer'), + 'instrumentation:clearTimer': Common.UIString('Clear Timer'), 'instrumentation:timerFired': Common.UIString('Timer Fired'), 'instrumentation:scriptFirstStatement': Common.UIString('Script First Statement'), 'instrumentation:scriptBlockedByCSP': Common.UIString('Script Blocked by Content Security Policy'), - 'instrumentation:requestAnimationFrame': Common.UIString('Request Animation Frame'), - 'instrumentation:cancelAnimationFrame': Common.UIString('Cancel Animation Frame'), - 'instrumentation:requestAnimationFrame.callback': Common.UIString('Animation Frame Fired'), + 'instrumentation:DOMWindow.requestAnimationFrame': Common.UIString('Request Animation Frame'), + 'instrumentation:DOMWindow.cancelAnimationFrame': Common.UIString('Cancel Animation Frame'), + 'instrumentation:DOMWindow.requestAnimationFrame.callback': Common.UIString('Animation Frame Fired'), 'instrumentation:webglErrorFired': Common.UIString('WebGL Error Fired'), 'instrumentation:webglWarningFired': Common.UIString('WebGL Warning Fired'), 'instrumentation:Element.setInnerHTML': Common.UIString('Set innerHTML'),