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 110 matching lines @@
 const char kJSEmailCc[] = "cc";
 const char kJSEmailBcc[] = "bcc";
 const char kJSEmailSubject[] = "subject";
 const char kJSEmailBody[] = "body";
 // Rotation (Page -> Plugin)
 const char kJSRotateClockwiseType[] = "rotateClockwise";
 const char kJSRotateCounterclockwiseType[] = "rotateCounterclockwise";
 // Select all text in the document (Page -> Plugin)
 const char kJSSelectAllType[] = "selectAll";
 
+// List of named destinations (Plugin -> Page)
+const char kJSSetNamedDestinations[] = "setNamedDestinations";
+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 694 matching lines @@
                                       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;
+      // if '#' is already present in |url_| then remove old fragment and add
+      // new |url_copy| fragment.
+      std::size_t index = url_.find('#');
+      if (index != std::string::npos)
+        url_copy = url_.substr(0, index) + url_copy;
+      else
+        url_copy = url_ + url_copy;
     }

[raymes, 2015/01/13 01:59:31]

Can we move this code into JS as well? We should have the original URL available
there too (this.streamDetails_.originalUrl)

[Deepak, 2015/01/13 08:29:07]

Done.

   }
   pp::VarDictionary message;
   message.Set(kType, kJSNavigateType);
   message.Set(kJSNavigateUrl, url_copy);
   message.Set(kJSNavigateNewTab, open_in_new_tab);
   PostMessage(message);
 }
 
 void OutOfProcessInstance::UpdateCursor(PP_CursorType_Dev cursor) {
   if (cursor == cursor_)
@@ skipping 194 matching lines @@
   }
 
   pp::Memory_Dev memory;
   memory.MemFree(pp_results);
 }
 
 void OutOfProcessInstance::DocumentPaintOccurred() {
 }
 
 void OutOfProcessInstance::DocumentLoadComplete(int page_count) {
+  pp::VarDictionary named_message;

[raymes, 2015/01/13 01:59:31]

nit: move this down to right above where it is used. Maybe call it
named_destinations_message

[Deepak, 2015/01/13 08:29:07]

Done.

+  pp::VarDictionary named_destinations;
+  engine_->GetAllNameDests(&named_destinations);

[raymes, 2015/01/13 01:59:31]

Can't this function just return a pp::VarDictionary rather than having an out
parameter?

[Deepak, 2015/01/13 08:29:07]

Done.

+  named_message.Set(pp::Var(kType), pp::Var(kJSSetNamedDestinations));
+  named_message.Set(pp::Var(kJSNamedDestinations), pp::Var(named_destinations));
+  PostMessage(named_message);

[raymes, 2015/01/13 01:59:31]

nit: let's move the above code down to right above the progress message

[Deepak, 2015/01/13 08:29:07]

Done.

+
   // Clear focus state for OSK.
   FormTextFieldFocusChange(false);
 
   DCHECK(document_load_state_ == LOAD_STATE_LOADING);
   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;

[raymes, 2015/01/13 01:59:31]

Maybe call this progress_message now since there are 2 different messages

[Deepak, 2015/01/13 08:29:07]

Done.

   message.Set(pp::Var(kType), pp::Var(kJSLoadProgressType));
   message.Set(pp::Var(kJSProgressPercentage), pp::Var(100)) ;
   PostMessage(message);
 
   if (!full_)
     return;
 
   if (did_call_start_loading_) {
     pp::PDF::DidStopLoading(this);
     did_call_start_loading_ = false;
@@ skipping 275 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