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 17 matching lines...) Expand all Loading... |
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 "ScrollableArea.h" | 33 #include "ScrollableArea.h" |
34 | 34 |
35 #include "GraphicsContext.h" | 35 #include "GraphicsContext.h" |
36 #include "GraphicsLayer.h" | 36 #include "GraphicsLayer.h" |
37 #include "FloatPoint.h" | 37 #include "FloatPoint.h" |
38 #include "PlatformMemoryInstrumentation.h" | |
39 #include "PlatformWheelEvent.h" | 38 #include "PlatformWheelEvent.h" |
40 #include "ScrollAnimator.h" | 39 #include "ScrollAnimator.h" |
41 #include "ScrollbarTheme.h" | 40 #include "ScrollbarTheme.h" |
42 #include <wtf/PassOwnPtr.h> | 41 #include <wtf/PassOwnPtr.h> |
43 | 42 |
44 #include "TraceEvent.h" | 43 #include "TraceEvent.h" |
45 | 44 |
46 namespace WebCore { | 45 namespace WebCore { |
47 | 46 |
48 struct SameSizeAsScrollableArea { | 47 struct SameSizeAsScrollableArea { |
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 scrollPosition().y(), | 398 scrollPosition().y(), |
400 std::max(0, visibleWidth() + verticalScrollbarWidth), | 399 std::max(0, visibleWidth() + verticalScrollbarWidth), |
401 std::max(0, visibleHeight() + horizontalScrollbarHeight)); | 400 std::max(0, visibleHeight() + horizontalScrollbarHeight)); |
402 } | 401 } |
403 | 402 |
404 IntPoint ScrollableArea::clampScrollPosition(const IntPoint& scrollPosition) con
st | 403 IntPoint ScrollableArea::clampScrollPosition(const IntPoint& scrollPosition) con
st |
405 { | 404 { |
406 return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumSc
rollPosition()); | 405 return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumSc
rollPosition()); |
407 } | 406 } |
408 | 407 |
409 void ScrollableArea::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | |
410 { | |
411 MemoryClassInfo info(memoryObjectInfo, this); | |
412 info.addMember(m_scrollAnimator, "scrollAnimator"); | |
413 } | |
414 | |
415 } // namespace WebCore | 408 } // namespace WebCore |
OLD | NEW |