[DevTools] Added inline breakpoints

third_party/WebKit/LayoutTests/http/tests/inspector/debugger-test.js

Index: third_party/WebKit/LayoutTests/http/tests/inspector/debugger-test.js
diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/debugger-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/debugger-test.js
index 831baa5578c42e02a38debcf001cf66333fdf2dc..b10104d011dbc6819a104b5114fa5f4bd2ff4f62 100644
--- a/third_party/WebKit/LayoutTests/http/tests/inspector/debugger-test.js
+++ b/third_party/WebKit/LayoutTests/http/tests/inspector/debugger-test.js
@@ -629,19 +629,35 @@ InspectorTest.evaluateOnCurrentCallFrame = function(code)
     return new Promise(succ => InspectorTest.debuggerModel.evaluateOnSelectedCallFrame(code, "console", false, true, false, false, InspectorTest.safeWrap(succ)));
 }
 
-InspectorTest.waitJavaScriptSourceFrameBreakpoints = function(sourceFrame)
-{
-    return new Promise(resolve => InspectorTest.addSniffer(sourceFrame.__proto__, "_breakpointDecorationsUpdatedForTest", resolveIfAllBreakpointsResolved.bind(null, resolve)));
+InspectorTest.prepareJavaScriptSourceFrame = function(sourceFrame)

[lushnikov, 2016/11/29 21:24:29]

prepareSourceFrameForBreakpointTest =

[kozy, 2016/11/29 22:30:10]

Done.

+{
+    var symbol = Symbol('waitedDecorations');
+    sourceFrame[symbol] = 0;
+    InspectorTest.addSniffer(sourceFrame.__proto__, "_willAddInlineDecorationsForTest", () => sourceFrame[symbol]++, true);
+    InspectorTest.addSniffer(sourceFrame.__proto__, "_didAddInlineDecorationsForTest", (updateWasScheduled) => {
+        sourceFrame[symbol]--;
+        if (!updateWasScheduled)
+            sourceFrame._breakpointDecorationsUpdatedForTest();
+    }, true);
+    sourceFrame._waitingForPossibleLocationsForTest = () => !!sourceFrame[symbol];
+}
 
-    function resolveIfAllBreakpointsResolved(resolve)
+InspectorTest.waitJavaScriptSourceFrameBreakpoints = function(sourceFrame, inline)
+{
+    return waitUpdate().then(checkIfReady);

[lushnikov, 2016/11/29 21:24:29]

let's that sourceFrame is prepared!

if (..) {
   log
   InspectorTest.completeTest();
   return;
}

[kozy, 2016/11/29 22:30:10]

Done.

+    function waitUpdate()
     {
+        return new Promise(resolve => InspectorTest.addSniffer(sourceFrame.__proto__, "_breakpointDecorationsUpdatedForTest", resolve));
+    }
+    function checkIfReady()
+    {
+        if (sourceFrame._waitingForPossibleLocationsForTest())
+            return waitUpdate().then(checkIfReady);

[lushnikov, 2016/11/29 21:24:29]

this will potentially result in an infinite promise chain

[kozy, 2016/11/29 22:30:10]

Yes, but all previous promises will be collected after resolving since there is
no other reference to promise object and there are no any memory leaks.

         for (var breakpoint of Bindings.breakpointManager._allBreakpoints()) {
-            if (breakpoint._fakePrimaryLocation && breakpoint.enabled()) {
-                InspectorTest.addSniffer(sourceFrame.__proto__, "_breakpointDecorationsUpdatedForTest", resolveIfAllBreakpointsResolved.bind(null, resolve));
-                return;
-            }
+            if (breakpoint._fakePrimaryLocation && breakpoint.enabled())
+                return waitUpdate().then(checkIfReady);
         }
-        resolve();
+        return Promise.resolve();
     }
 }
 
@@ -655,6 +671,26 @@ InspectorTest.dumpJavaScriptSourceFrameBreakpoints = function(sourceFrame)
         var conditional = textEditor.hasLineClass(lineNumber, "cm-breakpoint-conditional")
         InspectorTest.addResult("breakpoint at " + lineNumber + (disabled ? " disabled" : "") + (conditional ? " conditional" : ""));
     }
+    var bookmarks = textEditor.bookmarks(textEditor.fullRange(), Sources.JavaScriptSourceFrame.BreakpointDecoration._bookmarkSymbol);
+    bookmarks = bookmarks.filter(bookmark => !!bookmark.position());
+    bookmarks.sort((bookmark1, bookmark2) => bookmark1.position().startColumn - bookmark2.position().startColumn);
+    for (var bookmark of bookmarks) {
+        var position = bookmark.position();
+        var element = bookmark[Sources.JavaScriptSourceFrame.BreakpointDecoration._elementSymbolForTest];
+        var disabled = element.classList.contains("cm-inline-disabled");
+        var conditional = element.classList.contains("cm-inline-conditional");
+        InspectorTest.addResult("  inline breakpoint at (" + position.startLine + ", " + position.startColumn + ")" + (disabled ? " disabled" : "") + (conditional ? " conditional" : ""));
+    }
+}
+
+InspectorTest.clickJavaScriptSourceFrameBreakpoint = function(sourceFrame, lineNumber, index)
+{
+    var textEditor = sourceFrame._textEditor;
+    var lineLength = textEditor.line(lineNumber).length;
+    var lineRange = new Common.TextRange(lineNumber, 0, lineNumber, lineLength);
+    var bookmarks = textEditor.bookmarks(lineRange, Sources.JavaScriptSourceFrame.BreakpointDecoration._bookmarkSymbol);
+    bookmarks.sort((bookmark1, bookmark2) => bookmark1.position().startColumn - bookmark2.position().startColumn);
+    bookmarks[index][Sources.JavaScriptSourceFrame.BreakpointDecoration._elementSymbolForTest].click();
 }
 
 };