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

Side by Side Diff: cc/trees/layer_tree_host_unittest.cc

Issue 870363005: Remove scroll_delta flooring hack (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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
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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 5524 matching lines...) Expand 10 before | Expand all | Expand 10 after
5535 PostSetNeedsCommitToMainThread(); 5535 PostSetNeedsCommitToMainThread();
5536 } 5536 }
5537 5537
5538 void BeginMainFrame(const BeginFrameArgs& args) override { 5538 void BeginMainFrame(const BeginFrameArgs& args) override {
5539 EXPECT_EQ(nullptr, layer_tree_host()->root_layer()); 5539 EXPECT_EQ(nullptr, layer_tree_host()->root_layer());
5540 5540
5541 layer_tree_host()->ApplyScrollAndScale(&info_); 5541 layer_tree_host()->ApplyScrollAndScale(&info_);
5542 EndTest(); 5542 EndTest();
5543 } 5543 }
5544 5544
5545 void ApplyViewportDeltas(const gfx::Vector2d& inner, 5545 void ApplyViewportDeltas(const gfx::Vector2dF& inner,
5546 const gfx::Vector2d& outer, 5546 const gfx::Vector2dF& outer,
5547 const gfx::Vector2dF& elastic_overscroll_delta, 5547 const gfx::Vector2dF& elastic_overscroll_delta,
5548 float scale_delta, 5548 float scale_delta,
5549 float top_controls_delta) override { 5549 float top_controls_delta) override {
5550 EXPECT_EQ(info_.page_scale_delta, scale_delta); 5550 EXPECT_EQ(info_.page_scale_delta, scale_delta);
5551 EXPECT_EQ(info_.top_controls_delta, top_controls_delta); 5551 EXPECT_EQ(info_.top_controls_delta, top_controls_delta);
5552 deltas_sent_to_client_ = true; 5552 deltas_sent_to_client_ = true;
5553 } 5553 }
5554 5554
5555 void ApplyViewportDeltas( 5555 void ApplyViewportDeltas(
5556 const gfx::Vector2d& scroll, 5556 const gfx::Vector2d& scroll,
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
6262 6262
6263 void AfterTest() override { EXPECT_TRUE(did_commit_); } 6263 void AfterTest() override { EXPECT_TRUE(did_commit_); }
6264 6264
6265 private: 6265 private:
6266 bool did_commit_; 6266 bool did_commit_;
6267 }; 6267 };
6268 6268
6269 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit); 6269 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit);
6270 6270
6271 } // namespace cc 6271 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_no_message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698