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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 993016a24448e84ab56285d03c9106df53f5a5fe
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 21:11:15 2010 +0000

    2010-07-16  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Avoid crashing if offscreen GLES2 context creation fails
            https://bugs.webkit.org/show_bug.cgi?id=42469
    
            If creating or initializing an offscreen GLES2Context fails we should return null
            rather than crashing or returning an invalid context.
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::getOffscreenGLES2Context):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63580 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a1ddb68..78c2e29 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Avoid crashing if offscreen GLES2 context creation fails
+        https://bugs.webkit.org/show_bug.cgi?id=42469
+
+        If creating or initializing an offscreen GLES2Context fails we should return null
+        rather than crashing or returning an invalid context.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::getOffscreenGLES2Context):
+
 2010-07-15  Tony Gentilcore  <tonyg at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index a982c1b..83c8822 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -2164,7 +2164,10 @@ PassOwnPtr<GLES2Context> WebViewImpl::getOnscreenGLES2Context()
 PassOwnPtr<GLES2Context> WebViewImpl::getOffscreenGLES2Context()
 {
     WebGLES2Context* context = webKitClient()->createGLES2Context();
-    context->initialize(0, gles2Context());
+    if (!context)
+        return 0;
+    if (!context->initialize(0, gles2Context()))
+        return 0;
     return GLES2Context::create(GLES2ContextInternal::create(context, true));
 }
 

-- 
WebKit Debian packaging