summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp2
-rw-r--r--WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index ba9f295..72aefa4 100644
--- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -852,9 +852,9 @@ void GraphicsLayerAndroid::setContentsToMedia(PlatformLayer* mediaLayer)
mediaLayer->setSize(m_contentLayer->getWidth(), m_contentLayer->getHeight());
mediaLayer->setDrawTransform(m_contentLayer->drawTransform());
+ mediaLayer->ref();
m_contentLayer->unref();
m_contentLayer = mediaLayer;
- m_contentLayer->ref();
// If the parent exists then notify it to re-sync it's children
if (m_parent) {
diff --git a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h
index d10e1ff..66b35dd 100644
--- a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h
+++ b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h
@@ -99,7 +99,7 @@ public:
bool supportsAcceleratedRendering() const { return true; }
LayerAndroid* platformLayer() const
{
- return const_cast<VideoLayerAndroid*> (&m_videoLayer);
+ return m_videoLayer;
}
protected:
@@ -131,7 +131,7 @@ protected:
bool m_naturalSizeUnknown;
bool m_isVisible;
- VideoLayerAndroid m_videoLayer;
+ VideoLayerAndroid* m_videoLayer;
};
} // namespace WebCore