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

jianli at chromium.org jianli at chromium.org
Wed Dec 22 12:18:53 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 64d2d55fbf87eca874dffa679f6a09e2614df3ee
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 23:33:34 2010 +0000

    Fix layout test crashes in chromium.
    
    * src/BlobRegistryProxy.cpp:
    (WebCore::BlobRegistryProxy::registerBlobURL):
    (WebCore::BlobRegistryProxy::unregisterBlobURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65642 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 8885bbf..1b4c746 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-18  Jian Li  <jianli at chromium.org>
 
+        Fix layout test crashes in chromium.
+
+        * src/BlobRegistryProxy.cpp:
+        (WebCore::BlobRegistryProxy::registerBlobURL):
+        (WebCore::BlobRegistryProxy::unregisterBlobURL):
+
+2010-08-18  Jian Li  <jianli at chromium.org>
+
         Fix chromium build break.
 
         * src/WebBlobStorageData.cpp:
diff --git a/WebKit/chromium/src/BlobRegistryProxy.cpp b/WebKit/chromium/src/BlobRegistryProxy.cpp
index 7bb430e..84fcb4d 100644
--- a/WebKit/chromium/src/BlobRegistryProxy.cpp
+++ b/WebKit/chromium/src/BlobRegistryProxy.cpp
@@ -64,18 +64,22 @@ BlobRegistryProxy::BlobRegistryProxy()
 
 void BlobRegistryProxy::registerBlobURL(const KURL& url, PassOwnPtr<BlobData> blobData)
 {
-    WebBlobData webBlobData(blobData);
-    m_webBlobRegistry->registerBlobURL(url, webBlobData);
+    if (m_webBlobRegistry) {
+        WebBlobData webBlobData(blobData);
+        m_webBlobRegistry->registerBlobURL(url, webBlobData);
+    }
 }
 
 void BlobRegistryProxy::registerBlobURL(const KURL& url, const KURL& srcURL)
 {
-    m_webBlobRegistry->registerBlobURL(url, srcURL);
+    if (m_webBlobRegistry)
+        m_webBlobRegistry->registerBlobURL(url, srcURL);
 }
 
 void BlobRegistryProxy::unregisterBlobURL(const KURL& url)
 {
-    m_webBlobRegistry->unregisterBlobURL(url);
+    if (m_webBlobRegistry)
+        m_webBlobRegistry->unregisterBlobURL(url);
 }
 
 } // namespace WebCore

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list