| 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 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 #include "PlatformMemoryInstrumentation.h" | 35 #include "PlatformMemoryInstrumentation.h" |
| 36 #include "PlatformWheelEvent.h" | 36 #include "PlatformWheelEvent.h" |
| 37 #include "ScrollAnimator.h" | 37 #include "ScrollAnimator.h" |
| 38 #include "ScrollbarTheme.h" | 38 #include "ScrollbarTheme.h" |
| 39 #include "core/platform/graphics/FloatPoint.h" | 39 #include "core/platform/graphics/FloatPoint.h" |
| 40 #include "core/platform/graphics/GraphicsContext.h" | 40 #include "core/platform/graphics/GraphicsContext.h" |
| 41 #include "core/platform/graphics/GraphicsLayer.h" | 41 #include "core/platform/graphics/GraphicsLayer.h" |
| 42 #include <wtf/PassOwnPtr.h> | 42 #include <wtf/PassOwnPtr.h> |
| 43 | 43 |
| 44 #include "TraceEvent.h" | 44 #include "core/platform/chromium/TraceEvent.h" |
| 45 | 45 |
| 46 namespace WebCore { | 46 namespace WebCore { |
| 47 | 47 |
| 48 struct SameSizeAsScrollableArea { | 48 struct SameSizeAsScrollableArea { |
| 49 virtual ~SameSizeAsScrollableArea(); | 49 virtual ~SameSizeAsScrollableArea(); |
| 50 void* pointer; | 50 void* pointer; |
| 51 unsigned bitfields : 16; | 51 unsigned bitfields : 16; |
| 52 IntPoint origin; | 52 IntPoint origin; |
| 53 }; | 53 }; |
| 54 | 54 |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumSc
rollPosition()); | 406 return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumSc
rollPosition()); |
| 407 } | 407 } |
| 408 | 408 |
| 409 void ScrollableArea::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 409 void ScrollableArea::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
| 410 { | 410 { |
| 411 MemoryClassInfo info(memoryObjectInfo, this); | 411 MemoryClassInfo info(memoryObjectInfo, this); |
| 412 info.addMember(m_scrollAnimator, "scrollAnimator"); | 412 info.addMember(m_scrollAnimator, "scrollAnimator"); |
| 413 } | 413 } |
| 414 | 414 |
| 415 } // namespace WebCore | 415 } // namespace WebCore |
| OLD | NEW |