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

andreip at google.com andreip at google.com
Wed Dec 22 13:51:23 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 47a08fb96a75a64b373d8763ee09053395014579
Author: andreip at google.com <andreip at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 10:52:35 2010 +0000

    2010-09-28  Andrei Popescu  <andreip at google.com>
    
            Reviewed by Jeremy Orlow.
    
            [Chromium] Linking error due to wrong guard in WebIDBTransaction.h
            https://bugs.webkit.org/show_bug.cgi?id=46710
    
            Remove the wrong guard.
    
            * public/WebIDBTransaction.h:
            (WebKit::WebIDBTransaction::getIDBTransactionBackendInterface):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9211559..eb5c2ef 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-28  Andrei Popescu  <andreip at google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        [Chromium] Linking error due to wrong guard in WebIDBTransaction.h
+        https://bugs.webkit.org/show_bug.cgi?id=46710
+
+        Remove the wrong guard.
+
+        * public/WebIDBTransaction.h:
+        (WebKit::WebIDBTransaction::getIDBTransactionBackendInterface):
+
 2010-09-27  Alpha Lam  <hclam at chromium.org>
 
         Build fix. Not reviewed.
diff --git a/WebKit/chromium/public/WebIDBTransaction.h b/WebKit/chromium/public/WebIDBTransaction.h
index 0ecf55e..7b51b97 100644
--- a/WebKit/chromium/public/WebIDBTransaction.h
+++ b/WebKit/chromium/public/WebIDBTransaction.h
@@ -60,13 +60,12 @@ public:
     }
     virtual void setCallbacks(WebIDBTransactionCallbacks*) { WEBKIT_ASSERT_NOT_REACHED(); }
 
-#if WEBKIT_IMPLEMENTATION
+    // FIXME: this is never called from WebCore. Find a cleaner solution.
     virtual WebCore::IDBTransactionBackendInterface* getIDBTransactionBackendInterface() const
     {
         WEBKIT_ASSERT_NOT_REACHED();
         return 0;
     }
-#endif
 
 };
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list