OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google Inc. All rights reserved. |
3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. | 3 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 15 matching lines...) Expand all Loading... |
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
30 */ | 30 */ |
31 | 31 |
32 #include "config.h" | 32 #include "config.h" |
33 #include "core/platform/ScrollableArea.h" | 33 #include "core/platform/ScrollableArea.h" |
34 | 34 |
35 #include "core/platform/PlatformMemoryInstrumentation.h" | 35 #include "core/platform/PlatformMemoryInstrumentation.h" |
36 #include "core/platform/PlatformWheelEvent.h" | |
37 #include "core/platform/ScrollAnimator.h" | 36 #include "core/platform/ScrollAnimator.h" |
38 #include "core/platform/ScrollbarTheme.h" | 37 #include "core/platform/ScrollbarTheme.h" |
39 #include "core/platform/graphics/FloatPoint.h" | 38 #include "core/platform/graphics/FloatPoint.h" |
40 #include "core/platform/graphics/GraphicsContext.h" | |
41 #include "core/platform/graphics/GraphicsLayer.h" | 39 #include "core/platform/graphics/GraphicsLayer.h" |
42 #include <wtf/PassOwnPtr.h> | 40 #include <wtf/PassOwnPtr.h> |
43 | 41 |
44 #include "core/platform/chromium/TraceEvent.h" | 42 #include "core/platform/chromium/TraceEvent.h" |
45 | 43 |
46 namespace WebCore { | 44 namespace WebCore { |
47 | 45 |
48 struct SameSizeAsScrollableArea { | 46 struct SameSizeAsScrollableArea { |
49 virtual ~SameSizeAsScrollableArea(); | 47 virtual ~SameSizeAsScrollableArea(); |
50 void* pointer; | 48 void* pointer; |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumSc
rollPosition()); | 404 return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumSc
rollPosition()); |
407 } | 405 } |
408 | 406 |
409 void ScrollableArea::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 407 void ScrollableArea::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
410 { | 408 { |
411 MemoryClassInfo info(memoryObjectInfo, this); | 409 MemoryClassInfo info(memoryObjectInfo, this); |
412 info.addMember(m_scrollAnimator, "scrollAnimator"); | 410 info.addMember(m_scrollAnimator, "scrollAnimator"); |
413 } | 411 } |
414 | 412 |
415 } // namespace WebCore | 413 } // namespace WebCore |
OLD | NEW |