summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/resources/pdf/pdf.js16
-rw-r--r--chrome/browser/resources/pdf/viewport.js53
-rw-r--r--chrome/test/data/pdf/basic_plugin_test.js3
-rw-r--r--chrome/test/data/pdf/navigator_test.js2
-rw-r--r--chrome/test/data/pdf/viewport_test.js63
5 files changed, 31 insertions, 106 deletions
diff --git a/chrome/browser/resources/pdf/pdf.js b/chrome/browser/resources/pdf/pdf.js
index 3fb6148..dfa2d31 100644
--- a/chrome/browser/resources/pdf/pdf.js
+++ b/chrome/browser/resources/pdf/pdf.js
@@ -75,12 +75,6 @@ function shouldIgnoreKeyEvents(activeElement) {
PDFViewer.MIN_TOOLBAR_OFFSET = 15;
/**
- * The height of the toolbar along the top of the page. The document will be
- * shifted down by this much in the viewport.
- */
-PDFViewer.MATERIAL_TOOLBAR_HEIGHT = 64;
-
-/**
* Creates a new PDFViewer. There should only be one of these objects per
* document.
* @constructor
@@ -110,16 +104,13 @@ function PDFViewer(browserApi) {
this.errorScreen_ = $('error-screen');
// Create the viewport.
- var topToolbarHeight =
- this.isMaterial_ ? PDFViewer.MATERIAL_TOOLBAR_HEIGHT : 0;
this.viewport_ = new Viewport(window,
this.sizer_,
this.viewportChanged_.bind(this),
this.beforeZoom_.bind(this),
this.afterZoom_.bind(this),
getScrollbarWidth(),
- this.browserApi_.getDefaultZoom(),
- topToolbarHeight);
+ this.browserApi_.getDefaultZoom());
// Create the plugin object dynamically so we can set its src. The plugin
// element is sized to fill the entire window and is set to be fixed
@@ -152,11 +143,8 @@ function PDFViewer(browserApi) {
}
this.plugin_.setAttribute('headers', headers);
- if (this.isMaterial_) {
+ if (this.isMaterial_)
this.plugin_.setAttribute('is-material', '');
- this.plugin_.setAttribute('top-toolbar-height',
- PDFViewer.MATERIAL_TOOLBAR_HEIGHT);
- }
if (!this.browserApi_.getStreamInfo().embedded)
this.plugin_.setAttribute('full-frame', '');
diff --git a/chrome/browser/resources/pdf/viewport.js b/chrome/browser/resources/pdf/viewport.js
index 35a5f65..47c2507 100644
--- a/chrome/browser/resources/pdf/viewport.js
+++ b/chrome/browser/resources/pdf/viewport.js
@@ -25,8 +25,6 @@ function getIntersectionHeight(rect1, rect2) {
* @param {Function} afterZoomCallback is run after a change in zoom
* @param {number} scrollbarWidth the width of scrollbars on the page
* @param {number} defaultZoom The default zoom level.
- * @param {number} topToolbarHeight The number of pixels that should initially
- * be left blank above the document for the toolbar.
*/
function Viewport(window,
sizer,
@@ -34,8 +32,7 @@ function Viewport(window,
beforeZoomCallback,
afterZoomCallback,
scrollbarWidth,
- defaultZoom,
- topToolbarHeight) {
+ defaultZoom) {
this.window_ = window;
this.sizer_ = sizer;
this.viewportChangedCallback_ = viewportChangedCallback;
@@ -48,7 +45,6 @@ function Viewport(window,
this.scrollbarWidth_ = scrollbarWidth;
this.fittingType_ = Viewport.FittingType.NONE;
this.defaultZoom_ = defaultZoom;
- this.topToolbarHeight_ = topToolbarHeight;
window.addEventListener('scroll', this.updateViewport_.bind(this));
window.addEventListener('resize', this.resize_.bind(this));
@@ -143,8 +139,8 @@ Viewport.prototype = {
if (this.documentDimensions_) {
this.sizer_.style.width =
this.documentDimensions_.width * this.zoom_ + 'px';
- this.sizer_.style.height = this.documentDimensions_.height * this.zoom_ +
- this.topToolbarHeight_ + 'px';
+ this.sizer_.style.height =
+ this.documentDimensions_.height * this.zoom_ + 'px';
}
},
@@ -175,7 +171,7 @@ Viewport.prototype = {
get position() {
return {
x: this.window_.pageXOffset,
- y: this.window_.pageYOffset - this.topToolbarHeight_
+ y: this.window_.pageYOffset
};
},
@@ -184,7 +180,7 @@ Viewport.prototype = {
* @type {Object} position the position to scroll to.
*/
set position(position) {
- this.window_.scrollTo(position.x, position.y + this.topToolbarHeight_);
+ this.window_.scrollTo(position.x, position.y);
},
/**
@@ -233,17 +229,15 @@ Viewport.prototype = {
'Viewport.mightZoom_.';
}
// Record the scroll position (relative to the top-left of the window).
- var currentScrollPos = {
- x: this.position.x / this.zoom_,
- y: this.position.y / this.zoom_
- };
+ var currentScrollPos = [
+ this.window_.pageXOffset / this.zoom_,
+ this.window_.pageYOffset / this.zoom_
+ ];
this.zoom_ = newZoom;
this.contentSizeChanged_();
// Scroll to the scaled scroll position.
- this.position = {
- x: currentScrollPos.x * newZoom,
- y: currentScrollPos.y * newZoom
- };
+ this.window_.scrollTo(currentScrollPos[0] * newZoom,
+ currentScrollPos[1] * newZoom);
},
/**
@@ -432,12 +426,8 @@ Viewport.prototype = {
height: this.pageDimensions_[page].height,
};
this.setZoomInternal_(this.computeFittingZoom_(dimensions, false));
- if (scrollToTopOfPage) {
- this.position = {
- x: 0,
- y: this.pageDimensions_[page].y * this.zoom_
- };
- }
+ if (scrollToTopOfPage)
+ this.window_.scrollTo(0, this.pageDimensions_[page].y * this.zoom_);
this.updateViewport_();
}.bind(this));
},
@@ -495,16 +485,8 @@ Viewport.prototype = {
if (page >= this.pageDimensions_.length)
page = this.pageDimensions_.length - 1;
var dimensions = this.pageDimensions_[page];
- var toolbarOffset = 0;
- // Unless we're in fit to page mode, scroll above the page by
- // |this.topToolbarHeight_| so that the toolbar isn't covering it
- // initially.
- if (this.fittingType_ != Viewport.FittingType.FIT_TO_PAGE)
- toolbarOffset = this.topToolbarHeight_;
- this.position = {
- x: dimensions.x * this.zoom_,
- y: dimensions.y * this.zoom_ - toolbarOffset
- };
+ this.window_.scrollTo(dimensions.x * this.zoom_,
+ dimensions.y * this.zoom_);
this.updateViewport_();
}.bind(this));
},
@@ -522,10 +504,7 @@ Viewport.prototype = {
this.setZoomInternal_(
Math.min(this.defaultZoom_,
this.computeFittingZoom_(this.documentDimensions_, true)));
- this.position = {
- x: 0,
- y: -this.topToolbarHeight_
- };
+ this.window_.scrollTo(0, 0);
}
this.contentSizeChanged_();
this.resize_();
diff --git a/chrome/test/data/pdf/basic_plugin_test.js b/chrome/test/data/pdf/basic_plugin_test.js
index fc73d54..08d2714 100644
--- a/chrome/test/data/pdf/basic_plugin_test.js
+++ b/chrome/test/data/pdf/basic_plugin_test.js
@@ -18,8 +18,7 @@ var tests = [
viewer.viewport.setZoom(1);
var sizer = document.getElementById('sizer');
chrome.test.assertEq(826, sizer.offsetWidth);
- chrome.test.assertEq(1066 + viewer.viewport.topToolbarHeight_,
- sizer.offsetHeight);
+ chrome.test.assertEq(1066, sizer.offsetHeight);
chrome.test.succeed();
},
diff --git a/chrome/test/data/pdf/navigator_test.js b/chrome/test/data/pdf/navigator_test.js
index a7ffbbb..149fe2f 100644
--- a/chrome/test/data/pdf/navigator_test.js
+++ b/chrome/test/data/pdf/navigator_test.js
@@ -32,7 +32,7 @@ var tests = [
var mockSizer = new MockSizer();
var mockCallback = new MockViewportChangedCallback();
var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
- function() {}, function() {}, 0, 1, 0);
+ function() {}, function() {}, 0, 1);
var paramsParser = new OpenPDFParamsParser(function(name) {
if (name == 'US')
diff --git a/chrome/test/data/pdf/viewport_test.js b/chrome/test/data/pdf/viewport_test.js
index 1a45c63..a513de9 100644
--- a/chrome/test/data/pdf/viewport_test.js
+++ b/chrome/test/data/pdf/viewport_test.js
@@ -6,7 +6,7 @@ var tests = [
function testDocumentNeedsScrollbars() {
var viewport =
new Viewport(new MockWindow(100, 100), new MockSizer(), function() {},
- function() {}, function() {}, 10, 1, 0);
+ function() {}, function() {}, 10, 1);
var scrollbars;
viewport.setDocumentDimensions(new MockDocumentDimensions(90, 90));
@@ -61,7 +61,7 @@ var tests = [
var mockWindow = new MockWindow(100, 100, mockSizer);
var mockCallback = new MockViewportChangedCallback();
var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
- function() {}, function() {}, 0, 1, 0);
+ function() {}, function() {}, 0, 1);
// Test setting the zoom without the document dimensions set. The sizer
// shouldn't change size.
@@ -136,7 +136,7 @@ var tests = [
function testGetMostVisiblePage() {
var mockWindow = new MockWindow(100, 100);
var viewport = new Viewport(mockWindow, new MockSizer(), function() {},
- function() {}, function() {}, 0, 1, 0);
+ function() {}, function() {}, 0, 1);
var documentDimensions = new MockDocumentDimensions(100, 100);
documentDimensions.addPage(50, 100);
@@ -186,7 +186,7 @@ var tests = [
var mockSizer = new MockSizer();
var mockCallback = new MockViewportChangedCallback();
var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
- function() {}, function() {}, 0, 1, 0);
+ function() {}, function() {}, 0, 1);
var documentDimensions = new MockDocumentDimensions();
// Test with a document width which matches the window width.
@@ -245,7 +245,7 @@ var tests = [
// fit to width, which will cause the page height to span outside of the
// viewport, triggering 15px scrollbars to be shown.
viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
- function() {}, function() {}, 15, 1, 0);
+ function() {}, function() {}, 15, 1);
documentDimensions.reset();
documentDimensions.addPage(50, 100);
viewport.setDocumentDimensions(documentDimensions);
@@ -264,7 +264,7 @@ var tests = [
var mockSizer = new MockSizer();
var mockCallback = new MockViewportChangedCallback();
var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
- function() {}, function() {}, 0, 1, 0);
+ function() {}, function() {}, 0, 1);
var documentDimensions = new MockDocumentDimensions();
// Test with a page size which matches the window size.
@@ -373,7 +373,7 @@ var tests = [
var mockSizer = new MockSizer();
var mockCallback = new MockViewportChangedCallback();
var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
- function() {}, function() {}, 0, 1, 0);
+ function() {}, function() {}, 0, 1);
var documentDimensions = new MockDocumentDimensions();
documentDimensions.addPage(100, 100);
@@ -414,7 +414,7 @@ var tests = [
var mockSizer = new MockSizer();
var mockCallback = new MockViewportChangedCallback();
var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
- function() {}, function() {}, 0, 1, 0);
+ function() {}, function() {}, 0, 1);
var documentDimensions = new MockDocumentDimensions();
documentDimensions.addPage(100, 100);
documentDimensions.addPage(200, 200);
@@ -469,7 +469,7 @@ var tests = [
chrome.test.assertEq(1, viewport.zoom);
};
viewport = new Viewport(mockWindow, mockSizer, function() {},
- beforeZoom, afterZoom, 0, 1, 0);
+ beforeZoom, afterZoom, 0, 1);
viewport.setZoom(0.5);
chrome.test.succeed();
},
@@ -477,7 +477,7 @@ var tests = [
function testInitialSetDocumentDimensionsZoomConstrained() {
var viewport =
new Viewport(new MockWindow(100, 100), new MockSizer(), function() {},
- function() {}, function() {}, 0, 1.2, 0);
+ function() {}, function() {}, 0, 1.2);
viewport.setDocumentDimensions(new MockDocumentDimensions(50, 50));
chrome.test.assertEq(1.2, viewport.zoom);
chrome.test.succeed();
@@ -486,52 +486,11 @@ var tests = [
function testInitialSetDocumentDimensionsZoomUnconstrained() {
var viewport = new Viewport(
new MockWindow(100, 100),
- new MockSizer(), function() {}, function() {}, function() {}, 0, 3, 0);
+ new MockSizer(), function() {}, function() {}, function() {}, 0, 3);
viewport.setDocumentDimensions(new MockDocumentDimensions(50, 50));
chrome.test.assertEq(2, viewport.zoom);
chrome.test.succeed();
},
-
- function testToolbarHeightOffset() {
- var mockSizer = new MockSizer();
- var mockWindow = new MockWindow(100, 100);
- var viewport = new Viewport(mockWindow,
- mockSizer, function() {}, function() {}, function() {}, 0, 1, 50);
- var documentDimensions = new MockDocumentDimensions(0, 0);
- documentDimensions.addPage(50, 500);
- viewport.setDocumentDimensions(documentDimensions);
- viewport.setZoom(1);
-
- // Check that the sizer incorporates the toolbar height.
- chrome.test.assertEq('550px', mockSizer.style.height);
- chrome.test.assertEq('50px', mockSizer.style.width);
- chrome.test.assertEq(0, viewport.position.x);
-
- // Check the sizer incorporates the toolbar height correctly even if zoomed.
- viewport.setZoom(2);
- chrome.test.assertEq('1050px', mockSizer.style.height);
- chrome.test.assertEq('100px', mockSizer.style.width);
-
- // Test that the viewport scrolls to the correct offset when fit-to-page is
- // enabled. The top of the viewport should be at the start of the document.
- viewport.fitToPage();
- chrome.test.assertEq(0, viewport.position.y);
-
- // Check that going to a page scrolls to the correct offset when fit-to-page
- // is enabled. The top of the viewport should be at the start of the
- // document.
- mockWindow.scrollTo(0, 100);
- viewport.goToPage(0);
- chrome.test.assertEq(0, viewport.position.y);
-
- // Check that going to a page scrolls to the correct offset when fit-to-page
- // is not enabled. The top of the viewport should be before start of the
- // document.
- viewport.setZoom(1);
- viewport.goToPage(0);
- chrome.test.assertEq(-50, viewport.position.y);
- chrome.test.succeed();
- }
];
chrome.test.runTests(tests);
generated by cgit v1.1 at 2025-05-07 15:30:17 +0000