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

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

Issue 12676029: cc: Fix capitalization style in chromified files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « cc/trees/layer_tree_host_unittest_occlusion.cc ('k') | cc/trees/layer_tree_impl.h » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/layers/content_layer.h" 7 #include "cc/layers/content_layer.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "cc/layers/layer_impl.h" 9 #include "cc/layers/layer_impl.h"
10 #include "cc/test/fake_content_layer_client.h" 10 #include "cc/test/fake_content_layer_client.h"
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 if (!impl->pending_tree()) { 559 if (!impl->pending_tree()) {
560 can_activate_ = false; 560 can_activate_ = false;
561 EXPECT_VECTOR_EQ(root->scroll_delta(), gfx::Vector2d()); 561 EXPECT_VECTOR_EQ(root->scroll_delta(), gfx::Vector2d());
562 root->ScrollBy(impl_thread_scroll1_); 562 root->ScrollBy(impl_thread_scroll1_);
563 563
564 EXPECT_VECTOR_EQ(root->scroll_offset(), initial_scroll_); 564 EXPECT_VECTOR_EQ(root->scroll_offset(), initial_scroll_);
565 EXPECT_VECTOR_EQ(root->scroll_delta(), impl_thread_scroll1_); 565 EXPECT_VECTOR_EQ(root->scroll_delta(), impl_thread_scroll1_);
566 EXPECT_VECTOR_EQ(root->sent_scroll_delta(), gfx::Vector2d()); 566 EXPECT_VECTOR_EQ(root->sent_scroll_delta(), gfx::Vector2d());
567 PostSetNeedsCommitToMainThread(); 567 PostSetNeedsCommitToMainThread();
568 568
569 // commitCompleteOnThread will trigger this function again 569 // CommitCompleteOnThread will trigger this function again
570 // and cause us to take the else clause. 570 // and cause us to take the else clause.
571 } else { 571 } else {
572 can_activate_ = true; 572 can_activate_ = true;
573 ASSERT_TRUE(pending_root); 573 ASSERT_TRUE(pending_root);
574 EXPECT_EQ(impl->pending_tree()->source_frame_number(), 1); 574 EXPECT_EQ(impl->pending_tree()->source_frame_number(), 1);
575 575
576 root->ScrollBy(impl_thread_scroll2_); 576 root->ScrollBy(impl_thread_scroll2_);
577 EXPECT_VECTOR_EQ(root->scroll_offset(), initial_scroll_); 577 EXPECT_VECTOR_EQ(root->scroll_offset(), initial_scroll_);
578 EXPECT_VECTOR_EQ(root->scroll_delta(), 578 EXPECT_VECTOR_EQ(root->scroll_delta(),
579 impl_thread_scroll1_ + impl_thread_scroll2_); 579 impl_thread_scroll1_ + impl_thread_scroll2_);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 InputHandlerClient::Gesture)); 653 InputHandlerClient::Gesture));
654 654
655 EndTest(); 655 EndTest();
656 } 656 }
657 657
658 virtual void AfterTest() OVERRIDE {} 658 virtual void AfterTest() OVERRIDE {}
659 }; 659 };
660 660
661 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostScrollTestScrollZeroMaxScrollOffset) 661 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostScrollTestScrollZeroMaxScrollOffset)
662 662
663
664 } // namespace 663 } // namespace
665 } // namespace cc 664 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_occlusion.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698