Changeset 74013 in webkit


Ignore:
Timestamp:
Dec 14, 2010 3:48:18 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-12-14 Zalan Bujtas <zbujtas@gmail.com>

Reviewed by Kenneth Rohde Christiansen.

Add loadFinished() for provisional load error
This fixes the hanging UI state, when provisional load error occurs due to
the async nature of policy check.

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

  • UIProcess/API/qt/ClientImpl.cpp: (loadFinished): (qt_wk_didFailProvisionalLoadWithErrorForFrame): (qt_wk_didFinishLoadForFrame): (qt_wk_didFailLoadWithErrorForFrame):
Location:
trunk/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit2/ChangeLog

    r74000 r74013  
     12010-12-14  Zalan Bujtas  <zbujtas@gmail.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        Add loadFinished() for provisional load error
     6        This fixes the hanging UI state, when provisional load error occurs due to
     7        the async nature of policy check.
     8
     9        https://bugs.webkit.org/show_bug.cgi?id=48724
     10
     11        * UIProcess/API/qt/ClientImpl.cpp:
     12        (loadFinished):
     13        (qt_wk_didFailProvisionalLoadWithErrorForFrame):
     14        (qt_wk_didFinishLoadForFrame):
     15        (qt_wk_didFailLoadWithErrorForFrame):
     16
    1172010-12-13  Sam Weinig  <sam@webkit.org>
    218
  • trunk/WebKit2/UIProcess/API/qt/ClientImpl.cpp

    r72468 r74013  
    3838}
    3939
     40static void loadFinished(WKFrameRef frame, const void* clientInfo, bool ok)
     41{
     42    if (!WKFrameIsMainFrame(frame))
     43        return;
     44    emit toQWKPage(clientInfo)->loadFinished(ok);
     45    QWKPagePrivate::get(toQWKPage(clientInfo))->updateNavigationActions();
     46}
     47
    4048void qt_wk_didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
    4149{
     
    5260void qt_wk_didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
    5361{
     62    loadFinished(frame, clientInfo, false);
    5463}
    5564
     
    7281void qt_wk_didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
    7382{
    74     if (!WKFrameIsMainFrame(frame))
    75         return;
    76     emit toQWKPage(clientInfo)->loadFinished(true);
    77     QWKPagePrivate::get(toQWKPage(clientInfo))->updateNavigationActions();
     83    loadFinished(frame, clientInfo, true);
    7884}
    7985
    8086void qt_wk_didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
    8187{
    82     if (!WKFrameIsMainFrame(frame))
    83         return;
    84     emit toQWKPage(clientInfo)->loadFinished(false);
    85     QWKPagePrivate::get(toQWKPage(clientInfo))->updateNavigationActions();
     88    loadFinished(frame, clientInfo, false);
    8689}
    8790
Note: See TracChangeset for help on using the changeset viewer.