Bug 1527122 - [release 125] [client] remove backward compatibility in a couple of cases (#7916). r=dwalsh
authorJason Laster <jason.laster.11@gmail.com>
Mon, 11 Feb 2019 17:01:00 -0800
changeset 458684 80a68251af66
parent 458683 745ea4fc4420
child 458685 7dee5f1a75b4
push id35544
push userccoroiu@mozilla.com
push dateTue, 12 Feb 2019 16:29:08 +0000
treeherdermozilla-central@c849fb69e2e7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdwalsh
bugs1527122
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1527122 - [release 125] [client] remove backward compatibility in a couple of cases (#7916). r=dwalsh
devtools/client/debugger/new/src/client/firefox/commands.js
devtools/client/debugger/new/src/client/firefox/create.js
devtools/client/debugger/new/src/client/firefox/types.js
--- a/devtools/client/debugger/new/src/client/firefox/commands.js
+++ b/devtools/client/debugger/new/src/client/firefox/commands.js
@@ -7,17 +7,16 @@
 import { createSource, createWorker } from "./create";
 import { supportsWorkers, updateWorkerClients } from "./workers";
 import { features } from "../../utils/prefs";
 
 import type {
   ActorId,
   BreakpointLocation,
   BreakpointOptions,
-  BreakpointResult,
   EventListenerBreakpoints,
   Frame,
   FrameId,
   Script,
   SourceId,
   SourceActor,
   SourceActorLocation,
   Worker
--- a/devtools/client/debugger/new/src/client/firefox/create.js
+++ b/devtools/client/debugger/new/src/client/firefox/create.js
@@ -22,24 +22,18 @@ export function createFrame(thread: Thre
   }
   let title;
   if (frame.type == "call") {
     const c = frame.callee;
     title = c.name || c.userDisplayName || c.displayName;
   } else {
     title = `(${frame.type})`;
   }
-
-  // NOTE: Firefox 66 switched from where.source to where.actor
-  const actor = frame.where.source
-    ? frame.where.source.actor
-    : frame.where.actor;
-
   const location = {
-    sourceId: clientCommands.getSourceForActor(actor),
+    sourceId: clientCommands.getSourceForActor(frame.where.actor),
     line: frame.where.line,
     column: frame.where.column
   };
 
   return {
     id: frame.actor,
     thread,
     displayName: title,
--- a/devtools/client/debugger/new/src/client/firefox/types.js
+++ b/devtools/client/debugger/new/src/client/firefox/types.js
@@ -72,17 +72,17 @@ export type FramePacket = {
   actor: ActorId,
   arguments: any[],
   callee: any,
   environment: any,
   this: any,
   depth?: number,
   oldest?: boolean,
   type: "pause" | "call",
-  where: ActualLocation
+  where: {| actor: string, line: number, column: number |}
 };
 
 /**
  * Firefox Source File payload
  * introductionType can be a "scriptElement"
  * @memberof firefox/payloads
  * @static
  */