| 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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 } | 574 } |
| 575 | 575 |
| 576 void GraphicsLayerChromium::notifyAnimationFinished(double) | 576 void GraphicsLayerChromium::notifyAnimationFinished(double) |
| 577 { | 577 { |
| 578 // Do nothing. | 578 // Do nothing. |
| 579 } | 579 } |
| 580 | 580 |
| 581 void GraphicsLayerChromium::didScroll() | 581 void GraphicsLayerChromium::didScroll() |
| 582 { | 582 { |
| 583 if (m_scrollableArea) | 583 if (m_scrollableArea) |
| 584 m_scrollableArea->scrollToOffsetWithoutAnimation(IntPoint(m_layer->layer
()->scrollPosition())); | 584 m_scrollableArea->scrollToOffsetWithoutAnimation(m_scrollableArea->minim
umScrollPosition() + toIntSize(m_layer->layer()->scrollPosition())); |
| 585 } | 585 } |
| 586 | 586 |
| 587 void GraphicsLayerChromium::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo
) const | 587 void GraphicsLayerChromium::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo
) const |
| 588 { | 588 { |
| 589 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Layers); | 589 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Layers); |
| 590 GraphicsLayer::reportMemoryUsage(memoryObjectInfo); | 590 GraphicsLayer::reportMemoryUsage(memoryObjectInfo); |
| 591 info.addMember(m_nameBase, "nameBase"); | 591 info.addMember(m_nameBase, "nameBase"); |
| 592 info.addMember(m_layer, "layer"); | 592 info.addMember(m_layer, "layer"); |
| 593 info.addMember(m_transformLayer, "transformLayer"); | 593 info.addMember(m_transformLayer, "transformLayer"); |
| 594 info.addMember(m_imageLayer, "imageLayer"); | 594 info.addMember(m_imageLayer, "imageLayer"); |
| 595 info.addMember(m_contentsLayer, "contentsLayer"); | 595 info.addMember(m_contentsLayer, "contentsLayer"); |
| 596 info.addMember(m_linkHighlight, "linkHighlight"); | 596 info.addMember(m_linkHighlight, "linkHighlight"); |
| 597 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking
ContentLayerDelegate"); | 597 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking
ContentLayerDelegate"); |
| 598 info.addMember(m_animationIdMap, "animationIdMap"); | 598 info.addMember(m_animationIdMap, "animationIdMap"); |
| 599 info.addMember(m_scrollableArea, "scrollableArea"); | 599 info.addMember(m_scrollableArea, "scrollableArea"); |
| 600 } | 600 } |
| 601 | 601 |
| 602 void GraphicsLayerChromium::setAnimationDelegateForLayer(WebKit::WebLayer* layer
) | 602 void GraphicsLayerChromium::setAnimationDelegateForLayer(WebKit::WebLayer* layer
) |
| 603 { | 603 { |
| 604 layer->setAnimationDelegate(this); | 604 layer->setAnimationDelegate(this); |
| 605 } | 605 } |
| 606 | 606 |
| 607 } // namespace WebCore | 607 } // namespace WebCore |
| OLD | NEW |