30216 2009-10-08 09:33:58 -0700 [Qt] better handle possible edge cases on qwebframe::requestedUrl use 2009-10-15 10:20:14 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 30213 1 tonikitoo tonikitoo hausmann oldest_to_newest 153404 0 tonikitoo 2009-10-08 09:33:58 -0700 requestedUrl was failing is it was called from within qwebpage::extension reimplementation... 153405 1 40880 tonikitoo 2009-10-08 09:36:38 -0700 Created attachment 40880 patch 0.1 - make use or error.failingURL as much as possible 153448 2 40880 eric 2009-10-08 11:09:37 -0700 Comment on attachment 40880 patch 0.1 - make use or error.failingURL as much as possible The ChagneLog doesn't say what this does. What edge cases? What is the modification to that if and why? Why do we need to clear the previous error. Comments should ideally be sentences, beginning with a capital and ending with a period. 153598 3 40925 tonikitoo 2009-10-08 20:06:51 -0700 Created attachment 40925 patch 0.2 - make use or error.failingURL as much as possible * improved changelog description * code/changes commented. * fixed issue w/ comment 153679 4 hausmann 2009-10-09 07:38:32 -0700 Is there any way to write a unit test for these edge cases? I'm worried about this function becoming untouchable code. 153716 5 tonikitoo 2009-10-09 10:53:41 -0700 simon, thx for you comments. (In reply to comment #4) > Is there any way to write a unit test for these edge cases? The use cases described are already implemented as tests in tst_qwebframe. I am actually making the current implementation "better". > I'm worried about this function becoming untouchable code. you mean no one explicitly using it ? imho (and in defense of requestedUrl :) is can be a important method to offer to the client since many of internal WebCore action's use the "original submitted url" , and not the resolved/redirected url. e.g. icondatabase, global and session history. 153987 6 41017 tonikitoo 2009-10-11 21:14:24 -0700 Created attachment 41017 (committed in r49497) patch 0.3 - make use or error.failingURL as much as possible one more shot ... * same patch as 0.2, but more legible/cleaner code ... 154264 7 hausmann 2009-10-12 22:26:52 -0700 (In reply to comment #5) > simon, thx for you comments. > > (In reply to comment #4) > > Is there any way to write a unit test for these edge cases? > > The use cases described are already implemented as tests in tst_qwebframe. I am > actually making the current implementation "better". Ahh, I overlooked that. Thanks! > > I'm worried about this function becoming untouchable code. > > you mean no one explicitly using it ? > > imho (and in defense of requestedUrl :) is can be a important method to offer > to the client since many of internal WebCore action's use the "original > submitted url" , and not the resolved/redirected url. > > e.g. icondatabase, global and session history. No, I was worried that the code because untouchable because it tests many edge cases without us verifiying them in unit tests. But I'm wrong, you're doing a great effort in testing this stuff. Sorry :) 154265 8 41017 hausmann 2009-10-12 22:28:29 -0700 Comment on attachment 41017 (committed in r49497) patch 0.3 - make use or error.failingURL as much as possible r=me > + This patch makes requestUrl calls to fallsback to FrameLoaderClient Small typo here. Would be good to fix when landing :) 154309 9 tonikitoo 2009-10-13 03:58:32 -0700 (In reply to comment #8) > (From update of attachment 41017 [details]) > r=me > > > + This patch makes requestUrl calls to fallsback to FrameLoaderClient > > Small typo here. Would be good to fix when landing :) thx simon landed in r49497 154834 10 41017 tonikitoo 2009-10-15 10:20:14 -0700 Comment on attachment 41017 (committed in r49497) patch 0.3 - make use or error.failingURL as much as possible clearing r+ flag since it has landed. 40880 2009-10-08 09:36:38 -0700 2009-10-08 20:06:51 -0700 patch 0.1 - make use or error.failingURL as much as possible 0001--Qt-better-handle-possible-edge-cases-on-qwebframe.patch text/plain 3071 tonikitoo RnJvbSA5Mjg3NGFhYjc5OThlZTEzODJlN2EyZWZlNTcxM2RlMzA3Njk5NmFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVGh1LCA4IE9jdCAyMDA5IDEyOjM0OjQ3IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW1F0 XSBiZXR0ZXIgaGFuZGxlIHBvc3NpYmxlIGVkZ2UgY2FzZXMgb24gcXdlYmZyYW1lOjpyZXF1ZXN0 ZWRVcmwgdXNlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAyMTYK ClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPHRvbmlraXRvb0B3ZWJraXQub3JnPiBvbiAyMDA5LTEw LTA4ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBBcGkvcXdlYmZyYW1lLmNwcDoKKFFX ZWJGcmFtZTo6cmVxdWVzdGVkVXJsKToKKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dFF0LmNwcDoKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6OnBvc3RQcm9ncmVzc1N0YXJ0 ZWROb3RpZmljYXRpb24pOgotLS0KIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCAgICAgICAg ICAgICAgICAgICAgICB8ICAgIDkgKysrKysrLS0tCiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysrKwogV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIHwgICAgMSArCiAzIGZpbGVzIGNo YW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmlu ZGV4IDE3NzdjYzguLmJmMWFhNjMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1l LmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTU0NCw5ICs1NDQsMTIg QEAgUVVybCBRV2ViRnJhbWU6OnJlcXVlc3RlZFVybCgpIGNvbnN0CiAgICAgLy8gbG9hZGVyIGRv ZXMgbm90IGdldCBjb21taXRlZCBieSB0aGUgZnJhbWUgbG9hZGVyKSBpdCBpcwogICAgIC8vIHNh ZmVyIHRvIHJlbHkgb24gb3V0Z29pbmdSZWZlcnJlciB0aGFuIG9yaWdpbmFsUmVxdWVzdC4KICAg ICBpZiAoIWQtPmZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKQotICAgICAg ICB8fCAoIWQtPmZyYW1lTG9hZGVyQ2xpZW50LT5tX2xvYWRFcnJvci5pc051bGwoKQotICAgICAg ICAmJiAgIWQtPmZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpLmlzRW1wdHkoKSkp Ci0gICAgICAgIHJldHVybiBRVXJsKGQtPmZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJl cigpKTsKKyAgICAgICAgfHwgIWQtPmZyYW1lTG9hZGVyQ2xpZW50LT5tX2xvYWRFcnJvci5pc051 bGwoKSkgeworICAgICAgICBpZiAoIWQtPmZyYW1lTG9hZGVyQ2xpZW50LT5tX2xvYWRFcnJvci5m YWlsaW5nVVJMKCkuaXNOdWxsKCkpCisgICAgICAgICAgICByZXR1cm4gUVVybChkLT5mcmFtZUxv YWRlckNsaWVudC0+bV9sb2FkRXJyb3IuZmFpbGluZ1VSTCgpKTsKKyAgICAgICAgZWxzZSBpZiAo IWQtPmZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpLmlzRW1wdHkoKSkKKyAgICAg ICAgICAgIHJldHVybiBRVXJsKGQtPmZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigp KTsKKyAgICB9CiAKICAgICByZXR1cm4gZC0+ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVl c3QoKS51cmwoKTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQv cXQvQ2hhbmdlTG9nCmluZGV4IDVhZmYwMTguLmNiZmY0OTkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9x dC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisy MDA5LTEwLTA4ICBBbnRvbmlvIEdvbWVzICA8dG9uaWtpdG9vQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBiZXR0ZXIgaGFu ZGxlIHBvc3NpYmxlIGVkZ2UgY2FzZXMgb24gcXdlYmZyYW1lOjpyZXF1ZXN0ZWRVcmwgdXNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDIxNgorCisg ICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6OnJlcXVlc3Rl ZFVybCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0Ojpwb3N0UHJvZ3Jlc3NTdGFy dGVkTm90aWZpY2F0aW9uKToKKwogMjAwOS0xMC0wOCAgSmVkcnplaiBOb3dhY2tpICA8amVkcnpl ai5ub3dhY2tpQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFu bi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNw cAppbmRleCA2NjVmMTZhLi43NjJiMzcyIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC00MzIsNiArNDMyLDcgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudFF0OjpyZXZlcnRUb1Byb3Zpc2lvbmFsU3RhdGUoRG9jdW1lbnRMb2FkZXIq KQogdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0Ojpwb3N0UHJvZ3Jlc3NTdGFydGVkTm90aWZpY2F0 aW9uKCkKIHsKICAgICBpZiAobV93ZWJGcmFtZSAmJiBtX2ZyYW1lLT5wYWdlKCkpIHsKKyAgICAg ICAgbV9sb2FkRXJyb3IgPSBSZXNvdXJjZUVycm9yKCk7IC8vIGNsZWFycyB0aGUgcHJldmlvdXMg ZXJyb3IKICAgICAgICAgZW1pdCBsb2FkU3RhcnRlZCgpOwogICAgICAgICBwb3N0UHJvZ3Jlc3NF c3RpbWF0ZUNoYW5nZWROb3RpZmljYXRpb24oKTsKICAgICB9Ci0tIAoxLjYuMC40Cgo= 40925 2009-10-08 20:06:51 -0700 2009-10-11 21:14:24 -0700 patch 0.2 - make use or error.failingURL as much as possible 0001--Qt-better-handle-possible-edge-cases-on-qwebframe.patch text/plain 5052 tonikitoo RnJvbSA4YmUyNGM3YTE1NGY2M2I3NjZiNzBhMzIxNzRlNGVjNzI1NDRiY2U1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVGh1LCA4IE9jdCAyMDA5IDE3OjM4OjQ2IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW1F0 XSBiZXR0ZXIgaGFuZGxlIHBvc3NpYmxlIGVkZ2UgY2FzZXMgb24gcXdlYmZyYW1lOjpyZXF1ZXN0 ZWRVcmwgdXNlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAyMTYK ClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPHRvbmlraXRvb0B3ZWJraXQub3JnPiBvbiAyMDA5LTEw LTA4ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwg Y2FuIGJlIGNhbGxlZCBhdCBhbnkgdGltZSBkdXJpbmcgdGhlIGxvYWQKcHJvY2VzcywgaW5jbHVk aW5nIGR1cmluZyBhIGVycm9yIGhhbmRsaW5nLiBTdWNoIGNhc2UgY2FuIGJlCmFuIHVuc3VjY2Vz c2Z1bCBsb2FkIChhbHRlcm5hdGUgZXJyb3IgcGFnZSBiZWluZyBzZXQpLCBhIHNzbCBlcnJvcgpl eGNlcHRpb24sIGFtb25nIG90aGVycy4gTm93IHdlIGFyZSB1c2luZyBGcmFtZUxvYWRlckNsaWVu dCBtX2xvYWRFcnJvcidzCmZhaWxpbmdVUkwgbW9yZSB3aGVuIGl0IGlzIGF2YWlsYWJsZS4KCkFs c28sIG1fbG9hZEVycm9yIGlzIG5vdyBiZWluZyByZXNldCBhdCBlYWNoIHRoZSBtYWluIGZyYW1l IHN0YXJ0cyBhCmxvYWQsIGluIG9yZGVyIHRvIGF2b2lkIHByZXZpb3VzIGxvYWQgZXJyb3JzIGZv b3RwcmludHMuCgoqIEFwaS9xd2ViZnJhbWUuY3BwOgooUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwp OgoqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgooV2ViQ29yZTo6RnJh bWVMb2FkZXJDbGllbnRRdDo6cG9zdFByb2dyZXNzU3RhcnRlZE5vdGlmaWNhdGlvbik6Ci0tLQog V2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwICAgICAgICAgICAgICAgICAgICAgIHwgICAyMSAr KysrKysrKysrKysrKystLS0tLS0KIFdlYktpdC9xdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMjEgKysrKysrKysrKysrKysrKysrKysrCiBXZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgfCAgICA1ICsrKystCiAzIGZpbGVz IGNoYW5nZWQsIDQwIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3Bw CmluZGV4IDE3NzdjYzguLjNkN2EzMDIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZy YW1lLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTU0MCwxMyArNTQw LDIyIEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogKi8KIFFVcmwgUVdlYkZyYW1lOjpy ZXF1ZXN0ZWRVcmwoKSBjb25zdAogewotICAgIC8vIEluIHRoZSBmb2xsb3dpbmcgZWRnZSBjYXNl cyAod2hlcmUgdGhlIGZhaWxpbmcgZG9jdW1lbnQKLSAgICAvLyBsb2FkZXIgZG9lcyBub3QgZ2V0 IGNvbW1pdGVkIGJ5IHRoZSBmcmFtZSBsb2FkZXIpIGl0IGlzCi0gICAgLy8gc2FmZXIgdG8gcmVs eSBvbiBvdXRnb2luZ1JlZmVycmVyIHRoYW4gb3JpZ2luYWxSZXF1ZXN0LgorICAgIC8vIFRoZXJl IGFyZSBzb21lIHBvc3NpYmxlIGVkZ2UgY2FzZXMgdG8gYmUgaGFuZGxlZCBoZXJlLAorICAgIC8v IGFwYXJ0IGZyb20gY2hlY2tpbmcgaWYgYWN0aXZlRG9jdW1lbnRMb2FkZXIgaXMgdmFsaWQ6Cisg ICAgLy8KKyAgICAvLyAqIE1ldGhvZCBjYW4gYmUgY2FsbGVkIHdoaWxlIHByb2Nlc3NpbmcgYW4g dW5zdWNlc3NmdWwgbG9hZC4KKyAgICAvLyAgIEluIHRoaXMgY2FzZSwgZnJhbWVMb2FkZXJDbGll bnQgd2lsbCBoYXZlIGhvbGQgdGhlIGN1cnJlbnQKKyAgICAvLyAgIGVycm9yIChtX2xvYWRFcnJv ciksIHByb3ZpZGluZyBhIHByb3BlciAnZmFpbGluZ1VSTCcuCisgICAgLy8gKiBUaGUgYWJvdmUg aXMgcHJvYmxlbWF0aWMgKG51bGwnZWQgc3RyaW5nIGluIGZhaWxpbmdVUkwpLAorICAgIC8vICAg dGhlbiB3ZSBmYWxsYmFjayB0byBvdXRnb2luZ1JlZmVycmVyIChpdCBpcyBzYWZlciB0aGFuCisg ICAgLy8gICBvcmlnaW5hbFJlcXVlc3QpLgogICAgIGlmICghZC0+ZnJhbWUtPmxvYWRlcigpLT5h Y3RpdmVEb2N1bWVudExvYWRlcigpCi0gICAgICAgIHx8ICghZC0+ZnJhbWVMb2FkZXJDbGllbnQt Pm1fbG9hZEVycm9yLmlzTnVsbCgpCi0gICAgICAgICYmICAhZC0+ZnJhbWUtPmxvYWRlcigpLT5v dXRnb2luZ1JlZmVycmVyKCkuaXNFbXB0eSgpKSkKLSAgICAgICAgcmV0dXJuIFFVcmwoZC0+ZnJh bWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOworICAgICAgICB8fCAhZC0+ZnJhbWVM b2FkZXJDbGllbnQtPm1fbG9hZEVycm9yLmlzTnVsbCgpKSB7CisgICAgICAgIGlmICghZC0+ZnJh bWVMb2FkZXJDbGllbnQtPm1fbG9hZEVycm9yLmZhaWxpbmdVUkwoKS5pc051bGwoKSkKKyAgICAg ICAgICAgIHJldHVybiBRVXJsKGQtPmZyYW1lTG9hZGVyQ2xpZW50LT5tX2xvYWRFcnJvci5mYWls aW5nVVJMKCkpOworICAgICAgICBlbHNlIGlmICghZC0+ZnJhbWUtPmxvYWRlcigpLT5vdXRnb2lu Z1JlZmVycmVyKCkuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmV0dXJuIFFVcmwoZC0+ZnJhbWUt PmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOworICAgIH0KIAogICAgIHJldHVybiBkLT5m cmFtZS0+bG9hZGVyKCktPm9yaWdpbmFsUmVxdWVzdCgpLnVybCgpOwogfQpkaWZmIC0tZ2l0IGEv V2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNWFmZjAxOC4u Y2Y4M2QzZSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJLaXQvcXQv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMDktMTAtMDggIEFudG9uaW8gR29tZXMgIDx0 b25pa2l0b29Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbUXRdIGJldHRlciBoYW5kbGUgcG9zc2libGUgZWRnZSBjYXNlcyBvbiBx d2ViZnJhbWU6OnJlcXVlc3RlZFVybCB1c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTMwMjE2CisKKyAgICAgICAgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRV cmwgY2FuIGJlIGNhbGxlZCBhdCBhbnkgdGltZSBkdXJpbmcgdGhlIGxvYWQKKyAgICAgICAgcHJv Y2VzcywgaW5jbHVkaW5nIGR1cmluZyBhIGVycm9yIGhhbmRsaW5nLiBTdWNoIGNhc2UgY2FuIGJl CisgICAgICAgIGFuIHVuc3VjY2Vzc2Z1bCBsb2FkIChhbHRlcm5hdGUgZXJyb3IgcGFnZSBiZWlu ZyBzZXQpLCBhIHNzbCBlcnJvcgorICAgICAgICBleGNlcHRpb24sIGFtb25nIG90aGVycy4gTm93 IHdlIGFyZSB1c2luZyBGcmFtZUxvYWRlckNsaWVudCBtX2xvYWRFcnJvcidzCisgICAgICAgIGZh aWxpbmdVUkwgbW9yZSB3aGVuIGl0IGlzIGF2YWlsYWJsZS4KKworICAgICAgICBBbHNvLCBtX2xv YWRFcnJvciBpcyBub3cgYmVpbmcgcmVzZXQgYXQgZWFjaCB0aGUgbWFpbiBmcmFtZSBzdGFydHMg YQorICAgICAgICBsb2FkLCBpbiBvcmRlciB0byBhdm9pZCBwcmV2aW91cyBsb2FkIGVycm9ycyBm b290cHJpbnRzLgorCisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2Vi RnJhbWU6OnJlcXVlc3RlZFVybCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0Ojpw b3N0UHJvZ3Jlc3NTdGFydGVkTm90aWZpY2F0aW9uKToKKwogMjAwOS0xMC0wOCAgSmVkcnplaiBO b3dhY2tpICA8amVkcnplai5ub3dhY2tpQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmNwcAppbmRleCA2NjVmMTZhLi5mNzlkZDk1IDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC0zNzgsNyArMzc4 LDggQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpkaXNwYXRjaERpZEZpbmlzaExvYWQoKQog ICAgIGlmIChkdW1wRnJhbWVMb2FkZXJDYWxsYmFja3MpCiAgICAgICAgIHByaW50ZigiJXMgLSBk aWRGaW5pc2hMb2FkRm9yRnJhbWVcbiIsIHFQcmludGFibGUoZHJ0RGVzY3JpcHRpb25TdWl0YWJs ZUZvclRlc3RSZXN1bHQobV9mcmFtZSkpKTsKIAotICAgIG1fbG9hZEVycm9yID0gUmVzb3VyY2VF cnJvcigpOyAvLyBjbGVhcnMgdGhlIHByZXZpb3VzIGVycm9yCisgICAgLy8gQ2xlYXJzIHRoZSBw cmV2aW91cyBlcnJvci4KKyAgICBtX2xvYWRFcnJvciA9IFJlc291cmNlRXJyb3IoKTsKIAogICAg IGlmICghbV93ZWJGcmFtZSkKICAgICAgICAgcmV0dXJuOwpAQCAtNDMyLDYgKzQzMyw4IEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6cmV2ZXJ0VG9Qcm92aXNpb25hbFN0YXRlKERvY3VtZW50 TG9hZGVyKikKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRRdDo6cG9zdFByb2dyZXNzU3RhcnRlZE5v dGlmaWNhdGlvbigpCiB7CiAgICAgaWYgKG1fd2ViRnJhbWUgJiYgbV9mcmFtZS0+cGFnZSgpKSB7 CisgICAgICAgIC8vIEEgbmV3IGxvYWQgc3RhcnRzLCBzbyBsZXRzIGNsZWFyIHRoZSBwcmV2aW91 cyBlcnJvci4KKyAgICAgICAgbV9sb2FkRXJyb3IgPSBSZXNvdXJjZUVycm9yKCk7CiAgICAgICAg IGVtaXQgbG9hZFN0YXJ0ZWQoKTsKICAgICAgICAgcG9zdFByb2dyZXNzRXN0aW1hdGVDaGFuZ2Vk Tm90aWZpY2F0aW9uKCk7CiAgICAgfQotLSAKMS42LjAuNAoK 41017 2009-10-11 21:14:24 -0700 2009-10-15 10:20:14 -0700 (committed in r49497) patch 0.3 - make use or error.failingURL as much as possible 0001--Qt-better-handle-possible-edge-cases-on-qwebframe.patch text/plain 5601 tonikitoo RnJvbSBiM2M2NGI4NTg2MGIyMmRkZTY2Mjg5NDZmZDljMmM3YzBkMGY5ODJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVGh1LCA4IE9jdCAyMDA5IDE3OjM4OjQ2IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW1F0 XSBiZXR0ZXIgaGFuZGxlIHBvc3NpYmxlIGVkZ2UgY2FzZXMgb24gcXdlYmZyYW1lOjpyZXF1ZXN0 ZWRVcmwgdXNlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAyMTYK ClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPHRvbmlraXRvb0B3ZWJraXQub3JnPiBvbiAyMDA5LTEw LTA4ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwg Y2FuIGJlIGNhbGxlZCBhdCBhbnkgdGltZSBkdXJpbmcgdGhlIGxvYWQKcHJvY2VzcywgaW5jbHVk aW5nOgoKKiBBbiBlcnJvciBoYW5kbGluZyAod2hlcmVhcyBhbiBhbHRlcm5hdGUgZXJyb3IgcGFn ZSBmb3IgdW5zdWNjZXNzZnVsCiAgbG9hZCBpcyBiZWluZyBzZXQpOwoqIEEgc3NsIGVycm9yIGV4 Y2VwdGlvbiBjYWxsOwoqIE5hdmlnYXRpb24gbm90aWZpY2F0aW9ucyAodGl0bGVDaGFuZ2VkLCB1 cmxDaGFuZ2VkLCBwcm9ncmVzc2VzLAogIGFkZEhpc3RvcnlFbnRyeSwgZXRjKTsKKiBBbW9uZyBv dGhlcnMuCgpUaGlzIHBhdGNoIG1ha2VzIHJlcXVlc3RVcmwgY2FsbHMgdG8gZmFsbHNiYWNrIHRv IEZyYW1lTG9hZGVyQ2xpZW50Cm1fbG9hZEVycm9yJ3MgZmFpbGluZ1VSTCB3aGVuIGFuIGVycm9y IGhhcyBvY2N1cnJlZCwgdW5sZXNzIGl0IGlzCm51bGwvZW1wdHkuCgpBbHNvLCBtX2xvYWRFcnJv ciBpcyBub3cgYmVpbmcgcmVzZXQgYXQgZWFjaCB0aGUgbWFpbiBmcmFtZSBzdGFydHMgYQpsb2Fk LCBpbiBvcmRlciB0byBhdm9pZCBwcmV2aW91cyBsb2FkIGVycm9ycyBmb290cHJpbnRzLgoKKiBB cGkvcXdlYmZyYW1lLmNwcDoKKFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJsKToKKiBXZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcDoKKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50 UXQ6OnBvc3RQcm9ncmVzc1N0YXJ0ZWROb3RpZmljYXRpb24pOgotLS0KIFdlYktpdC9xdC9BcGkv cXdlYmZyYW1lLmNwcCAgICAgICAgICAgICAgICAgICAgICB8ICAgMjkgKysrKysrKysrKysrKysr LS0tLS0tLQogV2ViS2l0L3F0L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgICAyOSArKysrKysrKysrKysrKysrKysrKysrCiBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgfCAgICA1ICsrKy0KIDMgZmlsZXMgY2hhbmdlZCwgNTMg aW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0Fw aS9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCmluZGV4IGQ3MTBk Y2YuLmQyYzMyNGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKQEAgLTU0MCwxNSArNTQwLDI2IEBAIFFVcmwg UVdlYkZyYW1lOjp1cmwoKSBjb25zdAogKi8KIFFVcmwgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwo KSBjb25zdAogewotICAgIC8vIEluIHRoZSBmb2xsb3dpbmcgZWRnZSBjYXNlcyAod2hlcmUgdGhl IGZhaWxpbmcgZG9jdW1lbnQKLSAgICAvLyBsb2FkZXIgZG9lcyBub3QgZ2V0IGNvbW1pdGVkIGJ5 IHRoZSBmcmFtZSBsb2FkZXIpIGl0IGlzCi0gICAgLy8gc2FmZXIgdG8gcmVseSBvbiBvdXRnb2lu Z1JlZmVycmVyIHRoYW4gb3JpZ2luYWxSZXF1ZXN0LgotICAgIGlmICghZC0+ZnJhbWUtPmxvYWRl cigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpCi0gICAgICAgIHx8ICghZC0+ZnJhbWVMb2FkZXJD bGllbnQtPm1fbG9hZEVycm9yLmlzTnVsbCgpCi0gICAgICAgICYmICAhZC0+ZnJhbWUtPmxvYWRl cigpLT5vdXRnb2luZ1JlZmVycmVyKCkuaXNFbXB0eSgpKSkKLSAgICAgICAgcmV0dXJuIFFVcmwo ZC0+ZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkpOwotCi0gICAgcmV0dXJuIGQt PmZyYW1lLT5sb2FkZXIoKS0+b3JpZ2luYWxSZXF1ZXN0KCkudXJsKCk7CisgICAgLy8gVGhlcmUg YXJlIHNvbWUgcG9zc2libGUgZWRnZSBjYXNlcyB0byBiZSBoYW5kbGVkIGhlcmUsCisgICAgLy8g YXBhcnQgZnJvbSBjaGVja2luZyBpZiBhY3RpdmVEb2N1bWVudExvYWRlciBpcyB2YWxpZDoKKyAg ICAvLworICAgIC8vICogTWV0aG9kIGNhbiBiZSBjYWxsZWQgd2hpbGUgcHJvY2Vzc2luZyBhbiB1 bnN1Y2Vzc2Z1bCBsb2FkLgorICAgIC8vICAgSW4gdGhpcyBjYXNlLCBmcmFtZUxvYWRlckNsaWVu dCB3aWxsIGhvbGQgdGhlIGN1cnJlbnQgZXJyb3IKKyAgICAvLyAgIChtX2xvYWRFcnJvciksIGFu ZCB3ZSB3aWxsIG1ha2UgdXNlIG9mIGl0IHRvIHJlY292ZXIgdGhlICdmYWlsaW5nVVJMJy4KKyAg ICAvLyAqIElmIHRoZSAnZmFpbGluZ1VSTCcgaG9sZHMgYSBudWxsJ2VkIHN0cmluZyB0aG91Z2gs IHdlIGZhbGxiYWNrCisgICAgLy8gICB0byAnb3V0Z29pbmdSZWZlcnJlcicgKGl0IHlldCBpcyBz YWZlciB0aGFuIG9yaWdpbmFsUmVxdWVzdCkuCisgICAgRnJhbWVMb2FkZXIqIGxvYWRlciA9IGQt PmZyYW1lLT5sb2FkZXIoKTsKKyAgICBGcmFtZUxvYWRlckNsaWVudFF0KiBsb2FkZXJDbGllbnQg PSBkLT5mcmFtZUxvYWRlckNsaWVudDsKKworICAgIGlmICghbG9hZGVyLT5hY3RpdmVEb2N1bWVu dExvYWRlcigpCisgICAgICAgIHx8ICFsb2FkZXJDbGllbnQtPm1fbG9hZEVycm9yLmlzTnVsbCgp KSB7CisgICAgICAgIGlmICghbG9hZGVyQ2xpZW50LT5tX2xvYWRFcnJvci5mYWlsaW5nVVJMKCku aXNOdWxsKCkpCisgICAgICAgICAgICByZXR1cm4gUVVybChsb2FkZXJDbGllbnQtPm1fbG9hZEVy cm9yLmZhaWxpbmdVUkwoKSk7CisgICAgICAgIGVsc2UgaWYgKCFsb2FkZXItPm91dGdvaW5nUmVm ZXJyZXIoKS5pc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm4gUVVybChsb2FkZXItPm91dGdv aW5nUmVmZXJyZXIoKSk7CisgICAgfQorCisgICAgcmV0dXJuIGxvYWRlci0+b3JpZ2luYWxSZXF1 ZXN0KCkudXJsKCk7CiB9CiAvKiEKICAgICBcc2luY2UgNC42CmRpZmYgLS1naXQgYS9XZWJLaXQv cXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBhMWU4MWE5Li44YTVhNDMw IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwzMiBAQAorMjAwOS0xMC0wOCAgQW50b25pbyBHb21lcyAgPHRvbmlraXRv b0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gYmV0dGVyIGhhbmRsZSBwb3NzaWJsZSBlZGdlIGNhc2VzIG9uIHF3ZWJmcmFt ZTo6cmVxdWVzdGVkVXJsIHVzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzAyMTYKKworICAgICAgICBRV2ViRnJhbWU6OnJlcXVlc3RlZFVybCBjYW4g YmUgY2FsbGVkIGF0IGFueSB0aW1lIGR1cmluZyB0aGUgbG9hZAorICAgICAgICBwcm9jZXNzLCBp bmNsdWRpbmc6CisKKyAgICAgICAgKiBBbiBlcnJvciBoYW5kbGluZyAod2hlcmVhcyBhbiBhbHRl cm5hdGUgZXJyb3IgcGFnZSBmb3IgdW5zdWNjZXNzZnVsCisgICAgICAgICAgbG9hZCBpcyBiZWlu ZyBzZXQpOworICAgICAgICAqIEEgc3NsIGVycm9yIGV4Y2VwdGlvbiBjYWxsOworICAgICAgICAq IER1cmluZyBuYXZpZ2F0aW9uIG5vdGlmaWNhdGlvbnMvY2FsbGJhY2tzICh0aXRsZUNoYW5nZWQs IHVybENoYW5nZWQsCisgICAgICAgICAgcHJvZ3Jlc3NlcywgYWRkSGlzdG9yeUVudHJ5LCBldGMp OworICAgICAgICAqIEFtb25nIG90aGVycy4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2VzIHJl cXVlc3RVcmwgY2FsbHMgdG8gZmFsbHNiYWNrIHRvIEZyYW1lTG9hZGVyQ2xpZW50CisgICAgICAg IG1fbG9hZEVycm9yJ3MgZmFpbGluZ1VSTCB3aGVuIGFuIGVycm9yIGhhcyBvY2N1cnJlZCwgdW5s ZXNzIGl0IGlzCisgICAgICAgIG51bGwvZW1wdHkuCisKKyAgICAgICAgQWxzbywgbV9sb2FkRXJy b3IgaXMgbm93IGJlaW5nIHJlc2V0IGF0IGVhY2ggdGhlIG1haW4gZnJhbWUgc3RhcnRzIGEKKyAg ICAgICAgbG9hZCwgaW4gb3JkZXIgdG8gYXZvaWQgcHJldmlvdXMgbG9hZCBlcnJvcnMgZm9vdHBy aW50cy4KKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdlYkZyYW1l OjpyZXF1ZXN0ZWRVcmwpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6cG9zdFBy b2dyZXNzU3RhcnRlZE5vdGlmaWNhdGlvbik6CisKIDIwMDktMTAtMDggIEFkYW0gQmFydGggIDxh YmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNw cCBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAppbmRl eCA2NjVmMTZhLi5mNzlkZDk1IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwCkBAIC0zNzgsNyArMzc4LDggQEAgdm9pZCBGcmFtZUxvYWRl ckNsaWVudFF0OjpkaXNwYXRjaERpZEZpbmlzaExvYWQoKQogICAgIGlmIChkdW1wRnJhbWVMb2Fk ZXJDYWxsYmFja3MpCiAgICAgICAgIHByaW50ZigiJXMgLSBkaWRGaW5pc2hMb2FkRm9yRnJhbWVc biIsIHFQcmludGFibGUoZHJ0RGVzY3JpcHRpb25TdWl0YWJsZUZvclRlc3RSZXN1bHQobV9mcmFt ZSkpKTsKIAotICAgIG1fbG9hZEVycm9yID0gUmVzb3VyY2VFcnJvcigpOyAvLyBjbGVhcnMgdGhl IHByZXZpb3VzIGVycm9yCisgICAgLy8gQ2xlYXJzIHRoZSBwcmV2aW91cyBlcnJvci4KKyAgICBt X2xvYWRFcnJvciA9IFJlc291cmNlRXJyb3IoKTsKIAogICAgIGlmICghbV93ZWJGcmFtZSkKICAg ICAgICAgcmV0dXJuOwpAQCAtNDMyLDYgKzQzMyw4IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRR dDo6cmV2ZXJ0VG9Qcm92aXNpb25hbFN0YXRlKERvY3VtZW50TG9hZGVyKikKIHZvaWQgRnJhbWVM b2FkZXJDbGllbnRRdDo6cG9zdFByb2dyZXNzU3RhcnRlZE5vdGlmaWNhdGlvbigpCiB7CiAgICAg aWYgKG1fd2ViRnJhbWUgJiYgbV9mcmFtZS0+cGFnZSgpKSB7CisgICAgICAgIC8vIEEgbmV3IGxv YWQgc3RhcnRzLCBzbyBsZXRzIGNsZWFyIHRoZSBwcmV2aW91cyBlcnJvci4KKyAgICAgICAgbV9s b2FkRXJyb3IgPSBSZXNvdXJjZUVycm9yKCk7CiAgICAgICAgIGVtaXQgbG9hZFN0YXJ0ZWQoKTsK ICAgICAgICAgcG9zdFByb2dyZXNzRXN0aW1hdGVDaGFuZ2VkTm90aWZpY2F0aW9uKCk7CiAgICAg fQotLSAKMS42LjAuNAoK