Skip to content

Commit 3634dab

Browse files
Merge pull request #18988 from Snuffleupagus/split-dom-factory
Move the various DOM-factories into their own files
2 parents e930f30 + 4e12906 commit 3634dab

24 files changed

+1038
-919
lines changed

gulpfile.mjs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ function createWebpackAlias(defines) {
191191
"fluent-dom": "node_modules/@fluent/dom/esm/index.js",
192192
};
193193
const libraryAlias = {
194+
"display-cmap_reader_factory": "src/display/stubs.js",
195+
"display-standard_fontdata_factory": "src/display/stubs.js",
194196
"display-fetch_stream": "src/display/stubs.js",
195197
"display-network": "src/display/stubs.js",
196198
"display-node_stream": "src/display/stubs.js",
@@ -219,6 +221,10 @@ function createWebpackAlias(defines) {
219221
};
220222

221223
if (defines.CHROME) {
224+
libraryAlias["display-cmap_reader_factory"] =
225+
"src/display/cmap_reader_factory.js";
226+
libraryAlias["display-standard_fontdata_factory"] =
227+
"src/display/standard_fontdata_factory.js";
222228
libraryAlias["display-fetch_stream"] = "src/display/fetch_stream.js";
223229
libraryAlias["display-network"] = "src/display/network.js";
224230

@@ -231,6 +237,10 @@ function createWebpackAlias(defines) {
231237
// Aliases defined here must also be replicated in the paths section of
232238
// the tsconfig.json file for the type generation to work.
233239
// In the tsconfig.json files, the .js extension must be omitted.
240+
libraryAlias["display-cmap_reader_factory"] =
241+
"src/display/cmap_reader_factory.js";
242+
libraryAlias["display-standard_fontdata_factory"] =
243+
"src/display/standard_fontdata_factory.js";
234244
libraryAlias["display-fetch_stream"] = "src/display/fetch_stream.js";
235245
libraryAlias["display-network"] = "src/display/network.js";
236246
libraryAlias["display-node_stream"] = "src/display/node_stream.js";
@@ -1573,6 +1583,8 @@ function buildLibHelper(bundleDefines, inputStream, outputDir) {
15731583
defines: bundleDefines,
15741584
map: {
15751585
"pdfjs-lib": "../pdf.js",
1586+
"display-cmap_reader_factory": "./cmap_reader_factory.js",
1587+
"display-standard_fontdata_factory": "./standard_fontdata_factory.js",
15761588
"display-fetch_stream": "./fetch_stream.js",
15771589
"display-network": "./network.js",
15781590
"display-node_stream": "./node_stream.js",

src/display/annotation_layer.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,10 @@ import {
3737
Util,
3838
warn,
3939
} from "../shared/util.js";
40-
import {
41-
DOMSVGFactory,
42-
PDFDateString,
43-
setLayerDimensions,
44-
} from "./display_utils.js";
40+
import { PDFDateString, setLayerDimensions } from "./display_utils.js";
4541
import { AnnotationStorage } from "./annotation_storage.js";
4642
import { ColorConverters } from "../shared/scripting_utils.js";
43+
import { DOMSVGFactory } from "./svg_factory.js";
4744
import { XfaLayer } from "./xfa_layer.js";
4845

4946
const DEFAULT_TAB_INDEX = 1000;

src/display/api.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ import {
4545
} from "./annotation_storage.js";
4646
import {
4747
deprecated,
48-
DOMCanvasFactory,
49-
DOMCMapReaderFactory,
50-
DOMFilterFactory,
51-
DOMStandardFontDataFactory,
5248
isDataScheme,
5349
isValidFetchUrl,
5450
PageViewport,
@@ -64,6 +60,10 @@ import {
6460
NodeStandardFontDataFactory,
6561
} from "display-node_utils";
6662
import { CanvasGraphics } from "./canvas.js";
63+
import { DOMCanvasFactory } from "./canvas_factory.js";
64+
import { DOMCMapReaderFactory } from "display-cmap_reader_factory";
65+
import { DOMFilterFactory } from "./filter_factory.js";
66+
import { DOMStandardFontDataFactory } from "display-standard_fontdata_factory";
6767
import { GlobalWorkerOptions } from "./worker_options.js";
6868
import { MessageHandler } from "../shared/message_handler.js";
6969
import { Metadata } from "./metadata.js";

src/display/base_factory.js

Lines changed: 0 additions & 234 deletions
This file was deleted.

0 commit comments

Comments
 (0)