Plumb PinchVirtualViewport layers into CC.

cc/trees/layer_tree_impl.cc

 // Copyright 2011 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 "cc/trees/layer_tree_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/debug/traced_value.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/layers/scrollbar_layer_impl_base.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
 
 namespace cc {
 
 LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl)
     : layer_tree_host_impl_(layer_tree_host_impl),
       source_frame_number_(-1),
       hud_layer_(0),
       root_scroll_layer_(NULL),
       currently_scrolling_layer_(NULL),
       root_layer_scroll_offset_delegate_(NULL),
       background_color_(0),
       has_transparent_background_(false),
+      page_scale_layer_(NULL),
+      inner_viewport_scroll_layer_(NULL),
+      outer_viewport_scroll_layer_(NULL),
       page_scale_factor_(1),
       page_scale_delta_(1),
       sent_page_scale_delta_(1),
       min_page_scale_factor_(0),
       max_page_scale_factor_(0),
       scrolling_layer_id_from_previous_tree_(0),
       contents_textures_purged_(false),
       viewport_size_invalid_(false),
       needs_update_draw_properties_(true),
       needs_full_tree_sync_(true) {
@@ skipping 68 matching lines @@
   DCHECK_EQ(ui_resource_request_queue_.size(), 0u);
 
   target_tree->SetLatencyInfo(latency_info_);
   latency_info_.Clear();
   target_tree->SetPageScaleFactorAndLimits(
       page_scale_factor(), min_page_scale_factor(), max_page_scale_factor());
   target_tree->SetPageScaleDelta(
       target_tree->page_scale_delta() / target_tree->sent_page_scale_delta());
   target_tree->set_sent_page_scale_delta(1);
 
+  if (settings().use_pinch_virtual_viewport)

[enne (OOO), 2013/09/11 20:13:03]

style nit: {}

[wjmaclean, 2013/09/12 18:16:47]

Done.

+    target_tree->SetPinchViewportLayerIds(page_scale_layer_->id(),
+                                          inner_viewport_scroll_layer_->id(),
+                                          outer_viewport_scroll_layer_->id());
   // This should match the property synchronization in
   // LayerTreeHost::finishCommitOnImplThread().
   target_tree->set_source_frame_number(source_frame_number());
   target_tree->set_background_color(background_color());
   target_tree->set_has_transparent_background(has_transparent_background());
 
   if (ContentsTexturesPurged())
     target_tree->SetContentsTexturesPurged();
   else
     target_tree->ResetContentsTexturesPurged();
@@ skipping 122 matching lines @@
 
 void LayerTreeImpl::ApplyScrollDeltasSinceBeginFrame() {
   DCHECK(IsPendingTree());
   if (!root_layer())
     return;
 
   LayerTreeHostCommon::CallFunctionForSubtree(
       root_layer(), base::Bind(&ApplyScrollDeltasSinceBeginFrameTo));
 }
 
+void LayerTreeImpl::SetPinchViewportLayerIds(

[enne (OOO), 2013/09/11 20:13:03]

Should this DCHECK that these exist? It seems like an error to have ids but not
have layers.

[wjmaclean, 2013/09/12 18:16:47]

Done.

We need to check the validity of the layer id for the outer viewport scroll
layer, as (eventually) we will call this in both code paths.

+    int page_scale_layer_id,
+    int inner_viewport_scroll_layer_id,
+    int outer_viewport_scroll_layer_id) {
+  page_scale_layer_ = FindPendingTreeLayerById(page_scale_layer_id);
+  inner_viewport_scroll_layer_ =
+      FindPendingTreeLayerById(inner_viewport_scroll_layer_id);
+  outer_viewport_scroll_layer_ =
+      FindPendingTreeLayerById(outer_viewport_scroll_layer_id);
+}
+
 // TODO(wjmaclean) This needs to go away, and be replaced with a single core
 // of login that works for both scrollbar layer types. This is already planned
 // as part of the larger pinch-zoom re-factoring viewport.
 void LayerTreeImpl::UpdateSolidColorScrollbars() {
   DCHECK(settings().solid_color_scrollbars);
 
   LayerImpl* root_scroll = RootScrollLayer();
   DCHECK(root_scroll);
   DCHECK(IsActiveTree());
 
@@ skipping 39 matching lines @@
   if (!root_layer())
     return;
 
   {
     TRACE_EVENT2("cc",
                  "LayerTreeImpl::UpdateDrawProperties",
                  "IsActive",
                  IsActiveTree(),
                  "SourceFrameNumber",
                  source_frame_number_);
+    LayerImpl* page_scale_layer =
+        page_scale_layer_ ? page_scale_layer_ : RootContainerLayer();
     LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
         root_layer(),
         DrawViewportSize(),
         layer_tree_host_impl_->DrawTransform(),
         device_scale_factor(),
         total_page_scale_factor(),
-        root_scroll_layer_ ? root_scroll_layer_->parent() : NULL,
+        page_scale_layer,
         MaxTextureSize(),
         settings().can_use_lcd_text,
         settings().layer_transforms_should_scale_layer_contents,
         &render_surface_layer_list_);
     LayerTreeHostCommon::CalculateDrawProperties(&inputs);
   }
 
   DCHECK(!needs_update_draw_properties_) <<
       "CalcDrawProperties should not set_needs_update_draw_properties()";
 }
@@ skipping 331 matching lines @@
 const std::vector<LayerImpl*> LayerTreeImpl::LayersWithCopyOutputRequest()
     const {
   // Only the active tree needs to know about layers with copy requests, as
   // they are aborted if not serviced during draw.
   DCHECK(IsActiveTree());
 
   return layers_with_copy_output_request_;
 }
 
 }  // namespace cc