Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(705)

Side by Side Diff: cc/test/layer_tree_test.cc

Issue 585063002: Made double-tap zoom work in pinch virtual viewport mode (Chromium-side). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another build fix Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "cc/animation/animation.h" 8 #include "cc/animation/animation.h"
9 #include "cc/animation/animation_registrar.h" 9 #include "cc/animation/animation_registrar.h"
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 virtual void DidBeginMainFrame() OVERRIDE { 275 virtual void DidBeginMainFrame() OVERRIDE {
276 test_hooks_->DidBeginMainFrame(); 276 test_hooks_->DidBeginMainFrame();
277 } 277 }
278 278
279 virtual void BeginMainFrame(const BeginFrameArgs& args) OVERRIDE { 279 virtual void BeginMainFrame(const BeginFrameArgs& args) OVERRIDE {
280 test_hooks_->BeginMainFrame(args); 280 test_hooks_->BeginMainFrame(args);
281 } 281 }
282 282
283 virtual void Layout() OVERRIDE { test_hooks_->Layout(); } 283 virtual void Layout() OVERRIDE { test_hooks_->Layout(); }
284 284
285 virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
286 const gfx::Vector2d& outer_delta,
287 float page_scale,
288 float top_controls_delta) OVERRIDE {
289 test_hooks_->ApplyViewportDeltas(inner_delta,
290 outer_delta,
291 page_scale,
292 top_controls_delta);
293 }
285 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, 294 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
286 float scale, 295 float scale,
287 float top_controls_delta) OVERRIDE { 296 float top_controls_delta) OVERRIDE {
288 test_hooks_->ApplyViewportDeltas(scroll_delta, 297 test_hooks_->ApplyViewportDeltas(scroll_delta,
289 scale, 298 scale,
290 top_controls_delta); 299 top_controls_delta);
291 } 300 }
292 301
293 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback) 302 virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback)
294 OVERRIDE { 303 OVERRIDE {
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 return -1; 710 return -1;
702 } 711 }
703 712
704 void LayerTreeTest::DestroyLayerTreeHost() { 713 void LayerTreeTest::DestroyLayerTreeHost() {
705 if (layer_tree_host_ && layer_tree_host_->root_layer()) 714 if (layer_tree_host_ && layer_tree_host_->root_layer())
706 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); 715 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
707 layer_tree_host_.reset(); 716 layer_tree_host_.reset();
708 } 717 }
709 718
710 } // namespace cc 719 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698