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 18 matching lines...) Expand all Loading... |
29 | 29 |
30 #include "RuntimeEnabledFeatures.h" | 30 #include "RuntimeEnabledFeatures.h" |
31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
32 #include "core/dom/Node.h" | 32 #include "core/dom/Node.h" |
33 #include "core/dom/WheelController.h" | 33 #include "core/dom/WheelController.h" |
34 #include "core/html/HTMLElement.h" | 34 #include "core/html/HTMLElement.h" |
35 #include "core/frame/Frame.h" | 35 #include "core/frame/Frame.h" |
36 #include "core/frame/FrameView.h" | 36 #include "core/frame/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/ScrollAnimator.h" | |
40 #include "core/platform/ScrollbarTheme.h" | |
41 #include "core/platform/chromium/support/WebScrollbarImpl.h" | 39 #include "core/platform/chromium/support/WebScrollbarImpl.h" |
42 #include "core/platform/chromium/support/WebScrollbarThemeGeometryNative.h" | 40 #include "core/platform/chromium/support/WebScrollbarThemeGeometryNative.h" |
43 #include "core/platform/graphics/GraphicsLayer.h" | |
44 #include "platform/TraceEvent.h" | 41 #include "platform/TraceEvent.h" |
45 #include "platform/geometry/Region.h" | 42 #include "platform/geometry/Region.h" |
46 #include "platform/geometry/TransformState.h" | 43 #include "platform/geometry/TransformState.h" |
| 44 #include "platform/graphics/GraphicsLayer.h" |
47 #if OS(MACOSX) | 45 #if OS(MACOSX) |
48 #include "core/platform/mac/ScrollAnimatorMac.h" | 46 #include "platform/mac/ScrollAnimatorMac.h" |
49 #endif | 47 #endif |
| 48 #include "platform/scroll/ScrollAnimator.h" |
| 49 #include "platform/scroll/ScrollbarTheme.h" |
50 #include "core/plugins/PluginView.h" | 50 #include "core/plugins/PluginView.h" |
51 #include "core/rendering/CompositedLayerMapping.h" | 51 #include "core/rendering/CompositedLayerMapping.h" |
52 #include "core/rendering/RenderGeometryMap.h" | 52 #include "core/rendering/RenderGeometryMap.h" |
53 #include "core/rendering/RenderLayerCompositor.h" | 53 #include "core/rendering/RenderLayerCompositor.h" |
54 #include "core/rendering/RenderView.h" | 54 #include "core/rendering/RenderView.h" |
55 #include "public/platform/Platform.h" | 55 #include "public/platform/Platform.h" |
56 #include "public/platform/WebCompositorSupport.h" | 56 #include "public/platform/WebCompositorSupport.h" |
57 #include "public/platform/WebLayerPositionConstraint.h" | 57 #include "public/platform/WebLayerPositionConstraint.h" |
58 #include "public/platform/WebScrollbarLayer.h" | 58 #include "public/platform/WebScrollbarLayer.h" |
59 #include "public/platform/WebScrollbarThemeGeometry.h" | 59 #include "public/platform/WebScrollbarThemeGeometry.h" |
(...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
924 } | 924 } |
925 | 925 |
926 bool ScrollingCoordinator::frameViewIsScrollableIsDirty() const | 926 bool ScrollingCoordinator::frameViewIsScrollableIsDirty() const |
927 { | 927 { |
928 FrameView* frameView = m_page->mainFrame()->view(); | 928 FrameView* frameView = m_page->mainFrame()->view(); |
929 bool frameIsScrollable = frameView && frameView->isScrollable(); | 929 bool frameIsScrollable = frameView && frameView->isScrollable(); |
930 return frameIsScrollable != m_wasFrameScrollable; | 930 return frameIsScrollable != m_wasFrameScrollable; |
931 } | 931 } |
932 | 932 |
933 } // namespace WebCore | 933 } // namespace WebCore |
OLD | NEW |