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

[jberlin at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5ffcc8ec81e52ce7496a398da0e7939b1d705cea
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 02:17:56 2010 +0000

    2010-08-05  Jessie Berlin  <jberlin at apple.com>
    
            Reviewed by Jon Honeycutt.
    
            Bug 43593 - WebView::backingStore should check if m_backingStoreBitmap is NULL.
            https://bugs.webkit.org/show_bug.cgi?id=43593
    
            * WebView.cpp:
            (WebView::backingStore):
            If m_backingStoreBitmap is NULL, return E_FAIL.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64811 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index f8646b3..3fe44d2 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-05  Jessie Berlin  <jberlin at apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Bug 43593 - WebView::backingStore should check if m_backingStoreBitmap is NULL.
+        https://bugs.webkit.org/show_bug.cgi?id=43593
+
+        * WebView.cpp:
+        (WebView::backingStore):
+        If m_backingStoreBitmap is NULL, return E_FAIL.
+
 2010-08-05  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 4fd2b10..33f1ff1 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -5725,6 +5725,8 @@ HRESULT STDMETHODCALLTYPE WebView::backingStore(
 {
     if (!hBitmap)
         return E_POINTER;
+    if (!m_backingStoreBitmap)
+        return E_FAIL;
     *hBitmap = reinterpret_cast<OLE_HANDLE>(m_backingStoreBitmap->handle());
     return S_OK;
 }

-- 
WebKit Debian packaging