Fix for PDFs with lots of named destinations take a long time to load.

chrome/browser/resources/pdf/pdf.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * @return {number} Width of a scrollbar in pixels
  */
 function getScrollbarWidth() {
@@ skipping 13 matching lines @@
  * Return the filename component of a URL.
  * @param {string} url The URL to get the filename from.
  * @return {string} The filename component.
  */
 function getFilenameFromURL(url) {
   var components = url.split(/\/|\\/);
   return components[components.length - 1];
 }
 
 /**
- * Called when navigation happens in the current tab.
- * @param {string} url The url to be opened in the current tab.
- */
-function onNavigateInCurrentTab(url) {
-  window.location.href = url;
-}
-
-/**
  * Called when navigation happens in the new tab.
  * @param {string} url The url to be opened in the new tab.
  */
 function onNavigateInNewTab(url) {
   // Prefer the tabs API because it guarantees we can just open a new tab.
   // window.open doesn't have this guarantee.
   if (chrome.tabs)
     chrome.tabs.create({ url: url});
   else
     window.open(url);
@@ skipping 128 matching lines @@
       // We should not change zoom level when we are responsible for initiating
       // the zoom. onZoomChange() is called before setZoomComplete() callback
       // when we initiate the zoom.
       if ((zoomDelta > MIN_ZOOM_DELTA) && !this.setZoomInProgress_)
         this.viewport_.setZoom(zoomChangeInfo.newZoomFactor);
     }.bind(this));
   }
 
   // Parse open pdf parameters.
   this.paramsParser_ = new OpenPDFParamsParser();
-  this.navigator_ = new Navigator(this.streamDetails_.originalUrl,
-      this.viewport_, this.paramsParser_, onNavigateInCurrentTab,
-      onNavigateInNewTab);
+  this.navigator_ = new Navigator(
+      this.streamDetails_.originalUrl, this.viewport_, this.paramsParser_,
+      this.onNavigateInCurrentTab_.bind(this), onNavigateInNewTab);

[raymes, 2015/02/12 22:19:05]

