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

[beidson at apple.com]

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

    No review - release build fix.
    
    * loader/HistoryController.cpp:
    (WebCore::HistoryController::pushState):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5962840..696fd11 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-03  Brady Eidson  <beidson at apple.com>
+
+        No review - release build fix.
+
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::pushState):
+
 2009-12-03  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/loader/HistoryController.cpp b/WebCore/loader/HistoryController.cpp
index f7d1f98..d30b231 100644
--- a/WebCore/loader/HistoryController.cpp
+++ b/WebCore/loader/HistoryController.cpp
@@ -628,8 +628,6 @@ void HistoryController::pushState(PassRefPtr<SerializedScriptValue> stateObject,
 {
     Page* page = m_frame->page();
     ASSERT(page);
-    Frame* mainFrame = page->mainFrame();
-    ASSERT(mainFrame);
 
     // Get a HistoryItem tree for the current frame tree.
     RefPtr<HistoryItem> item = createItemTree(m_frame, false);

-- 
WebKit Debian packaging