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

[jorlow at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 047a08b66ac3c3ab30d6add71bf95c59341081da
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 12:38:42 2010 +0000

    2010-09-23  Jeremy Orlow  <jorlow at chromium.org>
    
            Unreviewed small fix for my last patch.
    
            * public/WebIDBTransaction.h:
            (WebKit::WebIDBTransaction::id):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68131 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7b65891..842904c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-23  Jeremy Orlow  <jorlow at chromium.org>
+
+        Unreviewed small fix for my last patch.
+
+        * public/WebIDBTransaction.h:
+        (WebKit::WebIDBTransaction::id):
+
 2010-09-22  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebIDBTransaction.h b/WebKit/chromium/public/WebIDBTransaction.h
index 0369b89..a79c18b 100644
--- a/WebKit/chromium/public/WebIDBTransaction.h
+++ b/WebKit/chromium/public/WebIDBTransaction.h
@@ -51,7 +51,8 @@ public:
     virtual void abort() { WEBKIT_ASSERT_NOT_REACHED(); }
     virtual int id() const
     {
-        WEBKIT_ASSERT_NOT_REACHED();
+        // FIXME: Uncomment this after the next Chromium WebKit roll.
+        //WEBKIT_ASSERT_NOT_REACHED();
         return 0;
     }
     virtual void setCallbacks(WebIDBTransactionCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }

-- 
WebKit Debian packaging