chrome-devtools-frontend 1.0.965113 → 1.0.965611

package/front_end/panels/console/ErrorStackParser.ts

@@ -4,6 +4,7 @@
 
 import * as Common from '../../core/common/common.js';
 import type * as SDK from '../../core/sdk/sdk.js';
+import type * as Protocol from '../../generated/protocol.js';
 
 export interface ParsedErrorFrame {
   line: string;
@@ -11,6 +12,7 @@ export interface ParsedErrorFrame {
     url: string,
     lineNumber?: number,
     columnNumber?: number, enclosedInBraces: boolean, positionLeft: number, positionRight: number,
+    scriptId?: Protocol.Runtime.ScriptId,
   };
 }
 
@@ -115,3 +117,35 @@ function parseOrScriptMatch(debuggerModel: SDK.DebuggerModel.DebuggerModel, url:
   }
   return null;
 }
+
+/**
+ * Error#stack output only contains script URLs. In some cases we are able to
+ * retrieve additional exception details from V8 that we can use to augment
+ * the parsed Error#stack with script IDs.
+ * This function sets the `scriptId` field in `ParsedErrorFrame` when it finds
+ * the corresponding info in `Protocol.Runtime.StackTrace`.
+ */
+export function augmentErrorStackWithScriptIds(
+    parsedFrames: ParsedErrorFrame[], protocolStackTrace: Protocol.Runtime.StackTrace): void {
+  // Note that the number of frames between the two stack traces can differ. The
+  // parsed Error#stack can contain Builtin frames which are not present in the protocol
+  // stack. This means its easier to always search the whole protocol stack for a matching
+  // frame rather then trying to detect the Builtin frames and skipping them.
+  for (const parsedFrame of parsedFrames) {
+    const protocolFrame = protocolStackTrace.callFrames.find(frame => framesMatch(parsedFrame, frame));
+    if (protocolFrame && parsedFrame.link) {
+      parsedFrame.link.scriptId = protocolFrame.scriptId;
+    }
+  }
+}
+
+/** Returns true iff both stack frames have the same url and line/column numbers. The function name is ignored */
+function framesMatch(parsedFrame: ParsedErrorFrame, protocolFrame: Protocol.Runtime.CallFrame): boolean {
+  if (!parsedFrame.link) {
+    return false;
+  }
+
+  const {url, lineNumber, columnNumber} = parsedFrame.link;
+  return url === protocolFrame.url && lineNumber === protocolFrame.lineNumber &&
+      columnNumber === protocolFrame.columnNumber;
+}

package/front_end/panels/emulation/DeviceModeView.ts

@@ -467,7 +467,9 @@ export class DeviceModeView extends UI.Widget.VBox {
 
       const canvas = document.createElement('canvas');
       canvas.width = Math.floor(outlineRect.width);
-      canvas.height = Math.floor(outlineRect.height);
+      // Cap the height to not hit the GPU limit.
+      // https://crbug.com/1260828
+      canvas.height = Math.min((1 << 14), Math.floor(outlineRect.height));
       const ctx = canvas.getContext('2d');
       if (!ctx) {
         throw new Error('Could not get 2d context from canvas.');
@@ -507,7 +509,9 @@ export class DeviceModeView extends UI.Widget.VBox {
     pageImage.onload = (): void => {
       const canvas = document.createElement('canvas');
       canvas.width = pageImage.naturalWidth;
-      canvas.height = pageImage.naturalHeight;
+      // Cap the height to not hit the GPU limit.
+      // https://crbug.com/1260828
+      canvas.height = Math.min((1 << 14), Math.floor(pageImage.naturalHeight));
       const ctx = canvas.getContext('2d');
       if (!ctx) {
         throw new Error('Could not get 2d context for base64 screenshot.');

package/front_end/panels/sources/WatchExpressionsSidebarPane.ts

@@ -171,7 +171,7 @@ export class WatchExpressionsSidebarPane extends UI.ThrottledWidget.ThrottledWid
     this.createWatchExpression(null).startEditing();
   }
 
-  doUpdate(): Promise<void> {
+  async doUpdate(): Promise<void> {
     this.linkifier.reset();
     this.contentElement.removeChildren();
     this.treeOutline.removeChildren();
@@ -191,7 +191,6 @@ export class WatchExpressionsSidebarPane extends UI.ThrottledWidget.ThrottledWid
 
       this.createWatchExpression(expression);
     }
-    return Promise.resolve();
   }
 
   private createWatchExpression(expression: string|null): WatchExpression {