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

[api-major] Remove the enhanceTextSelection functionality (PR 15145 follow-up)

Browse Source 
For the `gulp mozcentral` command, this reduces the size of the *built* `pdf.js` file by `> 10` kB.
This commit is contained in:
Jonas Jenwald 2022-01-18 18:09:12 +01:00
parent 3f8b5449e8
commit 571ce13dd6
13 changed files with 34 additions and 559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/chromium/options/migration.js
View File

@ -109,17 +109,10 @@ limitations under the License.
}
// Migration code for https://github.com/mozilla/pdf.js/pull/9479.
if (typeof items.disableTextLayer === "boolean") {
var textLayerMode = 1;
if (items.disableTextLayer) {
textLayerMode = 0;
} else if (items.enhanceTextSelection) {
textLayerMode = 2;
}
if (textLayerMode !== 1) {
// Overwrite if computed textLayerMode is not the default value (1).
storageSync.set(
{
textLayerMode,
textLayerMode: 0,
},
function () {
if (!chrome.runtime.lastError) {

1
extensions/chromium/options/options.html
View File

@ -126,7 +126,6 @@ body {
<select>
<option value="0">Disable text selection</option>
<option value="1">Enable text selection</option>
<option value="2">Enable enhanced mode (experimental)</option>
</select>
</label>
</div>

10
extensions/chromium/preferences_schema.json
View File

@ -102,19 +102,13 @@
"type": "boolean",
"default": false
},
"enhanceTextSelection": {
"description": "DEPRECATED. Set textLayerMode to 2 to use the enhanced text selection layer by default.",
"type": "boolean",
"default": false
},
"textLayerMode": {
"title": "Text layer mode",
"description": "Controls if the text layer is enabled, and the selection mode that is used.\n 0 = Disabled.\n 1 = Enabled.\n 2 = (Experimental) Enabled, with enhanced text selection.",
"description": "Controls if the text layer is enabled, and the selection mode that is used.\n 0 = Disabled.\n 1 = Enabled.",
"type": "integer",
"enum": [
0,
1,
2
1
],
"default": 1
},

447
src/display/text_layer.js
View File

@ -18,7 +18,6 @@ import {
createPromiseCapability,
Util,
} from "../shared/util.js";
import { deprecated } from "./display_utils.js";
/**
* Text layer render parameters.
@ -40,15 +39,12 @@ import { deprecated } from "./display_utils.js";
* This is output and shall initially be set to an empty array.
* @property {number} [timeout] - Delay in milliseconds before rendering of the
* text runs occurs.
* @property {boolean} [enhanceTextSelection] - Whether to turn on the text
* selection enhancement.
*/
const MAX_TEXT_DIVS_TO_RENDER = 100000;
const DEFAULT_FONT_SIZE = 30;
const DEFAULT_FONT_ASCENT = 0.8;
const ascentCache = new Map();
const AllWhitespaceRegexp = /^\s+$/g;
function getAscent(fontFamily, ctx) {
const cachedAscent = ascentCache.get(fontFamily);
@ -120,28 +116,13 @@ function getAscent(fontFamily, ctx) {
function appendText(task, geom, styles, ctx) {
// Initialize all used properties to keep the caches monomorphic.
const textDiv = document.createElement("span");
const textDivProperties = task._enhanceTextSelection
? {
angle: 0,
canvasWidth: 0,
hasText: geom.str !== "",
hasEOL: geom.hasEOL,
originalTransform: null,
paddingBottom: 0,
paddingLeft: 0,
paddingRight: 0,
paddingTop: 0,
scale: 1,
fontSize: 0,
}
: {
angle: 0,
canvasWidth: 0,
hasText: geom.str !== "",
hasEOL: geom.hasEOL,
fontSize: 0,
};
const textDivProperties = {
angle: 0,
canvasWidth: 0,
hasText: geom.str !== "",
hasEOL: geom.hasEOL,
fontSize: 0,
};
task._textDivs.push(textDiv);
const tx = Util.transform(task._viewport.transform, geom.transform);
@ -189,10 +170,7 @@ function appendText(task, geom, styles, ctx) {
// little effect on text highlighting. This makes scrolling on docs with
// lots of such divs a lot faster.
let shouldScaleText = false;
if (
geom.str.length > 1 ||
(task._enhanceTextSelection && AllWhitespaceRegexp.test(geom.str))
) {
if (geom.str.length > 1) {
shouldScaleText = true;
} else if (geom.str !== " " && geom.transform[0] !== geom.transform[3]) {
const absScaleX = Math.abs(geom.transform[0]),
@ -217,36 +195,6 @@ function appendText(task, geom, styles, ctx) {
if (task._textContentStream) {
task._layoutText(textDiv);
}
if (task._enhanceTextSelection && textDivProperties.hasText) {
let angleCos = 1,
angleSin = 0;
if (angle !== 0) {
angleCos = Math.cos(angle);
angleSin = Math.sin(angle);
}
const divWidth =
(style.vertical ? geom.height : geom.width) * task._viewport.scale;
const divHeight = fontHeight;
let m, b;
if (angle !== 0) {
m = [angleCos, angleSin, -angleSin, angleCos, left, top];
b = Util.getAxialAlignedBoundingBox([0, 0, divWidth, divHeight], m);
} else {
b = [left, top, left + divWidth, top + divHeight];
}
task._bounds.push({
left: b[0],
top: b[1],
right: b[2],
bottom: b[3],
div: textDiv,
size: [divWidth, divHeight],
m,
});
}
}
function render(task) {
@ -275,295 +223,6 @@ function render(task) {
capability.resolve();
}
function findPositiveMin(ts, offset, count) {
let result = 0;
for (let i = 0; i < count; i++) {
const t = ts[offset++];
if (t > 0) {
result = result ? Math.min(t, result) : t;
}
}
return result;
}
function expand(task) {
const bounds = task._bounds;
const viewport = task._viewport;
const expanded = expandBounds(viewport.width, viewport.height, bounds);
for (let i = 0; i < expanded.length; i++) {
const div = bounds[i].div;
const divProperties = task._textDivProperties.get(div);
if (divProperties.angle === 0) {
divProperties.paddingLeft = bounds[i].left - expanded[i].left;
divProperties.paddingTop = bounds[i].top - expanded[i].top;
divProperties.paddingRight = expanded[i].right - bounds[i].right;
divProperties.paddingBottom = expanded[i].bottom - bounds[i].bottom;
task._textDivProperties.set(div, divProperties);
continue;
}
// Box is rotated -- trying to find padding so rotated div will not
// exceed its expanded bounds.
const e = expanded[i],
b = bounds[i];
const m = b.m,
c = m[0],
s = m[1];
// Finding intersections with expanded box.
const points = [[0, 0], [0, b.size[1]], [b.size[0], 0], b.size];
const ts = new Float64Array(64);
for (let j = 0, jj = points.length; j < jj; j++) {
const t = Util.applyTransform(points[j], m);
ts[j + 0] = c && (e.left - t[0]) / c;
ts[j + 4] = s && (e.top - t[1]) / s;
ts[j + 8] = c && (e.right - t[0]) / c;
ts[j + 12] = s && (e.bottom - t[1]) / s;
ts[j + 16] = s && (e.left - t[0]) / -s;
ts[j + 20] = c && (e.top - t[1]) / c;
ts[j + 24] = s && (e.right - t[0]) / -s;
ts[j + 28] = c && (e.bottom - t[1]) / c;
ts[j + 32] = c && (e.left - t[0]) / -c;
ts[j + 36] = s && (e.top - t[1]) / -s;
ts[j + 40] = c && (e.right - t[0]) / -c;
ts[j + 44] = s && (e.bottom - t[1]) / -s;
ts[j + 48] = s && (e.left - t[0]) / s;
ts[j + 52] = c && (e.top - t[1]) / -c;
ts[j + 56] = s && (e.right - t[0]) / s;
ts[j + 60] = c && (e.bottom - t[1]) / -c;
}
// Not based on math, but to simplify calculations, using cos and sin
// absolute values to not exceed the box (it can but insignificantly).
const boxScale = 1 + Math.min(Math.abs(c), Math.abs(s));
divProperties.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale;
divProperties.paddingTop = findPositiveMin(ts, 48, 16) / boxScale;
divProperties.paddingRight = findPositiveMin(ts, 0, 16) / boxScale;
divProperties.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale;
task._textDivProperties.set(div, divProperties);
}
}
function expandBounds(width, height, boxes) {
const bounds = boxes.map(function (box, i) {
return {
x1: box.left,
y1: box.top,
x2: box.right,
y2: box.bottom,
index: i,
x1New: undefined,
x2New: undefined,
};
});
expandBoundsLTR(width, bounds);
const expanded = new Array(boxes.length);
for (const b of bounds