[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[darin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8e600ca110eecc7e6fc621d1f49bf28188869eb8
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 22:24:55 2010 +0000

    2010-01-21  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            Unnecessary call to HistoryItem::targetItem in HistoryController::pushState
            https://bugs.webkit.org/show_bug.cgi?id=33969
    
            * loader/HistoryController.cpp:
            (WebCore::HistoryController::pushState): Remove unnecessary code.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0e50ea5..cfeaed8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-21  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by David Levin.
+
+        Unnecessary call to HistoryItem::targetItem in HistoryController::pushState
+        https://bugs.webkit.org/show_bug.cgi?id=33969
+
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::pushState): Remove unnecessary code.
+
 2010-01-21  Dmitry Titov  <dimich at chromium.org>
 
         Not reviewed, Chromium build fix. Add AccessibilityScrollbar.h and .cpp to WebCore.gypi
diff --git a/WebCore/loader/HistoryController.cpp b/WebCore/loader/HistoryController.cpp
index e6bbbda..90bd60b 100644
--- a/WebCore/loader/HistoryController.cpp
+++ b/WebCore/loader/HistoryController.cpp
@@ -632,14 +632,13 @@ void HistoryController::pushState(PassRefPtr<SerializedScriptValue> stateObject,
 
     // Get a HistoryItem tree for the current frame tree.
     RefPtr<HistoryItem> item = createItemTree(m_frame, false);
+    ASSERT(item->isTargetItem());
     
     // Override data in the target item to reflect the pushState() arguments.
-    HistoryItem* targetItem = item->targetItem();
-    ASSERT(targetItem->isTargetItem());
-    targetItem->setDocument(m_frame->document());
-    targetItem->setTitle(title);
-    targetItem->setStateObject(stateObject);
-    targetItem->setURLString(urlString);
+    item->setDocument(m_frame->document());
+    item->setTitle(title);
+    item->setStateObject(stateObject);
+    item->setURLString(urlString);
     
     page->backForwardList()->pushStateItem(item.release());
 }

-- 
WebKit Debian packaging