This shouldn't change

 }
 
 PDFViewer.prototype = {
   /**
    * @private
    * Handle key events. These may come from the user directly or via the
    * scripting API.
    * @param {KeyboardEvent} e the event to handle.
    */
   handleKeyEvent_: function(e) {
@@ skipping 134 matching lines @@
   rotateCounterClockwise_: function() {
     this.plugin_.postMessage({
       type: 'rotateCounterclockwise'
     });
   },
 
   /**
    * @private
    * Notify the plugin to print.
    */
-  print_: function() {
-    this.plugin_.postMessage({
-      type: 'print'
-    });
-  },
+  print_: function() { this.plugin_.postMessage({type: 'print'}); },
 
   /**
    * @private
    * Notify the plugin to save.
    */
-  save_: function() {
+  save_: function() { this.plugin_.postMessage({type: 'save'}); },

[raymes, 2015/02/12 22:19:05]

nit: don't change these

+
+  /**
+   * @private
+   * Callback to fetch namedDestination from plugin.
+   */
+  namedDestCallback_: function(namedDestination, url) {

[raymes, 2015/02/12 22:19:05]

This should be called getNamedDestination(name)

     this.plugin_.postMessage({
-      type: 'save'
+      type: 'getNamedDestination',
+      namedDestination: namedDestination,
+      navigationUrl: url
     });
   },
 
   /**
+   * Called when navigation happens in the current tab.
+   * @param {string} url The url to be opened in the current tab.
+   */
+  onNavigateInCurrentTab_: function(url) {
+    var pageNumber =
+        this.paramsParser_.getViewportFromUrlParams(
+                               url, this.namedDestCallback_.bind(this), true)
+            .page;
+    if (pageNumber != undefined && pageNumber != -1)
+      this.viewport_.goToPage(pageNumber);
+    else
+      window.location.href = url;
+  },

[raymes, 2015/02/12 22:19:05]

This shouldn't be here

+
+
+  /**
    * @private
    * Handle open pdf parameters. This function updates the viewport as per
    * the parameters mentioned in the url while opening pdf. The order is
    * important as later actions can override the effects of previous actions.
    */
   handleURLParams_: function() {
-    var urlParams =
-        this.paramsParser_.getViewportFromUrlParams(
-            this.streamDetails_.originalUrl);
-    if (urlParams.page)
+    var urlParams = this.paramsParser_.getViewportFromUrlParams(
+        this.streamDetails_.originalUrl, this.namedDestCallback_.bind(this),
+        false);

[raymes, 2015/02/12 22:19:05]

This should look like

this.parmsParser_.getViewportFromUrlParams(this.streamDetails_.originalUrl,
function(initialViewport) {
  if (initialViewport.page && initialViewport.page != -1)
    this.viewport_.goToPage(initialViewport.page);
  if (initialViewport.position) {
    // Make sure we don't cancel effect of page parameter.
.... (the rest of the code in this function)

+    if (urlParams.page && urlParams.page != -1)
       this.viewport_.goToPage(urlParams.page);
     if (urlParams.position) {
       // Make sure we don't cancel effect of page parameter.
       this.viewport_.position = {
         x: this.viewport_.position.x + urlParams.position.x,
         y: this.viewport_.position.y + urlParams.position.y
       };
     }
     if (urlParams.zoom)
       this.viewport_.setZoom(urlParams.zoom);
@@ skipping 63 matching lines @@
         // can dismiss the password screen.
         if (this.passwordScreen_.active)
           this.passwordScreen_.accept();
 
         if (this.isMaterial_) {
           this.materialToolbar_.docLength =
               this.documentDimensions_.pageDimensions.length;
         } else {
           this.pageIndicator_.initialFadeIn();
         }
-
         this.toolbar_.initialFadeIn();
         break;
       case 'email':
         var href = 'mailto:' + message.data.to + '?cc=' + message.data.cc +
             '&bcc=' + message.data.bcc + '&subject=' + message.data.subject +
             '&body=' + message.data.body;
         window.location.href = href;
         break;
       case 'getAccessibilityJSONReply':
         this.sendScriptingMessage_(message.data);
@@ skipping 15 matching lines @@
       case 'loadProgress':
         this.updateProgress_(message.data.progress);
         break;
       case 'navigate':
         // If in print preview, always open a new tab.
         if (this.isPrintPreview_)
           this.navigator_.navigate(message.data.url, true);
         else
           this.navigator_.navigate(message.data.url, message.data.newTab);
         break;
-      case 'setNamedDestinations':
-        this.paramsParser_.namedDestinations = message.data.namedDestinations;
-        break;
       case 'setScrollPosition':
         var position = this.viewport_.position;
         if (message.data.x !== undefined)
           position.x = message.data.x;
         if (message.data.y !== undefined)
           position.y = message.data.y;
         this.viewport_.position = position;
         break;
       case 'setTranslatedStrings':
         this.passwordScreen_.text = message.data.getPasswordString;
         if (!this.isMaterial_) {
           this.progressBar_.text = message.data.loadingString;
           if (!this.isPrintPreview_)
             this.progressBar_.style.visibility = 'visible';
         }
         this.errorScreen_.text = message.data.loadFailedString;
         break;
       case 'cancelStreamUrl':
         chrome.mimeHandlerPrivate.abortStream();
         break;
       case 'bookmarks':
         this.bookmarks_ = message.data.bookmarks;
         if (this.isMaterial_)
           this.bookmarksPane_.bookmarks = message.data.bookmarks;
         break;
+      case 'getNamedDestinationReply':

[raymes, 2015/02/12 22:19:05]

this should just call: this.paramsParser_.onNamedDestinationReceived(...)

+        if (message.data.namedDestinationPageNumber != undefined)
+          this.viewport_.goToPage(message.data.namedDestinationPageNumber);
+        else if (message.data.navigationUrl)
+          window.location.href = message.data.navigationUrl;
+        break;
     }
   },
 
   /**
    * @private
    * A callback that's called before the zoom changes. Notify the plugin to stop
    * reacting to scroll events while zoom is taking place to avoid flickering.
    */
   beforeZoom_: function() {
     this.plugin_.postMessage({
@@ skipping 228 matching lines @@
    * Each bookmark is an Object containing a:
    * - title
    * - page (optional)
    * - array of children (themselves bookmarks)
    * @type {Array} the top-level bookmarks of the PDF.
    */
   get bookmarks() {
     return this.bookmarks_;
   }
 };