diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 21:44:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-01 21:44:40 +0000 |
| commit | b8bdc427dc7802592bb2fea2b042f1db9667cd61 (patch) | |
| tree | 9d1337b4b30ad85a14dd9307cedd0ce438c33f41 /ash/wm | |
| parent | 07407b6976668863b6ebff63674bfc90da89967f (diff) | |
| download | chromium_src-b8bdc427dc7802592bb2fea2b042f1db9667cd61.zip chromium_src-b8bdc427dc7802592bb2fea2b042f1db9667cd61.tar.gz chromium_src-b8bdc427dc7802592bb2fea2b042f1db9667cd61.tar.bz2 | |
Pass const gfx::Rect& as the first parameter to FillRect.
BUG=100898
R=pkasting@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9021046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/system_modal_container_layout_manager.cc | 2 | ||||
| -rw-r--r-- | ash/wm/toplevel_frame_view.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index 6fdd910..3cad587 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -35,7 +35,7 @@ class ScreenView : public views::View { // Overridden from views::View: virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { - canvas->FillRect(GetOverlayColor(), GetLocalBounds()); + canvas->FillRect(GetLocalBounds(), GetOverlayColor()); } private: diff --git a/ash/wm/toplevel_frame_view.cc b/ash/wm/toplevel_frame_view.cc index 89fe70f..391ae1a 100644 --- a/ash/wm/toplevel_frame_view.cc +++ b/ash/wm/toplevel_frame_view.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -43,7 +43,7 @@ class WindowControlButton : public views::CustomButton { // Overridden from views::View: virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { - canvas->FillRect(GetBackgroundColor(), GetLocalBounds()); + canvas->FillRect(GetLocalBounds(), GetBackgroundColor()); canvas->DrawBitmapInt(icon_, 0, 0); } virtual gfx::Size GetPreferredSize() OVERRIDE { @@ -113,11 +113,11 @@ class FrameComponent : public views::View, // Fill with current opacity value. int opacity = animation_->CurrentValueBetween(kFrameBorderHiddenOpacity, kFrameBorderVisibleOpacity); - canvas->FillRect(SkColorSetARGB(opacity, + canvas->FillRect(GetLocalBounds(), + SkColorSetARGB(opacity, SkColorGetR(kFrameColor), SkColorGetG(kFrameColor), - SkColorGetB(kFrameColor)), - GetLocalBounds()); + SkColorGetB(kFrameColor))); } // Overridden from ui::AnimationDelegate: |