diff options
| author | Grace Kloba <klobag@google.com> | 2009-12-04 04:28:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 04:28:52 -0800 |
| commit | 2ae51606c93841b97b8ab44a9297811e37df7d55 (patch) | |
| tree | 491bca42b3a250debe6c7ae461f377e26d7e8a4e | |
| parent | 7263230c429cb5f78fc329a3a31ced4bda21222f (diff) | |
| parent | 4ee2e705696ac652df49d552efbe58c92c031e47 (diff) | |
| download | external_webkit-2ae51606c93841b97b8ab44a9297811e37df7d55.zip external_webkit-2ae51606c93841b97b8ab44a9297811e37df7d55.tar.gz external_webkit-2ae51606c93841b97b8ab44a9297811e37df7d55.tar.bz2 | |
am 4ee2e705: am 4f016e5e: Fix the build due to auto merge
Merge commit '4ee2e705696ac652df49d552efbe58c92c031e47'
* commit '4ee2e705696ac652df49d552efbe58c92c031e47':
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 f27b2e9..d24f6e2 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) { |