[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mihaip at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit c41a2e4aa9374a7a57e5a530c9bed0452afd5556
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 06:17:25 2011 +0000

    2011-01-24  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            Add runtime checks for invariants in memory cache
            https://bugs.webkit.org/show_bug.cgi?id=53059
    
            To help track down bug 53045, add some CRASH calls in addition to
            ASSERTs, so that we can track down failures in reliability bots.
    
            Just some checks, no new tests necessary.
    
            * css/CSSImageValue.cpp:
            (WebCore::CSSImageValue::cachedImage):
            * loader/cache/CachedResource.h:
            * loader/cache/CachedResource.cpp:
            (WebCore::CachedResource::~CachedResource):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9f51f11..028185b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2011-01-24  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Add runtime checks for invariants in memory cache
+        https://bugs.webkit.org/show_bug.cgi?id=53059
+        
+        To help track down bug 53045, add some CRASH calls in addition to
+        ASSERTs, so that we can track down failures in reliability bots.
+
+        Just some checks, no new tests necessary.
+        
+        * css/CSSImageValue.cpp:
+        (WebCore::CSSImageValue::cachedImage):
+        * loader/cache/CachedResource.h:
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::~CachedResource):
+
 2011-01-24  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Source/WebCore/css/CSSImageValue.cpp b/Source/WebCore/css/CSSImageValue.cpp
index a9038b9..6896596 100644
--- a/Source/WebCore/css/CSSImageValue.cpp
+++ b/Source/WebCore/css/CSSImageValue.cpp
@@ -67,6 +67,10 @@ StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader)
 StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader, const String& url)
 {
     ASSERT(loader);
+    if (!loader) {
+        // FIXME: Remove when http://webkit.org/b/53045 is fixed.
+        CRASH();
+    }
 
     if (!m_accessedImage) {
         m_accessedImage = true;
diff --git a/Source/WebCore/loader/cache/CachedResource.cpp b/Source/WebCore/loader/cache/CachedResource.cpp
index 06b3131..884b115 100644
--- a/Source/WebCore/loader/cache/CachedResource.cpp
+++ b/Source/WebCore/loader/cache/CachedResource.cpp
@@ -93,8 +93,8 @@ CachedResource::CachedResource(const String& url, Type type)
     , m_loading(false)
     , m_type(type)
     , m_status(Pending)
-#ifndef NDEBUG
     , m_deleted(false)
+#ifndef NDEBUG
     , m_lruIndex(0)
 #endif
     , m_nextInAllResourcesList(0)
@@ -117,6 +117,12 @@ CachedResource::~CachedResource()
     ASSERT(!inCache());
     ASSERT(!m_deleted);
     ASSERT(url().isNull() || memoryCache()->resourceForURL(KURL(ParsedURLString, url())) != this);
+    
+    if (m_deleted) {
+        // FIXME: Remove when http://webkit.org/b/53045 is fixed.
+        CRASH();
+    }
+    
 #ifndef NDEBUG
     m_deleted = true;
     cachedResourceLeakCounter.decrement();
diff --git a/Source/WebCore/loader/cache/CachedResource.h b/Source/WebCore/loader/cache/CachedResource.h
index 5c8b38f..3379f8c 100644
--- a/Source/WebCore/loader/cache/CachedResource.h
+++ b/Source/WebCore/loader/cache/CachedResource.h
@@ -266,8 +266,9 @@ private:
     unsigned m_type : 3; // Type
     unsigned m_status : 3; // Status
 
-#ifndef NDEBUG
+    // FIXME: Move m_deleted back inside NDEBUG when http://webkit.org/b/53045 is fixed.
     bool m_deleted;
+#ifndef NDEBUG
     unsigned m_lruIndex;
 #endif
 

-- 
WebKit Debian packaging