Changeset 116121 in webkit


Ignore:
Timestamp:
May 4, 2012 10:31:03 AM (12 years ago)
Author:
Nate Chapin
Message:

Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
​https://bugs.webkit.org/show_bug.cgi?id=85533

Reviewed by Alexey Proskuryakov.

Source/WebKit/blackberry:

  • WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::finishedLoading):

Source/WebKit/chromium:

  • src/FrameLoaderClientImpl.cpp:

(WebKit::FrameLoaderClientImpl::FrameLoaderClientImpl):
(WebKit):
(WebKit::FrameLoaderClientImpl::finishedLoading):

  • src/FrameLoaderClientImpl.h:

(WebKit::FrameLoaderClientImpl::makeRepresentation):
(WebKit::FrameLoaderClientImpl::revertToProvisionalState):
(FrameLoaderClientImpl):

Source/WebKit/efl:

  • WebCoreSupport/FrameLoaderClientEfl.cpp:

(WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl):
(WebCore):
(WebCore::FrameLoaderClientEfl::finishedLoading):

  • WebCoreSupport/FrameLoaderClientEfl.h:

(WebCore::FrameLoaderClientEfl::makeRepresentation):
(WebCore::FrameLoaderClientEfl::revertToProvisionalState):
(FrameLoaderClientEfl):

Source/WebKit/gtk:

  • WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::FrameLoaderClient):
(WebKit):
(WebKit::FrameLoaderClient::finishedLoading):

  • WebCoreSupport/FrameLoaderClientGtk.h:

(WebKit::FrameLoaderClient::makeRepresentation):
(WebKit::FrameLoaderClient::revertToProvisionalState):
(FrameLoaderClient):

Source/WebKit/mac:

  • WebView/WebHTMLRepresentation.mm:

(-[WebHTMLRepresentation finishedLoadingWithDataSource:]): Calling commitData when finishing is no longer necessary,

as WebCore will take care of simulating the receipt of data and ensuring the requisite work gets done in the blank document case.

Source/WebKit/qt:

  • WebCoreSupport/FrameLoaderClientQt.cpp:

(WebCore::FrameLoaderClientQt::FrameLoaderClientQt):
(WebCore):
(WebCore::FrameLoaderClientQt::finishedLoading):

  • WebCoreSupport/FrameLoaderClientQt.h:

(WebCore::FrameLoaderClientQt::makeRepresentation):
(WebCore::FrameLoaderClientQt::revertToProvisionalState):
(FrameLoaderClientQt):

Source/WebKit/win:

  • WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::finishedLoading):

Source/WebKit/wince:

  • WebCoreSupport/FrameLoaderClientWinCE.cpp:

(WebKit::FrameLoaderClientWinCE::finishedLoading):

Source/WebKit/wx:

  • WebKitSupport/FrameLoaderClientWx.cpp:

(WebCore::FrameLoaderClientWx::finishedLoading):
(WebCore::FrameLoaderClientWx::setMainDocumentError):
(WebCore::FrameLoaderClientWx::dispatchDidReceiveResponse):
(WebCore::FrameLoaderClientWx::dispatchDidFailLoading):

  • WebKitSupport/FrameLoaderClientWx.h:

(FrameLoaderClientWx):

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::finishedLoading):

Location:
trunk/Source
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/blackberry/ChangeLog

    r116105 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
     9        (WebCore::FrameLoaderClientBlackBerry::finishedLoading):
     10
    1112012-05-04  Sheriff Bot  <webkit.review.bot@gmail.com>
    212

  • trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

    r115926 r116121  
    364364}
    365365
    366 void FrameLoaderClientBlackBerry::finishedLoading(DocumentLoader* loader)
     366void FrameLoaderClientBlackBerry::finishedLoading(DocumentLoader*)
    367367{
    368368    if (m_pluginView) {
    … …  
    370370        m_pluginView = 0;
    371371        m_hasSentResponseToPlugin = false;
    372     } else {
    373         // Telling the frame we received some data and passing 0 as the data is our
    374         // way to get work done that is normally done when the first bit of data is
    375         // received, even for the case of a document with no data (like about:blank).
    376         committedLoad(loader, 0, 0);
    377372    }
    378373}

  • trunk/Source/WebKit/chromium/ChangeLog

    r116116 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * src/FrameLoaderClientImpl.cpp:
     9        (WebKit::FrameLoaderClientImpl::FrameLoaderClientImpl):
     10        (WebKit):
     11        (WebKit::FrameLoaderClientImpl::finishedLoading):
     12        * src/FrameLoaderClientImpl.h:
     13        (WebKit::FrameLoaderClientImpl::makeRepresentation):
     14        (WebKit::FrameLoaderClientImpl::revertToProvisionalState):
     15        (FrameLoaderClientImpl):
     16
    1172012-05-04  Alexander Pavlov  <apavlov@chromium.org>
    218

  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r115926 r116121  
    111111FrameLoaderClientImpl::FrameLoaderClientImpl(WebFrameImpl* frame)
    112112    : m_webFrame(frame)
    113     , m_hasRepresentation(false)
    114113    , m_sentInitialResponseToPlugin(false)
    115114    , m_nextNavigationPolicy(WebNavigationPolicyIgnore)
    … …  
    271270{
    272271    m_webFrame->createFrameView();
    273 }
    274 
    275 void FrameLoaderClientImpl::makeRepresentation(DocumentLoader*)
    276 {
    277     m_hasRepresentation = true;
    278272}
    279273
    … …  
    10501044}
    10511045
    1052 void FrameLoaderClientImpl::revertToProvisionalState(DocumentLoader*)
    1053 {
    1054     m_hasRepresentation = true;
    1055 }
    1056 
    10571046void FrameLoaderClientImpl::setMainDocumentError(DocumentLoader*,
    10581047                                                 const ResourceError& error)
    … …  
    11511140}
    11521141
    1153 void FrameLoaderClientImpl::finishedLoading(DocumentLoader* dl)
     1142void FrameLoaderClientImpl::finishedLoading(DocumentLoader*)
    11541143{
    11551144    if (m_pluginWidget) {
    … …  
    11571146        m_pluginWidget = 0;
    11581147        m_sentInitialResponseToPlugin = false;
    1159     } else {
    1160         // This is necessary to create an empty document. See bug 634004.
    1161         // However, we only want to do this if makeRepresentation has been called, to
    1162         // match the behavior on the Mac.
    1163         if (m_hasRepresentation)
    1164             dl->writer()->setEncoding("", false);
    11651148    }
    11661149}

  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h

    r115926 r116121  
    7373    virtual bool hasWebView() const;
    7474    virtual bool hasFrameView() const;
    75     virtual void makeRepresentation(WebCore::DocumentLoader*);
     75    virtual void makeRepresentation(WebCore::DocumentLoader*) { }
    7676    virtual void forceLayout();
    7777    virtual void forceLayoutForNonHTML();
    … …  
    119119    virtual void dispatchWillSendSubmitEvent(PassRefPtr<WebCore::FormState>);
    120120    virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, PassRefPtr<WebCore::FormState>);
    121     virtual void revertToProvisionalState(WebCore::DocumentLoader*);
     121    virtual void revertToProvisionalState(WebCore::DocumentLoader*) { }
    122122    virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&);
    123123    virtual void willChangeEstimatedProgress() { }
    … …  
    226226    WebFrameImpl* m_webFrame;
    227227
    228     // True if makeRepresentation was called.  We don't actually have a concept
    229     // of a "representation", but we need to know when we're expected to have one.
    230     // See finishedLoading().
    231     bool m_hasRepresentation;
    232 
    233228    // Used to help track client redirects. When a provisional load starts, it
    234229    // has no redirects in its chain. But in the case of client redirects, we want

  • trunk/Source/WebKit/efl/ChangeLog

    r116119 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/FrameLoaderClientEfl.cpp:
     9        (WebCore::FrameLoaderClientEfl::FrameLoaderClientEfl):
     10        (WebCore):
     11        (WebCore::FrameLoaderClientEfl::finishedLoading):
     12        * WebCoreSupport/FrameLoaderClientEfl.h:
     13        (WebCore::FrameLoaderClientEfl::makeRepresentation):
     14        (WebCore::FrameLoaderClientEfl::revertToProvisionalState):
     15        (FrameLoaderClientEfl):
     16
    1172012-05-04  Christophe Dumez  <christophe.dumez@intel.com>
    218

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r116119 r116121  
    7171    , m_pluginView(0)
    7272    , m_hasSentResponseToPlugin(false)
    73     , m_hasRepresentation(false)
    7473{
    7574}
    … …  
    532531}
    533532
    534 void FrameLoaderClientEfl::makeRepresentation(DocumentLoader*)
    535 {
    536     m_hasRepresentation = true;
    537 }
    538 
    539533void FrameLoaderClientEfl::forceLayout()
    540534{
    … …  
    663657{
    664658    notImplemented();
    665 }
    666 
    667 void FrameLoaderClientEfl::revertToProvisionalState(DocumentLoader*)
    668 {
    669     m_hasRepresentation = true;
    670659}
    671660
    … …  
    718707}
    719708
    720 void FrameLoaderClientEfl::finishedLoading(DocumentLoader* documentLoader)
    721 {
    722     if (!m_pluginView) {
    723         if (m_hasRepresentation)
    724             documentLoader->writer()->setEncoding("", false);
    725         return;
    726     }
     709void FrameLoaderClientEfl::finishedLoading(DocumentLoader*)
     710{
     711    if (!m_pluginView)
     712        return;
    727713    m_pluginView->didFinishLoading();
    728714    m_pluginView = 0;

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h

    r115926 r116121  
    6262    void callPolicyFunction(FramePolicyFunction, PolicyAction);
    6363
    64     virtual void makeRepresentation(DocumentLoader*);
     64    virtual void makeRepresentation(DocumentLoader*) { }
    6565    virtual void forceLayout();
    6666    virtual void forceLayoutForNonHTML();
    … …  
    123123    virtual void dispatchWillSubmitForm(FramePolicyFunction, WTF::PassRefPtr<FormState>);
    124124
    125     virtual void revertToProvisionalState(DocumentLoader*);
     125    virtual void revertToProvisionalState(DocumentLoader*) { }
    126126    virtual void setMainDocumentError(DocumentLoader*, const ResourceError&);
    127127
    … …  
    218218    PluginView* m_pluginView;
    219219    bool m_hasSentResponseToPlugin;
    220     bool m_hasRepresentation;
    221220};
    222221

  • trunk/Source/WebKit/gtk/ChangeLog

    r116114 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     9        (WebKit::FrameLoaderClient::FrameLoaderClient):
     10        (WebKit):
     11        (WebKit::FrameLoaderClient::finishedLoading):
     12        * WebCoreSupport/FrameLoaderClientGtk.h:
     13        (WebKit::FrameLoaderClient::makeRepresentation):
     14        (WebKit::FrameLoaderClient::revertToProvisionalState):
     15        (FrameLoaderClient):
     16
    1172012-05-03  Martin Robinson  <mrobinson@igalia.com>
    218

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r113001 r116121  
    107107    , m_pluginView(0)
    108108    , m_hasSentResponseToPlugin(false)
    109     , m_hasRepresentation(false)
    110109{
    111110    ASSERT(m_frame);
    … …  
    666665}
    667666
    668 void FrameLoaderClient::makeRepresentation(WebCore::DocumentLoader*)
    669 {
    670     m_hasRepresentation = true;
    671 }
    672 
    673667void FrameLoaderClient::forceLayout()
    674668{
    … …  
    884878}
    885879
    886 void FrameLoaderClient::revertToProvisionalState(WebCore::DocumentLoader*)
    887 {
    888     m_hasRepresentation = true;
    889 }
    890 
    891880void FrameLoaderClient::willChangeTitle(WebCore::DocumentLoader*)
    892881{
    … …  
    931920}
    932921
    933 void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader* documentLoader)
    934 {
    935     if (!m_pluginView) {
    936         // This is necessary to create an empty document,
    937         // but it has to be skipped in the provisional phase.
    938         if (m_hasRepresentation)
    939             documentLoader->writer()->setEncoding("", false);
    940     } else {
     922void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader*)
     923{
     924    if (m_pluginView) {
    941925        m_pluginView->didFinishLoading();
    942926        m_pluginView = 0;

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

    r115926 r116121  
    5050        virtual bool hasWebView() const;
    5151
    52         virtual void makeRepresentation(WebCore::DocumentLoader*);
     52        virtual void makeRepresentation(WebCore::DocumentLoader*) { }
    5353        virtual void forceLayout();
    5454        virtual void forceLayoutForNonHTML();
    … …  
    106106        virtual void dispatchWillSubmitForm(WebCore::FramePolicyFunction, WTF::PassRefPtr<WebCore::FormState>);
    107107
    108         virtual void revertToProvisionalState(WebCore::DocumentLoader*);
     108        virtual void revertToProvisionalState(WebCore::DocumentLoader*) { }
    109109        virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&);
    110110
    … …  
    199199        WebCore::PluginView* m_pluginView;
    200200        bool m_hasSentResponseToPlugin;
    201 
    202         bool m_hasRepresentation;
    203201    };
    204202

  • trunk/Source/WebKit/mac/ChangeLog

    r116053 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebView/WebHTMLRepresentation.mm:
     9        (-[WebHTMLRepresentation finishedLoadingWithDataSource:]): Calling commitData when finishing is no longer necessary,
     10            as WebCore will take care of simulating the receipt of data and ensuring the requisite work gets done in the blank document case.
     11
    1122012-05-03  Anders Carlsson  <andersca@apple.com>
    213

  • trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm

    r96480 r116121  
    215215    if (!webFrame)
    216216        return;
    217 
    218     if (![self _isDisplayingWebArchive]) {
    219         // Telling the frame we received some data and passing nil as the data is our
    220         // way to get work done that is normally done when the first bit of data is
    221         // received, even for the case of a document with no data (like about:blank).
    222         [webFrame _commitData:nil];
    223     }
    224 
    225217    WebView *webView = [webFrame webView];
    226218    if ([webView mainFrame] == webFrame && [webView isEditable])

  • trunk/Source/WebKit/qt/ChangeLog

    r115998 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/FrameLoaderClientQt.cpp:
     9        (WebCore::FrameLoaderClientQt::FrameLoaderClientQt):
     10        (WebCore):
     11        (WebCore::FrameLoaderClientQt::finishedLoading):
     12        * WebCoreSupport/FrameLoaderClientQt.h:
     13        (WebCore::FrameLoaderClientQt::makeRepresentation):
     14        (WebCore::FrameLoaderClientQt::revertToProvisionalState):
     15        (FrameLoaderClientQt):
     16
    1172012-05-03  Fady Samuel  <fsamuel@chromium.org>
    218

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r114042 r116121  
    213213    , m_pluginView(0)
    214214    , m_hasSentResponseToPlugin(false)
    215     , m_hasRepresentation(false)
    216215    , m_isOriginatingLoad(false)
    217216{
    … …  
    313312}
    314313
    315 void FrameLoaderClientQt::makeRepresentation(DocumentLoader*)
    316 {
    317     m_hasRepresentation = true;
    318 }
    319 
    320314
    321315void FrameLoaderClientQt::forceLayout()
    … …  
    565559    // FIXME: This is surely too simple.
    566560    callPolicyFunction(function, PolicyUse);
    567 }
    568 
    569 
    570 void FrameLoaderClientQt::revertToProvisionalState(DocumentLoader*)
    571 {
    572     m_hasRepresentation = true;
    573561}
    574562
    … …  
    627615
    628616
    629 void FrameLoaderClientQt::finishedLoading(DocumentLoader* loader)
    630 {
    631     if (!m_pluginView) {
    632         // This is necessary to create an empty document. See bug 634004.
    633         // However, we only want to do this if makeRepresentation has been called,
    634         // to match the behavior on the Mac.
    635         if (m_hasRepresentation)
    636             loader->writer()->setEncoding("", false);
    637         return;
    638     }
     617void FrameLoaderClientQt::finishedLoading(DocumentLoader*)
     618{
     619    if (!m_pluginView)
     620        return;
    639621    if (m_pluginView->isPluginView())
    640622        m_pluginView->didFinishLoading();

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

    r115926 r116121  
    8484    virtual bool hasWebView() const; // mainly for assertions
    8585
    86     virtual void makeRepresentation(DocumentLoader*);
     86    virtual void makeRepresentation(DocumentLoader*) { }
    8787    virtual void forceLayout();
    8888    virtual void forceLayoutForNonHTML();
    … …  
    139139    virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>);
    140140
    141     virtual void revertToProvisionalState(DocumentLoader*);
     141    virtual void revertToProvisionalState(DocumentLoader*) { }
    142142    virtual void setMainDocumentError(DocumentLoader*, const ResourceError&);
    143143
    … …  
    273273    bool m_hasSentResponseToPlugin;
    274274
    275     // True if makeRepresentation was called.  We don't actually have a concept
    276     // of a "representation", but we need to know when we're expected to have one.
    277     // See finishedLoading().
    278     bool m_hasRepresentation;
    279 
    280275    KURL m_lastRequestedUrl;
    281276    bool m_isOriginatingLoad;

  • trunk/Source/WebKit/win/ChangeLog

    r115943 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/WebFrameLoaderClient.cpp:
     9        (WebFrameLoaderClient::finishedLoading):
     10
    1112012-04-27  Jon Lee  <jonlee@apple.com>
    212

  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

    r112474 r116121  
    518518}
    519519
    520 void WebFrameLoaderClient::finishedLoading(DocumentLoader* loader)
    521 {
    522     // Telling the frame we received some data and passing 0 as the data is our
    523     // way to get work done that is normally done when the first bit of data is
    524     // received, even for the case of a document with no data (like about:blank)
    525     committedLoad(loader, 0, 0);
    526 
     520void WebFrameLoaderClient::finishedLoading(DocumentLoader*)
     521{
    527522    if (!m_manualLoader)
    528523        return;

  • trunk/Source/WebKit/wince/ChangeLog

    r115926 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
     9        (WebKit::FrameLoaderClientWinCE::finishedLoading):
     10
    1112012-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
    212

  • trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp

    r112474 r116121  
    444444}
    445445
    446 void FrameLoaderClientWinCE::finishedLoading(DocumentLoader* documentLoader)
    447 {
    448     if (!m_pluginView) {
    449         documentLoader->writer()->setEncoding(m_response.textEncodingName(), false);
     446void FrameLoaderClientWinCE::finishedLoading(DocumentLoader*)
     447{
     448    if (!m_pluginView)
    450449        return;
    451     }
    452450
    453451    m_pluginView->didFinishLoading();

  • trunk/Source/WebKit/wx/ChangeLog

    r115926 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebKitSupport/FrameLoaderClientWx.cpp:
     9        (WebCore::FrameLoaderClientWx::finishedLoading):
     10        (WebCore::FrameLoaderClientWx::setMainDocumentError):
     11        (WebCore::FrameLoaderClientWx::dispatchDidReceiveResponse):
     12        (WebCore::FrameLoaderClientWx::dispatchDidFailLoading):
     13        * WebKitSupport/FrameLoaderClientWx.h:
     14        (FrameLoaderClientWx):
     15
    1162012-04-18  Jon Honeycutt  <jhoneycutt@apple.com>
    217

  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r112746 r116121  
    445445
    446446
    447 void FrameLoaderClientWx::finishedLoading(DocumentLoader* loader)
    448 {
    449     if (!m_pluginView) {
    450         if (m_firstData) {
    451             loader->writer()->setEncoding(m_response.textEncodingName(), false);
    452             m_firstData = false;
    453         }
    454     } else {
     447void FrameLoaderClientWx::finishedLoading(DocumentLoader*)
     448{
     449    if (m_pluginView) {
    455450        m_pluginView->didFinishLoading();
    456451        m_pluginView = 0;
    … …  
    652647void FrameLoaderClientWx::setMainDocumentError(WebCore::DocumentLoader* loader, const WebCore::ResourceError&)
    653648{
    654     if (m_firstData) {
    655         loader->writer()->setEncoding(m_response.textEncodingName(), false);
    656         m_firstData = false;
    657     }
     649    notImplemented();
    658650}
    659651
    … …  
    762754    notImplemented();
    763755    m_response = response;
    764     m_firstData = true;
    765756}
    766757
    … …  
    777768void FrameLoaderClientWx::dispatchDidFailLoading(DocumentLoader* loader, unsigned long, const ResourceError&)
    778769{
    779     if (m_firstData) {
    780         loader->writer()->setEncoding(m_response.textEncodingName(), false);
    781         m_firstData = false;
    782     }
    783770    if (m_webView) {
    784771        WebKit::WebViewLoadEvent wkEvent(m_webView);

  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

    r115926 r116121  
    242242        bool m_hasSentResponseToPlugin;
    243243        ResourceResponse m_response;
    244         bool m_firstData;
    245244    };
    246245

  • trunk/Source/WebKit2/ChangeLog

    r116102 r116121  
     12012-05-04  Nate Chapin  <japhet@chromium.org>
     2
     3        Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
     4        https://bugs.webkit.org/show_bug.cgi?id=85533
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     9        (WebKit::WebFrameLoaderClient::finishedLoading):
     10
    1112012-05-04  Kent Hansen <kent.hansen@nokia.com>
    212

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r116016 r116121  
    880880{
    881881    if (!m_pluginView) {
    882         committedLoad(loader, 0, 0);
    883 
    884882        if (m_frameHasCustomRepresentation) {
    885883            WebPage* webPage = m_frame->page();
Note: See TracChangeset for help on using the changeset viewer.