25409 2009-04-26 10:05:36 -0700 [GTK] incorrectly fallsback on cancellation 2009-04-27 07:54:55 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned xan.lopez oldest_to_newest 118910 0 gustavo 2009-04-26 10:05:36 -0700 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. 118914 1 29803 gustavo 2009-04-26 10:28:24 -0700 Created attachment 29803 Fix fallback and cancellation handling WebKit/gtk/ChangeLog | 16 ++++++++++++++++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletions(-) 118938 2 29809 gustavo 2009-04-26 17:28:09 -0700 Created attachment 29809 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(-) 118939 3 29810 gustavo 2009-04-26 17:28:13 -0700 Created attachment 29810 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(-) 118948 4 29809 xan.lopez 2009-04-26 22:40:48 -0700 Comment on attachment 29809 Do not fallback on cancellation and load interruption caused by policy change. Looks good. 118949 5 29810 xan.lopez 2009-04-26 22:44:07 -0700 Comment on attachment 29810 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. 118975 6 gustavo 2009-04-27 07:54:55 -0700 Landed as r42888, r42889 with Xan's comment addressed. 29803 2009-04-26 10:28:24 -0700 2009-04-26 17:29:18 -0700 Fix fallback and cancellation handling Fix-fallback-and-cancellation-handling.patch text/plain 2050 gustavo YTY0Yjg2ODFlNDExOWRjZTliMTgzZjRhMjZkOWNjNDgyNzQzMjc0YQpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA4MzUxZDJlLi5j ZTBhYWJmIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDA5LTA0LTI2ICBHdXN0YXZvIE5vcm9uaGEg U2lsdmEgIDxnbnNAZ25vbWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NTQwOQorICAgICAgICBbR1RLXSBpbmNvcnJlY3RseSBmYWxsc2JhY2sgb24gY2FuY2VsbGF0aW9u CisKKyAgICAgICAgQ29ycmVjdGx5IGhhbmRsZSBjYW5jZWxsYXRpb24gYW5kIGZhbGxiYWNrIG9u IGRpZEZhaWxMb2FkLCBzbyB0aGF0CisgICAgICAgIHdlIGRvbid0IGdldCBlcnJvciBwYWdlcyBz aG93aW5nIHVwIGluIHBhcnRzIG9mIHRoZSBjb250ZW50IG9mCisgICAgICAgIHNvbWUgc2l0ZXMg YmVjYXVzZSBvZiwgZm9yIGluc3RhbmNlLCBsb2NhdGlvbiBjaGFuZ2VzLiBUaGlzIGFsc28KKyAg ICAgICAgZml4ZXMgZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdlLmh0bWwuCisKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJL aXQ6OkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZEZhaWxMb2FkKToKKyAgICAgICAgKFdl YktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OnNob3VsZEZhbGxCYWNrKToKKwogMjAwOS0wNC0yNSAg R3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4K IAogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGQ3MjcyZmQuLjIzNDI1 NzQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRHdGsuY3BwCkBAIC04NDksNiArODQ5LDEyIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGlkRmFpbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKKyAgICBpZiAoIXNob3VsZEZhbGxCYWNrKGVycm9yKSkgeworICAgICAg ICBnX2Vycm9yX2ZyZWUod2ViRXJyb3IpOworICAgICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUo bV9mcmFtZSwgImxvYWQtZG9uZSIsIGZhbHNlKTsgLy8gZGVwcmVjYXRlZAorICAgICAgICByZXR1 cm47CisgICAgfQorCiAgICAgU3RyaW5nIGNvbnRlbnQ7CiAgICAgZ2NoYXIqIGZpbGVDb250ZW50 ID0gMDsKICAgICBnY2hhciogZXJyb3JVUkkgPSBnX2ZpbGVuYW1lX3RvX3VyaShEQVRBX0RJUiIv d2Via2l0LTEuMC9yZXNvdXJjZXMvZXJyb3IuaHRtbCIsIE5VTEwsIE5VTEwpOwpAQCAtOTMzLDcg KzkzOSw3IEBAIGJvb2wgRnJhbWVMb2FkZXJDbGllbnQ6OnNob3VsZEZhbGxCYWNrKGNvbnN0IFJl c291cmNlRXJyb3ImIGVycm9yKQogICAgIC8vIEZJWE1FOiBOZWVkcyB0byBjaGVjayBkb21haW4u CiAgICAgLy8gRklYTUU6IE1hYyBjaGVja3MgZm9yIFdlYktpdEVycm9yUGx1Z0luV2lsbEhhbmRs ZUxvYWQgaGVyZSB0byBhdm9pZAogICAgIC8vIGxvYWRpbmcgcGx1Z2luIGNvbnRlbnQgdHdpY2Uu IERvIHdlIG5lZWQgaXQ/Ci0gICAgcmV0dXJuIGVycm9yLmVycm9yQ29kZSgpICE9IFdFQktJVF9O RVRXT1JLX0VSUk9SX0NBTkNFTExFRDsKKyAgICByZXR1cm4gIWVycm9yLmlzQ2FuY2VsbGF0aW9u KCk7CiB9CiAKIGJvb2wgRnJhbWVMb2FkZXJDbGllbnQ6OmNhbkNhY2hlUGFnZSgpIGNvbnN0Cg== 29809 2009-04-26 17:28:09 -0700 2009-04-26 22:40:48 -0700 Do not fallback on cancellation and load interruption caused by policy change. Do-not-fallback-on-cancellation-and-load-interruption-caused-by-policy-change..patch text/plain 1602 gustavo YjY5ZTU5NTE1OTE0ZTUxYmMzMWYxZjI3NmY2OTNkNzFkNTRmNjc1ZApkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA3ZGZlNzFkLi45 NzExNTgwIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDA5LTA0LTI2ICBHdXN0YXZvIE5vcm9uaGEg U2lsdmEgIDxnbnNAZ25vbWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NTQwOQorICAgICAgICBbR1RLXSBpbmNvcnJlY3RseSBmYWxsc2JhY2sgb24gY2FuY2VsbGF0aW9u CisKKyAgICAgICAgQ29ycmVjdGx5IGhhbmRsZSBjYW5jZWxsYXRpb24gYW5kIGZyYW1lIGxvYWRp bmcgaW50ZXJydXB0aW9uCisgICAgICAgIGNhdXNlZCBieSBwb2xpY3kgY2hhbmdlLiAgVGhpcyBh bHNvIGZpeGVzCisgICAgICAgIGZhc3QvZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS5odG1sLgorCisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwOgorICAgICAg ICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6c2hvdWxkRmFsbEJhY2spOgorCiAyMDA5LTA0 LTI2ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBHdXN0YXZvIE5vcm9uaGEuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGQ3MjcyZmQuLjhkNDgzNWQgMTAwNjQ0Ci0tLSBh L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBi L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC05 MzAsMTAgKzkzMCw5IEBAIFJlc291cmNlRXJyb3IgRnJhbWVMb2FkZXJDbGllbnQ6OnBsdWdpbldp bGxIYW5kbGVMb2FkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXNwb25zCiAKIGJvb2wgRnJhbWVMb2Fk ZXJDbGllbnQ6OnNob3VsZEZhbGxCYWNrKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogewot ICAgIC8vIEZJWE1FOiBOZWVkcyB0byBjaGVjayBkb21haW4uCiAgICAgLy8gRklYTUU6IE1hYyBj aGVja3MgZm9yIFdlYktpdEVycm9yUGx1Z0luV2lsbEhhbmRsZUxvYWQgaGVyZSB0byBhdm9pZAog ICAgIC8vIGxvYWRpbmcgcGx1Z2luIGNvbnRlbnQgdHdpY2UuIERvIHdlIG5lZWQgaXQ/Ci0gICAg cmV0dXJuIGVycm9yLmVycm9yQ29kZSgpICE9IFdFQktJVF9ORVRXT1JLX0VSUk9SX0NBTkNFTExF RDsKKyAgICByZXR1cm4gIShlcnJvci5pc0NhbmNlbGxhdGlvbigpIHx8IGVycm9yLmVycm9yQ29k ZSgpID09IFdFQktJVF9QT0xJQ1lfRVJST1JfRlJBTUVfTE9BRF9JTlRFUlJVUFRFRF9CWV9QT0xJ Q1lfQ0hBTkdFKTsKIH0KIAogYm9vbCBGcmFtZUxvYWRlckNsaWVudDo6Y2FuQ2FjaGVQYWdlKCkg Y29uc3QK 29810 2009-04-26 17:28:13 -0700 2009-04-26 22:44:07 -0700 Check if we should use the fallback content in didFailLoad. Check-if-we-should-use-the-fallback-content-in-didFailLoad..patch text/plain 1695 gustavo MjI5Y2NmMzEwOGNkYzcwNGJhY2ViYWMxZjE2ZDEwODE3ZGNlY2FlMgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA5NzExNTgwLi43 OTVmZWZhIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwpAQCAtNSw2ICs1LDIwIEBACiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNTQwOQogICAgICAgICBbR1RLXSBpbmNvcnJlY3RseSBmYWxs c2JhY2sgb24gY2FuY2VsbGF0aW9uCiAKKyAgICAgICAgQ2hlY2sgd2hldGhlciB3ZSBzaG91bGQg ZmFsbGJhY2sgYWxzbyBvbiBkaWRGYWlsTG9hZCwgc28gdGhhdCB3ZQorICAgICAgICBkb24ndCBn ZXQgZXJyb3IgcGFnZXMgc2hvd2luZyB1cCBpbiBwYXJ0cyBvZiB0aGUgY29udGVudCBvZiBzb21l CisgICAgICAgIHNpdGVzIGJlY2F1c2Ugb2YsIGZvciBpbnN0YW5jZSwgbG9jYXRpb24gY2hhbmdl cy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoK KyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbExvYWQp OgorCisyMDA5LTA0LTI2ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTQwOQorICAgICAgICBbR1RLXSBpbmNv cnJlY3RseSBmYWxsc2JhY2sgb24gY2FuY2VsbGF0aW9uCisKICAgICAgICAgQ29ycmVjdGx5IGhh bmRsZSBjYW5jZWxsYXRpb24gYW5kIGZyYW1lIGxvYWRpbmcgaW50ZXJydXB0aW9uCiAgICAgICAg IGNhdXNlZCBieSBwb2xpY3kgY2hhbmdlLiAgVGhpcyBhbHNvIGZpeGVzCiAgICAgICAgIGZhc3Qv ZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS5odG1sLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAppbmRleCA4ZDQ4MzVkLi4xOTYyODM1IDEw MDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcApAQCAtODQ5LDYgKzg0OSwxMiBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRj aERpZEZhaWxMb2FkKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogICAgICAgICByZXR1cm47 CiAgICAgfQogCisgICAgaWYgKCFzaG91bGRGYWxsQmFjayhlcnJvcikpIHsKKyAgICAgICAgZ19l cnJvcl9mcmVlKHdlYkVycm9yKTsKKyAgICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKG1fZnJh bWUsICJsb2FkLWRvbmUiLCBmYWxzZSk7IC8vIGRlcHJlY2F0ZWQKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKwogICAgIFN0cmluZyBjb250ZW50OwogICAgIGdjaGFyKiBmaWxlQ29udGVudCA9IDA7 CiAgICAgZ2NoYXIqIGVycm9yVVJJID0gZ19maWxlbmFtZV90b191cmkoREFUQV9ESVIiL3dlYmtp dC0xLjAvcmVzb3VyY2VzL2Vycm9yLmh0bWwiLCBOVUxMLCBOVUxMKTsK