Draw the text area resizer with drawing commands

third_party/WebKit/Source/core/paint/ScrollableAreaPainter.cpp

 // Copyright 2014 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 "core/paint/ScrollableAreaPainter.h"
 
 #include "core/layout/LayoutView.h"
 #include "core/page/Page.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPaintProperties.h"
@@ skipping 52 matching lines @@
     context.SetStrokeColor(Color(217, 217, 217));
     context.SetStrokeThickness(1.0f);
     context.SetFillColor(Color::kTransparent);
     context.DrawRect(larger_corner);
   }
 }
 
 void ScrollableAreaPainter::DrawPlatformResizerImage(
     GraphicsContext& context,
     IntRect resizer_corner_rect) {
-  float old_device_scale_factor =
-      blink::DeviceScaleFactorDeprecated(GetScrollableArea().Box().GetFrame());
-  // |blink::deviceScaleFactor| returns different values between MAC (2 or 1)
-  // and other platforms (always 1). For this reason we cannot hardcode the
-  // value of 1 in the call for |windowToViewportScalar|. Since zoom-for-dsf is
-  // disabled on MAC, |windowToViewportScalar| will be a no-op on it.
-  float device_scale_factor =
-      GetScrollableArea().GetChromeClient()->WindowToViewportScalar(
-          old_device_scale_factor);
+  PaintFlags paint_flags;
+  paint_flags.setStyle(PaintFlags::kStroke_Style);
+  paint_flags.setStrokeWidth(1);
+  SkPath line_path;
 
-  RefPtr<Image> resize_corner_image;
-  IntSize corner_resizer_size;
-  if (device_scale_factor >= 2) {
-    DEFINE_STATIC_REF(Image, resize_corner_image_hi_res,
-                      (Image::LoadPlatformResource("textAreaResizeCorner@2x")));
-    resize_corner_image = resize_corner_image_hi_res;
-    corner_resizer_size = resize_corner_image->Size();
-    if (old_device_scale_factor >= 2)
-      corner_resizer_size.Scale(0.5f);
-  } else {
-    DEFINE_STATIC_REF(Image, resize_corner_image_lo_res,
-                      (Image::LoadPlatformResource("textAreaResizeCorner")));
-    resize_corner_image = resize_corner_image_lo_res;
-    corner_resizer_size = resize_corner_image->Size();
-  }
+  auto paint_resizer_line = [&context, &paint_flags, &line_path](
+                                IntPoint& start, IntPoint& end, bool on_left) {
+    line_path.rewind();
+    line_path.moveTo(start.X(), start.Y());
+    line_path.lineTo(end.X(), end.Y());
+    paint_flags.setARGB(153, 0, 0, 0);
+    context.DrawPath(line_path, paint_flags);

[f(malita), 2017/04/26 17:56:33]

Can we use DrawLine instead?

(DrawPoints would be even better, but I don't think we have SkCanvas::DrawPoints
plumbed in GC)

+    line_path.rewind();
+    line_path.moveTo(start.X(), start.Y() + 1);
+    line_path.lineTo(end.X() + (on_left ? -1 : 1), end.Y());
+    paint_flags.setARGB(153, 255, 255, 255);
+    context.DrawPath(line_path, paint_flags);
+  };
 
   if (GetScrollableArea()
           .Box()
           .ShouldPlaceBlockDirectionScrollbarOnLogicalLeft()) {
-    context.Save();
-    context.Translate(resizer_corner_rect.X() + corner_resizer_size.Width(),
-                      resizer_corner_rect.Y() + resizer_corner_rect.Height() -
-                          corner_resizer_size.Height());
-    context.Scale(-1.0, 1.0);
-    context.DrawImage(resize_corner_image.Get(),
-                      IntRect(IntPoint(), corner_resizer_size));
-    context.Restore();
+    IntPoint start_pt(
+        resizer_corner_rect.X() + 1,
+        resizer_corner_rect.Y() + resizer_corner_rect.Height() / 2);
+    IntPoint end_pt(resizer_corner_rect.X() + resizer_corner_rect.Width() -
+                        resizer_corner_rect.Width() / 2,

[Stephen Chennney, 2017/04/25 20:55:28]

While this seems like a roundabout way to do it, it does result in an exact 45
degree line under any circumstances. And hence it matches the old results.

+                    resizer_corner_rect.Y() + resizer_corner_rect.Height() - 1);
+    paint_resizer_line(start_pt, end_pt, true);
+
+    start_pt.SetY(resizer_corner_rect.Y() +
+                  resizer_corner_rect.Height() * 3 / 4);
+    end_pt.SetX(resizer_corner_rect.X() + resizer_corner_rect.Width() -
+                resizer_corner_rect.Width() * 3 / 4);

[Stephen Chennney, 2017/04/25 20:55:28]

Ditto.

+    paint_resizer_line(start_pt, end_pt, true);
     return;
   }

[f(malita), 2017/04/26 17:56:34]

I'm thinking we can merge part of these branches, and only keep the line
endpoints computation separate.  How about something along these lines

  IntPoint dark_points[4];
  IntPoint light_points[4];

  if (<logical left>) {
    <compute logical left pts>
  } else {
    <compute right pts>
  }

  context.setStrokeColor(<dark>);
  context.DrawLine(dark_points[0], dark_points[1]);
  context.DrawLine(dark_points[2], dark_points[3]);

  context.setStrokeColor(<light>);
  context.DrawLine(light_points[0], light_points[1]);
  context.DrawLine(light_points[2], light_points[3]);

-  IntRect image_rect(resizer_corner_rect.MaxXMaxYCorner() - corner_resizer_size,
-                     corner_resizer_size);
-  context.DrawImage(resize_corner_image.Get(), image_rect);
+
+  IntPoint start_pt(resizer_corner_rect.X() + resizer_corner_rect.Width() - 1,
+                    resizer_corner_rect.Y() + resizer_corner_rect.Height() / 2);
+  IntPoint end_pt(resizer_corner_rect.X() + resizer_corner_rect.Width() / 2,
+                  resizer_corner_rect.Y() + resizer_corner_rect.Height() - 1);
+  paint_resizer_line(start_pt, end_pt, false);
+
+  start_pt.SetY(resizer_corner_rect.Y() + resizer_corner_rect.Height() * 3 / 4);
+  end_pt.SetX(resizer_corner_rect.X() + resizer_corner_rect.Width() * 3 / 4);
+  paint_resizer_line(start_pt, end_pt, false);
 }
 
 void ScrollableAreaPainter::PaintOverflowControls(
     GraphicsContext& context,
     const IntPoint& paint_offset,
     const CullRect& cull_rect,
     bool painting_overlay_controls) {
   // Don't do anything if we have no overflow.
   if (!GetScrollableArea().Box().HasOverflowClip())
     return;
@@ skipping 144 matching lines @@
   LayoutObjectDrawingRecorder recorder(context, GetScrollableArea().Box(),
                                        DisplayItem::kScrollbarCorner, abs_rect);
   context.FillRect(abs_rect, Color::kWhite);
 }
 
 PaintLayerScrollableArea& ScrollableAreaPainter::GetScrollableArea() const {
   return *scrollable_area_;
 }
 
 }  // namespace blink