Changeset 57202 in webkit


Ignore:
Timestamp:
Apr 7, 2010 4:14:59 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-07 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Simon Hausmann.

[Qt] When providing a widget for the PDF mime type it will cause a crash

m_pluginView may actually be a Widget (for embedded Qt widgets),
so always check isPluginView() before calling PluginView specific methods.

https://bugs.webkit.org/show_bug.cgi?id=29450

  • WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::finishedLoading): (WebCore::FrameLoaderClientQt::setMainDocumentError): (WebCore::FrameLoaderClientQt::committedLoad):
Location:
trunk/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/qt/ChangeLog

    r57155 r57202  
     12010-04-07  Andreas Kling  <andreas.kling@nokia.com>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        [Qt] When providing a widget for the PDF mime type it will cause a crash
     6
     7        m_pluginView may actually be a Widget (for embedded Qt widgets),
     8        so always check isPluginView() before calling PluginView specific methods.
     9
     10        https://bugs.webkit.org/show_bug.cgi?id=29450
     11
     12        * WebCoreSupport/FrameLoaderClientQt.cpp:
     13        (WebCore::FrameLoaderClientQt::finishedLoading):
     14        (WebCore::FrameLoaderClientQt::setMainDocumentError):
     15        (WebCore::FrameLoaderClientQt::committedLoad):
     16
    1172010-04-06  Diego Gonzalez  <diego.gonzalez@openbossa.org>
    218
  • trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r56750 r57202  
    518518    }
    519519    else {
    520         m_pluginView->didFinishLoading();
     520        if (m_pluginView->isPluginView())
     521            m_pluginView->didFinishLoading();
    521522        m_pluginView = 0;
    522523        m_hasSentResponseToPlugin = false;
     
    707708        }
    708709    } else {
    709         m_pluginView->didFail(error);
     710        if (m_pluginView->isPluginView())
     711            m_pluginView->didFail(error);
    710712        m_pluginView = 0;
    711713        m_hasSentResponseToPlugin = false;
     
    727729   
    728730    // We re-check here as the plugin can have been created
    729     if (m_pluginView) {
     731    if (m_pluginView && m_pluginView->isPluginView()) {
    730732        if (!m_hasSentResponseToPlugin) {
    731733            m_pluginView->didReceiveResponse(loader->response());
Note: See TracChangeset for help on using the changeset viewer.