Navigation to relative fragments does not work correctly for OOP pdf.

pdf/out_of_process_instance.cc

 // Copyright (c) 2012 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.
 
 #include "pdf/out_of_process_instance.h"
 
 #include <algorithm>  // for min/max()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 115 matching lines @@
 const char kJSRotateClockwiseType[] = "rotateClockwise";
 const char kJSRotateCounterclockwiseType[] = "rotateCounterclockwise";
 // Select all text in the document (Page -> Plugin)
 const char kJSSelectAllType[] = "selectAll";
 // Get the selected text in the document (Page -> Plugin)
 const char kJSGetSelectedTextType[] = "getSelectedText";
 // Reply with selected text (Plugin -> Page)
 const char kJSGetSelectedTextReplyType[] = "getSelectedTextReply";
 const char kJSSelectedText[] = "selectedText";
 
+// List of named destinations (Plugin -> Page)
+const char kJSSetNamedDestinations[] = "setNamedDestinations";

[raymes, 2015/01/15 04:51:11]

nit kJSSetNamedDestinationsType

[Deepak, 2015/01/15 06:30:06]

Done.

+const char kJSNamedDestinations[] = "namedDestinations";
+
 const int kFindResultCooldownMs = 100;
 
 const double kMinZoom = 0.01;
 
 namespace {
 
 static const char kPPPPdfInterface[] = PPP_PDF_INTERFACE_1;
 
 PP_Var GetLinkAtPosition(PP_Instance instance, PP_Point point) {
   pp::Var var;
@@ skipping 693 matching lines @@
     return;
 
   pp::VarDictionary message;
   message.Set(kType, kJSGoToPageType);
   message.Set(kJSPageNumber, pp::Var(page));
   PostMessage(message);
 }
 
 void OutOfProcessInstance::NavigateTo(const std::string& url,
                                       bool open_in_new_tab) {
-  std::string url_copy(url);
-
-  // Empty |url_copy| is ok, and will effectively be a reload.
-  // Skip the code below so an empty URL does not turn into "http://", which
-  // will cause GURL to fail a DCHECK.
-  if (!url_copy.empty()) {
-    // If |url_copy| starts with '#', then it's for the same URL with a
-    // different URL fragment.
-    if (url_copy[0] == '#') {
-      url_copy = url_ + url_copy;
-    }
-    // If there's no scheme, add http.
-    if (url_copy.find("://") == std::string::npos &&
-        url_copy.find("mailto:") == std::string::npos) {
-      url_copy = std::string("http://") + url_copy;
-    }
-    // Make sure |url_copy| starts with a valid scheme.
-    if (url_copy.find("http://") != 0 &&
-        url_copy.find("https://") != 0 &&
-        url_copy.find("ftp://") != 0 &&
-        url_copy.find("file://") != 0 &&
-        url_copy.find("mailto:") != 0) {
-      return;
-    }
-    // Make sure |url_copy| is not only a scheme.
-    if (url_copy == "http://" ||
-        url_copy == "https://" ||
-        url_copy == "ftp://" ||
-        url_copy == "file://" ||
-        url_copy == "mailto:") {
-      return;
-    }
-  }
   pp::VarDictionary message;
   message.Set(kType, kJSNavigateType);
-  message.Set(kJSNavigateUrl, url_copy);
+  message.Set(kJSNavigateUrl, url);
   message.Set(kJSNavigateNewTab, open_in_new_tab);
   PostMessage(message);
 }
 
 void OutOfProcessInstance::UpdateCursor(PP_CursorType_Dev cursor) {
   if (cursor == cursor_)
     return;
   cursor_ = cursor;
 
   const PPB_CursorControl_Dev* cursor_interface =
@@ skipping 204 matching lines @@
   document_load_state_ = LOAD_STATE_COMPLETE;
   UserMetricsRecordAction("PDF.LoadSuccess");
 
   // Note: If we are in print preview mode the scroll location is retained
   // across document loads so we don't want to scroll again and override it.
   if (IsPrintPreview()) {
     AppendBlankPrintPreviewPages();
     OnGeometryChanged(0, 0);
   }
 
-  pp::VarDictionary message;
-  message.Set(pp::Var(kType), pp::Var(kJSLoadProgressType));
-  message.Set(pp::Var(kJSProgressPercentage), pp::Var(100)) ;
-  PostMessage(message);
+  pp::VarDictionary named_destinations_message;
+  pp::VarDictionary named_destinations = engine_->GetNamedDestinations();
+  named_destinations_message.Set(pp::Var(kType),
+                                 pp::Var(kJSSetNamedDestinations));
+  named_destinations_message.Set(pp::Var(kJSNamedDestinations),
+                                 pp::Var(named_destinations));
+  PostMessage(named_destinations_message);
+
+  pp::VarDictionary progress_message;
+  progress_message.Set(pp::Var(kType), pp::Var(kJSLoadProgressType));
+  progress_message.Set(pp::Var(kJSProgressPercentage), pp::Var(100));
+  PostMessage(progress_message);
 
   if (!full_)
     return;
 
   if (did_call_start_loading_) {
     pp::PDF::DidStopLoading(this);
     did_call_start_loading_ = false;
   }
 
   int content_restrictions =
@@ skipping 272 matching lines @@
 pp::FloatPoint OutOfProcessInstance::BoundScrollOffsetToDocument(
     const pp::FloatPoint& scroll_offset) {
   float max_x = document_size_.width() * zoom_ - plugin_dip_size_.width();
   float x = std::max(std::min(scroll_offset.x(), max_x), 0.0f);
   float max_y = document_size_.height() * zoom_ - plugin_dip_size_.height();
   float y = std::max(std::min(scroll_offset.y(), max_y), 0.0f);
   return pp::FloatPoint(x, y);
 }
 
 }  // namespace chrome_pdf