diff options
| author | Grace Kloba <klobag@google.com> | 2009-12-03 10:56:34 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-12-03 10:56:34 -0800 |
| commit | 4f016e5ec4ca26ad35c960dd81c2f631e385cdce (patch) | |
| tree | c456fad95df553514b78cd116b6afb2c87edb130 | |
| parent | fdd2ae400181744b916fcc8319e68f1cec57c981 (diff) | |
| download | external_webkit-4f016e5ec4ca26ad35c960dd81c2f631e385cdce.zip external_webkit-4f016e5ec4ca26ad35c960dd81c2f631e385cdce.tar.gz external_webkit-4f016e5ec4ca26ad35c960dd81c2f631e385cdce.tar.bz2 | |
Fix the build due to auto merge
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |