Skip to content

Commit

Permalink
Fix more uses of document.createElement('canvas') (pixijs#8523)
Browse files Browse the repository at this point in the history
  • Loading branch information
bigtimebuddy committed Aug 1, 2022
1 parent a344b58 commit b095861
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
3 changes: 2 additions & 1 deletion packages/canvas-prepare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"peerDependencies": {
"@pixi/canvas-renderer": "6.5.1",
"@pixi/core": "6.5.1",
"@pixi/prepare": "6.5.1"
"@pixi/prepare": "6.5.1",
"@pixi/settings": "6.5.1"
}
}
8 changes: 5 additions & 3 deletions packages/canvas-prepare/src/CanvasPrepare.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { BaseTexture, ExtensionType } from '@pixi/core';
import { BasePrepare } from '@pixi/prepare';
import { settings } from '@pixi/settings';

import type { AbstractRenderer, ExtensionMetadata } from '@pixi/core';
import type { CanvasRenderer } from '@pixi/canvas-renderer';
Expand Down Expand Up @@ -81,9 +82,10 @@ export class CanvasPrepare extends BasePrepare

this.uploadHookHelper = this;

this.canvas = document.createElement('canvas');
this.canvas.width = CANVAS_START_SIZE;
this.canvas.height = CANVAS_START_SIZE;
this.canvas = settings.ADAPTER.createCanvas(
CANVAS_START_SIZE,
CANVAS_START_SIZE
);

this.ctx = this.canvas.getContext('2d');

Expand Down
5 changes: 3 additions & 2 deletions packages/canvas-renderer/src/canvasUtils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { hex2rgb, rgb2hex } from '@pixi/utils';
import { settings } from '@pixi/settings';
import { canUseNewCanvasBlendModes } from './utils/canUseNewCanvasBlendModes';

import type { Texture } from '@pixi/core';
Expand Down Expand Up @@ -47,7 +48,7 @@ export const canvasUtils = {
}
else
{
canvas = document.createElement('canvas');
canvas = settings.ADAPTER.createCanvas();
}

canvasUtils.tintMethod(texture, color, canvas);
Expand Down Expand Up @@ -94,7 +95,7 @@ export const canvasUtils = {
}
if (!canvasUtils.canvas)
{
canvasUtils.canvas = document.createElement('canvas');
canvasUtils.canvas = settings.ADAPTER.createCanvas();
}
canvasUtils.tintMethod(texture, color, canvasUtils.canvas);
pattern = canvasUtils.canvas.getContext('2d').createPattern(canvasUtils.canvas, 'repeat');
Expand Down
14 changes: 4 additions & 10 deletions packages/canvas-renderer/src/utils/canUseNewCanvasBlendModes.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { settings } from '@pixi/settings';

/**
* Creates a little colored canvas
* @ignore
Expand All @@ -6,11 +8,7 @@
*/
function createColoredCanvas(color: string): HTMLCanvasElement
{
const canvas = document.createElement('canvas');

canvas.width = 6;
canvas.height = 1;

const canvas = settings.ADAPTER.createCanvas(6, 1);
const context = canvas.getContext('2d');

context.fillStyle = color;
Expand All @@ -34,11 +32,7 @@ export function canUseNewCanvasBlendModes(): boolean
const magenta = createColoredCanvas('#ff00ff');
const yellow = createColoredCanvas('#ffff00');

const canvas = document.createElement('canvas');

canvas.width = 6;
canvas.height = 1;

const canvas = settings.ADAPTER.createCanvas(6, 1);
const context = canvas.getContext('2d');

context.globalCompositeOperation = 'multiply';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { LoaderResource } from '@pixi/loaders';
import { url } from '@pixi/utils';
import { settings } from '@pixi/settings';

import type { Loader } from '@pixi/loaders';
import type { INTERNAL_FORMATS } from '../const';
Expand Down Expand Up @@ -167,7 +168,7 @@ export class CompressedTextureLoader
if (!CompressedTextureLoader._textureExtensions)
{
// Auto-detect WebGL compressed-texture extensions
const canvas = document.createElement('canvas');
const canvas = settings.ADAPTER.createCanvas();
const gl = canvas.getContext('webgl');

if (!gl)
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/textures/resources/SVGResource.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { uid } from '@pixi/utils';
import { BaseImageResource } from './BaseImageResource';
import { settings } from '@pixi/settings';

import type { ISize } from '@pixi/math';

Expand Down Expand Up @@ -51,7 +52,7 @@ export class SVGResource extends BaseImageResource
{
options = options || {};

super(document.createElement('canvas'));
super(settings.ADAPTER.createCanvas());
this._width = 0;
this._height = 0;

Expand Down

0 comments on commit b095861

Please sign in to comment.