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

Side by Side Diff: ui/views/view.h

Issue 1035833002: views: Remove View::PaintCommon, merge it into View::Paint. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | ui/views/view.cc » ('j') | ui/views/view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef UI_VIEWS_VIEW_H_ 5 #ifndef UI_VIEWS_VIEW_H_
6 #define UI_VIEWS_VIEW_H_ 6 #define UI_VIEWS_VIEW_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 SCHEDULE_PAINT_SIZE_SAME, 1237 SCHEDULE_PAINT_SIZE_SAME,
1238 1238
1239 // Indicates the size changed (and possibly the origin). 1239 // Indicates the size changed (and possibly the origin).
1240 SCHEDULE_PAINT_SIZE_CHANGED 1240 SCHEDULE_PAINT_SIZE_CHANGED
1241 }; 1241 };
1242 1242
1243 // Invoked before and after the bounds change to schedule painting the old and 1243 // Invoked before and after the bounds change to schedule painting the old and
1244 // new bounds. 1244 // new bounds.
1245 void SchedulePaintBoundsChanged(SchedulePaintType type); 1245 void SchedulePaintBoundsChanged(SchedulePaintType type);
1246 1246
1247 // Common Paint() code shared by accelerated and non-accelerated code paths to
1248 // invoke OnPaint() on the View.
1249 void PaintCommon(gfx::Canvas* canvas, const CullSet& cull_set);
1250
1251 // Tree operations ----------------------------------------------------------- 1247 // Tree operations -----------------------------------------------------------
1252 1248
1253 // Removes |view| from the hierarchy tree. If |update_focus_cycle| is true, 1249 // Removes |view| from the hierarchy tree. If |update_focus_cycle| is true,
1254 // the next and previous focusable views of views pointing to this view are 1250 // the next and previous focusable views of views pointing to this view are
1255 // updated. If |update_tool_tip| is true, the tooltip is updated. If 1251 // updated. If |update_tool_tip| is true, the tooltip is updated. If
1256 // |delete_removed_view| is true, the view is also deleted (if it is parent 1252 // |delete_removed_view| is true, the view is also deleted (if it is parent
1257 // owned). If |new_parent| is not NULL, the remove is the result of 1253 // owned). If |new_parent| is not NULL, the remove is the result of
1258 // AddChildView() to a new parent. For this case, |new_parent| is the View 1254 // AddChildView() to a new parent. For this case, |new_parent| is the View
1259 // that |view| is going to be added to after the remove completes. 1255 // that |view| is going to be added to after the remove completes.
1260 void DoRemoveChildView(View* view, 1256 void DoRemoveChildView(View* view,
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1604 // Belongs to this view, but it's reference-counted on some platforms 1600 // Belongs to this view, but it's reference-counted on some platforms
1605 // so we can't use a scoped_ptr. It's dereferenced in the destructor. 1601 // so we can't use a scoped_ptr. It's dereferenced in the destructor.
1606 NativeViewAccessibility* native_view_accessibility_; 1602 NativeViewAccessibility* native_view_accessibility_;
1607 1603
1608 DISALLOW_COPY_AND_ASSIGN(View); 1604 DISALLOW_COPY_AND_ASSIGN(View);
1609 }; 1605 };
1610 1606
1611 } // namespace views 1607 } // namespace views
1612 1608
1613 #endif // UI_VIEWS_VIEW_H_ 1609 #endif // UI_VIEWS_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/view.cc » ('j') | ui/views/view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698