Update PDF accessibility when zoom level changes

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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>  // for min/max()
@@ skipping 591 matching lines @@
   if (accessibility_state_ == ACCESSIBILITY_STATE_LOADED)
     return;
 
   if (accessibility_state_ == ACCESSIBILITY_STATE_OFF)
     accessibility_state_ = ACCESSIBILITY_STATE_PENDING;
 
   if (document_load_state_ == LOAD_STATE_COMPLETE)
     LoadAccessibility();
 }
 
 void OutOfProcessInstance::LoadAccessibility() {

[raymes, 2016/09/27 05:05:31]

We should make sure these functions are in the same order as the header if
possible

[dmazzoni, 2016/09/27 16:19:32]

I rearranged these three to match. The rest of the file isn't
as consistent so I don't want to do too much in this change.

If you'd like I could follow up with a change to rearrange
the whole file.

   accessibility_state_ = ACCESSIBILITY_STATE_LOADED;
   PP_PrivateAccessibilityDocInfo doc_info;
   doc_info.page_count = engine_->GetNumberOfPages();
   doc_info.text_accessible = PP_FromBool(
       engine_->HasPermission(PDFEngine::PERMISSION_COPY_ACCESSIBLE));
   doc_info.text_copyable = PP_FromBool(
       engine_->HasPermission(PDFEngine::PERMISSION_COPY));
 
   pp::PDF::SetAccessibilityDocInfo(GetPluginInstance(), &doc_info);
 
   // If the document contents isn't accessible, don't send anything more.
   if (!(engine_->HasPermission(PDFEngine::PERMISSION_COPY) ||
         engine_->HasPermission(PDFEngine::PERMISSION_COPY_ACCESSIBLE))) {
     return;
   }
 
-  PP_PrivateAccessibilityViewportInfo viewport_info;
-  viewport_info.scroll.x = 0;
-  viewport_info.scroll.y = -top_toolbar_height_ * device_scale_;
-  viewport_info.offset = available_area_.point();
-  viewport_info.zoom = zoom_ * device_scale_;
-  pp::PDF::SetAccessibilityViewportInfo(GetPluginInstance(), &viewport_info);
+  SendAccessibilityViewportInfo();
 
   // Schedule loading the first page.
   pp::CompletionCallback callback = timer_factory_.NewCallback(
       &OutOfProcessInstance::SendNextAccessibilityPage);
   pp::Module::Get()->core()->CallOnMainThread(kAccessibilityPageDelayMs,
                                               callback, 0);
 }
 
+void OutOfProcessInstance::SendAccessibilityViewportInfo() {
+  PP_PrivateAccessibilityViewportInfo viewport_info;
+  viewport_info.scroll.x = 0;
+  viewport_info.scroll.y = -top_toolbar_height_ * device_scale_;
+  viewport_info.offset = available_area_.point();
+  viewport_info.zoom = zoom_ * device_scale_;
+  pp::PDF::SetAccessibilityViewportInfo(GetPluginInstance(), &viewport_info);
+}
+
 void OutOfProcessInstance::SendNextAccessibilityPage(int32_t page_index) {
   int page_count = engine_->GetNumberOfPages();
   if (page_index < 0 || page_index >= page_count)
     return;
 
   int char_count = engine_->GetCharCount(page_index);
   PP_PrivateAccessibilityPageInfo page_info;
   page_info.page_index = page_index;
   page_info.bounds = engine_->GetPageBoundsRect(page_index);
   page_info.char_count = char_count;
@@ skipping 758 matching lines @@
   if (bottom_of_document < available_area_.height())
     available_area_.set_height(bottom_of_document);
 
   CalculateBackgroundParts();
   engine_->PageOffsetUpdated(available_area_.point());
   engine_->PluginSizeUpdated(available_area_.size());
 
   if (document_size_.IsEmpty())
     return;
   paint_manager_.InvalidateRect(pp::Rect(pp::Point(), plugin_size_));
+
+  if (accessibility_state_ == ACCESSIBILITY_STATE_LOADED)
+    SendAccessibilityViewportInfo();
 }
 
 void OutOfProcessInstance::LoadUrl(const std::string& url) {
   LoadUrlInternal(url, &embed_loader_, &OutOfProcessInstance::DidOpen);
 }
 
 void OutOfProcessInstance::LoadPreviewUrl(const std::string& url) {
   LoadUrlInternal(url, &embed_preview_loader_,
                   &OutOfProcessInstance::DidOpenPreview);
 }
@@ skipping 96 matching lines @@
     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 min_y = -top_toolbar_height_;
   float max_y = document_size_.height() * zoom_ - plugin_dip_size_.height();
   float y = std::max(std::min(scroll_offset.y(), max_y), min_y);
   return pp::FloatPoint(x, y);
 }
 
 }  // namespace chrome_pdf