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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "platform/geometry/Region.h" | 45 #include "platform/geometry/Region.h" |
46 #include "platform/geometry/TransformState.h" | 46 #include "platform/geometry/TransformState.h" |
47 #if OS(MACOSX) | 47 #if OS(MACOSX) |
48 #include "core/platform/mac/ScrollAnimatorMac.h" | 48 #include "core/platform/mac/ScrollAnimatorMac.h" |
49 #endif | 49 #endif |
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 "platform/geometry/IntRect.h" | |
56 #include "public/platform/Platform.h" | 55 #include "public/platform/Platform.h" |
57 #include "public/platform/WebCompositorSupport.h" | 56 #include "public/platform/WebCompositorSupport.h" |
58 #include "public/platform/WebLayerPositionConstraint.h" | 57 #include "public/platform/WebLayerPositionConstraint.h" |
59 #include "public/platform/WebScrollbarLayer.h" | 58 #include "public/platform/WebScrollbarLayer.h" |
60 #include "public/platform/WebScrollbarThemeGeometry.h" | 59 #include "public/platform/WebScrollbarThemeGeometry.h" |
61 #include "public/platform/WebScrollbarThemePainter.h" | 60 #include "public/platform/WebScrollbarThemePainter.h" |
62 #include "wtf/text/StringBuilder.h" | 61 #include "wtf/text/StringBuilder.h" |
63 | 62 |
64 using blink::WebLayer; | 63 using blink::WebLayer; |
65 using blink::WebLayerPositionConstraint; | 64 using blink::WebLayerPositionConstraint; |
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 } | 924 } |
926 | 925 |
927 bool ScrollingCoordinator::frameViewIsScrollableIsDirty() const | 926 bool ScrollingCoordinator::frameViewIsScrollableIsDirty() const |
928 { | 927 { |
929 FrameView* frameView = m_page->mainFrame()->view(); | 928 FrameView* frameView = m_page->mainFrame()->view(); |
930 bool frameIsScrollable = frameView && frameView->isScrollable(); | 929 bool frameIsScrollable = frameView && frameView->isScrollable(); |
931 return frameIsScrollable != m_wasFrameScrollable; | 930 return frameIsScrollable != m_wasFrameScrollable; |
932 } | 931 } |
933 | 932 |
934 } // namespace WebCore | 933 } // namespace WebCore |
OLD | NEW |