Magnifier border is now more visible on light backgrounds.

ash/magnifier/partial_magnification_controller.cc

 // 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.
 
 #include "ash/magnifier/partial_magnification_controller.h"
 
 #include "ash/shell.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #endif
 
 namespace ash {
 namespace {
 
 // Ratio of magnifier scale.
 const float kMagnificationScale = 2.f;
 // Radius of the magnifying glass in DIP.
 const int kMagnifierRadius = 200;
 // Size of the border around the magnifying glass in DIP.
 const int kBorderSize = 10;
+// Thickness of the outline around magnifiying glass border in DIP.

[James Cook, 2016/09/14 03:04:58]

nit: magnifying

[sammiequon, 2016/09/14 18:02:22]

Done.

+const int kBorderOutlineThickness = 2;
+const SkColor kBorderColor = SK_ColorWHITE;

[James Cook, 2016/09/14 03:04:59]

nit: document what this looks like (is it black / white / black)?

[sammiequon, 2016/09/14 18:02:22]

Done.

+const SkColor kBorderOutlineColor = SK_ColorBLACK;
 // Inset on the zoom filter.
 const int kZoomInset = 0;
 // Vertical offset between the center of the magnifier and the tip of the
 // pointer. TODO(jdufault): The vertical offset should only apply to the window
 // location, not the magnified contents. See crbug.com/637617.
 const int kVerticalOffset = 0;
 
 // Name of the magnifier window.
 const char kPartialMagniferWindowName[] = "PartialMagnifierWindow";
 
@@ skipping 41 matching lines @@
     layer_.set_delegate(this);
     layer_.SetFillsBoundsOpaquely(false);
     layer_.SetBounds(gfx::Rect(mask_bounds));
   }
 
   ~ContentMask() override { layer_.set_delegate(nullptr); }
 
   ui::Layer* layer() { return &layer_; }
 
  private:
-  // Overridden from LayerDelegate.
+  // ui::LayerDelegate.
   void OnPaintLayer(const ui::PaintContext& context) override {
     ui::PaintRecorder recorder(context, layer()->size());
 
     SkPaint paint;
     paint.setAlpha(255);
     paint.setAntiAlias(true);
     paint.setStrokeWidth(kBorderSize);
     paint.setStyle(stroke_ ? SkPaint::kStroke_Style : SkPaint::kFill_Style);
 
     gfx::Rect rect(layer()->bounds().size());
@@ skipping 10 matching lines @@
   base::Closure PrepareForLayerBoundsChange() override {
     return base::Closure();
   }
 
   ui::Layer layer_;
   bool stroke_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentMask);
 };
 
+// The border render draws the border as well as outline on both the outer and

[James Cook, 2016/09/14 03:04:58]

nit: render -> renderer

[sammiequon, 2016/09/14 18:02:23]

Done.

+// inner radius to increase visibility.
+class PartialMagnificationController::BorderRenderer

[James Cook, 2016/09/14 03:04:59]

I like how you put this in an inner class.

[sammiequon, 2016/09/14 18:02:22]

:)

+    : public ui::LayerDelegate {
+ public:
+  explicit BorderRenderer(const gfx::Rect& bounds) : bounds_(bounds) {}
+
+  ~BorderRenderer() override {}
+
+ private:
+  // ui::LayerDelegate.

[James Cook, 2016/09/14 03:04:59]

super nit: We usually end with a colon, like "ui::LayerDelegate:"

also above

[sammiequon, 2016/09/14 18:02:23]

Done.

+  void OnPaintLayer(const ui::PaintContext& context) override {
+    ui::PaintRecorder recorder(context, bounds_.size());
+
+    SkPaint paint;
+    paint.setAntiAlias(true);
+    paint.setStyle(SkPaint::kStroke_Style);
+
+    // Draw the inner border.
+    paint.setStrokeWidth(kBorderSize);
+    paint.setColor(kBorderColor);
+    recorder.canvas()->DrawCircle(bounds_.CenterPoint(),
+                                  bounds_.width() / 2 - kBorderSize / 2, paint);

[James Cook, 2016/09/14 03:04:59]

optional: I wonder if caching "const int radius = bounds_.width() / 2;" would
make this more or less readable.

[sammiequon, 2016/09/14 18:02:23]

Done.

+
+    // Draw border outer outline and then draw the border inner outline.
+    paint.setStrokeWidth(kBorderOutlineThickness);
+    paint.setColor(kBorderOutlineColor);
+    recorder.canvas()->DrawCircle(
+        bounds_.CenterPoint(),
+        bounds_.width() / 2 - kBorderOutlineThickness / 2, paint);
+    recorder.canvas()->DrawCircle(
+        bounds_.CenterPoint(),
+        bounds_.width() / 2 - kBorderSize + kBorderOutlineThickness / 2, paint);
+  }
+
+  void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
+
+  void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
+
+  base::Closure PrepareForLayerBoundsChange() override {
+    return base::Closure();
+  }
+
+  gfx::Rect bounds_;

[James Cook, 2016/09/14 03:04:59]

document: bounds of what? or rename to something like |window_bounds_| or
|magnifier_bounds_|

[sammiequon, 2016/09/14 18:02:23]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(BorderRenderer);
+};
+
 PartialMagnificationController::PartialMagnificationController() {
   Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 PartialMagnificationController::~PartialMagnificationController() {
   CloseMagnifierWindow();
 
   Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
@@ skipping 123 matching lines @@
   aura::Window* window = host_widget_->GetNativeView();
   window->SetName(kPartialMagniferWindowName);
 
   ui::Layer* root_layer = host_widget_->GetNativeView()->layer();
 
   zoom_layer_.reset(new ui::Layer(ui::LayerType::LAYER_SOLID_COLOR));
   zoom_layer_->SetBounds(gfx::Rect(GetWindowSize()));
   zoom_layer_->SetBackgroundZoom(kMagnificationScale, kZoomInset);
   root_layer->Add(zoom_layer_.get());
 
-  border_layer_.reset(new ui::Layer(ui::LayerType::LAYER_SOLID_COLOR));
+  border_layer_.reset(new ui::Layer(ui::LayerType::LAYER_TEXTURED));
   border_layer_->SetBounds(gfx::Rect(GetWindowSize()));
-  border_layer_->SetColor(SK_ColorWHITE);
+  border_layer_->set_delegate(new BorderRenderer(gfx::Rect(GetWindowSize())));
   root_layer->Add(border_layer_.get());
 
   border_mask_.reset(new ContentMask(true, GetWindowSize()));
   border_layer_->SetMaskLayer(border_mask_->layer());
 
   zoom_mask_.reset(new ContentMask(false, GetWindowSize()));
   zoom_layer_->SetMaskLayer(zoom_mask_->layer());
 
   host_widget_->AddObserver(this);
 }
 
 void PartialMagnificationController::CloseMagnifierWindow() {
   if (host_widget_) {
     RemoveZoomWidgetObservers();
     host_widget_->Close();
     host_widget_ = nullptr;
   }
 }
 
 void PartialMagnificationController::RemoveZoomWidgetObservers() {
   DCHECK(host_widget_);
   host_widget_->RemoveObserver(this);
   aura::Window* root_window = host_widget_->GetNativeView()->GetRootWindow();
   DCHECK(root_window);
   root_window->RemoveObserver(this);
 }
 
 }  // namespace ash