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

Unified Diff: ash/magnifier/partial_magnification_controller.cc

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: Re-add ios changes 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
Index: ash/magnifier/partial_magnification_controller.cc
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc
index a9184eb869a216f9c5b60305533e1caf70386f03..f34f894d0dea904270ddfb30e832172ecd04a602 100644
--- a/ash/magnifier/partial_magnification_controller.cc
+++ b/ash/magnifier/partial_magnification_controller.cc
@@ -104,14 +104,15 @@ class PartialMagnificationController::ContentMask : public ui::LayerDelegate {
void OnPaintLayer(const ui::PaintContext& context) override {
ui::PaintRecorder recorder(context, layer()->size());
- SkPaint paint;
+ cc::PaintFlags paint;
paint.setAlpha(255);
paint.setAntiAlias(true);
// Stroke is used for clipping the border which consists of the rendered
// border |kBorderSize| and the magnifier shadow |kShadowThickness| and
// |kShadowOffset|.
paint.setStrokeWidth(kBorderSize + kShadowThickness + kShadowOffset);
- paint.setStyle(is_border_ ? SkPaint::kStroke_Style : SkPaint::kFill_Style);
+ paint.setStyle(is_border_ ? cc::PaintFlags::kStroke_Style
+ : cc::PaintFlags::kFill_Style);
// If we want to clip the magnifier zone use the magnifiers radius.
// Otherwise we want to clip the border, shadow and shadow offset so we
@@ -157,7 +158,7 @@ class PartialMagnificationController::BorderRenderer
ui::PaintRecorder recorder(context, magnifier_window_bounds_.size());
// Draw the shadow.
- SkPaint shadow_paint;
+ cc::PaintFlags shadow_paint;
shadow_paint.setAntiAlias(true);
shadow_paint.setColor(SK_ColorTRANSPARENT);
shadow_paint.setLooper(
@@ -168,9 +169,9 @@ class PartialMagnificationController::BorderRenderer
shadow_bounds.width() / 2 - kShadowThickness - kShadowOffset,
shadow_paint);
- SkPaint border_paint;
+ cc::PaintFlags border_paint;
border_paint.setAntiAlias(true);
- border_paint.setStyle(SkPaint::kStroke_Style);
+ border_paint.setStyle(cc::PaintFlags::kStroke_Style);
// The radius of the magnifier and its border.
const int magnifier_radius = kMagnifierRadius + kBorderSize;

Powered by Google App Engine
This is Rietveld 408576698