diff options
| author | Patrick Scott <phanna@android.com> | 2011-01-12 10:34:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-12 10:34:22 -0800 |
| commit | c0e03e4dfc21bef53c7674af12014856b97a2876 (patch) | |
| tree | 6d6b252023b133172d9e06723c4e250b96508ee6 /WebKit/android/jni | |
| parent | e2a258d48b48a0c2bd0ed4f34090426d00ea950f (diff) | |
| parent | 8c5d18443e0c51c5762b25da443b1a76c75a5d86 (diff) | |
| download | external_webkit-c0e03e4dfc21bef53c7674af12014856b97a2876.zip external_webkit-c0e03e4dfc21bef53c7674af12014856b97a2876.tar.gz external_webkit-c0e03e4dfc21bef53c7674af12014856b97a2876.tar.bz2 | |
Merge "Fix a ref count issue." into honeycomb
Diffstat (limited to 'WebKit/android/jni')
| -rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index 7f3e4e3..52d9f61 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -168,8 +168,8 @@ static void WebHistoryInflate(JNIEnv* env, jobject obj, jint frame, jbyteArray d // Inflate the history tree into one HistoryItem or null if the inflation // failed. RefPtr<WebCore::HistoryItem> newItem = WebCore::HistoryItem::create(); - RefPtr<WebHistoryItem> bridge = adoptRef(new WebHistoryItem(env, obj, newItem.get())); - newItem->setBridge(bridge.get()); + WebHistoryItem* bridge = new WebHistoryItem(env, obj, newItem.get()); + newItem->setBridge(bridge); // Inflate the item recursively. If it fails, that is ok. We'll have an // incomplete HistoryItem but that is better than crashing due to a null |