| Index: ui/views/bubble/bubble_border.cc
|
| diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc
|
| index b151db0f348ce4d48a8c6535c7eaee1c3621442f..5f3b777d14e67aa428aaf6418042d9714a9ffb09 100644
|
| --- a/ui/views/bubble/bubble_border.cc
|
| +++ b/ui/views/bubble/bubble_border.cc
|
| @@ -7,6 +7,7 @@
|
| #include <algorithm>
|
|
|
| #include "base/logging.h"
|
| +#include "skia/ext/cdl_paint.h"
|
| #include "third_party/skia/include/core/SkDrawLooper.h"
|
| #include "third_party/skia/include/core/SkPaint.h"
|
| #include "third_party/skia/include/core/SkPath.h"
|
| @@ -504,8 +505,8 @@ void BubbleBorder::DrawArrow(gfx::Canvas* canvas,
|
| canvas->DrawImageInt(*GetArrowImage(), arrow_bounds.x(), arrow_bounds.y());
|
| SkPath path;
|
| GetArrowPathFromArrowBounds(arrow_bounds, &path);
|
| - SkPaint paint;
|
| - paint.setStyle(SkPaint::kFill_Style);
|
| + CdlPaint paint;
|
| + paint.setStyle(CdlPaint::kFill_Style);
|
| paint.setColor(background_color_);
|
|
|
| canvas->DrawPath(path, paint);
|
| @@ -524,7 +525,7 @@ void BubbleBorder::PaintMd(const View& view, gfx::Canvas* canvas) {
|
|
|
| gfx::ScopedCanvas scoped(canvas);
|
|
|
| - SkPaint paint;
|
| + CdlPaint paint;
|
| std::vector<gfx::ShadowValue> shadows;
|
| // gfx::ShadowValue counts blur pixels both inside and outside the shape,
|
| // whereas these blur values only describe the outside portion, hence they
|
| @@ -564,9 +565,9 @@ void BubbleBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
|
| canvas->DrawColor(border_->background_color());
|
|
|
| // Fill the contents with a round-rect region to match the border images.
|
| - SkPaint paint;
|
| + CdlPaint paint;
|
| paint.setAntiAlias(true);
|
| - paint.setStyle(SkPaint::kFill_Style);
|
| + paint.setStyle(CdlPaint::kFill_Style);
|
| paint.setColor(border_->background_color());
|
| SkPath path;
|
| gfx::RectF bounds(view->GetLocalBounds());
|
|
|