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

Merge pull request #12555 from calixteman/color

Browse Source 
Replace css color rgb(...) by #...
This commit is contained in:
Tim van der Meij 2020-11-02 23:55:39 +01:00 committed by GitHub
commit 3e52098e29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/pattern.js
View File

@ -205,14 +205,14 @@ Shadings.RadialAxial = (function RadialAxialClosure() {
ratio[0] = t0 + i * step; ratio[0] = t0 + i * step;
fn(ratio, 0, color, 0); fn(ratio, 0, color, 0);
rgbColor = cs.getRgb(color, 0); rgbColor = cs.getRgb(color, 0);
var cssColor = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]); var cssColor = Util.makeHexColor(rgbColor[0], rgbColor[1], rgbColor[2]);
colorStops.push([i / NUMBER_OF_SAMPLES, cssColor]); colorStops.push([i / NUMBER_OF_SAMPLES, cssColor]);
} }
var background = "transparent"; var background = "transparent";
if (dict.has("Background")) { if (dict.has("Background")) {
rgbColor = cs.getRgb(dict.get("Background"), 0); rgbColor = cs.getRgb(dict.get("Background"), 0);
background = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]); background = Util.makeHexColor(rgbColor[0], rgbColor[1], rgbColor[2]);
} }
if (!extendStart) { if (!extendStart) {

4
src/display/annotation_layer.js
View File

@ -221,7 +221,7 @@ class AnnotationElement {
} }
if (data.color) { if (data.color) {
container.style.borderColor = Util.makeCssRgb( container.style.borderColor = Util.makeHexColor(
data.color[0] | 0, data.color[0] | 0,
data.color[1] | 0, data.color[1] | 0,
data.color[2] | 0 data.color[2] | 0
@ -860,7 +860,7 @@ class PopupElement {
const r = BACKGROUND_ENLIGHT * (255 - color[0]) + color[0]; const r = BACKGROUND_ENLIGHT * (255 - color[0]) + color[0];
const g = BACKGROUND_ENLIGHT * (255 - color[1]) + color[1]; const g = BACKGROUND_ENLIGHT * (255 - color[1]) + color[1];
const b = BACKGROUND_ENLIGHT * (255 - color[2]) + color[2]; const b = BACKGROUND_ENLIGHT * (255 - color[2]) + color[2];
popup.style.backgroundColor = Util.makeCssRgb(r | 0, g | 0, b | 0); popup.style.backgroundColor = Util.makeHexColor(r | 0, g | 0, b | 0);
} }
const title = document.createElement("h1"); const title = document.createElement("h1");

4
src/display/canvas.js
View File

@ -1951,12 +1951,12 @@ const CanvasGraphics = (function CanvasGraphicsClosure() {
this.current.patternFill = true; this.current.patternFill = true;
}, },
setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) { setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
const color = Util.makeCssRgb(r, g, b); const color = Util.makeHexColor(r, g, b);
this.ctx.strokeStyle = color; this.ctx.strokeStyle = color;
this.current.strokeColor = color; this.current.strokeColor = color;
}, },
setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) { setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
const color = Util.makeCssRgb(r, g, b); const color = Util.makeHexColor(r, g, b);
this.ctx.fillStyle = color; this.ctx.fillStyle = color;
this.current.fillColor = color; this.current.fillColor = color;
this.current.patternFill = false; this.current.patternFill = false;

2
src/display/pattern_helper.js
View File

@ -571,7 +571,7 @@ const TilingPattern = (function TilingPatternClosure() {
current.strokeColor = ctx.strokeStyle; current.strokeColor = ctx.strokeStyle;
break; break;
case PaintType.UNCOLORED: case PaintType.UNCOLORED:
const cssColor = Util.makeCssRgb(color[0], color[1], color[2]); const cssColor = Util.makeHexColor(color[0], color[1], color[2]);
context.fillStyle = cssColor; context.fillStyle = cssColor;
context.strokeStyle = cssColor; context.strokeStyle = cssColor;
// Set color needed by image masks (fixes issues 3226 and 8741). // Set color needed by image masks (fixes issues 3226 and 8741).

6
src/display/svg.js
View File

@ -1049,7 +1049,7 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
} }
setStrokeRGBColor(r, g, b) { setStrokeRGBColor(r, g, b) {
this.current.strokeColor = Util.makeCssRgb(r, g, b); this.current.strokeColor = Util.makeHexColor(r, g, b);
} }
setFillAlpha(fillAlpha) { setFillAlpha(fillAlpha) {
@ -1057,7 +1057,7 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
} }
setFillRGBColor(r, g, b) { setFillRGBColor(r, g, b) {
this.current.fillColor = Util.makeCssRgb(r, g, b); this.current.fillColor = Util.makeHexColor(r, g, b);
this.current.tspan = this.svgFactory.createElement("svg:tspan"); this.current.tspan = this.svgFactory.createElement("svg:tspan");
this.current.xcoords = []; this.current.xcoords = [];
this.current.ycoords = []; this.current.ycoords = [];
@ -1143,7 +1143,7 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
this.svg = bbox; this.svg = bbox;
this.transformMatrix = matrix; this.transformMatrix = matrix;
if (paintType === 2) { if (paintType === 2) {
const cssColor = Util.makeCssRgb(...color); const cssColor = Util.makeHexColor(...color);
this.current.fillColor = cssColor; this.current.fillColor = cssColor;
this.current.strokeColor = cssColor; this.current.strokeColor = cssColor;
} }

13
src/shared/util.js
View File

@ -622,16 +622,13 @@ const IsEvalSupportedCached = {
}, },
}; };
const rgbBuf = ["rgb(", 0, ",", 0, ",", 0, ")"]; const hexNumbers = [...Array(256).keys()].map(n =>
n.toString(16).padStart(2, "0")
);
class Util { class Util {
// makeCssRgb() can be called thousands of times. Using ´rgbBuf` avoids static makeHexColor(r, g, b) {
// creating many intermediate strings. return `#${hexNumbers[r]}${hexNumbers[g]}${hexNumbers[b]}`;
static makeCssRgb(r, g, b) {
rgbBuf[1] = r;
rgbBuf[3] = g;
rgbBuf[5] = b;
return rgbBuf.join("");
} }
// Concatenates two transformation matrices together and returns the result. // Concatenates two transformation matrices together and returns the result.