Improved Pinch-Zoom for PDF.

pdf/paint_manager.cc

 // Copyright (c) 2010 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/paint_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 14 matching lines @@
 
 PaintManager::PaintManager(pp::Instance* instance,
                            Client* client,
                            bool is_always_opaque)
     : instance_(instance),
       client_(client),
       is_always_opaque_(is_always_opaque),
       callback_factory_(nullptr),
       manual_callback_pending_(false),
       flush_pending_(false),
+      flush_requested_(false),
       has_pending_resize_(false),
       graphics_need_to_be_bound_(false),
       pending_device_scale_(1.0),
       device_scale_(1.0),
       in_paint_(false),
       first_paint_(true),
       view_size_changed_waiting_for_paint_(false) {
   // Set the callback object outside of the initializer list to avoid a
   // compiler warning about using "this" in an initializer list.
   callback_factory_.Initialize(this);
@@ skipping 56 matching lines @@
 
   has_pending_resize_ = true;
   pending_size_ = new_size;
   pending_device_scale_ = device_scale;
 
   view_size_changed_waiting_for_paint_ = true;
 
   Invalidate();
 }
 
+void PaintManager::SetTransform(float scale,
+                                const pp::Point& origin,
+                                const pp::Point& translate) {
+  if (graphics_.is_null())
+    return;
+
+  graphics_.SetLayerTransform(scale, origin, translate);
+
+  if (flush_pending_) {

[Lei Zhang, 2016/10/27 23:04:33]

Given the differences in behavior, maybe this method should be called
SetTransformAndFlush() ?

[Kevin McNee - google account, 2016/10/28 19:19:38]

I've made the behaviour w.r.t. flushing more explicit.

Done.

+    flush_requested_ = true;
+    return;
+  }
+  Flush();
+}
+
+void PaintManager::SetTransform(float scale) {
+  if (graphics_.is_null())
+    return;
+
+  graphics_.SetLayerTransform(scale, pp::Point(), pp::Point());
+
+  EnsureCallbackPending();
+}
+
 void PaintManager::Invalidate() {
   if (graphics_.is_null() && !has_pending_resize_)
     return;
 
   EnsureCallbackPending();
   aggregator_.InvalidateRect(pp::Rect(GetEffectiveSize()));
 }
 
 void PaintManager::InvalidateRect(const pp::Rect& rect) {
   DCHECK(!in_paint_);
@@ skipping 133 matching lines @@
       EnsureCallbackPending();
       return;
     }
   }
 
   for (const auto& ready_rect : ready_now) {
     graphics_.PaintImageData(
         ready_rect.image_data, ready_rect.offset, ready_rect.rect);
   }
 
+  Flush();
+
+  in_paint_ = false;
+  first_paint_ = false;
+
+  if (graphics_need_to_be_bound_) {
+    instance_->BindGraphics(graphics_);
+    graphics_need_to_be_bound_ = false;
+  }
+}
+
+void PaintManager::Flush() {
+  flush_requested_ = false;
+
   int32_t result = graphics_.Flush(
       callback_factory_.NewCallback(&PaintManager::OnFlushComplete));
 
   // If you trigger this assertion, then your plugin has called Flush()
   // manually. When using the PaintManager, you should not call Flush, it will
   // handle that for you because it needs to know when it can do the next paint
   // by implementing the flush callback.
   //
   // Another possible cause of this assertion is re-using devices. If you
   // use one device, swap it with another, then swap it back, we won't know
   // that we've already scheduled a Flush on the first device. It's best to not
   // re-use devices in this way.
   DCHECK(result != PP_ERROR_INPROGRESS);
 
   if (result == PP_OK_COMPLETIONPENDING) {
     flush_pending_ = true;
   } else {
     DCHECK(result == PP_OK);  // Catch all other errors in debug mode.
   }
-
-  in_paint_ = false;
-  first_paint_ = false;
-
-  if (graphics_need_to_be_bound_) {
-    instance_->BindGraphics(graphics_);
-    graphics_need_to_be_bound_ = false;
-  }
 }
 
 void PaintManager::OnFlushComplete(int32_t) {
   DCHECK(flush_pending_);
   flush_pending_ = false;
 
   // If more paints were enqueued while we were waiting for the flush to
   // complete, execute them now.
   if (aggregator_.HasPendingUpdate())
     DoPaint();
+
+  // If there was another flush request while flushing we flush again.
+  if (flush_requested_) {
+    Flush();
+  }
 }
 
 void PaintManager::OnManualCallbackComplete(int32_t) {
   DCHECK(manual_callback_pending_);
   manual_callback_pending_ = false;
 
   // Just because we have a manual callback doesn't mean there are actually any
   // invalid regions. Even though we only schedule this callback when something
   // is pending, a Flush callback could have come in before this callback was
   // executed and that could have cleared the queue.
   if (aggregator_.HasPendingUpdate())
     DoPaint();
 }