Skip to content
Permalink
Browse files
[chromium] Fix potential nullptr deref in TiledLayerChromium::pushPro…
…pertiesTo

https://bugs.webkit.org/show_bug.cgi?id=66808

Reviewed by James Robinson.

* platform/graphics/chromium/TiledLayerChromium.cpp:
(WebCore::TiledLayerChromium::pushPropertiesTo):
* platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
(WebCore::CCTiledLayerImpl::draw):

Canonical link: https://commits.webkit.org/82613@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@93640 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
quisquous committed Aug 23, 2011
1 parent aa43f71 commit 5b72ae1b00932a1d592fe671e12d99069d9d5a33
Showing 3 changed files with 18 additions and 1 deletion.
@@ -1,3 +1,15 @@
2011-08-23 Adrienne Walker <enne@google.com>

[chromium] Fix potential nullptr deref in TiledLayerChromium::pushPropertiesTo
https://bugs.webkit.org/show_bug.cgi?id=66808

Reviewed by James Robinson.

* platform/graphics/chromium/TiledLayerChromium.cpp:
(WebCore::TiledLayerChromium::pushPropertiesTo):
* platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
(WebCore::CCTiledLayerImpl::draw):

2011-08-23 Peter Kasting <pkasting@google.com>

Unreviewed, rolling out r93452.
@@ -241,6 +241,11 @@ void TiledLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
LayerChromium::pushPropertiesTo(layer);

CCTiledLayerImpl* tiledLayer = static_cast<CCTiledLayerImpl*>(layer);
if (!m_tiler) {
tiledLayer->setSkipsDraw(true);
return;
}

tiledLayer->setTilingTransform(tilingTransform());
tiledLayer->setSkipsDraw(m_skipsDraw);
tiledLayer->setTextureOrientation(m_textureOrientation);
@@ -96,7 +96,7 @@ void CCTiledLayerImpl::draw()
{
const IntRect& layerRect = visibleLayerRect();

if (m_skipsDraw || m_tiler->isEmpty() || layerRect.isEmpty() || !layerRenderer())
if (m_skipsDraw || !m_tiler || m_tiler->isEmpty() || layerRect.isEmpty() || !layerRenderer())
return;

#if defined(OS_CHROMEOS)

0 comments on commit 5b72ae1

Please sign in to comment.