34167 2010-01-26 07:56:31 -0800 [Qt] DRT WebHistory support 2010-01-27 05:52:05 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 1 diegohcg webkit-unassigned commit-queue hausmann kenneth ossy tonikitoo oldest_to_newest 184595 0 diegohcg 2010-01-26 07:56:31 -0800 Activate WebHistory support in Qt DRT. Implement the keepWebHistory() and webHistoryItemCount() in LayoutTestController LayoutTests: http/tests/history 184597 1 47412 diegohcg 2010-01-26 08:23:07 -0800 Created attachment 47412 Activate history in DRT Possible way to activate the history in Qt DRT 184613 2 diegohcg 2010-01-26 09:36:32 -0800 The tests is not passing with the patch above (47412) because in the redirect file page (LayoutTests/http/tests/history/resources/redirect-target.html) the webHistoryItemCount is increased in one according the code below. function testHistoryItemCount() { var expected = parseInt(location.hash.slice(1)); var actual = layoutTestController.webHistoryItemCount + 1; // Add one to include the referring page, which loaded before we started recording history. if (actual === expected) log("PASS: History item count should be " + expected + " and is."); else log("FAIL: History item count should be " + expected + " but instead is " + actual + "."); } In our case is not necessary to add one to webHistoryItemCount because QWebHistory, created in QWebPage, records the referred page. One possible way to make the tests succeed is use specific expected files for Qt port use in these tests. Other ways coukd be: decrease in one the return of layoutTestController.webHistoryItemCount(); use the backItems() size; or limit the maximum count of QWebHistory. Someone has any suggestion or comment of the the best way to solve it? 184615 3 tonikitoo 2010-01-26 09:42:43 -0800 > In our case is not necessary to add one to webHistoryItemCount because > QWebHistory, created in QWebPage, records the referred page. > > One possible way to make the tests succeed is use specific expected files for > Qt port use in these tests. I vote for this option. > > Other ways coukd be: decrease in one the return of > layoutTestController.webHistoryItemCount(); use the backItems() size; or limit > the maximum count of QWebHistory. This way, we would be adapting our implementation to match a test result. @kenneth, simon: thoughts ? 184616 4 kenneth 2010-01-26 09:46:13 -0800 (In reply to comment #3) > > In our case is not necessary to add one to webHistoryItemCount because > > QWebHistory, created in QWebPage, records the referred page. > > > > One possible way to make the tests succeed is use specific expected files for > > Qt port use in these tests. > > I vote for this option. Expected results saying FAIL. That doesn't sound good. Better just add 1 to the result. 184618 5 diegohcg 2010-01-26 09:55:29 -0800 (In reply to comment #4) > (In reply to comment #3) > > > In our case is not necessary to add one to webHistoryItemCount because > > > QWebHistory, created in QWebPage, records the referred page. > > > > > > One possible way to make the tests succeed is use specific expected files for > > > Qt port use in these tests. > > > > I vote for this option. > > Expected results saying FAIL. That doesn't sound good. Better just add 1 to the > result. Kenneth, you mean add 1 in the expected file or when the method returns? 184652 6 47427 diegohcg 2010-01-26 11:28:25 -0800 Created attachment 47427 Proposed patch to pass history tests With this patch the following tests are passing now: http/tests/history/redirect-js-form-submit-2-seconds.html http/tests/history/redirect-js-location-2-seconds.html http/tests/history/redirect-js-location-assign-before-load.html http/tests/history/redirect-js-location-href-2-seconds.html http/tests/history/redirect-js-location-href-0-seconds.html http/tests/history/redirect-js-location-replace-2-seconds.html http/tests/history/redirect-js-document-location-before-load.html http/tests/history/redirect-js-location-assign-0-seconds.html http/tests/history/redirect-js-location-0-seconds.html http/tests/history/redirect-meta-refresh-2-seconds.html http/tests/history/redirect-js-document-location-2-seconds.html http/tests/history/redirect-js-location-replace-before-load.html http/tests/history/redirect-js-form-submit-0-seconds.html http/tests/history/redirect-js-location-before-load.html http/tests/history/redirect-js-location-href-before-load.html http/tests/history/redirect-js-form-submit-before-load.html http/tests/history/redirect-js-document-location-0-seconds.html http/tests/history/redirect-js-location-assign-2-seconds.html http/tests/history/redirect-js-location-replace-0-seconds.html http/tests/history/redirect-meta-refresh-0-seconds.html http/tests/history/redirect-301.pl http/tests/history/redirect-303.pl http/tests/history/redirect-200-refresh-2-seconds.pl http/tests/history/redirect-307.pl http/tests/history/redirect-302.pl http/tests/history/redirect-200-refresh-0-seconds.pl 184653 7 47427 kenneth 2010-01-26 11:29:39 -0800 Comment on attachment 47427 Proposed patch to pass history tests Please don't mark your own patches as r+ 184654 8 47427 kenneth 2010-01-26 11:31:39 -0800 Comment on attachment 47427 Proposed patch to pass history tests > + // Subtract one here as out QWebHistory::count() includes the actual page, > + // which is not considered in the DRT tests. our, not out > + return m_webHistory->count() - 1; > +} > + > void LayoutTestController::keepWebHistory() > { > - // FIXME: implement > + m_webHistory = m_drt->webPage()->history(); > } 184655 9 47428 diegohcg 2010-01-26 11:35:14 -0800 Created attachment 47428 Proposed patch v0.2 Fixed typo 184657 10 47429 diegohcg 2010-01-26 11:44:40 -0800 Created attachment 47429 Proposed patch v0.3 return -1 if web history doesn't exists 184929 11 47429 commit-queue 2010-01-26 21:21:17 -0800 Comment on attachment 47429 Proposed patch v0.3 Clearing flags on attachment: 47429 Committed r53895: <http://trac.webkit.org/changeset/53895> 184930 12 commit-queue 2010-01-26 21:21:23 -0800 All reviewed patches have been landed. Closing bug. 184971 13 ossy 2010-01-26 23:56:00 -0800 There are 4 failing tests on buildbot after http://trac.webkit.org/changeset/53895 http/tests/history/redirect-301.pl http/tests/history/redirect-302.pl http/tests/history/redirect-303.pl http/tests/history/redirect-307.pl Skipped them by http://trac.webkit.org/changeset/53906 184972 14 ossy 2010-01-26 23:57:20 -0800 detailed results: http://build.webkit.org/results/Qt%20Linux%20Release/r53905%20%286565%29/results.html 185036 15 diegohcg 2010-01-27 04:46:10 -0800 (In reply to comment #14) > detailed results: > http://build.webkit.org/results/Qt%20Linux%20Release/r53905%20%286565%29/results.html I'm taking a look 185047 16 diegohcg 2010-01-27 05:28:11 -0800 For some reason LayoutTestController is not being instatiated in these tests. I'm checking it now! 185051 17 diegohcg 2010-01-27 05:43:18 -0800 (In reply to comment #16) > For some reason LayoutTestController is not being instatiated in these tests. > I'm checking it now! Actually the LayoutTestController is being instantiated. The keepWebHistory() is not being called because the check: if (window.layoutTestController) { layoutTestController.keepWebHistory(); layoutTestController.waitUntilDone(); } is not passing. 185054 18 diegohcg 2010-01-27 05:51:22 -0800 (In reply to comment #17) > (In reply to comment #16) > > For some reason LayoutTestController is not being instatiated in these tests. > > I'm checking it now! > > Actually the LayoutTestController is being instantiated. The keepWebHistory() > is not being called because the check: > > if (window.layoutTestController) { > layoutTestController.keepWebHistory(); > layoutTestController.waitUntilDone(); > } > > is not passing. Created another bug: https://bugs.webkit.org/show_bug.cgi?id=34212 to investigate it. So, closing it 47412 2010-01-26 08:23:07 -0800 2010-01-26 11:35:14 -0800 Activate history in DRT 0001-Implement-web-history-in-qt-DRT.diff text/plain 2491 diegohcg RnJvbSBlZWRkM2Y4N2QwZjc3ZGM3YWMxODU5NWFjNzViYThmZDgzNzc4Njg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogV2VkLCAyMCBKYW4gMjAxMCAxODo0NToyMSAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIEltcGxlbWVudCB3ZWIgaGlzdG9yeSBpbiBxdCBEUlQKCi0tLQogLi4uL0R1bXBSZW5k ZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwICAgfCAgIDExICsrKysrKysrKyst CiAuLi4vRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oICAgICB8ICAg IDMgKysrCiAyIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENv bnRyb2xsZXJRdC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0 Q29udHJvbGxlclF0LmNwcAppbmRleCA3NjE2NWY2Li5lYjdkMjQxIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcAorKysg Yi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNw cApAQCAtNzEsNiArNzEsNyBAQCB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpyZXNldCgpCiAg ICAgbV90b3BMb2FkaW5nRnJhbWUgPSAwOwogICAgIG1fd2FpdEZvclBvbGljeSA9IGZhbHNlOwog ICAgIG1faGFuZGxlRXJyb3JQYWdlcyA9IGZhbHNlOworICAgIG1fd2ViSGlzdG9yeSA9IDA7CiAg ICAgcXRfZHVtcF9lZGl0aW5nX2NhbGxiYWNrcyhmYWxzZSk7CiAgICAgcXRfZHVtcF9yZXNvdXJj ZV9sb2FkX2NhbGxiYWNrcyhmYWxzZSk7CiB9CkBAIC0xMzEsOSArMTMyLDE3IEBAIFFTdHJpbmcg TGF5b3V0VGVzdENvbnRyb2xsZXI6OmNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKGNvbnN0IFFT dHJpbmcmIGlkKQogICAgIHJldHVybiBxdF9kcnRfY291bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQo bV9kcnQtPndlYlBhZ2UoKS0+bWFpbkZyYW1lKCksIGlkKTsKIH0KIAoraW50IExheW91dFRlc3RD b250cm9sbGVyOjp3ZWJIaXN0b3J5SXRlbUNvdW50KCkKK3sKKyAgICBpZiAoIW1fd2ViSGlzdG9y eSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gbV93ZWJIaXN0b3J5LT5jb3VudCgp OworfQorCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjprZWVwV2ViSGlzdG9yeSgpCiB7Ci0g ICAgLy8gRklYTUU6IGltcGxlbWVudAorICAgIG1fd2ViSGlzdG9yeSA9IG1fZHJ0LT53ZWJQYWdl KCktPmhpc3RvcnkoKTsKIH0KIAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bm90aWZ5RG9u ZSgpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0 Q29udHJvbGxlclF0LmggYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0 Q29udHJvbGxlclF0LmgKaW5kZXggMjM0Y2VkNS4uZDU1MDY4ZiAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oCisrKyBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaApAQCAt NTEsNiArNTEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiB9CiBjbGFzcyBMYXlvdXRUZXN0Q29u dHJvbGxlciA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVAorICAgIFFfUFJPUEVSVFko aW50IHdlYkhpc3RvcnlJdGVtQ291bnQgUkVBRCB3ZWJIaXN0b3J5SXRlbUNvdW50KQogcHVibGlj OgogICAgIExheW91dFRlc3RDb250cm9sbGVyKFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlKiBkcnQp OwogCkBAIC04Miw2ICs4Myw3IEBAIHB1YmxpYyBzbG90czoKICAgICB2b2lkIHNldENhbk9wZW5X aW5kb3dzKCkgeyBtX2Nhbk9wZW5XaW5kb3dzID0gdHJ1ZTsgfQogICAgIHZvaWQgd2FpdFVudGls RG9uZSgpOwogICAgIFFTdHJpbmcgY291bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQoY29uc3QgUVN0 cmluZyYgaWQpOworICAgIGludCB3ZWJIaXN0b3J5SXRlbUNvdW50KCk7CiAgICAgdm9pZCBrZWVw V2ViSGlzdG9yeSgpOwogICAgIHZvaWQgbm90aWZ5RG9uZSgpOwogICAgIHZvaWQgZHVtcEJhY2tG b3J3YXJkTGlzdCgpIHsgbV9kdW1wQmFja0ZvcndhcmRMaXN0ID0gdHJ1ZTsgfQpAQCAtMTU4LDYg KzE2MCw3IEBAIHByaXZhdGU6CiAgICAgUUJhc2ljVGltZXIgbV90aW1lb3V0VGltZXI7CiAgICAg UVdlYkZyYW1lKiBtX3RvcExvYWRpbmdGcmFtZTsKICAgICBXZWJDb3JlOjpEdW1wUmVuZGVyVHJl ZSogbV9kcnQ7CisgICAgUVdlYkhpc3RvcnkqIG1fd2ViSGlzdG9yeTsKIH07CiAKICNlbmRpZiAv LyBMYXlvdXRUZXN0Q29udHJvbGxlclF0X2gKLS0gCjEuNi4zLjMKCg== 47427 2010-01-26 11:28:25 -0800 2010-01-26 11:35:14 -0800 Proposed patch to pass history tests 0001-Qt-DRT-Implement-Web-History-support.diff text/plain 5948 diegohcg RnJvbSAyMDYzODViZTI2OTE0MjIxY2IxZmNhN2QyMjBlMjJhMGM3MGZlYzNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogVHVlLCAyNiBKYW4gMjAxMCAxNToxMDo0NSAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFtRdF0gRFJUIEltcGxlbWVudCBXZWIgSGlzdG9yeSBzdXBwb3J0LgoKUHJvdmlkZSBX ZWIgSGlzdG9yeSBzdXBwb3J0IGluIExheW91dFRlc3RDb250cm9sbGVyCgpUZXN0czoKCmh0dHAv dGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1mb3JtLXN1Ym1pdC0yLXNlY29uZHMuaHRtbApodHRw L3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtanMtbG9jYXRpb24tMi1zZWNvbmRzLmh0bWwKaHR0cC90 ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWxvY2F0aW9uLWFzc2lnbi1iZWZvcmUtbG9hZC5odG1s Cmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLTItc2Vjb25kcy5o dG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLTAtc2Vjb25k cy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1yZXBsYWNlLTIt c2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1kb2N1bWVudC1sb2Nh dGlvbi1iZWZvcmUtbG9hZC5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2Nh dGlvbi1hc3NpZ24tMC1zZWNvbmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpz LWxvY2F0aW9uLTAtc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1tZXRh LXJlZnJlc2gtMi1zZWNvbmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWRv Y3VtZW50LWxvY2F0aW9uLTItc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVj dC1qcy1sb2NhdGlvbi1yZXBsYWNlLWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5 L3JlZGlyZWN0LWpzLWZvcm0tc3VibWl0LTAtc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9y eS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1iZWZvcmUtbG9hZC5odG1sCmh0dHAvdGVzdHMvaGlzdG9y eS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0cy9o aXN0b3J5L3JlZGlyZWN0LWpzLWZvcm0tc3VibWl0LWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0 cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWRvY3VtZW50LWxvY2F0aW9uLTAtc2Vjb25kcy5odG1sCmh0 dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1hc3NpZ24tMi1zZWNvbmRzLmh0 bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWxvY2F0aW9uLXJlcGxhY2UtMC1zZWNv bmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LW1ldGEtcmVmcmVzaC0wLXNlY29u ZHMuaHRtbApodHRwL3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtMzAxLnBsCmh0dHAvdGVzdHMvaGlz dG9yeS9yZWRpcmVjdC0zMDMucGwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LTIwMC1yZWZy ZXNoLTItc2Vjb25kcy5wbApodHRwL3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtMzA3LnBsCmh0dHAv dGVzdHMvaGlzdG9yeS9yZWRpcmVjdC0zMDIucGwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0 LTIwMC1yZWZyZXNoLTAtc2Vjb25kcy5wbAotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgOSArKysrKysrKysKIExheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgICAgICAgICAgIHwgICAgMSAtCiBXZWJLaXRUb29s cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrKysr KysrKwogLi4uL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwICAg fCAgIDEzICsrKysrKysrKysrKy0KIC4uLi9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29u dHJvbGxlclF0LmggICAgIHwgICAgMyArKysKIDUgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9u cygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTUxMDJmNC4uOTM5NjJjOCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDEwLTAxLTI2ICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6 QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBEUlQgV2ViSGlzdG9yeSBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2NworCisgICAgICAgICogcGxhdGZvcm0v cXQvU2tpcHBlZDoKKwogMjAxMC0wMS0yNiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBw bGUuY29tPgogCiAgICAgICAgIE9uZSBtb3JlIGF0dGVtcHQgdG8gZ2V0IEdUSyB2ZXJzaW9uIHRv IHBhc3MuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCAwYTVmMGYzLi4wM2M4MzEzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTE4LDcgKzE4LDYgQEAgc3ZnL2JhdGlrL2ZpbHRlcnMv ZmVUaWxlLnN2ZwogaHR0cC90ZXN0cy9hcHBjYWNoZQogaHR0cC90ZXN0cy93ZWJhcmNoaXZlCiBo dHRwL3Rlc3RzL2dsb2JhbGhpc3RvcnkKLWh0dHAvdGVzdHMvaGlzdG9yeQogaHR0cC90ZXN0cy9p bmNyZW1lbnRhbAogaHR0cC90ZXN0cy9tZWRpYQogaHR0cC90ZXN0cy93ZWJhcmNoaXZlCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5k ZXggNDQyN2E5ZC4uMWE5NjNjMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisr KyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAxLTI2ICBE aWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBEUlQgV2ViSGlzdG9y eSBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zNDE2NworCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xs ZXJRdC5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6cmVzZXQpOgorICAgICAg ICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQpOgorICAgICAgICAo TGF5b3V0VGVzdENvbnRyb2xsZXI6OmtlZXBXZWJIaXN0b3J5KToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0Lmg6CisKIDIwMTAtMDEtMjUgIENocmlz IEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2hpbmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCmluZGV4IDc2MTY1ZjYuLmUxMzMwNTEg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250 cm9sbGVyUXQuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRl c3RDb250cm9sbGVyUXQuY3BwCkBAIC03MSw2ICs3MSw3IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRy b2xsZXI6OnJlc2V0KCkKICAgICBtX3RvcExvYWRpbmdGcmFtZSA9IDA7CiAgICAgbV93YWl0Rm9y UG9saWN5ID0gZmFsc2U7CiAgICAgbV9oYW5kbGVFcnJvclBhZ2VzID0gZmFsc2U7CisgICAgbV93 ZWJIaXN0b3J5ID0gMDsKICAgICBxdF9kdW1wX2VkaXRpbmdfY2FsbGJhY2tzKGZhbHNlKTsKICAg ICBxdF9kdW1wX3Jlc291cmNlX2xvYWRfY2FsbGJhY2tzKGZhbHNlKTsKIH0KQEAgLTEzMSw5ICsx MzIsMTkgQEAgUVN0cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6Y291bnRlclZhbHVlRm9yRWxl bWVudEJ5SWQoY29uc3QgUVN0cmluZyYgaWQpCiAgICAgcmV0dXJuIHF0X2RydF9jb3VudGVyVmFs dWVGb3JFbGVtZW50QnlJZChtX2RydC0+d2ViUGFnZSgpLT5tYWluRnJhbWUoKSwgaWQpOwogfQog CitpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQoKQoreworICAg IGlmICghbV93ZWJIaXN0b3J5KQorICAgICAgICByZXR1cm4gMDsKKworICAgIC8vIFN1YnRyYWN0 IG9uZSBoZXJlIGFzIG91dCBRV2ViSGlzdG9yeTo6Y291bnQoKSBpbmNsdWRlcyB0aGUgYWN0dWFs IHBhZ2UsCisgICAgLy8gd2hpY2ggaXMgbm90IGNvbnNpZGVyZWQgaW4gdGhlIERSVCB0ZXN0cy4K KyAgICByZXR1cm4gbV93ZWJIaXN0b3J5LT5jb3VudCgpIC0gMTsKK30KKwogdm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6a2VlcFdlYkhpc3RvcnkoKQogewotICAgIC8vIEZJWE1FOiBpbXBsZW1l bnQKKyAgICBtX3dlYkhpc3RvcnkgPSBtX2RydC0+d2ViUGFnZSgpLT5oaXN0b3J5KCk7CiB9CiAK IHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6Om5vdGlmeURvbmUoKQpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oIGIvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oCmluZGV4 IDIzNGNlZDUuLmQ1NTA2OGYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmgKQEAgLTUxLDYgKzUxLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogfQogY2xhc3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgOiBwdWJsaWMgUU9i amVjdCB7CiAgICAgUV9PQkpFQ1QKKyAgICBRX1BST1BFUlRZKGludCB3ZWJIaXN0b3J5SXRlbUNv dW50IFJFQUQgd2ViSGlzdG9yeUl0ZW1Db3VudCkKIHB1YmxpYzoKICAgICBMYXlvdXRUZXN0Q29u dHJvbGxlcihXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZSogZHJ0KTsKIApAQCAtODIsNiArODMsNyBA QCBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBzZXRDYW5PcGVuV2luZG93cygpIHsgbV9jYW5PcGVu V2luZG93cyA9IHRydWU7IH0KICAgICB2b2lkIHdhaXRVbnRpbERvbmUoKTsKICAgICBRU3RyaW5n IGNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKGNvbnN0IFFTdHJpbmcmIGlkKTsKKyAgICBpbnQg d2ViSGlzdG9yeUl0ZW1Db3VudCgpOwogICAgIHZvaWQga2VlcFdlYkhpc3RvcnkoKTsKICAgICB2 b2lkIG5vdGlmeURvbmUoKTsKICAgICB2b2lkIGR1bXBCYWNrRm9yd2FyZExpc3QoKSB7IG1fZHVt cEJhY2tGb3J3YXJkTGlzdCA9IHRydWU7IH0KQEAgLTE1OCw2ICsxNjAsNyBAQCBwcml2YXRlOgog ICAgIFFCYXNpY1RpbWVyIG1fdGltZW91dFRpbWVyOwogICAgIFFXZWJGcmFtZSogbV90b3BMb2Fk aW5nRnJhbWU7CiAgICAgV2ViQ29yZTo6RHVtcFJlbmRlclRyZWUqIG1fZHJ0OworICAgIFFXZWJI aXN0b3J5KiBtX3dlYkhpc3Rvcnk7CiB9OwogCiAjZW5kaWYgLy8gTGF5b3V0VGVzdENvbnRyb2xs ZXJRdF9oCi0tIAoxLjYuMy4zCgo= 47428 2010-01-26 11:35:14 -0800 2010-01-26 11:44:40 -0800 Proposed patch v0.2 0001-Qt-DRT-Implement-Web-History-support.diff text/plain 5948 diegohcg RnJvbSBlM2I3N2U4Zjg2ZDg0Y2EzM2RkZWQ2NmZiNjUyYWNlNjZlZjBkM2NiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogVHVlLCAyNiBKYW4gMjAxMCAxNToxMDo0NSAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFtRdF0gRFJUIEltcGxlbWVudCBXZWIgSGlzdG9yeSBzdXBwb3J0LgoKUHJvdmlkZSBX ZWIgSGlzdG9yeSBzdXBwb3J0IGluIExheW91dFRlc3RDb250cm9sbGVyCgpUZXN0czoKCmh0dHAv dGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1mb3JtLXN1Ym1pdC0yLXNlY29uZHMuaHRtbApodHRw L3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtanMtbG9jYXRpb24tMi1zZWNvbmRzLmh0bWwKaHR0cC90 ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWxvY2F0aW9uLWFzc2lnbi1iZWZvcmUtbG9hZC5odG1s Cmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLTItc2Vjb25kcy5o dG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLTAtc2Vjb25k cy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1yZXBsYWNlLTIt c2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1kb2N1bWVudC1sb2Nh dGlvbi1iZWZvcmUtbG9hZC5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2Nh dGlvbi1hc3NpZ24tMC1zZWNvbmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpz LWxvY2F0aW9uLTAtc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1tZXRh LXJlZnJlc2gtMi1zZWNvbmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWRv Y3VtZW50LWxvY2F0aW9uLTItc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVj dC1qcy1sb2NhdGlvbi1yZXBsYWNlLWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5 L3JlZGlyZWN0LWpzLWZvcm0tc3VibWl0LTAtc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9y eS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1iZWZvcmUtbG9hZC5odG1sCmh0dHAvdGVzdHMvaGlzdG9y eS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0cy9o aXN0b3J5L3JlZGlyZWN0LWpzLWZvcm0tc3VibWl0LWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0 cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWRvY3VtZW50LWxvY2F0aW9uLTAtc2Vjb25kcy5odG1sCmh0 dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1hc3NpZ24tMi1zZWNvbmRzLmh0 bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWxvY2F0aW9uLXJlcGxhY2UtMC1zZWNv bmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LW1ldGEtcmVmcmVzaC0wLXNlY29u ZHMuaHRtbApodHRwL3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtMzAxLnBsCmh0dHAvdGVzdHMvaGlz dG9yeS9yZWRpcmVjdC0zMDMucGwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LTIwMC1yZWZy ZXNoLTItc2Vjb25kcy5wbApodHRwL3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtMzA3LnBsCmh0dHAv dGVzdHMvaGlzdG9yeS9yZWRpcmVjdC0zMDIucGwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0 LTIwMC1yZWZyZXNoLTAtc2Vjb25kcy5wbAotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgOSArKysrKysrKysKIExheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgICAgICAgICAgIHwgICAgMSAtCiBXZWJLaXRUb29s cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrKysr KysrKwogLi4uL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwICAg fCAgIDEzICsrKysrKysrKysrKy0KIC4uLi9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29u dHJvbGxlclF0LmggICAgIHwgICAgMyArKysKIDUgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9u cygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTUxMDJmNC4uOTM5NjJjOCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDEwLTAxLTI2ICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6 QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBEUlQgV2ViSGlzdG9yeSBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2NworCisgICAgICAgICogcGxhdGZvcm0v cXQvU2tpcHBlZDoKKwogMjAxMC0wMS0yNiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBw bGUuY29tPgogCiAgICAgICAgIE9uZSBtb3JlIGF0dGVtcHQgdG8gZ2V0IEdUSyB2ZXJzaW9uIHRv IHBhc3MuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCAwYTVmMGYzLi4wM2M4MzEzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTE4LDcgKzE4LDYgQEAgc3ZnL2JhdGlrL2ZpbHRlcnMv ZmVUaWxlLnN2ZwogaHR0cC90ZXN0cy9hcHBjYWNoZQogaHR0cC90ZXN0cy93ZWJhcmNoaXZlCiBo dHRwL3Rlc3RzL2dsb2JhbGhpc3RvcnkKLWh0dHAvdGVzdHMvaGlzdG9yeQogaHR0cC90ZXN0cy9p bmNyZW1lbnRhbAogaHR0cC90ZXN0cy9tZWRpYQogaHR0cC90ZXN0cy93ZWJhcmNoaXZlCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5k ZXggNDQyN2E5ZC4uMWE5NjNjMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisr KyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAxLTI2ICBE aWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBEUlQgV2ViSGlzdG9y eSBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zNDE2NworCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xs ZXJRdC5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6cmVzZXQpOgorICAgICAg ICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQpOgorICAgICAgICAo TGF5b3V0VGVzdENvbnRyb2xsZXI6OmtlZXBXZWJIaXN0b3J5KToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0Lmg6CisKIDIwMTAtMDEtMjUgIENocmlz IEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2hpbmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCmluZGV4IDc2MTY1ZjYuLjkwZTZhNmUg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250 cm9sbGVyUXQuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRl c3RDb250cm9sbGVyUXQuY3BwCkBAIC03MSw2ICs3MSw3IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRy b2xsZXI6OnJlc2V0KCkKICAgICBtX3RvcExvYWRpbmdGcmFtZSA9IDA7CiAgICAgbV93YWl0Rm9y UG9saWN5ID0gZmFsc2U7CiAgICAgbV9oYW5kbGVFcnJvclBhZ2VzID0gZmFsc2U7CisgICAgbV93 ZWJIaXN0b3J5ID0gMDsKICAgICBxdF9kdW1wX2VkaXRpbmdfY2FsbGJhY2tzKGZhbHNlKTsKICAg ICBxdF9kdW1wX3Jlc291cmNlX2xvYWRfY2FsbGJhY2tzKGZhbHNlKTsKIH0KQEAgLTEzMSw5ICsx MzIsMTkgQEAgUVN0cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6Y291bnRlclZhbHVlRm9yRWxl bWVudEJ5SWQoY29uc3QgUVN0cmluZyYgaWQpCiAgICAgcmV0dXJuIHF0X2RydF9jb3VudGVyVmFs dWVGb3JFbGVtZW50QnlJZChtX2RydC0+d2ViUGFnZSgpLT5tYWluRnJhbWUoKSwgaWQpOwogfQog CitpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQoKQoreworICAg IGlmICghbV93ZWJIaXN0b3J5KQorICAgICAgICByZXR1cm4gMDsKKworICAgIC8vIFN1YnRyYWN0 IG9uZSBoZXJlIGFzIG91ciBRV2ViSGlzdG9yeTo6Y291bnQoKSBpbmNsdWRlcyB0aGUgYWN0dWFs IHBhZ2UsCisgICAgLy8gd2hpY2ggaXMgbm90IGNvbnNpZGVyZWQgaW4gdGhlIERSVCB0ZXN0cy4K KyAgICByZXR1cm4gbV93ZWJIaXN0b3J5LT5jb3VudCgpIC0gMTsKK30KKwogdm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6a2VlcFdlYkhpc3RvcnkoKQogewotICAgIC8vIEZJWE1FOiBpbXBsZW1l bnQKKyAgICBtX3dlYkhpc3RvcnkgPSBtX2RydC0+d2ViUGFnZSgpLT5oaXN0b3J5KCk7CiB9CiAK IHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6Om5vdGlmeURvbmUoKQpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oIGIvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oCmluZGV4 IDIzNGNlZDUuLmQ1NTA2OGYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmgKQEAgLTUxLDYgKzUxLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogfQogY2xhc3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgOiBwdWJsaWMgUU9i amVjdCB7CiAgICAgUV9PQkpFQ1QKKyAgICBRX1BST1BFUlRZKGludCB3ZWJIaXN0b3J5SXRlbUNv dW50IFJFQUQgd2ViSGlzdG9yeUl0ZW1Db3VudCkKIHB1YmxpYzoKICAgICBMYXlvdXRUZXN0Q29u dHJvbGxlcihXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZSogZHJ0KTsKIApAQCAtODIsNiArODMsNyBA QCBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBzZXRDYW5PcGVuV2luZG93cygpIHsgbV9jYW5PcGVu V2luZG93cyA9IHRydWU7IH0KICAgICB2b2lkIHdhaXRVbnRpbERvbmUoKTsKICAgICBRU3RyaW5n IGNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKGNvbnN0IFFTdHJpbmcmIGlkKTsKKyAgICBpbnQg d2ViSGlzdG9yeUl0ZW1Db3VudCgpOwogICAgIHZvaWQga2VlcFdlYkhpc3RvcnkoKTsKICAgICB2 b2lkIG5vdGlmeURvbmUoKTsKICAgICB2b2lkIGR1bXBCYWNrRm9yd2FyZExpc3QoKSB7IG1fZHVt cEJhY2tGb3J3YXJkTGlzdCA9IHRydWU7IH0KQEAgLTE1OCw2ICsxNjAsNyBAQCBwcml2YXRlOgog ICAgIFFCYXNpY1RpbWVyIG1fdGltZW91dFRpbWVyOwogICAgIFFXZWJGcmFtZSogbV90b3BMb2Fk aW5nRnJhbWU7CiAgICAgV2ViQ29yZTo6RHVtcFJlbmRlclRyZWUqIG1fZHJ0OworICAgIFFXZWJI aXN0b3J5KiBtX3dlYkhpc3Rvcnk7CiB9OwogCiAjZW5kaWYgLy8gTGF5b3V0VGVzdENvbnRyb2xs ZXJRdF9oCi0tIAoxLjYuMy4zCgo= 47429 2010-01-26 11:44:40 -0800 2010-01-26 21:21:17 -0800 Proposed patch v0.3 0001-Qt-DRT-Implement-Web-History-support.diff text/plain 5949 diegohcg RnJvbSBlMjA2MmQ4ZmI2YTM4ZjNlNDZmMTQ2NmZkYmUyMTE2MzM1MjBhMjEwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogVHVlLCAyNiBKYW4gMjAxMCAxNToxMDo0NSAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFtRdF0gRFJUIEltcGxlbWVudCBXZWIgSGlzdG9yeSBzdXBwb3J0LgoKUHJvdmlkZSBX ZWIgSGlzdG9yeSBzdXBwb3J0IGluIExheW91dFRlc3RDb250cm9sbGVyCgpUZXN0czoKCmh0dHAv dGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1mb3JtLXN1Ym1pdC0yLXNlY29uZHMuaHRtbApodHRw L3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtanMtbG9jYXRpb24tMi1zZWNvbmRzLmh0bWwKaHR0cC90 ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWxvY2F0aW9uLWFzc2lnbi1iZWZvcmUtbG9hZC5odG1s Cmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLTItc2Vjb25kcy5o dG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLTAtc2Vjb25k cy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1yZXBsYWNlLTIt c2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1kb2N1bWVudC1sb2Nh dGlvbi1iZWZvcmUtbG9hZC5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2Nh dGlvbi1hc3NpZ24tMC1zZWNvbmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpz LWxvY2F0aW9uLTAtc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1tZXRh LXJlZnJlc2gtMi1zZWNvbmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWRv Y3VtZW50LWxvY2F0aW9uLTItc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVj dC1qcy1sb2NhdGlvbi1yZXBsYWNlLWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5 L3JlZGlyZWN0LWpzLWZvcm0tc3VibWl0LTAtc2Vjb25kcy5odG1sCmh0dHAvdGVzdHMvaGlzdG9y eS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1iZWZvcmUtbG9hZC5odG1sCmh0dHAvdGVzdHMvaGlzdG9y eS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1ocmVmLWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0cy9o aXN0b3J5L3JlZGlyZWN0LWpzLWZvcm0tc3VibWl0LWJlZm9yZS1sb2FkLmh0bWwKaHR0cC90ZXN0 cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWRvY3VtZW50LWxvY2F0aW9uLTAtc2Vjb25kcy5odG1sCmh0 dHAvdGVzdHMvaGlzdG9yeS9yZWRpcmVjdC1qcy1sb2NhdGlvbi1hc3NpZ24tMi1zZWNvbmRzLmh0 bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LWpzLWxvY2F0aW9uLXJlcGxhY2UtMC1zZWNv bmRzLmh0bWwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LW1ldGEtcmVmcmVzaC0wLXNlY29u ZHMuaHRtbApodHRwL3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtMzAxLnBsCmh0dHAvdGVzdHMvaGlz dG9yeS9yZWRpcmVjdC0zMDMucGwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0LTIwMC1yZWZy ZXNoLTItc2Vjb25kcy5wbApodHRwL3Rlc3RzL2hpc3RvcnkvcmVkaXJlY3QtMzA3LnBsCmh0dHAv dGVzdHMvaGlzdG9yeS9yZWRpcmVjdC0zMDIucGwKaHR0cC90ZXN0cy9oaXN0b3J5L3JlZGlyZWN0 LTIwMC1yZWZyZXNoLTAtc2Vjb25kcy5wbAotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgOSArKysrKysrKysKIExheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgICAgICAgICAgIHwgICAgMSAtCiBXZWJLaXRUb29s cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrKysr KysrKwogLi4uL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwICAg fCAgIDEzICsrKysrKysrKysrKy0KIC4uLi9EdW1wUmVuZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29u dHJvbGxlclF0LmggICAgIHwgICAgMyArKysKIDUgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9u cygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTUxMDJmNC4uOTM5NjJjOCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDEwLTAxLTI2ICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6 QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBEUlQgV2ViSGlzdG9yeSBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2NworCisgICAgICAgICogcGxhdGZvcm0v cXQvU2tpcHBlZDoKKwogMjAxMC0wMS0yNiAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBw bGUuY29tPgogCiAgICAgICAgIE9uZSBtb3JlIGF0dGVtcHQgdG8gZ2V0IEdUSyB2ZXJzaW9uIHRv IHBhc3MuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCAwYTVmMGYzLi4wM2M4MzEzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTE4LDcgKzE4LDYgQEAgc3ZnL2JhdGlrL2ZpbHRlcnMv ZmVUaWxlLnN2ZwogaHR0cC90ZXN0cy9hcHBjYWNoZQogaHR0cC90ZXN0cy93ZWJhcmNoaXZlCiBo dHRwL3Rlc3RzL2dsb2JhbGhpc3RvcnkKLWh0dHAvdGVzdHMvaGlzdG9yeQogaHR0cC90ZXN0cy9p bmNyZW1lbnRhbAogaHR0cC90ZXN0cy9tZWRpYQogaHR0cC90ZXN0cy93ZWJhcmNoaXZlCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5k ZXggNDQyN2E5ZC4uMWE5NjNjMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisr KyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTAxLTI2ICBE aWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6QG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBEUlQgV2ViSGlzdG9y eSBzdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zNDE2NworCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xs ZXJRdC5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6cmVzZXQpOgorICAgICAg ICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQpOgorICAgICAgICAo TGF5b3V0VGVzdENvbnRyb2xsZXI6OmtlZXBXZWJIaXN0b3J5KToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0Lmg6CisKIDIwMTAtMDEtMjUgIENocmlz IEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2hpbmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwCmluZGV4IDc2MTY1ZjYuLjk2MTY0NjQg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250 cm9sbGVyUXQuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRl c3RDb250cm9sbGVyUXQuY3BwCkBAIC03MSw2ICs3MSw3IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRy b2xsZXI6OnJlc2V0KCkKICAgICBtX3RvcExvYWRpbmdGcmFtZSA9IDA7CiAgICAgbV93YWl0Rm9y UG9saWN5ID0gZmFsc2U7CiAgICAgbV9oYW5kbGVFcnJvclBhZ2VzID0gZmFsc2U7CisgICAgbV93 ZWJIaXN0b3J5ID0gMDsKICAgICBxdF9kdW1wX2VkaXRpbmdfY2FsbGJhY2tzKGZhbHNlKTsKICAg ICBxdF9kdW1wX3Jlc291cmNlX2xvYWRfY2FsbGJhY2tzKGZhbHNlKTsKIH0KQEAgLTEzMSw5ICsx MzIsMTkgQEAgUVN0cmluZyBMYXlvdXRUZXN0Q29udHJvbGxlcjo6Y291bnRlclZhbHVlRm9yRWxl bWVudEJ5SWQoY29uc3QgUVN0cmluZyYgaWQpCiAgICAgcmV0dXJuIHF0X2RydF9jb3VudGVyVmFs dWVGb3JFbGVtZW50QnlJZChtX2RydC0+d2ViUGFnZSgpLT5tYWluRnJhbWUoKSwgaWQpOwogfQog CitpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQoKQoreworICAg IGlmICghbV93ZWJIaXN0b3J5KQorICAgICAgICByZXR1cm4gLTE7CisKKyAgICAvLyBTdWJ0cmFj dCBvbmUgaGVyZSBhcyBvdXIgUVdlYkhpc3Rvcnk6OmNvdW50KCkgaW5jbHVkZXMgdGhlIGFjdHVh bCBwYWdlLAorICAgIC8vIHdoaWNoIGlzIG5vdCBjb25zaWRlcmVkIGluIHRoZSBEUlQgdGVzdHMu CisgICAgcmV0dXJuIG1fd2ViSGlzdG9yeS0+Y291bnQoKSAtIDE7Cit9CisKIHZvaWQgTGF5b3V0 VGVzdENvbnRyb2xsZXI6OmtlZXBXZWJIaXN0b3J5KCkKIHsKLSAgICAvLyBGSVhNRTogaW1wbGVt ZW50CisgICAgbV93ZWJIaXN0b3J5ID0gbV9kcnQtPndlYlBhZ2UoKS0+aGlzdG9yeSgpOwogfQog CiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpub3RpZnlEb25lKCkKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaCBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuaAppbmRl eCAyMzRjZWQ1Li5kNTUwNjhmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9xdC9MYXlvdXRUZXN0Q29udHJvbGxlclF0LmgKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5oCkBAIC01MSw2ICs1MSw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIH0KIGNsYXNzIExheW91dFRlc3RDb250cm9sbGVyIDogcHVibGljIFFP YmplY3QgewogICAgIFFfT0JKRUNUCisgICAgUV9QUk9QRVJUWShpbnQgd2ViSGlzdG9yeUl0ZW1D b3VudCBSRUFEIHdlYkhpc3RvcnlJdGVtQ291bnQpCiBwdWJsaWM6CiAgICAgTGF5b3V0VGVzdENv bnRyb2xsZXIoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWUqIGRydCk7CiAKQEAgLTgyLDYgKzgzLDcg QEAgcHVibGljIHNsb3RzOgogICAgIHZvaWQgc2V0Q2FuT3BlbldpbmRvd3MoKSB7IG1fY2FuT3Bl bldpbmRvd3MgPSB0cnVlOyB9CiAgICAgdm9pZCB3YWl0VW50aWxEb25lKCk7CiAgICAgUVN0cmlu ZyBjb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZChjb25zdCBRU3RyaW5nJiBpZCk7CisgICAgaW50 IHdlYkhpc3RvcnlJdGVtQ291bnQoKTsKICAgICB2b2lkIGtlZXBXZWJIaXN0b3J5KCk7CiAgICAg dm9pZCBub3RpZnlEb25lKCk7CiAgICAgdm9pZCBkdW1wQmFja0ZvcndhcmRMaXN0KCkgeyBtX2R1 bXBCYWNrRm9yd2FyZExpc3QgPSB0cnVlOyB9CkBAIC0xNTgsNiArMTYwLDcgQEAgcHJpdmF0ZToK ICAgICBRQmFzaWNUaW1lciBtX3RpbWVvdXRUaW1lcjsKICAgICBRV2ViRnJhbWUqIG1fdG9wTG9h ZGluZ0ZyYW1lOwogICAgIFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlKiBtX2RydDsKKyAgICBRV2Vi SGlzdG9yeSogbV93ZWJIaXN0b3J5OwogfTsKIAogI2VuZGlmIC8vIExheW91dFRlc3RDb250cm9s bGVyUXRfaAotLSAKMS42LjMuMwoK