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

Side by Side Diff: cc/layers/layer_impl_unittest.cc

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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/layers/layer_impl.h ('k') | cc/layers/layer_iterator_unittest.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/layers/layer_impl.h" 5 #include "cc/layers/layer_impl.h"
6 6
7 #include "cc/layers/painted_scrollbar_layer_impl.h" 7 #include "cc/layers/painted_scrollbar_layer_impl.h"
8 #include "cc/output/filter_operation.h" 8 #include "cc/output/filter_operation.h"
9 #include "cc/output/filter_operations.h" 9 #include "cc/output/filter_operations.h"
10 #include "cc/test/fake_impl_proxy.h" 10 #include "cc/test/fake_impl_proxy.h"
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 485
486 EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, 486 EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset,
487 layer()->ScrollDelta()), 487 layer()->ScrollDelta()),
488 layer()->TotalScrollOffset()); 488 layer()->TotalScrollOffset());
489 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); 489 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
490 } 490 }
491 491
492 class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate { 492 class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate {
493 public: 493 public:
494 virtual void SetTotalScrollOffset( 494 virtual void SetTotalScrollOffset(
495 const gfx::ScrollOffset& new_value) OVERRIDE {} 495 const gfx::ScrollOffset& new_value) override {}
496 virtual gfx::ScrollOffset GetTotalScrollOffset() OVERRIDE { 496 virtual gfx::ScrollOffset GetTotalScrollOffset() override {
497 return gfx::ScrollOffset(fixed_offset_); 497 return gfx::ScrollOffset(fixed_offset_);
498 } 498 }
499 virtual bool IsExternalFlingActive() const OVERRIDE { return false; } 499 virtual bool IsExternalFlingActive() const override { return false; }
500 500
501 void set_fixed_offset(const gfx::Vector2dF& fixed_offset) { 501 void set_fixed_offset(const gfx::Vector2dF& fixed_offset) {
502 fixed_offset_ = fixed_offset; 502 fixed_offset_ = fixed_offset;
503 } 503 }
504 504
505 private: 505 private:
506 gfx::Vector2dF fixed_offset_; 506 gfx::Vector2dF fixed_offset_;
507 }; 507 };
508 508
509 TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) { 509 TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) {
(...skipping 25 matching lines...) Expand all
535 gfx::Vector2dF scroll_delta(1, 1); 535 gfx::Vector2dF scroll_delta(1, 1);
536 layer()->ScrollBy(scroll_delta); 536 layer()->ScrollBy(scroll_delta);
537 537
538 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset()); 538 EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->TotalScrollOffset());
539 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset()); 539 EXPECT_VECTOR_EQ(scroll_offset, layer()->scroll_offset());
540 } 540 }
541 541
542 class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate { 542 class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate {
543 public: 543 public:
544 virtual void SetTotalScrollOffset( 544 virtual void SetTotalScrollOffset(
545 const gfx::ScrollOffset& new_value) OVERRIDE { 545 const gfx::ScrollOffset& new_value) override {
546 current_offset_ = new_value; 546 current_offset_ = new_value;
547 } 547 }
548 virtual gfx::ScrollOffset GetTotalScrollOffset() OVERRIDE { 548 virtual gfx::ScrollOffset GetTotalScrollOffset() override {
549 return current_offset_; 549 return current_offset_;
550 } 550 }
551 virtual bool IsExternalFlingActive() const OVERRIDE { return false; } 551 virtual bool IsExternalFlingActive() const override { return false; }
552 552
553 private: 553 private:
554 gfx::ScrollOffset current_offset_; 554 gfx::ScrollOffset current_offset_;
555 }; 555 };
556 556
557 TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) { 557 TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) {
558 gfx::ScrollOffset scroll_offset(10, 5); 558 gfx::ScrollOffset scroll_offset(10, 5);
559 layer()->SetScrollOffset(scroll_offset); 559 layer()->SetScrollOffset(scroll_offset);
560 560
561 EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset()); 561 EXPECT_VECTOR_EQ(scroll_offset, layer()->TotalScrollOffset());
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 layer()->id(), tree()->root_layer()->id()); 693 layer()->id(), tree()->root_layer()->id());
694 694
695 int expected_horizontal_maximum = 695 int expected_horizontal_maximum =
696 layer()->bounds().width() - tree()->root_layer()->bounds().width(); 696 layer()->bounds().width() - tree()->root_layer()->bounds().width();
697 EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum()); 697 EXPECT_EQ(expected_horizontal_maximum, horizontal_scrollbar->maximum());
698 EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos()); 698 EXPECT_EQ(scroll_offset.x(), horizontal_scrollbar->current_pos());
699 } 699 }
700 700
701 } // namespace 701 } // namespace
702 } // namespace cc 702 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/layer_iterator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698