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

Refactor text_layer.js to pass the task as a parameter

Browse Source 
We pass many parameters to `appendText` while we might as well pass the
`task` object that contains them. This saves a few lines of code and
makes the signature of `appendText` more clear. We do the same for
`expand`, which is useful for the next commit in which we replace
`div.dataset` with a `WeakMap`.

Furthermore, this patch adds a missing parameter to a comment block to
make it clear which parameters remain.
This commit is contained in:
Tim van der Meij 2016-09-02 17:51:13 +02:00
parent 8522625da2
commit b10add14f3
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/display/text_layer.js
View File

@ -46,6 +46,8 @@ var getDefaultSetting = displayDOMUtils.getDefaultSetting;
* initially be set to empty array. * initially be set to empty array.
* @property {number} timeout - (optional) Delay in milliseconds before * @property {number} timeout - (optional) Delay in milliseconds before
* rendering of the text runs occurs. * rendering of the text runs occurs.
* @property {boolean} enhanceTextSelection - (optional) Whether to turn on the
* text selection enhancement.
*/ */
var renderTextLayer = (function renderTextLayerClosure() { var renderTextLayer = (function renderTextLayerClosure() {
var MAX_TEXT_DIVS_TO_RENDER = 100000; var MAX_TEXT_DIVS_TO_RENDER = 100000;
@ -56,16 +58,15 @@ var renderTextLayer = (function renderTextLayerClosure() {
return !NonWhitespaceRegexp.test(str); return !NonWhitespaceRegexp.test(str);
} }
function appendText(textDivs, viewport, geom, styles, bounds, function appendText(task, geom) {
enhanceTextSelection) { var style = task._textContent.styles[geom.fontName];
var style = styles[geom.fontName];
var textDiv = document.createElement('div'); var textDiv = document.createElement('div');
textDivs.push(textDiv); task._textDivs.push(textDiv);
if (isAllWhitespace(geom.str)) { if (isAllWhitespace(geom.str)) {
textDiv.dataset.isWhitespace = true; textDiv.dataset.isWhitespace = true;
return; return;
} }
var tx = Util.transform(viewport.transform, geom.transform); var tx = Util.transform(task._viewport.transform, geom.transform);
var angle = Math.atan2(tx[1], tx[0]); var angle = Math.atan2(tx[1], tx[0]);
if (style.vertical) { if (style.vertical) {
angle += Math.PI / 2; angle += Math.PI / 2;
@ -108,19 +109,19 @@ var renderTextLayer = (function renderTextLayerClosure() {
// lots of such divs a lot faster. // lots of such divs a lot faster.
if (geom.str.length > 1) { if (geom.str.length > 1) {
if (style.vertical) { if (style.vertical) {
textDiv.dataset.canvasWidth = geom.height * viewport.scale; textDiv.dataset.canvasWidth = geom.height * task._viewport.scale;
} else { } else {
textDiv.dataset.canvasWidth = geom.width * viewport.scale; textDiv.dataset.canvasWidth = geom.width * task._viewport.scale;
} }
} }
if (enhanceTextSelection) { if (task._enhanceTextSelection) {
var angleCos = 1, angleSin = 0; var angleCos = 1, angleSin = 0;
if (angle !== 0) { if (angle !== 0) {
angleCos = Math.cos(angle); angleCos = Math.cos(angle);
angleSin = Math.sin(angle); angleSin = Math.sin(angle);
} }
var divWidth = (style.vertical ? geom.height : geom.width) * var divWidth = (style.vertical ? geom.height : geom.width) *
viewport.scale; task._viewport.scale;
var divHeight = fontHeight; var divHeight = fontHeight;
var m, b; var m, b;
@ -131,7 +132,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
b = [left, top, left + divWidth, top + divHeight]; b = [left, top, left + divWidth, top + divHeight];
} }
bounds.push({ task._bounds.push({
left: b[0], left: b[0],
top: b[1], top: b[1],
right: b[2], right: b[2],
@ -209,7 +210,10 @@ var renderTextLayer = (function renderTextLayerClosure() {
capability.resolve(); capability.resolve();
} }
function expand(bounds, viewport) { function expand(task) {
var bounds = task._bounds;
var viewport = task._viewport;
var expanded = expandBounds(viewport.width, viewport.height, bounds); var expanded = expandBounds(viewport.width, viewport.height, bounds);
for (var i = 0; i < expanded.length; i++) { for (var i = 0; i < expanded.length; i++) {
var div = bounds[i].div; var div = bounds[i].div;
@ -487,8 +491,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
this._textContent = textContent; this._textContent = textContent;
this._container = container; this._container = container;
this._viewport = viewport; this._viewport = viewport;
textDivs = textDivs || []; this._textDivs = textDivs || [];
this._textDivs = textDivs;
this._renderingDone = false; this._renderingDone = false;
this._canceled = false; this._canceled = false;
this._capability = createPromiseCapability(); this._capability = createPromiseCapability();
@ -513,15 +516,8 @@ var renderTextLayer = (function renderTextLayerClosure() {
_render: function TextLayer_render(timeout) { _render: function TextLayer_render(timeout) {
var textItems = this._textContent.items; var textItems = this._textContent.items;
var styles = this._textContent.styles;
var textDivs = this._textDivs;
var viewport = this._viewport;
var bounds = this._bounds;
var enhanceTextSelection = this._enhanceTextSelection;
for (var i = 0, len = textItems.length; i < len; i++) { for (var i = 0, len = textItems.length; i < len; i++) {
appendText(textDivs, viewport, textItems[i], styles, bounds, appendText(this, textItems[i]);
enhanceTextSelection);
} }
if (!timeout) { // Render right away if (!timeout) { // Render right away
@ -540,7 +536,7 @@ var renderTextLayer = (function renderTextLayerClosure() {
return; return;
} }
if (!this._expanded) { if (!this._expanded) {
expand(this._bounds, this._viewport); expand(this);
this._expanded = true; this._expanded = true;
this._bounds.length = 0; this._bounds.length = 0;
} }