Removed pinch viewport scroll offset distribution

cc/layers/layer.cc

 // Copyright 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 "cc/layers/layer.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/location.h"
@@ skipping 656 matching lines @@
 void Layer::RemoveClipChild(Layer* child) {
   clip_children_->erase(child);
   if (clip_children_->empty())
     clip_children_.reset();
   SetNeedsCommit();
 }
 
 void Layer::SetScrollOffset(gfx::Vector2d scroll_offset) {
   DCHECK(IsPropertyChangeAllowed());
 
-  if (layer_tree_host()) {
+  // TODO(bokan): Virtual viewport pinch doesn't need manual updates of main
+  // frame and pinch viewport layers. Remove once old-style pinch is no longer
+  // supported.
+  if (layer_tree_host() &&
+      !layer_tree_host()->settings().use_pinch_virtual_viewport) {
     scroll_offset = layer_tree_host()->DistributeScrollOffsetToViewports(

[aelias_OOO_until_Jul13, 2014/03/25 00:09:23]

It looks like this method just does "return offset" when called on the old pinch
flow, so can we just delete the whole thing now instead?

         scroll_offset, this);
   }
 
   if (scroll_offset_ == scroll_offset)
     return;
   scroll_offset_ = scroll_offset;
   SetNeedsCommit();
 }
 
 void Layer::SetScrollOffsetFromImplSide(const gfx::Vector2d& scroll_offset) {
@@ skipping 530 matching lines @@
   if (clip_parent_)
     clip_parent_->RemoveClipChild(this);
 
   clip_parent_ = NULL;
 }
 
 void Layer::RunMicroBenchmark(MicroBenchmark* benchmark) {
   benchmark->RunOnLayer(this);
 }
 }  // namespace cc