[go: nahoru, domu]

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core(offscreen-images): pass images with 'loading' attribute #10117

Merged
merged 9 commits into from
Dec 20, 2019
Prev Previous commit
Next Next commit
coords -> x, y
  • Loading branch information
jazyan committed Dec 18, 2019
commit 368f548d4e7d6c6a92cd6a89d200c76822d887d1
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,14 @@ function generateSize(width, height, prefix = 'displayed') {

function generateImage({
size,
coords,
x,
y,
networkRecord,
loading,
src = 'https://google.com/logo.png',
}) {
Object.assign(networkRecord || {}, {url: src});

const x = coords[0];
const y = coords[1];

const clientRect = {
top: y,
bottom: y + size.displayedHeight,
Expand Down Expand Up @@ -74,7 +72,7 @@ describe('OffscreenImages audit', () => {
const artifacts = {
ViewportDimensions: DEFAULT_DIMENSIONS,
ImageElements: [
generateImage({size: generateSize(100, 100), coords: [0, 0]}),
generateImage({size: generateSize(100, 100), x: 0, y: 0}),
],
traces: {defaultPass: createTestTrace({topLevelTasks})},
devtoolsLogs: {},
Expand All @@ -95,16 +93,23 @@ describe('OffscreenImages audit', () => {
const artifacts = {
ViewportDimensions: DEFAULT_DIMENSIONS,
ImageElements: [
generateImage({size: generateSize(200, 200), coords: [0, 0], networkRecord: recordA}),
generateImage({
size: generateSize(200, 200),
x: 0,
y: 0,
networkRecord: recordA,
}),
generateImage({
size: generateSize(100, 100),
coords: [0, 1080],
x: 0,
y: 1080,
networkRecord: recordB,
src: urlB,
}),
generateImage({
size: generateSize(400, 400),
coords: [1720, 1080],
x: 1720,
y: 1080,
networkRecord: recordC,
src: urlC,
}),
Expand Down Expand Up @@ -133,34 +138,39 @@ describe('OffscreenImages audit', () => {
// Offscreen to the right.
generateImage({
size: generateSize(200, 200),
coords: [3000, 0],
x: 3000,
y: 0,
networkRecord: networkRecords[0],
}),
// Offscreen to the bottom.
generateImage({
size: generateSize(100, 100),
coords: [0, 2000],
x: 0,
y: 2000,
networkRecord: networkRecords[1],
src: url('B'),
}),
// Offscreen to the top-left.
generateImage({
size: generateSize(100, 100),
coords: [-2000, -1000],
x: -2000,
y: -1000,
networkRecord: networkRecords[2],
src: url('C'),
}),
// Offscreen to the bottom-right.
generateImage({
size: generateSize(100, 100),
coords: [3000, 2000],
x: 3000,
y: 2000,
networkRecord: networkRecords[3],
src: url('D'),
}),
// Half offscreen to the top, should not warn.
generateImage({
size: generateSize(1000, 1000),
coords: [0, -500],
x: 0,
y: -500,
networkRecord: networkRecords[4],
src: url('E'),
}),
Expand All @@ -186,15 +196,17 @@ describe('OffscreenImages audit', () => {
// Offscreen to the right, but lazy loaded.
generateImage({
size: generateSize(200, 200),
coords: [3000, 0],
x: 3000,
y: 0,
networkRecord: networkRecords[0],
loading: 'lazy',
src: url('A'),
}),
// Offscreen to the bottom, but eager loaded.
generateImage({
size: generateSize(100, 100),
coords: [0, 2000],
x: 0,
y: 2000,
networkRecord: networkRecords[1],
loading: 'eager',
src: url('B'),
Expand All @@ -215,7 +227,7 @@ describe('OffscreenImages audit', () => {
const artifacts = {
ViewportDimensions: DEFAULT_DIMENSIONS,
ImageElements: [
generateImage({size: generateSize(0, 0), coords: [0, 0], networkRecord}),
generateImage({size: generateSize(0, 0), x: 0, y: 0, networkRecord}),
],
traces: {defaultPass: createTestTrace({topLevelTasks})},
devtoolsLogs: {},
Expand All @@ -241,23 +253,27 @@ describe('OffscreenImages audit', () => {
ImageElements: [
generateImage({
size: generateSize(50, 50),
coords: [0, 0],
x: 0,
y: 0,
networkRecord: networkRecords[0],
}),
generateImage({
size: generateSize(1000, 1000),
coords: [1000, 1000],
x: 1000,
y: 1000,
networkRecord: networkRecords[1],
}),
generateImage({
size: generateSize(50, 50),
coords: [0, 1500],
x: 0,
y: 1500,
networkRecord: networkRecords[2],
src: urlB,
}),
generateImage({
size: generateSize(400, 400),
coords: [0, 1500],
x: 0,
y: 1500,
networkRecord: networkRecords[3],
src: urlB,
}),
Expand All @@ -278,7 +294,7 @@ describe('OffscreenImages audit', () => {
ViewportDimensions: DEFAULT_DIMENSIONS,
ImageElements: [
// Offscreen to the right.
generateImage({size: generateSize(200, 200), coords: [3000, 0], networkRecord}),
generateImage({size: generateSize(200, 200), x: 3000, y: 0, networkRecord}),
],
traces: {defaultPass: createTestTrace({topLevelTasks})},
devtoolsLogs: {},
Expand All @@ -295,7 +311,7 @@ describe('OffscreenImages audit', () => {
ViewportDimensions: DEFAULT_DIMENSIONS,
ImageElements: [
// Offscreen to the right.
generateImage({size: generateSize(200, 200), coords: [3000, 0], networkRecord}),
generateImage({size: generateSize(200, 200), x: 3000, y: 0, networkRecord}),
],
traces: {defaultPass: createTestTrace({traceEnd: 2000})},
devtoolsLogs: {},
Expand All @@ -312,7 +328,7 @@ describe('OffscreenImages audit', () => {
ViewportDimensions: DEFAULT_DIMENSIONS,
ImageElements: [
// Offscreen to the right.
generateImage({size: generateSize(100, 100), coords: [0, 2000], networkRecord}),
generateImage({size: generateSize(100, 100), x: 0, y: 2000, networkRecord}),
],
traces: {defaultPass: createTestTrace({traceEnd: 2000})},
devtoolsLogs: {},
Expand Down Expand Up @@ -352,13 +368,15 @@ describe('OffscreenImages audit', () => {
ImageElements: [
generateImage({
size: generateSize(0, 0),
coords: [0, 0],
x: 0,
y: 0,
networkRecord: recordA,
src: recordA.url,
}),
generateImage({
size: generateSize(200, 200),
coords: [3000, 0],
x: 3000,
y: 0,
networkRecord: recordB,
src: recordB.url,
}),
Expand Down Expand Up @@ -406,13 +424,15 @@ describe('OffscreenImages audit', () => {
ImageElements: [
generateImage({
size: generateSize(0, 0),
coords: [0, 0],
x: 0,
y: 0,
networkRecord: recordA,
src: recordA.url,
}),
generateImage({
size: generateSize(200, 200),
coords: [3000, 0],
x: 3000,
y: 0,
networkRecord: recordB,
src: recordB.url,
}),
Expand Down Expand Up @@ -441,13 +461,15 @@ describe('OffscreenImages audit', () => {
ImageElements: [
generateImage({
size: generateSize(0, 0),
coords: [0, 0],
x: 0,
y: 0,
networkRecord: networkRecords[0],
src: 'a',
}),
generateImage({
size: generateSize(200, 200),
coords: [3000, 0],
x: 3000,
y: 0,
networkRecord: networkRecords[1],
src: 'b',
}),
Expand Down