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

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

Issue 923063002: Sample Patch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « chrome/browser/resources/pdf/navigator.js ('k') | 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 c0f4b19d1c8889d979221cc19009aa17f7e8a080..8adc9398587105db76ccfb2def4c1d2cd5b2e17c 100644
--- a/chrome/browser/resources/pdf/open_pdf_params_parser.js
+++ b/chrome/browser/resources/pdf/open_pdf_params_parser.js
@@ -7,10 +7,13 @@
/**
* Creates a new OpenPDFParamsParser. This parses the open pdf parameters
* passed in the url to set initial viewport settings for opening the pdf.
+ * @param {Object} getNamedDestination function to be post message to plugin
+ * for fetching page number for named destination.
*/
-function OpenPDFParamsParser() {
+function OpenPDFParamsParser(getNamedDestination) {
// A dictionary of all the named destinations in the PDF.
- this.namedDestinations = {};
+ this.outstandingRequests_ = [];
+ this.getNamedDestination_ = getNamedDestination;
}
OpenPDFParamsParser.prototype = {
@@ -52,22 +55,27 @@ OpenPDFParamsParser.prototype = {
* 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.
+ * @param {Object} callback function to be called back with viewport info.
*/
- getViewportFromUrlParams: function(url) {
+ getViewportFromUrlParams: function(url, callback) {
var viewportPosition = {};
var paramIndex = url.search('#');
- if (paramIndex == -1)
- return viewportPosition;
+ if (paramIndex == -1) {
+ callback(viewportPosition);
+ return;
+ }
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;
+ this.outstandingRequests_.push({
+ callback: callback,
+ viewportPosition: viewportPosition
+ });
+ this.getNamedDestination_(paramTokens[0]);
+ return;
}
var paramsDictionary = {};
@@ -78,12 +86,6 @@ 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']);
@@ -94,6 +96,25 @@ OpenPDFParamsParser.prototype = {
if ('zoom' in paramsDictionary)
this.parseZoomParam_(paramsDictionary['zoom'], viewportPosition);
- return viewportPosition;
- }
+ if ('nameddest' in paramsDictionary) {
+ this.outstandingRequests_.push({
+ callback: callback,
+ viewportPosition: viewportPosition
+ });
+ this.getNamedDestination_(paramsDictionary['nameddest']);
+ return;
+ }
+ callback(viewportPosition);
+ return;
+ },
+
+ onNamedDestinationReceived: function(namedDestinationPage) {
+ var outstandingRequest = this.outstandingRequests_.shift();
+ if (!outstandingRequest)
+ return;
+ if (!outstandingRequest.viewportPosition.page)
+ outstandingRequest.viewportPosition.page = namedDestinationPage;
+ outstandingRequest.callback(outstandingRequest.viewportPosition);
+ },
+
};
« no previous file with comments | « chrome/browser/resources/pdf/navigator.js ('k') | chrome/browser/resources/pdf/pdf.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698