Skip to content

Commit 2debdb2

Browse files
stepankuzmingithub-actions[bot]
authored andcommitted
Remove dead HTMLImageElement code paths (internal-9542)
GitOrigin-RevId: 1b931218ffb24fe59331a5d0faaa69e3673cdfe6
1 parent e095cef commit 2debdb2

File tree

6 files changed

+7
-24
lines changed

6 files changed

+7
-24
lines changed

src/source/image_source.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import boundsAttributes from '../data/bounds_attributes';
88
import SegmentVector from '../data/segment';
99
import Texture, {UserManagedTexture} from '../render/texture';
1010
import MercatorCoordinate, {MAX_MERCATOR_LATITUDE} from '../geo/mercator_coordinate';
11-
import browser from '../util/browser';
1211
import tileTransform, {getTilePoint} from '../geo/projection/tile_transform';
1312
import {GLOBE_VERTEX_GRID_SIZE} from '../geo/projection/globe_constants';
1413
import {mat3, vec3} from 'gl-matrix';
@@ -246,7 +245,7 @@ class ImageSource<T = 'image'> extends Evented<SourceEvents> implements ISource<
246245
dispatcher: Dispatcher;
247246
map: Map;
248247
texture: Texture | UserManagedTexture | null;
249-
image: HTMLImageElement | ImageBitmap | ImageData;
248+
image: ImageBitmap | ImageData;
250249
tileID?: CanonicalTileID;
251250
onNorthPole: boolean;
252251
onSouthPole: boolean;
@@ -317,11 +316,7 @@ class ImageSource<T = 'image'> extends Evented<SourceEvents> implements ISource<
317316
if (err) {
318317
this.fire(new ErrorEvent(err));
319318
} else if (image) {
320-
if (image instanceof HTMLImageElement) {
321-
this.image = browser.getImageData(image);
322-
} else {
323-
this.image = image;
324-
}
319+
this.image = image;
325320
this._dirty = true;
326321
this.width = this.image.width;
327322
this.height = this.image.height;

src/source/raster_dem_tile_source.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import type DEMData from '../data/dem_data';
1313
import type Dispatcher from '../util/dispatcher';
1414
import type Tile from './tile';
1515
import type {Callback} from '../types/callback';
16-
import type {TextureImage} from '../render/texture';
1716
import type {RasterDEMSourceSpecification} from '../style-spec/types';
1817
import type {WorkerSourceDEMTileRequest} from './worker_source';
1918

@@ -36,7 +35,7 @@ class RasterDEMTileSource extends RasterTileSource<'raster-dem'> {
3635
function imageLoaded(
3736
this: RasterDEMTileSource,
3837
err?: Error | null,
39-
img?: TextureImage | null,
38+
img?: ImageBitmap | null,
4039
responseHeaders?: Headers,
4140
) {
4241
delete tile.request;
@@ -49,7 +48,7 @@ class RasterDEMTileSource extends RasterTileSource<'raster-dem'> {
4948
} else if (img) {
5049
const expiryData = getExpiryDataFromHeaders(responseHeaders);
5150
if (this.map._refreshExpiredTiles) tile.setExpiryData(expiryData);
52-
const transfer = ImageBitmap && img instanceof ImageBitmap && offscreenCanvasSupported();
51+
const transfer = offscreenCanvasSupported();
5352
// DEMData uses 1px padding. Handle cases with image buffer of 1 and 2 pxs, the rest assume default buffer 0
5453
// in order to keep the previous implementation working (no validation against tileSize).
5554
const buffer = (img.width - prevPowerOfTwo(img.width)) / 2;
@@ -60,7 +59,6 @@ class RasterDEMTileSource extends RasterTileSource<'raster-dem'> {
6059
tile.neighboringTiles = this._getNeighboringTiles(tile.tileID);
6160
}
6261

63-
// @ts-expect-error - TS2345 - Argument of type 'TextureImage' is not assignable to parameter of type 'CanvasImageSource'.
6462
const rawImageData = transfer ? img : browser.getImageData(img, padding);
6563
const params: WorkerSourceDEMTileRequest = {
6664
uid: tile.uid,

src/style/load_sprite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function (
2424
requestManager: RequestManager,
2525
callback: Callback<StyleImages>,
2626
): Cancelable {
27-
let json: SpriteData | undefined, image: HTMLImageElement | ImageBitmap | undefined, error: Error | undefined;
27+
let json: SpriteData | undefined, image: ImageBitmap | undefined, error: Error | undefined;
2828
const format = browser.devicePixelRatio > 1 ? '@2x' : '';
2929

3030
let jsonRequest: Cancelable | null | undefined = getJSON(requestManager.transformRequest(requestManager.normalizeSpriteURL(baseURL, format, '.json'), ResourceType.SpriteJSON), (err?: Error | null, data?: object) => {

src/style/style.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Fog from './fog';
1212
import Snow from './snow';
1313
import Rain from './rain';
1414
import {pick, clone, deepEqual, filterObject, cartesianPositionToSpherical, warnOnce} from '../util/util';
15-
import {getJSON, getReferrer, makeRequest, ResourceType} from '../util/ajax';
15+
import {getJSON, getReferrer, ResourceType} from '../util/ajax';
1616
import {isMapboxURL} from '../util/mapbox_url';
1717
import {stripQueryParameters} from '../util/url';
1818
import browser from '../util/browser';
@@ -4561,10 +4561,6 @@ class Style extends Evented<MapEvents> {
45614561
this.glyphManager.getGlyphs(params.stacks, callback);
45624562
}
45634563

4564-
getResource(mapId: string, params: ActorMessages['getResource']['params'], callback: ActorMessages['getResource']['callback']): Cancelable {
4565-
return makeRequest(params, callback);
4566-
}
4567-
45684564
getOwnSourceCache(source: string): SourceCache | undefined {
45694565
return this._otherSourceCaches[source];
45704566
}

src/ui/map.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2809,7 +2809,7 @@ export class Map extends Camera {
28092809
*/
28102810
loadImage(url: string, callback: Callback<ImageBitmap | HTMLImageElement | ImageData>) {
28112811
getImage(this._requestManager.transformRequest(url, ResourceType.Image), (err, img) => {
2812-
callback(err, img instanceof HTMLImageElement ? browser.getImageData(img) : img);
2812+
callback(err, img);
28132813
});
28142814
}
28152815

src/util/actor_messages.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import type {LoadGeoJSONRequest} from '../source/geojson_source';
88
import type {LoadGeoJSONResult} from '../source/geojson_worker_source';
99
import type {OverscaledTileID} from '../source/tile_id';
1010
import type {PluginState} from '../source/rtl_text_plugin';
11-
import type {RequestParameters} from './ajax';
1211
import type {StyleImageMap} from '../style/style_image';
1312
import type {TDecodingResult, TProcessingBatch} from '../data/mrt/types';
1413
import type {WorkerPerformanceMetrics} from './performance';
@@ -75,11 +74,6 @@ export type ActorMessages = {
7574
callback: ActorCallback<StyleImageMap<StringifiedImageId>>;
7675
};
7776

78-
'getResource': {
79-
params: RequestParameters;
80-
callback: ActorCallback<unknown>;
81-
};
82-
8377
'getWorkerPerformanceMetrics': {
8478
params: void;
8579
callback: ActorCallback<WorkerPerformanceMetrics>;

0 commit comments

Comments
 (0)