Commit bc4eb07f authored by Nicolas Chevobbe's avatar Nicolas Chevobbe
Browse files

Bug 1730167 - [devtools] Replace usage of isRemoteFrame with isFrameWithChildTarget. r=ochameau. 

`isRemoteFrame` was used as a way to know if an iframe was tracked by its own target.
Since we can now have dedicated targets for every iframe, we need to check if a given
iframe is tracked by its dedicated target.

Differential Revision: https://phabricator.services.mozilla.com/D126805
parent 3c196757

devtools/server/actors/accessibility/walker.js

+5 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ loader.lazyRequireGetter( 
loader.lazyRequireGetter(this, "events", "devtools/shared/event-emitter");

loader.lazyRequireGetter(

  this,

  ["getCurrentZoom", "isWindowIncluded", "isRemoteFrame"],

  ["getCurrentZoom", "isWindowIncluded", "isFrameWithChildTarget"],

  "devtools/shared/layout/utils",

  true

);
@@ -880,7 +880,10 @@ const AccessibleWalkerActor = ActorClassWithSpec(accessibleWalkerSpec, { 
      // remote frame target should emit RDP events (hovered/picked/...). And

      // all other WalkerActor for intermediate iframe and top level document

      // targets should stay silent.

      isRemoteFrame(event.originalTarget || event.target)

      isFrameWithChildTarget(

        this.targetActor,

        event.originalTarget || event.target

      )

    );

  },

devtools/server/actors/highlighters/tabbing-order.js

+5 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ loader.lazyRequireGetter( 
);

loader.lazyRequireGetter(

  this,

  ["isRemoteFrame", "isWindowIncluded"],

  ["isFrameWithChildTarget", "isWindowIncluded"],

  "devtools/shared/layout/utils",

  true

);
@@ -118,7 +118,10 @@ class TabbingOrderHighlighter { 
    if (

      !endElm &&

      focusableElements.length > 0 &&

      isRemoteFrame(focusableElements[focusableElements.length - 1])

      isFrameWithChildTarget(

        this.highlighterEnv.targetActor,

        focusableElements[focusableElements.length - 1]

      )

    ) {

      endElm = focusableElements[focusableElements.length - 1];

    }

devtools/server/actors/inspector/walker.js

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ loader.lazyRequireGetter( 
    "isDirectShadowHostChild",

    "isMarkerPseudoElement",

    "isNativeAnonymous",

    "isRemoteFrame",

    "isFrameWithChildTarget",

    "isShadowHost",

    "isShadowRoot",

    "isTemplateElement",
@@ -725,7 +725,7 @@ var WalkerActor = protocol.ActorClassWithSpec(walkerSpec, { 
      isShadowHost(rawNode) ||

      rawNode.nodeType != Node.ELEMENT_NODE ||

      rawNode.children.length > 0 ||

      isRemoteFrame(rawNode)

      isFrameWithChildTarget(this.targetActor, rawNode)

    ) {

      return undefined;

    }