Skip to content

[pull] master from mozilla:master #287

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.

Sign up for GitHub

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

Merged
pull merged 6 commits into from
Mar 25, 2026
Merged

[pull] master from mozilla:master #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a0102ab
Move the `NetworkStream` choice from `src/display/api.js` and into a …
Snuffleupagus Mar 24, 2026
c0e3977
Remove the canvases cache
calixteman Mar 24, 2026
f608d56
Enable hardware acceleration by default
calixteman Mar 24, 2026
7b2901b
Merge pull request #20965 from calixteman/enable_hwa_default
calixteman Mar 25, 2026
ae84c66
Merge pull request #20966 from calixteman/rm_canvas_cache
calixteman Mar 25, 2026
777251d
Merge pull request #20968 from Snuffleupagus/getNetworkStream
Snuffleupagus Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions gulpfile.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,7 @@ function createWebpackAlias(defines) {
};
const libraryAlias = {
"display-binary_data_factory": "src/display/stubs.js",
"display-fetch_stream": "src/display/stubs.js",
"display-network": "src/display/stubs.js",
"display-node_stream": "src/display/stubs.js",
"display-network_stream": "src/display/stubs.js",
"display-node_utils": "src/display/stubs.js",
};
const viewerAlias = {
Expand Down Expand Up @@ -227,8 +225,7 @@ function createWebpackAlias(defines) {
if (defines.CHROME) {
libraryAlias["display-binary_data_factory"] =
"src/display/binary_data_factory.js";
libraryAlias["display-fetch_stream"] = "src/display/fetch_stream.js";
libraryAlias["display-network"] = "src/display/network.js";
libraryAlias["display-network_stream"] = "src/display/network_stream.js";

viewerAlias["web-download_manager"] = "web/chromecom.js";
viewerAlias["web-external_services"] = "web/chromecom.js";
Expand All @@ -241,9 +238,7 @@ function createWebpackAlias(defines) {
// In the tsconfig.json files, the .js extension must be omitted.
libraryAlias["display-binary_data_factory"] =
"src/display/binary_data_factory.js";
libraryAlias["display-fetch_stream"] = "src/display/fetch_stream.js";
libraryAlias["display-network"] = "src/display/network.js";
libraryAlias["display-node_stream"] = "src/display/node_stream.js";
libraryAlias["display-network_stream"] = "src/display/network_stream.js";
libraryAlias["display-node_utils"] = "src/display/node_utils.js";

viewerAlias["web-download_manager"] = "web/download_manager.js";
Expand Down Expand Up @@ -1540,9 +1535,7 @@ function buildLibHelper(bundleDefines, inputStream, outputDir) {
map: {
"pdfjs-lib": "../pdf.js",
"display-binary_data_factory": "./binary_data_factory.js",
"display-fetch_stream": "./fetch_stream.js",
"display-network": "./network.js",
"display-node_stream": "./node_stream.js",
"display-network_stream": "./network_stream.js",
"display-node_utils": "./node_utils.js",
"fluent-bundle": "../../../node_modules/@fluent/bundle/esm/index.js",
"fluent-dom": "../../../node_modules/@fluent/dom/esm/index.js",
Expand Down
13 changes: 2 additions & 11 deletions src/display/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,13 @@ import { CanvasGraphics } from "./canvas.js";
import { DOMBinaryDataFactory } from "display-binary_data_factory";
import { DOMCanvasFactory } from "./canvas_factory.js";
import { DOMFilterFactory } from "./filter_factory.js";
import { getNetworkStream } from "display-network_stream";
import { GlobalWorkerOptions } from "./worker_options.js";
import { initWebGPUMesh } from "./webgpu_mesh.js";
import { Metadata } from "./metadata.js";
import { OptionalContentConfig } from "./optional_content_config.js";
import { PagesMapper } from "./pages_mapper.js";
import { PDFDataTransportStream } from "./transport_stream.js";
import { PDFFetchStream } from "display-fetch_stream";
import { PDFNetworkStream } from "display-network";
import { PDFNodeStream } from "display-node_stream";
import { PDFObjects } from "./pdf_objects.js";
import { TextLayer } from "./text_layer.js";
import { XfaText } from "./xfa_text.js";
Expand Down Expand Up @@ -454,14 +452,7 @@ function getDocument(src = {}) {
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
throw new Error("Not implemented: NetworkStream");
}
// eslint-disable-next-line no-nested-ternary
const NetworkStream = isValidFetchUrl(url)
? PDFFetchStream
: typeof PDFJSDev !== "undefined" &&
PDFJSDev.test("GENERIC") &&
isNodeJS
? PDFNodeStream
: PDFNetworkStream;
const NetworkStream = getNetworkStream(url);

networkStream = new NetworkStream({
url,
Expand Down
Loading
Loading