[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

beidson at apple.com beidson at apple.com
Tue Jan 5 23:41:47 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 419401c065140b9f096f033ad52588fbd70eddcd
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 19:32:16 2009 +0000

    No review - release build fix.
    
    * history/HistoryItem.cpp:
    (WebCore::HistoryItem::documentDetached):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 696fd11..cea3a07 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,13 @@
 
         No review - release build fix.
 
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::documentDetached):
+
+2009-12-03  Brady Eidson  <beidson at apple.com>
+
+        No review - release build fix.
+
         * loader/HistoryController.cpp:
         (WebCore::HistoryController::pushState):
 
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp
index e604ac5..47637d3 100644
--- a/WebCore/history/HistoryItem.cpp
+++ b/WebCore/history/HistoryItem.cpp
@@ -413,7 +413,7 @@ void HistoryItem::setDocument(Document* document)
 
 void HistoryItem::documentDetached(Document* document)
 {
-    ASSERT(m_document == document);
+    ASSERT_UNUSED(document, m_document == document);
     m_document = 0;
     m_stateObject = 0;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list