[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hclam at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ec02c43f955fd1dc02f107d8925ef20781c8a7be
Author: hclam at chromium.org <hclam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 22:50:32 2010 +0000

    No longer ASSERT for LayerRenderer in VideoLayerChromium destructor
    https://bugs.webkit.org/show_bug.cgi?id=47432
    
    Patch by Victoria Kirst <vrk at google.com> on 2010-10-13
    Reviewed by James Robinson.
    
    * platform/graphics/chromium/VideoLayerChromium.cpp:
    (WebCore::VideoLayerChromium::cleanupResources):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69706 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7838fb7..bd0088c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-13  Victoria Kirst  <vrk at google.com>
+
+        Reviewed by James Robinson.
+
+        No longer ASSERT for LayerRenderer in VideoLayerChromium destructor
+        https://bugs.webkit.org/show_bug.cgi?id=47432
+
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+        (WebCore::VideoLayerChromium::cleanupResources):
+
 2010-10-13  Leandro Pereira  <leandro at profusion.mobi>
 
         [EFL] Unreviewed. Build fix.
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index 01b4d6e..46c73a1 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -188,7 +188,9 @@ VideoLayerChromium::~VideoLayerChromium()
 void VideoLayerChromium::cleanupResources()
 {
     releaseCurrentFrame();
-    ASSERT(layerRenderer());
+    if (!layerRenderer())
+        return;
+
     GraphicsContext3D* context = layerRendererContext();
     for (unsigned plane = 0; plane < VideoFrameChromium::maxPlanes; plane++) {
         if (m_textures[plane])

-- 
WebKit Debian packaging