From 4f016e5ec4ca26ad35c960dd81c2f631e385cdce Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Thu, 3 Dec 2009 10:56:34 -0800
Subject: Fix the build due to auto merge

---
 WebKit/android/jni/WebHistory.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebKit/android')

diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index 647dfb4..86eeffe 100644
--- a/WebKit/android/jni/WebHistory.cpp
+++ b/WebKit/android/jni/WebHistory.cpp
@@ -243,11 +243,12 @@ WebHistoryItem::~WebHistoryItem() {
 }
 
 void WebHistoryItem::detach(WebCore::HistoryItem* item) {
-    if (mHistoryItem == item) {
+/*    if (mHistoryItem == item) {
         mHistoryItem = NULL;
     } else if (mHistoryItem) {
         LOGE("WebHistoryItem::detach doesn't have a matching HistoryItem");
     }
+    */
 }
 
 void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) {
-- 
cgit v1.1