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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 58648a834c89d10039a4db2fa93112aec2ebcae9
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 04:08:51 2010 +0000

    2010-09-13  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            [chromium] Return NULL from getSharedGraphicsContext3D if we couldn't initialize
            https://bugs.webkit.org/show_bug.cgi?id=45731
    
            If we can't create a GraphicsContext3D, return NULL from getSharedGraphicsContext3D rather
            than an object with NULL internal pointers.  Callers know how to handle a null return value
            but not one that has inconsistent internal state.
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::getSharedGraphicsContext3D):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 373e1c3..9801a10 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-13  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [chromium] Return NULL from getSharedGraphicsContext3D if we couldn't initialize
+        https://bugs.webkit.org/show_bug.cgi?id=45731
+
+        If we can't create a GraphicsContext3D, return NULL from getSharedGraphicsContext3D rather
+        than an object with NULL internal pointers.  Callers know how to handle a null return value
+        but not one that has inconsistent internal state.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::getSharedGraphicsContext3D):
+
 2010-09-13  Chris Guillory  <chris.guillory at google.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 043e328..213cc12 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2375,6 +2375,8 @@ SharedGraphicsContext3D* WebViewImpl::getSharedGraphicsContext3D()
     if (!m_sharedContext3D) {
         GraphicsContext3D::Attributes attr;
         OwnPtr<GraphicsContext3D> context = GraphicsContext3D::create(attr, m_page->chrome());
+        if (!context)
+            return 0;
         m_sharedContext3D = SharedGraphicsContext3D::create(context.release());
     }
 

-- 
WebKit Debian packaging