52692 2011-01-18 18:13:12 -0800 WebKitTestRunner should track loading more like DumpRenderTree 2011-01-19 06:16:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mjs mjs kbalazs webkit-ews oldest_to_newest 336266 0 mjs 2011-01-18 18:13:12 -0800 WebKitTestRunner should track loading more like DumpRenderTree 336267 1 79374 mjs 2011-01-18 18:15:00 -0800 Created attachment 79374 Patch 336291 2 webkit-ews 2011-01-18 18:53:44 -0800 Attachment 79374 did not build on qt: Build output: http://queues.webkit.org/results/7596168 336302 3 mjs 2011-01-18 19:17:05 -0800 Committed r76092: <http://trac.webkit.org/changeset/76092> 336470 4 kbalazs 2011-01-19 06:16:10 -0800 Just to inform you: one puts call has been left in the patch in LayoutTestControllerMac.mm :) 79374 2011-01-18 18:15:00 -0800 2011-01-18 18:26:28 -0800 Patch bug-52692-20110118181459.patch text/plain 10780 mjs SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2MDg5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDEtMTggIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWJLaXRUZXN0UnVubmVyIHNob3VsZCB0cmFjayBsb2FkaW5n IG1vcmUgbGlrZSBEdW1wUmVuZGVyVHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTI2OTIKKyAgICAgICAgCisgICAgICAgIFJlbGF4IHRoZSBtZXNz YWdlIGNoZWNrIGluIGRpZFNhdmVGcmFtZVRvUGFnZUNhY2hlIGEgYml0IG1vcmUsIHNpbmNlCisg ICAgICAgIGxheW91dCB0ZXN0cyB3ZXJlIHN0aWxsIGhpdHRpbmcgdGhlIG9sZCBvbmUuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6aXNE aXNjb25uZWN0ZWRGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkU2F2 ZUZyYW1lVG9QYWdlQ2FjaGUpOgorCiAyMDExLTAxLTE4ICBCcmFkeSBFaWRzb24gIDxiZWlkc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiA3NjAwMikK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMDY3LDYgKzEwNjcsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENyZWF0ZVN1 YmZyYW1lKHVpbgogICAgIHBhcmVudEZyYW1lLT5hcHBlbmRDaGlsZChzdWJGcmFtZS5nZXQoKSk7 CiB9CiAKK3N0YXRpYyBib29sIGlzRGlzY29ubmVjdGVkRnJhbWUoV2ViRnJhbWVQcm94eSogZnJh bWUpCit7CisgICAgcmV0dXJuICFmcmFtZS0+cGFnZSgpIHx8ICFmcmFtZS0+cGFnZSgpLT5tYWlu RnJhbWUoKSB8fCAhZnJhbWUtPmlzRGVzY2VuZGFudE9mKGZyYW1lLT5wYWdlKCktPm1haW5GcmFt ZSgpKTsKK30KKwogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFNhdmVGcmFtZVRvUGFnZUNhY2hlKHVp bnQ2NF90IGZyYW1lSUQpCiB7CiAgICAgTUVTU0FHRV9DSEVDSyhtX21haW5GcmFtZSk7CkBAIC0x MDc0LDcgKzEwNzksNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU2F2ZUZyYW1lVG9QYWdlQ2Fj CiAgICAgV2ViRnJhbWVQcm94eSogc3ViZnJhbWUgPSBwcm9jZXNzKCktPndlYkZyYW1lKGZyYW1l SUQpOwogICAgIE1FU1NBR0VfQ0hFQ0soc3ViZnJhbWUpOwogCi0gICAgaWYgKCFzdWJmcmFtZS0+ cGFyZW50RnJhbWUoKSkKKyAgICBpZiAoaXNEaXNjb25uZWN0ZWRGcmFtZShzdWJmcmFtZSkpCiAg ICAgICAgIHJldHVybjsKIAogICAgIE1FU1NBR0VfQ0hFQ0soc3ViZnJhbWUtPmlzRGVzY2VuZGFu dE9mKG1fbWFpbkZyYW1lLmdldCgpKSk7CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA3NjA4OSkKKysrIFRvb2xzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDExLTAxLTE4ICBNYWNpZWogU3Rh Y2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBzaG91bGQgdHJhY2sgbG9hZGluZyBt b3JlIGxpa2UgRHVtcFJlbmRlclRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUyNjkyCisKKyAgICAgICAgQ2hhbmdlIGxvYWQgdHJhY2tpbmcgdG8g dHJhY2sgdGhlIGN1cnJlbnQgdG9wIGxvYWRpbmcgZnJhbWUsIGluIHRoZSBtYW5uZXIgb2YgRHVt cFJlbmRlclRyZWUuCisgICAgICAgIFRoaXMgbWFrZXMgc29tZSB0ZXN0cyB0aGF0IGNhbGwgbm90 aWZ5RG9uZSBtdWx0aXBsZSB0aW1lcyBwYXNzLgorICAgICAgICAKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW06CisgICAgICAgIChMYXlvdXRU ZXN0Q29udHJvbGxlcjo6bm90aWZ5RG9uZSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHA6CisgICAgICAgIChXVFI6OkluamVjdGVk QnVuZGxlOjpJbmplY3RlZEJ1bmRsZSk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlOjpk b25lKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVk QnVuZGxlLmg6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlOjp0b3BMb2FkaW5nRnJhbWUp OgorICAgICAgICAoV1RSOjpJbmplY3RlZEJ1bmRsZTo6c2V0VG9wTG9hZGluZ0ZyYW1lKToKKyAg ICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFn ZS5jcHA6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6SW5qZWN0ZWRCdW5kbGVQ YWdlKToKKyAgICAgICAgKFdUUjo6SW5qZWN0ZWRCdW5kbGVQYWdlOjpzdG9wTG9hZGluZyk6Cisg ICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRG b3JGcmFtZSk6CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6ZGlkRmFpbFByb3Zp c2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lKToKKyAgICAgICAgKFdUUjo6SW5qZWN0ZWRCdW5k bGVQYWdlOjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV1RSOjpJbmplY3RlZEJ1 bmRsZVBhZ2U6OmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOgorICAgICAgICAqIFdlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmg6CisgICAgICAg ICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9MYXlvdXRUZXN0Q29udHJvbGxlci5j cHA6CisgICAgICAgIChXVFI6OkxheW91dFRlc3RDb250cm9sbGVyOjpub3RpZnlEb25lKToKKyAg ICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdU Ujo6VGVzdENvbnRyb2xsZXI6OmRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKToK KwogMjAxMS0wMS0xOCAgTWloYWkgUGFycGFyaXRhICA8bWloYWlwQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9E dW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0JKHJldmlzaW9uIDc2 MDAyKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFj Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNjYsNiArMjY2LDggQEAgdW5zaWduZWQgTGF5b3V0VGVz dENvbnRyb2xsZXI6OndvcmtlclRocgogCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpub3Rp ZnlEb25lKCkKIHsKKyAgICBwdXRzKCJub3RpZnlEb25lIik7CisKICAgICBpZiAobV93YWl0VG9E dW1wICYmICF0b3BMb2FkaW5nRnJhbWUgJiYgIVdvcmtRdWV1ZTo6c2hhcmVkKCktPmNvdW50KCkp CiAgICAgICAgIGR1bXAoKTsKICAgICBtX3dhaXRUb0R1bXAgPSBmYWxzZTsKSW5kZXg6IFRvb2xz L1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA3NjAwMikKKysr IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zODYsNiArMzg2LDggQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6ZGlkUmVjZWl2ZVN5bmNo cm9ubwogCiB2b2lkIFRlc3RDb250cm9sbGVyOjpkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3Rl ZEJ1bmRsZShXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBlUmVmIG1lc3NhZ2VCb2R5KQog eworICAgIGlmICghbV9jdXJyZW50SW52b2NhdGlvbikKKyAgICAgICAgcmV0dXJuOwogICAgIG1f Y3VycmVudEludm9jYXRpb24tPmRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKG1l c3NhZ2VOYW1lLCBtZXNzYWdlQm9keSk7CiB9CiAKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCShyZXZp c2lvbiA3NjAwMikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5q ZWN0ZWRCdW5kbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw3IEBAIEluamVjdGVk QnVuZGxlJiBJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkKIAogSW5qZWN0ZWRCdW5kbGU6OkluamVj dGVkQnVuZGxlKCkKICAgICA6IG1fYnVuZGxlKDApCisgICAgLCBtX3RvcExvYWRpbmdGcmFtZSgw KQogICAgICwgbV9zdGF0ZShJZGxlKQogewogfQpAQCAtMTYxLDYgKzE2Miw3IEBAIHZvaWQgSW5q ZWN0ZWRCdW5kbGU6OmRvbmUoKQogICAgIG1fc3RhdGUgPSBTdG9wcGluZzsKIAogICAgIHBhZ2Uo KS0+c3RvcExvYWRpbmcoKTsKKyAgICBzZXRUb3BMb2FkaW5nRnJhbWUoMCk7CiAKICAgICBXS1Jl dGFpblB0cjxXS1N0cmluZ1JlZj4gZG9uZU1lc3NhZ2VOYW1lKEFkb3B0V0ssIFdLU3RyaW5nQ3Jl YXRlV2l0aFVURjhDU3RyaW5nKCJEb25lIikpOwogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVm PiBkb25lTWVzc2FnZUJvZHkoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmco bV9vdXRwdXRTdHJlYW0uc3RyKCkuY19zdHIoKSkpOwpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAkocmV2aXNp b24gNzYwMDIpCisrKyBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVj dGVkQnVuZGxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY1LDYgKzY1LDkgQEAgcHVibGljOgogCiAg ICAgYm9vbCBpc1Rlc3RSdW5uaW5nKCkgeyByZXR1cm4gbV9zdGF0ZSA9PSBUZXN0aW5nOyB9CiAK KyAgICBXS0J1bmRsZUZyYW1lUmVmIHRvcExvYWRpbmdGcmFtZSgpIHsgcmV0dXJuIG1fdG9wTG9h ZGluZ0ZyYW1lOyB9CisgICAgdm9pZCBzZXRUb3BMb2FkaW5nRnJhbWUoV0tCdW5kbGVGcmFtZVJl ZiBmcmFtZSkgeyBtX3RvcExvYWRpbmdGcmFtZSA9IGZyYW1lOyB9CisKIHByaXZhdGU6CiAgICAg SW5qZWN0ZWRCdW5kbGUoKTsKICAgICB+SW5qZWN0ZWRCdW5kbGUoKTsKQEAgLTg5LDYgKzkyLDgg QEAgcHJpdmF0ZToKICAgICBSZWZQdHI8R0NDb250cm9sbGVyPiBtX2djQ29udHJvbGxlcjsKICAg ICBSZWZQdHI8RXZlbnRTZW5kaW5nQ29udHJvbGxlcj4gbV9ldmVudFNlbmRpbmdDb250cm9sbGVy OwogCisgICAgV0tCdW5kbGVGcmFtZVJlZiBtX3RvcExvYWRpbmdGcmFtZTsKKwogICAgIHN0ZDo6 b3N0cmluZ3N0cmVhbSBtX291dHB1dFN0cmVhbTsKICAgICAKICAgICBlbnVtIFN0YXRlIHsKSW5k ZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQ YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAJKHJldmlzaW9uIDc2MDAyKQorKysgVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNyw2ICszNyw4IEBACiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0J1bmRsZUZy YW1lUHJpdmF0ZS5oPgogI2luY2x1ZGUgPFdlYktpdDIvV0tCdW5kbGVQYWdlUHJpdmF0ZS5oPgog CisjaW5jbHVkZSA8V2ViS2l0Mi9XS1N0cmluZ0NGLmg+CisKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7 CiAKIG5hbWVzcGFjZSBXVFIgewpAQCAtMTY4LDcgKzE3MCw2IEBAIHN0YXRpYyBvc3RyZWFtJiBv cGVyYXRvcjw8KG9zdHJlYW0mIG91dCwKIEluamVjdGVkQnVuZGxlUGFnZTo6SW5qZWN0ZWRCdW5k bGVQYWdlKFdLQnVuZGxlUGFnZVJlZiBwYWdlKQogICAgIDogbV9wYWdlKHBhZ2UpCiAgICAgLCBt X3dvcmxkKEFkb3B0V0ssIFdLQnVuZGxlU2NyaXB0V29ybGRDcmVhdGVXb3JsZCgpKQotICAgICwg bV9pc0xvYWRpbmcoZmFsc2UpCiB7CiAgICAgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50IGxvYWRl ckNsaWVudCA9IHsKICAgICAgICAgMCwKQEAgLTIzMyw3ICsyMzQsNiBAQCBJbmplY3RlZEJ1bmRs ZVBhZ2U6On5JbmplY3RlZEJ1bmRsZVBhZ2UoCiB2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6c3Rv cExvYWRpbmcoKQogewogICAgIFdLQnVuZGxlUGFnZVN0b3BMb2FkaW5nKG1fcGFnZSk7Ci0gICAg bV9pc0xvYWRpbmcgPSBmYWxzZTsKIH0KIAogdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OnJlc2V0 KCkKQEAgLTMzNCw4ICszMzQsOSBAQCB2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZGlkU3RhcnRQ cm92aXNpCiAgICAgaWYgKCFJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkuaXNUZXN0UnVubmluZygp KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoZnJhbWUgPT0gV0tCdW5kbGVQYWdlR2V0TWFp bkZyYW1lKG1fcGFnZSkpCi0gICAgICAgIG1faXNMb2FkaW5nID0gdHJ1ZTsKKyAgICBpZiAoSW5q ZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLnRvcExvYWRpbmdGcmFtZSgpKQorICAgICAgICByZXR1cm47 CisgICAgSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLnNldFRvcExvYWRpbmdGcmFtZShmcmFtZSk7 CiB9CiAKIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RG b3JQcm92aXNpb25hbExvYWRGb3JGcmFtZShXS0J1bmRsZUZyYW1lUmVmIGZyYW1lKQpAQCAtMzQ0 LDYgKzM0NSwxNyBAQCB2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZGlkUmVjZWl2ZVNlcnZlCiAK IHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9y Rm9yRnJhbWUoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tFcnJvclJlZiBlcnJvcikKIHsKKyAg ICBpZiAoIUluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5pc1Rlc3RSdW5uaW5nKCkpCisgICAgICAg IHJldHVybjsKKworICAgIGlmIChmcmFtZSAhPSBJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkudG9w TG9hZGluZ0ZyYW1lKCkpCisgICAgICAgIHJldHVybjsKKyAgICBJbmplY3RlZEJ1bmRsZTo6c2hh cmVkKCkuc2V0VG9wTG9hZGluZ0ZyYW1lKDApOworCisgICAgaWYgKEluamVjdGVkQnVuZGxlOjpz aGFyZWQoKS5sYXlvdXRUZXN0Q29udHJvbGxlcigpLT53YWl0VG9EdW1wKCkpCisgICAgICAgIHJl dHVybjsKKworICAgIEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5kb25lKCk7CiB9CiAKIHZvaWQg SW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRDb21taXRMb2FkRm9yRnJhbWUoV0tCdW5kbGVGcmFtZVJl ZiBmcmFtZSkKQEAgLTQ3NSwxOCArNDg3LDE0IEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpk aWRGaW5pc2hMb2FkRm8KICAgICBpZiAoIUluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5pc1Rlc3RS dW5uaW5nKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghV0tCdW5kbGVGcmFtZUlzTWFp bkZyYW1lKGZyYW1lKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9pc0xvYWRpbmcgPSBmYWxz ZTsKLQotICAgIGlmICh0aGlzICE9IEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5wYWdlKCkpCisg ICAgaWYgKGZyYW1lICE9IEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS50b3BMb2FkaW5nRnJhbWUo KSkKICAgICAgICAgcmV0dXJuOworICAgIEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5zZXRUb3BM b2FkaW5nRnJhbWUoMCk7CiAKICAgICBpZiAoSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLmxheW91 dFRlc3RDb250cm9sbGVyKCktPndhaXRUb0R1bXAoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg ZHVtcCgpOworICAgIEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5wYWdlKCktPmR1bXAoKTsKIH0K IAogdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUo V0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgV0tFcnJvclJlZikKQEAgLTQ5NCwxMiArNTAyLDExIEBA IHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdlOjpkaWRGYWlsTG9hZFdpdGgKICAgICBpZiAoIUluamVj dGVkQnVuZGxlOjpzaGFyZWQoKS5pc1Rlc3RSdW5uaW5nKCkpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGlmICghV0tCdW5kbGVGcmFtZUlzTWFpbkZyYW1lKGZyYW1lKSkKKyAgICBpZiAoZnJhbWUg IT0gSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLnRvcExvYWRpbmdGcmFtZSgpKQogICAgICAgICBy ZXR1cm47CisgICAgSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLnNldFRvcExvYWRpbmdGcmFtZSgw KTsKIAotICAgIG1faXNMb2FkaW5nID0gZmFsc2U7Ci0KLSAgICBpZiAodGhpcyAhPSBJbmplY3Rl ZEJ1bmRsZTo6c2hhcmVkKCkucGFnZSgpKQorICAgIGlmIChJbmplY3RlZEJ1bmRsZTo6c2hhcmVk KCkubGF5b3V0VGVzdENvbnRyb2xsZXIoKS0+d2FpdFRvRHVtcCgpKQogICAgICAgICByZXR1cm47 CiAKICAgICBJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkuZG9uZSgpOwpJbmRleDogVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVu ZGxlUGFnZS5oCShyZXZpc2lvbiA3NjAwMikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcg KzQxLDYgQEAgcHVibGljOgogICAgIHZvaWQgZHVtcCgpOwogCiAgICAgdm9pZCBzdG9wTG9hZGlu ZygpOwotICAgIGJvb2wgaXNMb2FkaW5nKCkgeyByZXR1cm4gbV9pc0xvYWRpbmc7IH0KIAogICAg IHZvaWQgcmVzZXQoKTsKIApAQCAtMTI0LDcgKzEyMyw2IEBAIHByaXZhdGU6CiAgICAgV0tCdW5k bGVQYWdlUmVmIG1fcGFnZTsKICAgICBXS1JldGFpblB0cjxXS0J1bmRsZVNjcmlwdFdvcmxkUmVm PiBtX3dvcmxkOwogICAgIFdLUmV0YWluUHRyPFdLQnVuZGxlQmFja0ZvcndhcmRMaXN0SXRlbVJl Zj4gbV9wcmV2aW91c1Rlc3RCYWNrRm9yd2FyZExpc3RJdGVtOwotICAgIGJvb2wgbV9pc0xvYWRp bmc7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXVFIKSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xs ZXIuY3BwCShyZXZpc2lvbiA3NjAwMikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzIs OCArMTMyLDkgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bm90aWZ5RG9uZSgpCiAgICAg aWYgKCFJbmplY3RlZEJ1bmRsZTo6c2hhcmVkKCkuaXNUZXN0UnVubmluZygpKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBpZiAobV93YWl0VG9EdW1wICYmICFJbmplY3RlZEJ1bmRsZTo6c2hhcmVk KCkucGFnZSgpLT5pc0xvYWRpbmcoKSkKKyAgICBpZiAobV93YWl0VG9EdW1wICYmICFJbmplY3Rl ZEJ1bmRsZTo6c2hhcmVkKCkudG9wTG9hZGluZ0ZyYW1lKCkpCiAgICAgICAgIEluamVjdGVkQnVu ZGxlOjpzaGFyZWQoKS5wYWdlKCktPmR1bXAoKTsKKwogICAgIG1fd2FpdFRvRHVtcCA9IGZhbHNl OwogfQogCg==