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

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

Issue 64643009: Remove duplicated headers from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years 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) 2011 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/platform/ScrollbarTheme.h" 27 #include "core/platform/ScrollbarTheme.h"
28 28
29 #include "RuntimeEnabledFeatures.h" 29 #include "RuntimeEnabledFeatures.h"
30 #include "core/platform/graphics/GraphicsContext.h"
31 #include "core/platform/mock/ScrollbarThemeMock.h" 30 #include "core/platform/mock/ScrollbarThemeMock.h"
32 #include "core/platform/mock/ScrollbarThemeOverlayMock.h" 31 #include "core/platform/mock/ScrollbarThemeOverlayMock.h"
33 #include "platform/scroll/ScrollbarThemeClient.h" 32 #include "platform/scroll/ScrollbarThemeClient.h"
34 33
35 namespace WebCore { 34 namespace WebCore {
36 35
37 ScrollbarTheme* ScrollbarTheme::theme() 36 ScrollbarTheme* ScrollbarTheme::theme()
38 { 37 {
39 if (ScrollbarTheme::mockScrollbarsEnabled()) { 38 if (ScrollbarTheme::mockScrollbarsEnabled()) {
40 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) { 39 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 void ScrollbarTheme::paintOverhangBackground(GraphicsContext* context, const Int Rect& horizontalOverhangRect, const IntRect& verticalOverhangRect, const IntRect & dirtyRect) 318 void ScrollbarTheme::paintOverhangBackground(GraphicsContext* context, const Int Rect& horizontalOverhangRect, const IntRect& verticalOverhangRect, const IntRect & dirtyRect)
320 { 319 {
321 context->setFillColor(Color::white); 320 context->setFillColor(Color::white);
322 if (!horizontalOverhangRect.isEmpty()) 321 if (!horizontalOverhangRect.isEmpty())
323 context->fillRect(intersection(horizontalOverhangRect, dirtyRect)); 322 context->fillRect(intersection(horizontalOverhangRect, dirtyRect));
324 if (!verticalOverhangRect.isEmpty()) 323 if (!verticalOverhangRect.isEmpty())
325 context->fillRect(intersection(verticalOverhangRect, dirtyRect)); 324 context->fillRect(intersection(verticalOverhangRect, dirtyRect));
326 } 325 }
327 326
328 } 327 }
OLDNEW
« no previous file with comments | « Source/core/platform/ScrollAnimatorNone.cpp ('k') | Source/core/platform/ScrollbarThemeNonMacCommon.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698