Commit cd23b378 authored by Coroiu Cristina's avatar Coroiu Cristina
Browse files

Merge mozilla-central to inbound a=merge on a CLOSED TREE

parents 69ace4b4 98926c46

devtools/client/debugger/new/src/components/SecondaryPanes/Frames/Group.js

+2 −2
Original line number Diff line number Diff line
@@ -108,9 +108,9 @@ export default class Group extends Component<Props, State> { 


    return (

      <div className="frames-list">

        {group.reduce((acc, frame) => {

        {group.reduce((acc, frame, i) => {

          if (selectable) {

            acc.push(<FrameIndent />);

            acc.push(<FrameIndent key={`frame-indent-${i}`} />);

          }

          return acc.concat(

            <FrameComponent

devtools/server/actors/inspector/event-collector.js

+9 −4
Original line number Diff line number Diff line
@@ -10,7 +10,11 @@ 
const { Cu } = require("chrome");

const Services = require("Services");

const makeDebugger = require("devtools/server/actors/utils/make-debugger");

const { isAnonymous } = require("devtools/shared/layout/utils");

const {

  isAfterPseudoElement,

  isBeforePseudoElement,

  isNativeAnonymous,

} = require("devtools/shared/layout/utils");



// eslint-disable-next-line

const JQUERY_LIVE_REGEX = /return typeof \w+.*.event\.triggered[\s\S]*\.event\.(dispatch|handle).*arguments/;
@@ -347,9 +351,10 @@ class JQueryEventCollector extends MainEventCollector { 
    const jQuery = this.getJQuery(node);

    const handlers = [];



    // If jQuery is not on the page or if this is an anonymous node we need

    // to return early.

    if (!jQuery || isAnonymous(node)) {

    // If jQuery is not on the page, if this is an anonymous node or a pseudo

    // element we need to return early.

    if (!jQuery || isNativeAnonymous(node) ||

        isBeforePseudoElement(node) || isAfterPseudoElement(node)) {

      if (checkOnly) {

        return false;

      }

js/src/gc/GC.cpp

+7 −8
Original line number Diff line number Diff line
@@ -4238,15 +4238,15 @@ static void RelazifyFunctionsForShrinkingGC(JSRuntime* rt) { 
  }

}



static void PurgeShapeTablesForShrinkingGC(JSRuntime* rt) {

  gcstats::AutoPhase ap(rt->gc.stats(), gcstats::PhaseKind::PURGE_SHAPE_TABLES);

static void PurgeShapeCachesForShrinkingGC(JSRuntime* rt) {

  gcstats::AutoPhase ap(rt->gc.stats(), gcstats::PhaseKind::PURGE_SHAPE_CACHES);

  for (GCZonesIter zone(rt); !zone.done(); zone.next()) {

    if (!CanRelocateZone(zone) || zone->keepShapeTables()) {

    if (!CanRelocateZone(zone) || zone->keepShapeCaches()) {

      continue;

    }

    for (auto baseShape = zone->cellIter<BaseShape>(); !baseShape.done();

         baseShape.next()) {

      baseShape->maybePurgeTable();

      baseShape->maybePurgeCache();

    }

  }

}
@@ -4337,7 +4337,7 @@ bool GCRuntime::beginMarkPhase(JS::GCReason reason, AutoGCSession& session) { 
     */

    if (invocationKind == GC_SHRINK) {

      RelazifyFunctionsForShrinkingGC(rt);

      PurgeShapeTablesForShrinkingGC(rt);

      PurgeShapeCachesForShrinkingGC(rt);

    }



    /*
@@ -8456,9 +8456,8 @@ void js::gc::CheckHashTablesAfterMovingGC(JSRuntime* rt) { 
    JS::AutoCheckCannotGC nogc;

    for (auto baseShape = zone->cellIter<BaseShape>(); !baseShape.done();

         baseShape.next()) {

      if (ShapeTable* table = baseShape->maybeTable(nogc)) {

        table->checkAfterMovingGC();

      }

      ShapeCachePtr p = baseShape->getCache(nogc);

      p.checkAfterMovingGC();

    }

  }

js/src/gc/GenerateStatsPhases.py

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ PhaseKindGraphRoots = [ 
        PhaseKind("MARK_DISCARD_CODE", "Mark Discard Code", 3),

        PhaseKind("RELAZIFY_FUNCTIONS", "Relazify Functions", 4),

        PhaseKind("PURGE", "Purge", 5),

        PhaseKind("PURGE_SHAPE_TABLES", "Purge ShapeTables", 60),

        PhaseKind("PURGE_SHAPE_CACHES", "Purge ShapeCaches", 60),

        JoinParallelTasksPhaseKind

    ]),

    PhaseKind("MARK", "Mark", 6, [

js/src/gc/Marking.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1097,8 +1097,8 @@ inline void js::GCMarker::eagerlyMarkChildren(Shape* shape) { 
    BaseShape* base = shape->base();

    CheckTraversedEdge(shape, base);

    if (mark(base)) {

      MOZ_ASSERT(base->canSkipMarkingShapeTable(shape));

      base->traceChildrenSkipShapeTable(this);

      MOZ_ASSERT(base->canSkipMarkingShapeCache(shape));

      base->traceChildrenSkipShapeCache(this);

    }



    traverseEdge(shape, shape->propidRef().get());