| 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) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 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 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 883 } | 883 } |
| 884 | 884 |
| 885 void GraphicsLayerChromium::notifyAnimationFinished(double) | 885 void GraphicsLayerChromium::notifyAnimationFinished(double) |
| 886 { | 886 { |
| 887 // Do nothing. | 887 // Do nothing. |
| 888 } | 888 } |
| 889 | 889 |
| 890 void GraphicsLayerChromium::didScroll() | 890 void GraphicsLayerChromium::didScroll() |
| 891 { | 891 { |
| 892 if (m_scrollableArea) | 892 if (m_scrollableArea) |
| 893 m_scrollableArea->scrollToOffsetWithoutAnimation(IntPoint(m_layer->layer
()->scrollPosition())); | 893 m_scrollableArea->scrollToOffsetWithoutAnimation(m_scrollableArea->minim
umScrollPosition() + toIntSize(m_layer->layer()->scrollPosition())); |
| 894 } | 894 } |
| 895 | 895 |
| 896 void GraphicsLayerChromium::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo
) const | 896 void GraphicsLayerChromium::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo
) const |
| 897 { | 897 { |
| 898 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Layers); | 898 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Layers); |
| 899 GraphicsLayer::reportMemoryUsage(memoryObjectInfo); | 899 GraphicsLayer::reportMemoryUsage(memoryObjectInfo); |
| 900 info.addMember(m_nameBase, "nameBase"); | 900 info.addMember(m_nameBase, "nameBase"); |
| 901 info.addMember(m_layer, "layer"); | 901 info.addMember(m_layer, "layer"); |
| 902 info.addMember(m_transformLayer, "transformLayer"); | 902 info.addMember(m_transformLayer, "transformLayer"); |
| 903 info.addMember(m_imageLayer, "imageLayer"); | 903 info.addMember(m_imageLayer, "imageLayer"); |
| 904 info.addMember(m_contentsLayer, "contentsLayer"); | 904 info.addMember(m_contentsLayer, "contentsLayer"); |
| 905 info.addMember(m_linkHighlight, "linkHighlight"); | 905 info.addMember(m_linkHighlight, "linkHighlight"); |
| 906 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking
ContentLayerDelegate"); | 906 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking
ContentLayerDelegate"); |
| 907 info.addMember(m_animationIdMap, "animationIdMap"); | 907 info.addMember(m_animationIdMap, "animationIdMap"); |
| 908 info.addMember(m_scrollableArea, "scrollableArea"); | 908 info.addMember(m_scrollableArea, "scrollableArea"); |
| 909 } | 909 } |
| 910 | 910 |
| 911 } // namespace WebCore | 911 } // namespace WebCore |
| OLD | NEW |