diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/ca/win')
-rw-r--r-- | Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp | 8 | ||||
-rw-r--r-- | Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp index 48b20d0b8..70168b210 100644 --- a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp +++ b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp @@ -167,7 +167,7 @@ void PlatformCALayer::animationStarted(CFTimeInterval beginTime) HashMap<String, RefPtr<PlatformCAAnimation> >::const_iterator end = m_animations.end(); for (HashMap<String, RefPtr<PlatformCAAnimation> >::const_iterator it = m_animations.begin(); it != end; ++it) - it->second->setActualStartTimeIfNeeded(cacfBeginTime); + it->value->setActualStartTimeIfNeeded(cacfBeginTime); if (m_owner) m_owner->platformCALayerAnimationStarted(beginTime); @@ -177,8 +177,8 @@ static void resubmitAllAnimations(PlatformCALayer* layer) { HashMap<String, RefPtr<PlatformCAAnimation> >::const_iterator end = layer->animations().end(); for (HashMap<String, RefPtr<PlatformCAAnimation> >::const_iterator it = layer->animations().begin(); it != end; ++it) { - RetainPtr<CFStringRef> s(AdoptCF, it->first.createCFString()); - CACFLayerAddAnimation(layer->platformLayer(), s.get(), it->second->platformAnimation()); + RetainPtr<CFStringRef> s(AdoptCF, it->key.createCFString()); + CACFLayerAddAnimation(layer->platformLayer(), s.get(), it->value->platformAnimation()); } } @@ -328,7 +328,7 @@ PassRefPtr<PlatformCAAnimation> PlatformCALayer::animationForKey(const String& k if (it == m_animations.end()) return 0; - return it->second; + return it->value; } PlatformCALayer* PlatformCALayer::mask() const diff --git a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp index de89ae1ce..c430cf284 100644 --- a/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp +++ b/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp @@ -96,7 +96,7 @@ void PlatformCALayerWinInternal::displayCallback(CACFLayerRef caLayer, CGContext } #endif - if (owner()->owner()->platformCALayerShowRepaintCounter()) { + if (owner()->owner()->platformCALayerShowRepaintCounter(owner())) { FontCachePurgePreventer fontCachePurgePreventer; String text = String::number(owner()->owner()->platformCALayerIncrementRepaintCount()); @@ -165,14 +165,14 @@ void PlatformCALayerWinInternal::setNeedsDisplay(const FloatRect* dirtyRect) for (int i = 0; i < numTileLayers; ++i) CACFLayerSetNeedsDisplay(tileAtIndex(i), dirtyRect ? &rect : 0); - if (m_owner->owner() && m_owner->owner()->platformCALayerShowRepaintCounter()) { + if (m_owner->owner() && m_owner->owner()->platformCALayerShowRepaintCounter(m_owner)) { CGRect layerBounds = m_owner->bounds(); CGRect indicatorRect = CGRectMake(layerBounds.origin.x, layerBounds.origin.y, 80, 25); CACFLayerSetNeedsDisplay(tileAtIndex(0), &indicatorRect); } } else if (owner()->layerType() == PlatformCALayer::LayerTypeWebLayer) { if (owner() && owner()->owner()) { - if (owner()->owner()->platformCALayerShowRepaintCounter()) { + if (owner()->owner()->platformCALayerShowRepaintCounter(owner())) { FloatRect layerBounds = owner()->bounds(); FloatRect repaintCounterRect = layerBounds; |