diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-21 15:38:50 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-21 18:38:29 +0000 |
| commit | 492fe96285a5ba81e8ece3754ed6a8feb5bbeff5 (patch) | |
| tree | d85fd9dd78ae20ff307c3de52d96e4c96c69386f /WebCore/platform/graphics/android | |
| parent | eb981e5d8d451de7d22f63d89da7f533b53fa5f5 (diff) | |
| download | external_webkit-492fe96285a5ba81e8ece3754ed6a8feb5bbeff5.zip external_webkit-492fe96285a5ba81e8ece3754ed6a8feb5bbeff5.tar.gz external_webkit-492fe96285a5ba81e8ece3754ed6a8feb5bbeff5.tar.bz2 | |
Video doesn't use a layer as we hand it off to the fullscreen player.
Fix null pointer deref.
Bug:3364538
Change-Id: Iafeecd81ec422de6e17ec8a0c36c29e4fcf7fc74
Diffstat (limited to 'WebCore/platform/graphics/android')
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index d99c1cb..46be9bb 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -758,14 +758,15 @@ void GraphicsLayerAndroid::setContentsToImage(Image* image) void GraphicsLayerAndroid::setContentsToMedia(PlatformLayer* mediaLayer) { - if (m_contentLayer != mediaLayer) { + // Only fullscreen video on Android, so media doesn't get it's own layer. + // We might still have other layers though. + if (m_contentLayer != mediaLayer && mediaLayer) { m_contentLayer->unref(); m_contentLayer = mediaLayer; m_contentLayer->ref(); setNeedsDisplay(); + askForSync(); } - - askForSync(); } PlatformLayer* GraphicsLayerAndroid::platformLayer() const |