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

Side by Side Diff: chrome/browser/ui/views/bubble_border.cc

Issue 6462022: It turns out I had the sense of the GetLocalBounds bool wrong everywhere, so ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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
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 "chrome/browser/ui/views/bubble_border.h" 5 #include "chrome/browser/ui/views/bubble_border.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "grit/theme_resources.h" 8 #include "grit/theme_resources.h"
9 #include "third_party/skia/include/core/SkBitmap.h" 9 #include "third_party/skia/include/core/SkBitmap.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const { 426 void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
427 // The border of this view creates an anti-aliased round-rect region for the 427 // The border of this view creates an anti-aliased round-rect region for the
428 // contents, which we need to fill with the background color. 428 // contents, which we need to fill with the background color.
429 // NOTE: This doesn't handle an arrow location of "NONE", which has square top 429 // NOTE: This doesn't handle an arrow location of "NONE", which has square top
430 // corners. 430 // corners.
431 SkPaint paint; 431 SkPaint paint;
432 paint.setAntiAlias(true); 432 paint.setAntiAlias(true);
433 paint.setStyle(SkPaint::kFill_Style); 433 paint.setStyle(SkPaint::kFill_Style);
434 paint.setColor(border_->background_color()); 434 paint.setColor(border_->background_color());
435 gfx::Path path; 435 gfx::Path path;
436 gfx::Rect bounds(view->GetLocalBounds()); 436 gfx::Rect bounds(view->GetContentsBounds());
437 SkRect rect; 437 SkRect rect;
438 rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()), 438 rect.set(SkIntToScalar(bounds.x()), SkIntToScalar(bounds.y()),
439 SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom())); 439 SkIntToScalar(bounds.right()), SkIntToScalar(bounds.bottom()));
440 SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius()); 440 SkScalar radius = SkIntToScalar(BubbleBorder::GetCornerRadius());
441 path.addRoundRect(rect, radius, radius); 441 path.addRoundRect(rect, radius, radius);
442 canvas->AsCanvasSkia()->drawPath(path, paint); 442 canvas->AsCanvasSkia()->drawPath(path, paint);
443 } 443 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698