Changeset 62846 in webkit
- Timestamp:
- Jul 8, 2010 2:37:02 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r62844 r62846 1 2010-07-08 Jon Honeycutt <jhoneycutt@apple.com> 2 3 Missing plug-ins may cause an assertion failure 4 https://bugs.webkit.org/show_bug.cgi?id=41900 5 6 Reviewed by Adele Peterson. 7 8 * plugins/missing-plugin.html: Added. 9 1 10 2010-07-08 Ojan Vafai <ojan@chromium.org> 2 11 -
trunk/WebCore/ChangeLog
r62845 r62846 1 2010-07-08 Jon Honeycutt <jhoneycutt@apple.com> 2 3 Missing plug-ins may cause an assertion failure. 4 https://bugs.webkit.org/show_bug.cgi?id=41900 5 6 Reviewed by Adele Peterson. 7 8 Test: plugins/missing-plugin.html 9 10 * plugins/PluginView.cpp: 11 (WebCore::PluginView::~PluginView): 12 Check whether m_instance is null before trying to remove it from the 13 map. Trying to remove a null instance results in an assertion failure. 14 (WebCore::PluginView::PluginView): 15 Initialize m_instance to 0, because there is an early return that may 16 skip its being assigned its proper value. 17 1 18 2010-07-08 Darin Adler <darin@apple.com> 2 19 -
trunk/WebCore/plugins/PluginView.cpp
r59904 r62846 285 285 ASSERT(!m_lifeSupportTimer.isActive()); 286 286 287 instanceMap().remove(m_instance); 287 // If we failed to find the plug-in, we'll return early in our constructor, and 288 // m_instance will be 0. 289 if (m_instance) 290 instanceMap().remove(m_instance); 288 291 289 292 if (m_isWaitingToStart) … … 812 815 , m_paramValues(0) 813 816 , m_mimeType(mimeType) 817 , m_instance(0) 814 818 #if defined(XP_MACOSX) 815 819 , m_isWindowed(false)
Note: See TracChangeset
for help on using the changeset viewer.