Bug 25409 – [GTK] incorrectly fallsback on cancellation

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Gustavo Noronha (kov)]

On some sites, there are some frames appearing with the fallback content when they shouldn't. The error message that is presented is that the load was cancelled. Also, our shouldFallBack implementation seems to miss some cancellation cases, which makes some tests fail.

[Gustavo Noronha (kov)]

Created attachment 29803 [details]
Fix fallback and cancellation handling

 WebKit/gtk/ChangeLog                               |   16 ++++++++++++++++
 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp |    8 +++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)

[Gustavo Noronha (kov)]

Created attachment 29809 [details]
Do not fallback on cancellation and load interruption caused by policy change.

 WebKit/gtk/ChangeLog                               |   14 ++++++++++++++
 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp |    3 +--
 2 files changed, 15 insertions(+), 2 deletions(-)

[Gustavo Noronha (kov)]

Created attachment 29810 [details]
Check if we should use the fallback content in didFailLoad.

 WebKit/gtk/ChangeLog                               |   14 ++++++++++++++
 WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp |    6 ++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

[Xan Lopez]

Comment on attachment 29809 [details]
Do not fallback on cancellation and load interruption caused by policy change.

Looks good.

[Xan Lopez]

Comment on attachment 29810 [details]
Check if we should use the fallback content in didFailLoad.

Perhaps you can add the same comment to the signal emission than Jan did, to be consistent. r=me otherwise.

[Gustavo Noronha (kov)]

Landed as r42888, r42889 with Xan's comment addressed.