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

Side by Side Diff: Source/core/platform/ScrollbarThemeWin.cpp

Issue 26558002: Remove unncessary Scrollbar.h include which will allow me to move all of ScrollbarTheme* to Source/… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Rebase to apply cleanly on trunk Created 7 years, 2 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
« no previous file with comments | « Source/core/platform/ScrollbarThemeOverlay.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2008, 2009 Google Inc. 3 * Copyright (C) 2008, 2009 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 13 matching lines...) Expand all
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/platform/ScrollbarThemeWin.h" 28 #include "core/platform/ScrollbarThemeWin.h"
29 29
30 #include <windows.h> 30 #include <windows.h>
31 #include <vsstyle.h> 31 #include <vsstyle.h>
32 32
33 #include "core/platform/PlatformMouseEvent.h" 33 #include "core/platform/PlatformMouseEvent.h"
34 #include "core/platform/Scrollbar.h"
35 #include "core/platform/graphics/GraphicsContext.h" 34 #include "core/platform/graphics/GraphicsContext.h"
36 #include "platform/LayoutTestSupport.h" 35 #include "platform/LayoutTestSupport.h"
36 #include "platform/scroll/ScrollbarThemeClient.h"
37 #include "platform/win/SystemInfo.h" 37 #include "platform/win/SystemInfo.h"
38 #include "public/platform/Platform.h" 38 #include "public/platform/Platform.h"
39 #include "public/platform/WebRect.h" 39 #include "public/platform/WebRect.h"
40 #include "public/platform/win/WebThemeEngine.h" 40 #include "public/platform/win/WebThemeEngine.h"
41
41 namespace WebCore { 42 namespace WebCore {
42 43
43 ScrollbarTheme* ScrollbarTheme::nativeTheme() 44 ScrollbarTheme* ScrollbarTheme::nativeTheme()
44 { 45 {
45 static ScrollbarThemeWin theme; 46 static ScrollbarThemeWin theme;
46 return &theme; 47 return &theme;
47 } 48 }
48 49
49 // The scrollbar size in DumpRenderTree on the Mac - so we can match their 50 // The scrollbar size in DumpRenderTree on the Mac - so we can match their
50 // layout results. Entries are for regular, small, and mini scrollbars. 51 // layout results. Entries are for regular, small, and mini scrollbars.
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 int width = scrollbar->width() < 2 * girth ? scrollbar->width() / 2 : gi rth; 247 int width = scrollbar->width() < 2 * girth ? scrollbar->width() / 2 : gi rth;
247 return IntSize(width, thickness); 248 return IntSize(width, thickness);
248 } 249 }
249 250
250 int height = scrollbar->height() < 2 * girth ? scrollbar->height() / 2 : gir th; 251 int height = scrollbar->height() < 2 * girth ? scrollbar->height() / 2 : gir th;
251 return IntSize(thickness, height); 252 return IntSize(thickness, height);
252 } 253 }
253 254
254 255
255 } // namespace WebCore 256 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/ScrollbarThemeOverlay.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698