diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/history/BackForwardListChromium.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/history/BackForwardListChromium.cpp')
| -rw-r--r-- | WebCore/history/BackForwardListChromium.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebCore/history/BackForwardListChromium.cpp b/WebCore/history/BackForwardListChromium.cpp index 011f987..34f294c 100644 --- a/WebCore/history/BackForwardListChromium.cpp +++ b/WebCore/history/BackForwardListChromium.cpp @@ -38,6 +38,7 @@ static const unsigned NoCurrentItemIndex = UINT_MAX; BackForwardList::BackForwardList(Page* page) : m_page(page) + , m_client(0) , m_capacity(DefaultCapacity) , m_closed(true) , m_enabled(true) @@ -128,7 +129,8 @@ HistoryItemVector& BackForwardList::entries() void BackForwardList::close() { - m_client->close(); + if (m_client) + m_client->close(); m_page = 0; m_closed = true; } |