summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-12-03 16:32:11 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-03 16:32:11 -0800
commit69bf013f4ecf5f43a1a40cf908623708c5f43e21 (patch)
tree13ff6d4fb8fa517b5d0529001351b15bf02fcf13 /WebCore
parent4ee2e705696ac652df49d552efbe58c92c031e47 (diff)
parentab87fa9e3781b4b32b4c1014acd9079ea145e2d6 (diff)
downloadexternal_webkit-69bf013f4ecf5f43a1a40cf908623708c5f43e21.zip
external_webkit-69bf013f4ecf5f43a1a40cf908623708c5f43e21.tar.gz
external_webkit-69bf013f4ecf5f43a1a40cf908623708c5f43e21.tar.bz2
am ab87fa9e: another file to fix the build
Merge commit 'ab87fa9e3781b4b32b4c1014acd9079ea145e2d6' into eclair-mr2-plus-aosp * commit 'ab87fa9e3781b4b32b4c1014acd9079ea145e2d6': another file to fix the build
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/history/HistoryItem.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp
index 1e2bc93..331dda1 100644
--- a/WebCore/history/HistoryItem.cpp
+++ b/WebCore/history/HistoryItem.cpp
@@ -98,8 +98,10 @@ HistoryItem::~HistoryItem()
ASSERT(!m_cachedPage);
iconDatabase()->releaseIconForPageURL(m_urlString);
#ifdef ANDROID_HISTORY_CLIENT
+/*
if (m_bridge)
m_bridge->detach(this);
+ */
#endif
}