Changeset 89572 in webkit


Ignore:
Timestamp:
Jun 23, 2011 8:20:24 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-23 Ryuan Choi <ryuan.choi@samsung.com>

Reviewed by Antonio Gomes.

[EFL] Crash when running EWebLauncher
https://bugs.webkit.org/show_bug.cgi?id=62628

Call DocumentWriter::setEncoding when FrameLoaderClientEfl::finishedLoading()
like other ports.
It will clear parser not to crash when called endIfNotLoadingMainResource().

  • WebCoreSupport/FrameLoaderClientEfl.cpp: (WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl): (WebCore::FrameLoaderClientEfl::makeRepresentation): (WebCore::FrameLoaderClientEfl::revertToProvisionalState): (WebCore::FrameLoaderClientEfl::finishedLoading):
  • WebCoreSupport/FrameLoaderClientEfl.h:
Location:
trunk/Source/WebKit/efl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/efl/ChangeLog

    r89509 r89572  
     12011-06-23  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Crash when running EWebLauncher
     6        https://bugs.webkit.org/show_bug.cgi?id=62628
     7
     8        Call DocumentWriter::setEncoding when FrameLoaderClientEfl::finishedLoading()
     9        like other ports.
     10        It will clear parser not to crash when called endIfNotLoadingMainResource().
     11
     12        * WebCoreSupport/FrameLoaderClientEfl.cpp:
     13        (WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl):
     14        (WebCore::FrameLoaderClientEfl::makeRepresentation):
     15        (WebCore::FrameLoaderClientEfl::revertToProvisionalState):
     16        (WebCore::FrameLoaderClientEfl::finishedLoading):
     17        * WebCoreSupport/FrameLoaderClientEfl.h:
     18
    1192011-06-22  Ryuan Choi  <ryuan.choi@samsung.com>
    220
  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r88628 r89572  
    7575    , m_pluginView(0)
    7676    , m_hasSentResponseToPlugin(false)
     77    , m_hasRepresentation(false)
    7778{
    7879}
     
    499500void FrameLoaderClientEfl::makeRepresentation(DocumentLoader*)
    500501{
    501     notImplemented();
     502    m_hasRepresentation = true;
    502503}
    503504
     
    636637void FrameLoaderClientEfl::revertToProvisionalState(DocumentLoader*)
    637638{
    638     notImplemented();
     639    m_hasRepresentation = true;
    639640}
    640641
     
    688689}
    689690
    690 void FrameLoaderClientEfl::finishedLoading(DocumentLoader* loader)
    691 {
    692     if (!m_pluginView)
     691void FrameLoaderClientEfl::finishedLoading(DocumentLoader* documentLoader)
     692{
     693    if (!m_pluginView) {
     694        if (m_hasRepresentation)
     695            documentLoader->writer()->setEncoding("", false);
    693696        return;
     697    }
    694698    m_pluginView->didFinishLoading();
    695699    m_pluginView = 0;
  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h

    r88628 r89572  
    224224    PluginView* m_pluginView;
    225225    bool m_hasSentResponseToPlugin;
     226    bool m_hasRepresentation;
    226227};
    227228
Note: See TracChangeset for help on using the changeset viewer.