OLD | NEW |
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 |
(...skipping 25 matching lines...) Expand all Loading... |
36 #include "core/page/FrameView.h" | 36 #include "core/page/FrameView.h" |
37 #include "core/page/Page.h" | 37 #include "core/page/Page.h" |
38 #include "core/page/Settings.h" | 38 #include "core/page/Settings.h" |
39 #include "core/platform/PlatformWheelEvent.h" | 39 #include "core/platform/PlatformWheelEvent.h" |
40 #include "core/platform/ScrollAnimator.h" | 40 #include "core/platform/ScrollAnimator.h" |
41 #include "core/platform/ScrollbarTheme.h" | 41 #include "core/platform/ScrollbarTheme.h" |
42 #include "core/platform/chromium/TraceEvent.h" | 42 #include "core/platform/chromium/TraceEvent.h" |
43 #include "core/platform/chromium/support/WebScrollbarImpl.h" | 43 #include "core/platform/chromium/support/WebScrollbarImpl.h" |
44 #include "core/platform/chromium/support/WebScrollbarThemeGeometryNative.h" | 44 #include "core/platform/chromium/support/WebScrollbarThemeGeometryNative.h" |
45 #include "core/platform/graphics/GraphicsLayer.h" | 45 #include "core/platform/graphics/GraphicsLayer.h" |
46 #include "core/platform/graphics/IntRect.h" | |
47 #include "core/platform/graphics/Region.h" | 46 #include "core/platform/graphics/Region.h" |
48 #include "core/platform/graphics/transforms/TransformState.h" | 47 #include "core/platform/graphics/transforms/TransformState.h" |
49 #if OS(MACOSX) | 48 #if OS(MACOSX) |
50 #include "core/platform/mac/ScrollAnimatorMac.h" | 49 #include "core/platform/mac/ScrollAnimatorMac.h" |
51 #endif | 50 #endif |
52 #include "core/plugins/PluginView.h" | 51 #include "core/plugins/PluginView.h" |
53 #include "core/rendering/RenderGeometryMap.h" | 52 #include "core/rendering/RenderGeometryMap.h" |
54 #include "core/rendering/RenderLayerBacking.h" | 53 #include "core/rendering/RenderLayerBacking.h" |
55 #include "core/rendering/RenderLayerCompositor.h" | 54 #include "core/rendering/RenderLayerCompositor.h" |
56 #include "core/rendering/RenderView.h" | 55 #include "core/rendering/RenderView.h" |
| 56 #include "platform/geometry/IntRect.h" |
57 #include "public/platform/Platform.h" | 57 #include "public/platform/Platform.h" |
58 #include "public/platform/WebCompositorSupport.h" | 58 #include "public/platform/WebCompositorSupport.h" |
59 #include "public/platform/WebLayerPositionConstraint.h" | 59 #include "public/platform/WebLayerPositionConstraint.h" |
60 #include "public/platform/WebScrollbarLayer.h" | 60 #include "public/platform/WebScrollbarLayer.h" |
61 #include "public/platform/WebScrollbarThemeGeometry.h" | 61 #include "public/platform/WebScrollbarThemeGeometry.h" |
62 #include "public/platform/WebScrollbarThemePainter.h" | 62 #include "public/platform/WebScrollbarThemePainter.h" |
63 #include "wtf/text/StringBuilder.h" | 63 #include "wtf/text/StringBuilder.h" |
64 | 64 |
65 using WebKit::WebLayer; | 65 using WebKit::WebLayer; |
66 using WebKit::WebLayerPositionConstraint; | 66 using WebKit::WebLayerPositionConstraint; |
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 stringBuilder.resize(stringBuilder.length() - 2); | 855 stringBuilder.resize(stringBuilder.length() - 2); |
856 return stringBuilder.toString(); | 856 return stringBuilder.toString(); |
857 } | 857 } |
858 | 858 |
859 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const | 859 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const |
860 { | 860 { |
861 return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons()); | 861 return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons()); |
862 } | 862 } |
863 | 863 |
864 } // namespace WebCore | 864 } // namespace WebCore |
OLD | NEW |