merge with TW upstream

Author: Titanium2099

src/RenderConstants.js

@@ -32,6 +32,13 @@ module.exports = {
          * @type {object}
          * @property {Array<int>} newSize - the new size of the renderer
          */
-        NativeSizeChanged: 'NativeSizeChanged'
+        NativeSizeChanged: 'NativeSizeChanged',
+
+        /**
+         * Event emitted when the WebGL context is lost.
+         *
+         * @event RenderWebGL#event:ContextLost
+         */
+        ContextLost: 'ContextLost'
     }
 };

src/RenderWebGL.js

@@ -271,6 +271,10 @@ class RenderWebGL extends EventEmitter {
 
         this.on(RenderConstants.Events.NativeSizeChanged, this.onNativeSizeChanged);
 
+        gl.canvas.addEventListener('webglcontextlost', () => {
+            this.emit(RenderConstants.Events.ContextLost);
+        });
+
         this.setBackgroundColor(1, 1, 1);
         this.setStageSize(xLeft || -240, xRight || 240, yBottom || -180, yTop || 180);
         this.resize(this._nativeSize[0], this._nativeSize[1]);
@@ -322,7 +326,9 @@ class RenderWebGL extends EventEmitter {
             PenSkin,
             SVGSkin,
             CanvasMeasurementProvider,
-            Rectangle
+            Rectangle,
+            EffectTransform,
+            ShaderManager
         };
     }
 
@@ -392,8 +398,8 @@ class RenderWebGL extends EventEmitter {
     resize (pixelsWide, pixelsTall) {
         const {canvas} = this._gl;
         const pixelRatio = window.devicePixelRatio || 1;
-        const newWidth = pixelsWide * pixelRatio;
-        const newHeight = pixelsTall * pixelRatio;
+        const newWidth = Math.round(pixelsWide * pixelRatio);
+        const newHeight = Math.round(pixelsTall * pixelRatio);
 
         // Certain operations, such as moving the color picker, call `resize` once per frame, even though the canvas
         // size doesn't change. To avoid unnecessary canvas updates, check that we *really* need to resize the canvas.
@@ -836,10 +842,25 @@ class RenderWebGL extends EventEmitter {
         if (index < endIndex) {
             this._drawList.splice(index, 1);
             this._updateOffsets('delete', currentLayerGroup.groupIndex);
-        } else {
-            log.warn('Could not destroy drawable that could not be found in layer group.');
             return;
         }
+
+        // Certain custom extensions, such as SharkPool Layer Control, thoroughly corrupt internal state
+        // by rearranging drawables outside the layer they ought to belong to. This breaks a lot of things
+        // in various ways. One of the things it breaks is the loop above where we try to find the drawable
+        // by checking where its layer starts and ends. The impact of this corruption is severe enough that
+        // it's best if we work around it.
+        index = this._drawList.indexOf(drawableID);
+        if (index === -1) {
+            log.warn('Could not destroy drawable that could not be found in draw list.');
+            return;
+        }
+        this._drawList.splice(index, 1);
+        for (const groupName of this._groupOrdering) {
+            if (this._layerGroups[groupName].drawListOffset > index) {
+                this._layerGroups[groupName].drawListOffset--;
+            }
+        }
     }
 
     /**
@@ -2375,6 +2396,7 @@ class RenderWebGL extends EventEmitter {
      * SEURITY CONSIDERATIONS: It is the caller's responsibility to ensure that the @font-face
      * statements do not contain malicious styles.
      * @param {Record<string, string>} customFonts Maps full font families (with fallbacks) to @font-face statements.
+     * @returns {Promise<unknown>} Resolves when the fonts are ready to use. Never rejects.
      */
     setCustomFonts (customFonts) {
         this.customFonts = customFonts;
@@ -2401,10 +2423,9 @@ class RenderWebGL extends EventEmitter {
             typeof document.fonts.load === 'function'
         ) {
             const families = Object.keys(customFonts);
-            for (const family of families) {
-                document.fonts.load(`12px ${family}`);
-            }
+            return Promise.all(families.map(family => document.fonts.load(`12px ${family}`).catch(() => {})));
         }
+        return Promise.resolve();
     }
 }
 

src/SVGSkin.js

@@ -56,6 +56,7 @@ class SVGSkin extends Skin {
      */
     dispose () {
         this.resetMIPs();
+        this._svgImage.onload = null;
         super.dispose();
     }
 

src/Skin.js

@@ -59,6 +59,10 @@ class Skin {
      * Dispose of this object. Do not use it after calling this method.
      */
     dispose () {
+        if (this._emptyImageTexture) {
+            this._renderer.gl.deleteTexture(this._emptyImageTexture);
+            this._emptyImageTexture = null;
+        }
         this._id = RenderConstants.ID_NONE;
     }