Merge ~santoshbit2007/oxide/+git/chromium:scrollbar_master_main into ~oxide-developers/oxide/+git/chromium:master

[Santosh]

Styling the aura based scrollbar according to ui guidelines.

Unmerged commits

d89af07... by Santosh on 2016-11-26

Change desktop style scrollbar to match UI guidelines

diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn
index 264b1a4..6f93d0a 100644
--- a/third_party/WebKit/Source/platform/BUILD.gn
+++ b/third_party/WebKit/Source/platform/BUILD.gn
@@ -1543,6 +1543,13 @@ component("platform") {
     ]
   }
 
+  if (use_default_render_theme && is_oxide) {
+    sources += [
+      "scroll/ScrollbarThemeAuraOverride.cpp",
+      "scroll/ScrollbarThemeAuraOverride.h",
+    ]
+  }
+
   if (current_cpu == "arm") {
     deps += [ ":blink_arm_neon" ]
   }
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp
index ce7f749..9c2786f 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAura.cpp
@@ -38,6 +38,7 @@
 #include "platform/scroll/ScrollableArea.h"
 #include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarThemeOverlay.h"
+#include "platform/scroll/ScrollbarThemeAuraOverride.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebThemeEngine.h"
@@ -88,7 +89,7 @@ PartPaintingParams buttonPartPaintingParams(
   bool checkMax = false;
 
   if (scrollbar.orientation() == HorizontalScrollbar) {
-    if (part == BackButtonStartPart) {
+    if (part == BackButtonEndPart) {
       paintPart = WebThemeEngine::PartScrollbarLeftArrow;
       checkMin = true;
     } else if (useMockTheme() && part != ForwardButtonEndPart) {
@@ -98,7 +99,7 @@ PartPaintingParams buttonPartPaintingParams(
       checkMax = true;
     }
   } else {
-    if (part == BackButtonStartPart) {
+    if (part == BackButtonEndPart) {
       paintPart = WebThemeEngine::PartScrollbarUpArrow;
       checkMin = true;
     } else if (useMockTheme() && part != ForwardButtonEndPart) {
@@ -142,7 +143,7 @@ ScrollbarTheme& ScrollbarTheme::nativeTheme() {
     return theme;
   }
 
-  DEFINE_STATIC_LOCAL(ScrollbarThemeAura, theme, ());
+  DEFINE_STATIC_LOCAL(ScrollbarThemeAuraOverride, theme, ());
   return theme;
 }
 
@@ -237,6 +238,7 @@ void ScrollbarThemeAura::paintTrackPiece(GraphicsContext& gc,
                                          const Scrollbar& scrollbar,
                                          const IntRect& rect,
                                          ScrollbarPart partType) {
+
   DisplayItem::Type displayItemType = trackPiecePartToDisplayItemType(partType);
   if (DrawingRecorder::useCachedDrawingIfPossible(gc, scrollbar,
                                                   displayItemType))
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraOverride.cpp b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraOverride.cpp
new file mode 100644
index 0000000..c78deb5
--- /dev/null
+++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraOverride.cpp
@@ -0,0 +1,75 @@
+#include "platform/scroll/ScrollbarThemeAuraOverride.h"
+
+#include "platform/scroll/ScrollTypes.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebRect.h"
+#include "public/platform/WebThemeEngine.h"
+
+namespace blink {
+
+IntRect ScrollbarThemeAuraOverride::backButtonRect(
+    const ScrollbarThemeClient& scrollbar,
+    ScrollbarPart part,
+    bool) {
+  // Windows and Linux just have single arrows.
+  if (part == BackButtonStartPart) {
+    return IntRect();
+  }
+
+  IntSize size = buttonSize(scrollbar);
+  int x, y;
+  if (scrollbar.orientation() == HorizontalScrollbar) {
+    x = scrollbar.x() + scrollbar.width() - 2 * size.width();
+    y = scrollbar.y();
+  } else {
+    x = scrollbar.x();
+    y = scrollbar.y() + scrollbar.height() - 2 * size.height();
+  }
+  return IntRect(x, y, size.width(), size.height());
+}
+
+IntRect ScrollbarThemeAuraOverride::trackRect(
+    const ScrollbarThemeClient& scrollbar,
+    bool) {
+  // The track occupies all space between the two buttons.
+  IntSize bs = buttonSize(scrollbar);
+  if (scrollbar.orientation() == HorizontalScrollbar) {
+    if (scrollbar.width() <= 2 * bs.width()) {
+      return IntRect();
+    }
+    return IntRect(scrollbar.x(), scrollbar.y(),
+                   scrollbar.width() - 2 * bs.width(), scrollbar.height());
+  }
+  if (scrollbar.height() <= 2 * bs.height()) {
+    return IntRect();
+  }
+  return IntRect(scrollbar.x(), scrollbar.y(), scrollbar.width(),
+                 scrollbar.height() - 2 * bs.height());
+}
+
+IntSize ScrollbarThemeAuraOverride::buttonSize(
+    const ScrollbarThemeClient& scrollbar) {
+  WebThemeEngine::Part part = WebThemeEngine::PartScrollbarLeftArrow;
+  if (scrollbar.orientation() == VerticalScrollbar) {
+    part = WebThemeEngine::PartScrollbarDownArrow;
+  }
+  WebThemeEngine* themeEngine = Platform::current()->themeEngine();
+  if (themeEngine->getSize(part).isEmpty()) {
+    return IntSize(0, 0);
+  }
+
+  if (scrollbar.orientation() == VerticalScrollbar) {
+    int squareSize = scrollbar.width();
+    return IntSize(squareSize, scrollbar.height() < 2 * squareSize
+                                   ? scrollbar.height() / 2
+                                   : squareSize);
+  }
+
+  // Horizontal Scrollbar
+  int squareSize = scrollbar.height();
+  return IntSize(
+      scrollbar.width() < 2 * squareSize ? scrollbar.width() / 2 : squareSize,
+      squareSize);
+}
+
+}  // blink
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraOverride.h b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraOverride.h
new file mode 100644
index 0000000..7222077
--- /dev/null
+++ b/third_party/WebKit/Source/platform/scroll/ScrollbarThemeAuraOverride.h
@@ -0,0 +1,23 @@
+
+#ifndef ScrollbarThemeAuraOverride_h
+#define ScrollbarThemeAuraOverride_h
+
+#include "platform/scroll/ScrollbarThemeAura.h"
+
+namespace blink {
+
+class ScrollbarThemeAuraOverride : public ScrollbarThemeAura {
+ protected:
+  IntRect trackRect(const ScrollbarThemeClient&,
+                    bool painting = false) override;
+  IntRect backButtonRect(const ScrollbarThemeClient&,
+                         ScrollbarPart,
+                         bool painting = false) override;
+
+ private:
+  IntSize buttonSize(const ScrollbarThemeClient&);
+};
+
+}  // namespace blink
+
+#endif
diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc
index 1d67f96..004e0f2 100644
--- a/ui/native_theme/native_theme_aura.cc
+++ b/ui/native_theme/native_theme_aura.cc
@@ -231,7 +231,7 @@ void NativeThemeAura::PaintScrollbarThumb(
   } else {
     // If there are no scrollbuttons then provide some padding so that the thumb
     // doesn't touch the top of the track.
-    const int kThumbPadding = 2;
+    const int kThumbPadding = 4;
     const int extra_padding =
         (scrollbar_button_length() == 0) ? kThumbPadding : 0;
     if (part == NativeTheme::kScrollbarVerticalThumb)
@@ -244,7 +244,7 @@ void NativeThemeAura::PaintScrollbarThumb(
 
   SkPaint paint;
   paint.setColor(SkColorSetA(thumb_color, thumb_alpha));
-  canvas->drawIRect(gfx::RectToSkIRect(thumb_rect), paint);
+  canvas->drawRoundRect(gfx::RectToSkRect(thumb_rect), 25, 25, paint);
 }
 
 void NativeThemeAura::PaintScrollbarCorner(SkCanvas* canvas,