Changeset 51980 in webkit

Timestamp:

Dec 11, 2009 4:20:43 AM (14 years ago)

Author:

benm@google.com

Message:

[Android] Add detachHistoryItem() to AndroidWebHistoryBridge. And the constructor takes
HistoryItem* now. As AndroidWebHistoryBridge holds a dumb pointer of HistoryItem and
HistoryItem holds a RefPtr of AndroidWebHistoryBridge, the dumb pointer needs to be cleared
when HistoryItem is deleted to avoid potential crash.
​https://bugs.webkit.org/show_bug.cgi?id=32251

Patch by Grace Kloba <​klobag@gmail.com> on 2009-12-11
Reviewed by Darin Adler.

• history/HistoryItem.cpp:

(WebCore::HistoryItem::~HistoryItem):

• history/android/AndroidWebHistoryBridge.h:

(WebCore::AndroidWebHistoryBridge::AndroidWebHistoryBridge):
(WebCore::AndroidWebHistoryBridge::detachHistoryItem):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/HistoryItem.cpp (modified) (1 diff)
• history/android/AndroidWebHistoryBridge.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-11  Grace Kloba  <klobag@gmail.com>
+
+        Reviewed by Darin Adler.
+
+        [Android] Add detachHistoryItem() to AndroidWebHistoryBridge. And the constructor takes
+        HistoryItem* now. As AndroidWebHistoryBridge holds a dumb pointer of HistoryItem and
+        HistoryItem holds a RefPtr of AndroidWebHistoryBridge, the dumb pointer needs to be cleared
+        when HistoryItem is deleted to avoid potential crash.
+        https://bugs.webkit.org/show_bug.cgi?id=32251
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::~HistoryItem):
+        * history/android/AndroidWebHistoryBridge.h:
+        (WebCore::AndroidWebHistoryBridge::AndroidWebHistoryBridge):
+        (WebCore::AndroidWebHistoryBridge::detachHistoryItem):
+
+
 2009-12-11  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/history/HistoryItem.cpp

@@ -103 +103 @@
     ASSERT(!m_document);
     iconDatabase()->releaseIconForPageURL(m_urlString);
+#if PLATFORM(ANDROID)
+    if (m_bridge)
+        m_bridge->detachHistoryItem();
+#endif
 }
 

trunk/WebCore/history/android/AndroidWebHistoryBridge.h

@@ -35 +35 @@
 class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> {
 public:
-    AndroidWebHistoryBridge()
+    AndroidWebHistoryBridge(HistoryItem* item)
         : m_scale(100)
         , m_screenWidthScale(100)
         , m_active(false)
-        , m_historyItem(0) { }
+        , m_historyItem(item) { }
     virtual ~AndroidWebHistoryBridge() { }
     virtual void updateHistoryItem(HistoryItem* item) = 0;
@@ -47 +47 @@
     int scale() const { return m_scale; }
     int screenWidthScale() const { return m_screenWidthScale; }
+    void detachHistoryItem() { m_historyItem = 0; }
     HistoryItem* historyItem() const { return m_historyItem; }
     void setActive() { m_active = true; }