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

Side by Side Diff: views/view_unittest.cc

Issue 6975051: Remove COMPOSITOR_2 flag, old compositor code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change conditional compile defines. Created 9 years, 6 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 | « views/view.cc ('k') | views/widget/root_view.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <map> 5 #include <map>
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
10 #include "ui/base/clipboard/clipboard.h" 10 #include "ui/base/clipboard/clipboard.h"
(...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 TransformPaintView() {} 1578 TransformPaintView() {}
1579 virtual ~TransformPaintView() {} 1579 virtual ~TransformPaintView() {}
1580 1580
1581 void ClearScheduledPaintRect() { 1581 void ClearScheduledPaintRect() {
1582 scheduled_paint_rect_ = gfx::Rect(); 1582 scheduled_paint_rect_ = gfx::Rect();
1583 } 1583 }
1584 1584
1585 gfx::Rect scheduled_paint_rect() const { return scheduled_paint_rect_; } 1585 gfx::Rect scheduled_paint_rect() const { return scheduled_paint_rect_; }
1586 1586
1587 // Overridden from View: 1587 // Overridden from View:
1588 virtual void SchedulePaintInRect(const gfx::Rect& rect) { 1588 virtual void SchedulePaintInternal(const gfx::Rect& rect) {
1589 gfx::Rect xrect = ConvertRectToParent(rect); 1589 gfx::Rect xrect = ConvertRectToParent(rect);
1590 scheduled_paint_rect_ = scheduled_paint_rect_.Union(xrect); 1590 scheduled_paint_rect_ = scheduled_paint_rect_.Union(xrect);
1591 } 1591 }
1592 1592
1593 private: 1593 private:
1594 gfx::Rect scheduled_paint_rect_; 1594 gfx::Rect scheduled_paint_rect_;
1595 1595
1596 DISALLOW_COPY_AND_ASSIGN(TransformPaintView); 1596 DISALLOW_COPY_AND_ASSIGN(TransformPaintView);
1597 }; 1597 };
1598 1598
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
2096 ASSERT_EQ(0, child1->GetIndexOf(foo1)); 2096 ASSERT_EQ(0, child1->GetIndexOf(foo1));
2097 2097
2098 ASSERT_EQ(-1, child2->GetIndexOf(NULL)); 2098 ASSERT_EQ(-1, child2->GetIndexOf(NULL));
2099 ASSERT_EQ(-1, child2->GetIndexOf(&root)); 2099 ASSERT_EQ(-1, child2->GetIndexOf(&root));
2100 ASSERT_EQ(-1, child2->GetIndexOf(child2)); 2100 ASSERT_EQ(-1, child2->GetIndexOf(child2));
2101 ASSERT_EQ(-1, child2->GetIndexOf(child1)); 2101 ASSERT_EQ(-1, child2->GetIndexOf(child1));
2102 ASSERT_EQ(-1, child2->GetIndexOf(foo1)); 2102 ASSERT_EQ(-1, child2->GetIndexOf(foo1));
2103 } 2103 }
2104 2104
2105 } // namespace views 2105 } // namespace views
OLDNEW
« no previous file with comments | « views/view.cc ('k') | views/widget/root_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698