tracing/tracing/extras/android/android_auditor.html - Issue 2776653002: [ESLint] Fix violations when enabling curly rule in eslint.

Unified Diff: tracing/tracing/extras/android/android_auditor.html

Issue 2776653002: [ESLint] Fix violations when enabling curly rule in eslint. (Closed)

Patch Set: rebase Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « tracing/tracing/extras/ads/domain_category.html ('k') | tracing/tracing/extras/chrome/blame_context/blame_context.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tracing/tracing/extras/android/android_auditor.html

diff --git a/tracing/tracing/extras/android/android_auditor.html b/tracing/tracing/extras/android/android_auditor.html

index fceaf546d8a3c49a70df49173a16b4f4da024068..c4595097c5ecab015d1a778fee1bb78f23eb4580 100644

--- a/tracing/tracing/extras/android/android_auditor.html

+++ b/tracing/tracing/extras/android/android_auditor.html

@@ -87,8 +87,9 @@ tr.exportTo('tr.e.audits', function() {

Auditor.call(this, model);

var helper = model.getOrCreateHelper(AndroidModelHelper);

- if (helper.apps.length || helper.surfaceFlinger)

+ if (helper.apps.length || helper.surfaceFlinger) {

this.helper = helper;

+ }

}

//////////////////////////////////////////////////////////////////////////////

@@ -127,8 +128,9 @@ tr.exportTo('tr.e.audits', function() {

'height': parseInt(match[4]) };

ret.push(new Alert(AndroidAuditor.viewAlphaAlertInfo_,

slice.start, [slice], args));

- } else if (saveLayerRegEx.test(slice.title))

+ } else if (saveLayerRegEx.test(slice.title)) {

events.push(slice);

+ }

}, this);

