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

Side by Side Diff: Source/platform/scroll/ScrollbarThemeAura.cpp

Issue 246293006: Blink Support for Overlay Scrollbar Animation Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix unittest and move unittest to blink_platform_unittests Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "platform/LayoutTestSupport.h" 34 #include "platform/LayoutTestSupport.h"
35 #include "platform/PlatformMouseEvent.h" 35 #include "platform/PlatformMouseEvent.h"
36 #include "platform/RuntimeEnabledFeatures.h" 36 #include "platform/RuntimeEnabledFeatures.h"
37 #include "platform/graphics/GraphicsContext.h" 37 #include "platform/graphics/GraphicsContext.h"
38 #include "platform/scroll/ScrollbarThemeClient.h" 38 #include "platform/scroll/ScrollbarThemeClient.h"
39 #include "platform/scroll/ScrollbarThemeOverlay.h" 39 #include "platform/scroll/ScrollbarThemeOverlay.h"
40 #include "public/platform/Platform.h" 40 #include "public/platform/Platform.h"
41 #include "public/platform/WebRect.h" 41 #include "public/platform/WebRect.h"
42 #include "public/platform/WebThemeEngine.h" 42 #include "public/platform/WebThemeEngine.h"
43 43
44 namespace {
45
46 const int kDefaultOverlayScrollbarThumbThickness = 13;
47
48 } // namespace
49
44 namespace blink { 50 namespace blink {
45 51
46 static bool useMockTheme() 52 static bool useMockTheme()
47 { 53 {
48 return LayoutTestSupport::isRunningLayoutTest(); 54 return LayoutTestSupport::isRunningLayoutTest();
49 } 55 }
50 56
51 ScrollbarTheme* ScrollbarTheme::nativeTheme() 57 ScrollbarTheme* ScrollbarTheme::nativeTheme()
52 { 58 {
53 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) { 59 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
54 DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, (10, 0, ScrollbarTheme Overlay::AllowHitTest)); 60 DEFINE_STATIC_LOCAL(ScrollbarThemeOverlay, theme, (kDefaultOverlayScroll barThumbThickness, 0, ScrollbarThemeOverlay::AllowHitTest));
55 return &theme; 61 return &theme;
56 } 62 }
57 63
58 DEFINE_STATIC_LOCAL(ScrollbarThemeAura, theme, ()); 64 DEFINE_STATIC_LOCAL(ScrollbarThemeAura, theme, ());
59 return &theme; 65 return &theme;
60 } 66 }
61 67
62 int ScrollbarThemeAura::scrollbarThickness(ScrollbarControlSize controlSize) 68 int ScrollbarThemeAura::scrollbarThickness(ScrollbarControlSize controlSize)
63 { 69 {
64 // Horiz and Vert scrollbars are the same thickness. 70 // Horiz and Vert scrollbars are the same thickness.
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 if (scrollbar->orientation() == VerticalScrollbar) { 166 if (scrollbar->orientation() == VerticalScrollbar) {
161 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink: :WebThemeEngine::PartScrollbarVerticalThumb); 167 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink: :WebThemeEngine::PartScrollbarVerticalThumb);
162 return size.height(); 168 return size.height();
163 } 169 }
164 170
165 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::Web ThemeEngine::PartScrollbarHorizontalThumb); 171 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::Web ThemeEngine::PartScrollbarHorizontalThumb);
166 return size.width(); 172 return size.width();
167 } 173 }
168 174
169 } // namespace blink 175 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollbarStateTransitionAnimatorTest.cpp ('k') | Source/platform/scroll/ScrollbarThemeClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698