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

Unified Diff: ash/laser/laser_pointer_view.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 11 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 | « ash/common/wm/window_cycle_list.cc ('k') | ash/magnifier/partial_magnification_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/laser/laser_pointer_view.cc
diff --git a/ash/laser/laser_pointer_view.cc b/ash/laser/laser_pointer_view.cc
index ed3d40539a499f3014f275a2e3dac7ee9a4aecc6..1a209a07be636643be9be75e2b39dfa4da359ad0 100644
--- a/ash/laser/laser_pointer_view.cc
+++ b/ash/laser/laser_pointer_view.cc
@@ -12,7 +12,6 @@
#include "ash/shell.h"
#include "base/timer/timer.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkPaint.h"
#include "ui/aura/window.h"
#include "ui/events/event.h"
#include "ui/gfx/canvas.h"
@@ -219,8 +218,8 @@ void LaserPointerView::OnPaint(gfx::Canvas* canvas) {
if (laser_points_.IsEmpty())
return;
- SkPaint paint;
- paint.setStyle(SkPaint::kFill_Style);
+ cc::PaintFlags paint;
+ paint.setStyle(cc::PaintFlags::kFill_Style);
paint.setAntiAlias(true);
// Compute the offset of the current widget.
@@ -272,7 +271,7 @@ void LaserPointerView::OnPaint(gfx::Canvas* canvas) {
}
// Draw the last point as a circle.
paint.setColor(SkColorSetA(kPointColor, current_opacity));
- paint.setStyle(SkPaint::kFill_Style);
+ paint.setStyle(cc::PaintFlags::kFill_Style);
canvas->DrawCircle(current_point.location, kPointInitialRadius, paint);
}
} // namespace ash
« no previous file with comments | « ash/common/wm/window_cycle_list.cc ('k') | ash/magnifier/partial_magnification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698