diff options
| author | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-10 16:43:27 +0000 |
|---|---|---|
| committer | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-10 16:43:27 +0000 |
| commit | c3870f4f8eb28a1e1685426368758e2cd8754e03 (patch) | |
| tree | 251094ddb06d759955749a30b9cb271feff0a581 /views/widget | |
| parent | 9a7a1f3ff43d10f7b8f5071fdd0d903691bd72ec (diff) | |
| download | chromium_src-c3870f4f8eb28a1e1685426368758e2cd8754e03.zip chromium_src-c3870f4f8eb28a1e1685426368758e2cd8754e03.tar.gz chromium_src-c3870f4f8eb28a1e1685426368758e2cd8754e03.tar.bz2 | |
Remove COMPOSITOR_2 flag, old compositor code.
BUG=none
TEST=compiles, run manually
Review URL: http://codereview.chromium.org/6975051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/root_view.cc | 2 | ||||
| -rw-r--r-- | views/widget/root_view.h | 2 | ||||
| -rw-r--r-- | views/widget/widget.cc | 11 |
3 files changed, 0 insertions, 15 deletions
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index cdc44a8..ce9cc7a 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -157,13 +157,11 @@ std::string RootView::GetClassName() const { } void RootView::SchedulePaintInRect(const gfx::Rect& rect) { -#if defined(COMPOSITOR_2) MarkTextureDirty(); SchedulePaintInternal(rect); } void RootView::SchedulePaintInternal(const gfx::Rect& rect) { -#endif gfx::Rect xrect = ConvertRectToParent(rect); gfx::Rect invalid_rect = GetLocalBounds().Intersect(xrect); if (!invalid_rect.IsEmpty()) diff --git a/views/widget/root_view.h b/views/widget/root_view.h index 6bb9795..67c9e40 100644 --- a/views/widget/root_view.h +++ b/views/widget/root_view.h @@ -102,9 +102,7 @@ class RootView : public View, virtual bool IsVisibleInRootView() const OVERRIDE; virtual std::string GetClassName() const OVERRIDE; virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; -#if defined(COMPOSITOR_2) virtual void SchedulePaintInternal(const gfx::Rect& rect) OVERRIDE; -#endif virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE; virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE; virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE; diff --git a/views/widget/widget.cc b/views/widget/widget.cc index 94eabd5..8638f7d 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) { |