Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15101 from Snuffleupagus/browsertest-use-viewer-css

Browse Source 
Use the *built* `components/pdf_viewer.css` file in the reference tests
This commit is contained in:
Tim van der Meij 2022-06-25 14:53:04 +02:00 committed by GitHub
commit b8a7cf7aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/driver.js
View File

@ -34,6 +34,7 @@ const CMAP_URL = "/build/generic/web/cmaps/";
const CMAP_PACKED = true; const CMAP_PACKED = true;
const STANDARD_FONT_DATA_URL = "/build/generic/web/standard_fonts/"; const STANDARD_FONT_DATA_URL = "/build/generic/web/standard_fonts/";
const IMAGE_RESOURCES_PATH = "/web/images/"; const IMAGE_RESOURCES_PATH = "/web/images/";
const VIEWER_CSS = "../build/components/pdf_viewer.css";
const WORKER_SRC = "../build/generic/build/pdf.worker.js"; const WORKER_SRC = "../build/generic/build/pdf.worker.js";
const RENDER_TASK_ON_CONTINUE_DELAY = 5; // ms const RENDER_TASK_ON_CONTINUE_DELAY = 5; // ms
const SVG_NS = "http://www.w3.org/2000/svg"; const SVG_NS = "http://www.w3.org/2000/svg";
@ -160,10 +161,7 @@ class Rasterize {
* styles are inserted via XHR. Therefore, we load and combine them here. * styles are inserted via XHR. Therefore, we load and combine them here.
*/ */
static get annotationStylePromise() { static get annotationStylePromise() {
const styles = [ const styles = [VIEWER_CSS, "./annotation_layer_builder_overrides.css"];
"../web/annotation_layer_builder.css",
"./annotation_layer_builder_overrides.css",
];
return shadow(this, "annotationStylePromise", loadStyles(styles)); return shadow(this, "annotationStylePromise", loadStyles(styles));
} }
@ -173,10 +171,7 @@ class Rasterize {
} }
static get xfaStylePromise() { static get xfaStylePromise() {
const styles = [ const styles = [VIEWER_CSS, "./xfa_layer_builder_overrides.css"];
"../web/xfa_layer_builder.css",
"./xfa_layer_builder_overrides.css",
];
return shadow(this, "xfaStylePromise", loadStyles(styles)); return shadow(this, "xfaStylePromise", loadStyles(styles));
} }
@ -215,7 +210,9 @@ class Rasterize {
div.className = "annotationLayer"; div.className = "annotationLayer";
const [common, overrides] = await this.annotationStylePromise; const [common, overrides] = await this.annotationStylePromise;
style.textContent = `:root { --scale-factor: ${viewport.scale} } ${common}\n${overrides}`; style.textContent =
`${common}\n${overrides}\n` +
`:root { --scale-factor: ${viewport.scale} }`;
const annotationViewport = viewport.clone({ dontFlip: true }); const annotationViewport = viewport.clone({ dontFlip: true });
const annotationImageMap = await convertCanvasesToImages( const annotationImageMap = await convertCanvasesToImages(
@ -256,8 +253,8 @@ class Rasterize {
// Items are transformed to have 1px font size. // Items are transformed to have 1px font size.
svg.setAttribute("font-size", 1); svg.setAttribute("font-size", 1);
const [cssRules] = await this.textStylePromise; const [overrides] = await this.textStylePromise;
style.textContent = cssRules; style.textContent = overrides;
// Rendering text layer as HTML. // Rendering text layer as HTML.
const task = renderTextLayer({ const task = renderTextLayer({
@ -289,7 +286,7 @@ class Rasterize {
const { svg, foreignObject, style, div } = this.createContainer(viewport); const { svg, foreignObject, style, div } = this.createContainer(viewport);
const [common, overrides] = await this.xfaStylePromise; const [common, overrides] = await this.xfaStylePromise;
style.textContent = `${fontRules}\n${common}\n${overrides}`; style.textContent = `${common}\n${overrides}\n${fontRules}`;
// Rendering XFA layer as HTML. // Rendering XFA layer as HTML.
XfaLayer.render({ XfaLayer.render({