if (events.length > ret.length) {

@@ -168,8 +170,7 @@ tr.exportTo('tr.e.audits', function() {

var start = Statistics.min(events, getStart);

var duration = Statistics.sum(events, getDuration);

- if (duration < 3)

- return undefined;

+ if (duration < 3) return undefined;

events.push(frame);

return new Alert(AndroidAuditor.pathAlertInfo_, start, events,

@@ -196,8 +197,7 @@ tr.exportTo('tr.e.audits', function() {

pixelsUploaded += parseInt(match[1]) * parseInt(match[2]);

}

});

- if (events.length === 0 || duration < 3)

- return undefined;

+ if (events.length === 0 || duration < 3) return undefined;

var mPixels = (pixelsUploaded / 1000000).toFixed(2) + ' million';

var args = { 'Pixels uploaded': mPixels,

@@ -222,15 +222,16 @@ tr.exportTo('tr.e.audits', function() {

});

var duration = Statistics.sum(events, getCpuDuration);

- if (events.length === 0 || duration < 3)

- return undefined;

+ if (events.length === 0 || duration < 3) return undefined;

// simplifying assumption - check for *any* inflation.

// TODO(ccraik): make 'inflate' slices associated events.

var hasInflation = false;

- for (var event of events)

- if (event.findDescendentSlice('inflate'))

+ for (var event of events) {

+ if (event.findDescendentSlice('inflate')) {

hasInflation = true;

+ }

var start = Statistics.min(events, getStart);

var args = { 'Time spent': new Scalar(timeDurationInMs, duration) };

@@ -255,8 +256,7 @@ tr.exportTo('tr.e.audits', function() {

});

var duration = Statistics.sum(events, getCpuDuration);

- if (events.length === 0 || duration < 3)

- return undefined;

+ if (events.length === 0 || duration < 3) return undefined;

var start = Statistics.min(events, getStart);

events.push(frame);

@@ -282,8 +282,7 @@ tr.exportTo('tr.e.audits', function() {

}

- if (!slice || getCpuDuration(slice) < 3)

- return undefined;

+ if (!slice || getCpuDuration(slice) < 3) return undefined;

return new Alert(AndroidAuditor.viewDrawAlertInfo_, slice.start,

[slice, frame],

{ 'Time spent': new Scalar(

@@ -308,8 +307,7 @@ tr.exportTo('tr.e.audits', function() {

event.title === 'GC: Wait For Concurrent';

});

var blockedDuration = Statistics.sum(events, getDuration);

- if (blockedDuration < 3)

- return undefined;

+ if (blockedDuration < 3) return undefined;

var start = Statistics.min(events, getStart);

events.push(frame);

@@ -328,8 +326,7 @@ tr.exportTo('tr.e.audits', function() {

});

var blockedDuration = Statistics.sum(events, getDuration);

- if (blockedDuration < 1)

- return undefined;

+ if (blockedDuration < 1) return undefined;

var start = Statistics.min(events, getStart);

events.push(frame);

@@ -347,8 +344,9 @@ tr.exportTo('tr.e.audits', function() {

for (var ttr of frame.threadTimeRanges) {

var stats = ttr.thread.getSchedulingStatsForRange(ttr.start, ttr.end);

for (var [key, value] of Object.entries(stats)) {

- if (!(key in totalStats))

+ if (!(key in totalStats)) {

totalStats[key] = 0;

+ }

totalStats[key] += value;

totalDuration += value;

}

@@ -358,15 +356,17 @@ tr.exportTo('tr.e.audits', function() {

// to never describe intentionally idle time.

if (!(SCHEDULING_STATE.RUNNING in totalStats) ||

totalDuration === 0 ||

- totalDuration - totalStats[SCHEDULING_STATE.RUNNING] < 3)

+ totalDuration - totalStats[SCHEDULING_STATE.RUNNING] < 3) {

return;

+ }

var args = {};

for (var [key, value] of Object.entries(totalStats)) {

- if (key === SCHEDULING_STATE.RUNNABLE)

+ if (key === SCHEDULING_STATE.RUNNABLE) {

key = 'Not scheduled, but runnable';

- else if (key === SCHEDULING_STATE.UNINTR_SLEEP)

+ } else if (key === SCHEDULING_STATE.UNINTR_SLEEP) {

key = 'Blocking I/O delay';

+ }

args[key] = new Scalar(timeDurationInMs, value);

}

@@ -383,8 +383,9 @@ tr.exportTo('tr.e.audits', function() {

this.model.getAllProcesses().forEach(function(process) {

if (this.helper.surfaceFlinger &&

process === this.helper.surfaceFlinger.process) {

- if (!process.name)

+ if (!process.name) {

process.name = 'SurfaceFlinger';

+ }

process.sortIndex = Number.NEGATIVE_INFINITY;

process.important = false; // auto collapse

return;

@@ -392,8 +393,9 @@ tr.exportTo('tr.e.audits', function() {

var uiThread = process.getThread(process.pid);

if (!process.name && uiThread && uiThread.name) {

- if (/^ndroid\./.test(uiThread.name))

+ if (/^ndroid\./.test(uiThread.name)) {

uiThread.name = 'a' + uiThread.name;

+ }

process.name = uiThread.name;

uiThread.name = 'UI Thread';

@@ -407,12 +409,15 @@ tr.exportTo('tr.e.audits', function() {

// ensure sequential, relative order for UI/Render/Worker threads

this.model.getAllThreads().forEach(function(thread) {

- if (thread.tid === thread.parent.pid)

+ if (thread.tid === thread.parent.pid) {

thread.sortIndex = -3;

- if (thread.name === 'RenderThread')

+ }

+ if (thread.name === 'RenderThread') {

thread.sortIndex = -2;

- if (/^hwuiTask/.test(thread.name))

+ }

+ if (/^hwuiTask/.test(thread.name)) {

thread.sortIndex = -1;

+ }

});

@@ -442,28 +447,30 @@ tr.exportTo('tr.e.audits', function() {

if (framesObserved) {

var portionBad = badFramesObserved / framesObserved;

- if (portionBad > 0.3)

+ if (portionBad > 0.3) {

this.model.faviconHue = 'red';

- else if (portionBad > 0.05)

+ } else if (portionBad > 0.05) {

this.model.faviconHue = 'yellow';

- else

+ } else {

this.model.faviconHue = 'green';

+ }

}

pushEventInfo_: function() {

var appAnnotator = new AppAnnotator();

this.helper.apps.forEach(function(app) {

- if (app.uiThread)

+ if (app.uiThread) {

appAnnotator.applyEventInfos(app.uiThread.sliceGroup);

- if (app.renderThread)

+ }

+ if (app.renderThread) {

appAnnotator.applyEventInfos(app.renderThread.sliceGroup);

+ }

});

runAnnotate: function() {

- if (!this.helper)

- return;

+ if (!this.helper) return;

this.renameAndSort_();

this.pushFramesAndJudgeJank_();

@@ -475,8 +482,7 @@ tr.exportTo('tr.e.audits', function() {

runAudit: function() {

- if (!this.helper)

- return;

+ if (!this.helper) return;

var alerts = this.model.alerts;

this.helper.apps.forEach(function(app) {

@@ -485,33 +491,33 @@ tr.exportTo('tr.e.audits', function() {

// skip most alerts for neutral or good frames

if (frame.perfClass === FRAME_PERF_CLASS.NEUTRAL ||

- frame.perfClass === FRAME_PERF_CLASS.GOOD)

+ frame.perfClass === FRAME_PERF_CLASS.GOOD) {

return;

+ }

var alert = AndroidAuditor.getPathAlert_(frame);

- if (alert)

- alerts.push(alert);