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

hclam at chromium.org hclam at chromium.org
Wed Dec 22 14:04:10 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit bd5cef31ae15e203588933e13e346c15f1f72f4d
Author: hclam at chromium.org <hclam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 2 07:57:43 2010 +0000

    Build fix. Not reviewed.
    
    An adhoc fix for a crash found by reliability bot. This will make the
    reliability bot happy. A proper fix is pending commit.
    
    * platform/graphics/chromium/VideoLayerChromium.cpp:
    (WebCore::VideoLayerChromium::~VideoLayerChromium):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b796973..3d08d26 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-02  Alpha Lam  <hclam at chromium.org>
+
+        Build fix. Not reviewed.
+
+        An adhoc fix for a crash found by reliability bot. This will make the
+        reliability bot happy. A proper fix is pending commit.
+
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+        (WebCore::VideoLayerChromium::~VideoLayerChromium):
+
 2010-10-01  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index 26641a9..a55cb2b 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -185,6 +185,9 @@ VideoLayerChromium::VideoLayerChromium(GraphicsLayerChromium* owner, VideoFrameP
 
 VideoLayerChromium::~VideoLayerChromium()
 {
+    if (!layerRenderer())
+        return;
+
     GraphicsContext3D* context = layerRendererContext();
     for (unsigned plane = 0; plane < VideoFrameChromium::maxPlanes; plane++) {
         if (m_textures[plane])

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list