Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(986)

Unified Diff: chrome/browser/resources/pdf/open_pdf_params_parser.js

Issue 830433002: Navigation to relative fragments does not work correctly for OOP pdf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing Build error. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/pdf.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/pdf/open_pdf_params_parser.js
diff --git a/chrome/browser/resources/pdf/open_pdf_params_parser.js b/chrome/browser/resources/pdf/open_pdf_params_parser.js
index f4fe8e7354a1617a6c5929c23e72379af59b9465..a0c7e0d0f4fa0c6d1d2e2ec1bdf5885eda2747b4 100644
--- a/chrome/browser/resources/pdf/open_pdf_params_parser.js
+++ b/chrome/browser/resources/pdf/open_pdf_params_parser.js
@@ -10,9 +10,8 @@
* @param {string} url to be parsed.
*/
function OpenPDFParamsParser(url) {
- this.url_ = url;
- this.urlParams = {};
- this.parseOpenPDFParams_();
+ // A dictionary of all the named destinations in the PDF.
+ this.namedDestinations = {};
}
OpenPDFParamsParser.prototype = {
@@ -22,8 +21,9 @@ OpenPDFParamsParser.prototype = {
* parameter is passed while opening PDF then PDF should be opened
* at the specified zoom level.
* @param {number} zoom value.
+ * @param {Object} viewportPosition to store zoom and position value.
*/
- parseZoomParam_: function(paramValue) {
+ parseZoomParam_: function(paramValue, viewportPosition) {
var paramValueSplit = paramValue.split(',');
if ((paramValueSplit.length != 1) && (paramValueSplit.length != 3))
return;
@@ -35,31 +35,42 @@ OpenPDFParamsParser.prototype = {
// Handle #zoom=scale.
if (paramValueSplit.length == 1) {
- this.urlParams['zoom'] = zoomFactor;
+ viewportPosition['zoom'] = zoomFactor;
return;
}
// Handle #zoom=scale,left,top.
var position = {x: parseFloat(paramValueSplit[1]),
y: parseFloat(paramValueSplit[2])};
- this.urlParams['position'] = position;
- this.urlParams['zoom'] = zoomFactor;
+ viewportPosition['position'] = position;
+ viewportPosition['zoom'] = zoomFactor;
},
/**
* @private
- * Parse open PDF parameters. These parameters are mentioned in the url
+ * Parse PDF url parameters. These parameters are mentioned in the url
* and specify actions to be performed when opening pdf files.
* See http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/
* pdfs/pdf_open_parameters.pdf for details.
+ * @param {string} url that needs to be parsed.
+ * @return {Object} A dictionary containing the viewport which should be
+ * displayed based on the URL.
*/
- parseOpenPDFParams_: function() {
- var originalUrl = this.url_;
- var paramIndex = originalUrl.search('#');
+ getViewportFromUrlParams: function(url) {
+ var viewportPosition = {};
+ var paramIndex = url.search('#');
if (paramIndex == -1)
- return;
+ return viewportPosition;
+
+ var paramTokens = url.substring(paramIndex + 1).split('&');
+ if ((paramTokens.length == 1) && (paramTokens[0].search('=') == -1)) {
+ // Handle the case of http://foo.com/bar#NAMEDDEST. This is not
+ // explicitlymentioned except by example in the Adobe
+ // "PDF Open Parameters" document.
+ viewportPosition['page'] = this.namedDestinations[paramTokens[0]];
+ return viewportPosition;
+ }
- var paramTokens = originalUrl.substring(paramIndex + 1).split('&');
var paramsDictionary = {};
for (var i = 0; i < paramTokens.length; ++i) {
var keyValueSplit = paramTokens[i].split('=');
@@ -68,14 +79,22 @@ OpenPDFParamsParser.prototype = {
paramsDictionary[keyValueSplit[0]] = keyValueSplit[1];
}
+ if ('nameddest' in paramsDictionary) {
+ var page = this.namedDestinations[paramsDictionary['nameddest']];
+ if (page != undefined)
+ viewportPosition['page'] = page;
+ }
+
if ('page' in paramsDictionary) {
// |pageNumber| is 1-based, but goToPage() take a zero-based page number.
var pageNumber = parseInt(paramsDictionary['page']);
- if (!isNaN(pageNumber))
- this.urlParams['page'] = pageNumber - 1;
+ if (!isNaN(pageNumber) && pageNumber > 0)
+ viewportPosition['page'] = pageNumber - 1;
}
if ('zoom' in paramsDictionary)
- this.parseZoomParam_(paramsDictionary['zoom']);
+ this.parseZoomParam_(paramsDictionary['zoom'], viewportPosition);
+
+ return viewportPosition;
}
};
« no previous file with comments | « no previous file | chrome/browser/resources/pdf/pdf.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698