Source/platform/scroll/ScrollbarThemeGtkOrAura.cpp - Issue 154733004: Switch to a single merged version of WebThemeEngine.h

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

Issue 154733004: Switch to a single merged version of WebThemeEngine.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: reorder the State enums to not break the mock theme Created 6 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « Source/core/rendering/RenderThemeChromiumDefault.cpp ('k') | Source/platform/scroll/ScrollbarThemeMacCommon.mm » ('j') | no next file with comments »

OLD	NEW
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 21 matching lines...) Expand all Loading...
32 #include "platform/scroll/ScrollbarThemeGtkOrAura.h"	32 #include "platform/scroll/ScrollbarThemeGtkOrAura.h"

33	33

34 #include "RuntimeEnabledFeatures.h"	34 #include "RuntimeEnabledFeatures.h"

35 #include "platform/LayoutTestSupport.h"	35 #include "platform/LayoutTestSupport.h"

36 #include "platform/PlatformMouseEvent.h"	36 #include "platform/PlatformMouseEvent.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/default/WebThemeEngine.h"	42 #include "public/platform/WebThemeEngine.h"

43	43

44 namespace WebCore {	44 namespace WebCore {

45	45

46 static bool useMockTheme()	46 static bool useMockTheme()

47 {	47 {

48 return isRunningLayoutTest();	48 return isRunningLayoutTest();

49 }	49 }

50	50

51 ScrollbarTheme* ScrollbarTheme::nativeTheme()	51 ScrollbarTheme* ScrollbarTheme::nativeTheme()

52 {	52 {

(...skipping 112 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 if (scrollbar->orientation() == VerticalScrollbar) {	165 if (scrollbar->orientation() == VerticalScrollbar) {

166 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink: :WebThemeEngine::PartScrollbarVerticalThumb);	166 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink: :WebThemeEngine::PartScrollbarVerticalThumb);

167 return size.height();	167 return size.height();

168 }	168 }

169	169

170 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::Web ThemeEngine::PartScrollbarHorizontalThumb);	170 IntSize size = blink::Platform::current()->themeEngine()->getSize(blink::Web ThemeEngine::PartScrollbarHorizontalThumb);

171 return size.width();	171 return size.width();

172 }	172 }

173	173

174 } // namespace WebCore	174 } // namespace WebCore

OLD	NEW