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

Unified Diff: views/widget/widget.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/root_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget.cc
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 94eabd5658218a7392c3bcd5fc8bd4d54cd24597..8638f7d9d6c2455f9afd488d0656f97f364b320d 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -651,9 +651,6 @@ bool Widget::HasFocusManager() const {
}
bool Widget::OnNativeWidgetPaintAccelerated(const gfx::Rect& dirty_region) {
-#if !defined(COMPOSITOR_2)
- return false;
-#else
if (!compositor_.get())
return false;
@@ -662,18 +659,10 @@ bool Widget::OnNativeWidgetPaintAccelerated(const gfx::Rect& dirty_region) {
GetRootView()->PaintComposite();
compositor_->NotifyEnd();
return true;
-#endif
}
void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
GetRootView()->Paint(canvas);
-#if !defined(COMPOSITOR_2)
- if (compositor_.get()) {
- compositor_->NotifyStart();
- root_view_->PaintComposite(compositor_.get());
- compositor_->NotifyEnd();
- }
-#endif
}
int Widget::GetNonClientComponent(const gfx::Point& point) {
« no previous file with comments | « views/widget/root_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698