46881 2010-09-30 02:02:38 -0700 [WINCE] Use OwnPtr for HBRUSH and HPEN in GraphicsContext 2010-09-30 15:09:16 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 paroga paroga aroben commit-queue oldest_to_newest 287436 0 paroga 2010-09-30 02:02:38 -0700 see patch 287458 1 69322 paroga 2010-09-30 02:55:51 -0700 Created attachment 69322 Patch 287807 2 69322 commit-queue 2010-09-30 14:08:31 -0700 Comment on attachment 69322 Patch Rejecting patch 69322 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']" exit_code: 2 Last 500 characters of output: /LayoutTests Testing 21426 test cases. websocket/tests/frame-lengths.html -> timed out Sampling process 65246 for 10 seconds with 10 milliseconds of run time between samples Sampling completed, processing symbols... Sample analysis of process 65246 written to file /Users/eseidel/Library/Logs/DumpRenderTree/HangReport.txt Exiting early after 1 failures. 21393 tests run. 568.21s total testing time 21392 test cases (99%) succeeded 1 test case (<1%) timed out 33 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/4201031 287872 3 69322 commit-queue 2010-09-30 15:09:12 -0700 Comment on attachment 69322 Patch Clearing flags on attachment: 69322 Committed r68839: <http://trac.webkit.org/changeset/68839> 287873 4 commit-queue 2010-09-30 15:09:16 -0700 All reviewed patches have been landed. Closing bug. 69322 2010-09-30 02:55:51 -0700 2010-09-30 15:09:12 -0700 Patch bug-46881.patch text/plain 13033 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWYwYmFhYS4uNjFhOGZmYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wOS0zMCAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbV0lOQ0VdIFVzZSBPd25QdHIgZm9yIEhCUlVTSCBhbmQgSFBF TiBpbiBHcmFwaGljc0NvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ2ODgxCisKKyAgICAgICAgQWxzbyBhZGQgc29tZSBtaXNzaW5nIFNlbGVj dE9iamVjdCBjYWxscy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBo aWNzQ29udGV4dFdpbkNFLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZVBlbik6CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVCcnVzaCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OmRyYXdSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJh d0xpbmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3RWxsaXBzZSk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnN0cm9rZUFyYyk6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdDb252ZXhQb2x5Z29uKToKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUmVjdCk6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQ6OmZpbGxSb3VuZGVkUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQ6OmZpbGxQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dDo6c3Ryb2tlUGF0aCk6CisKIDIwMTAtMDktMjkgIEpvw6NvIFBhdWxvIFJlY2hpIFZpdGEg IDxqcHJ2aXRhQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4 LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0Nv bnRleHRXaW5DRS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNz Q29udGV4dFdpbkNFLmNwcAppbmRleCBhOTFiOTg4Li5jYzY5OWU0IDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbkNFLmNwcAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbkNFLmNw cApAQCAtMzQ3LDcgKzM0Nyw3IEBAIHB1YmxpYzoKICAgICBWZWN0b3I8R3JhcGhpY3NDb250ZXh0 UGxhdGZvcm1Qcml2YXRlRGF0YT4gbV9iYWNrdXBEYXRhOwogfTsKIAotc3RhdGljIEhQRU4gY3Jl YXRlUGVuKGNvbnN0IENvbG9yJiBjb2wsIGRvdWJsZSBmV2lkdGgsIFN0cm9rZVN0eWxlIHN0eWxl KQorc3RhdGljIFBhc3NPd25QdHI8SFBFTj4gY3JlYXRlUGVuKGNvbnN0IENvbG9yJiBjb2wsIGRv dWJsZSBmV2lkdGgsIFN0cm9rZVN0eWxlIHN0eWxlKQogewogICAgIGludCB3aWR0aCA9IHN0YWJs ZVJvdW5kKGZXaWR0aCk7CiAgICAgaWYgKHdpZHRoIDwgMSkKQEAgLTM2NywxMiArMzY3LDEyIEBA IHN0YXRpYyBIUEVOIGNyZWF0ZVBlbihjb25zdCBDb2xvciYgY29sLCBkb3VibGUgZldpZHRoLCBT dHJva2VTdHlsZSBzdHlsZSkKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIHJldHVy biBDcmVhdGVQZW4ocGVuU3R5bGUsIHdpZHRoLCBSR0IoY29sLnJlZCgpLCBjb2wuZ3JlZW4oKSwg Y29sLmJsdWUoKSkpOworICAgIHJldHVybiBhZG9wdFB0cihDcmVhdGVQZW4ocGVuU3R5bGUsIHdp ZHRoLCBSR0IoY29sLnJlZCgpLCBjb2wuZ3JlZW4oKSwgY29sLmJsdWUoKSkpKTsKIH0KIAotc3Rh dGljIGlubGluZSBIR0RJT0JKIGNyZWF0ZUJydXNoKGNvbnN0IENvbG9yJiBjb2wpCitzdGF0aWMg aW5saW5lIFBhc3NPd25QdHI8SEJSVVNIPiBjcmVhdGVCcnVzaChjb25zdCBDb2xvciYgY29sKQog ewotICAgIHJldHVybiBDcmVhdGVTb2xpZEJydXNoKFJHQihjb2wucmVkKCksIGNvbC5ncmVlbigp LCBjb2wuYmx1ZSgpKSk7CisgICAgcmV0dXJuIGFkb3B0UHRyKENyZWF0ZVNvbGlkQnJ1c2goUkdC KGNvbC5yZWQoKSwgY29sLmdyZWVuKCksIGNvbC5ibHVlKCkpKSk7CiB9CiAKIHRlbXBsYXRlIDx0 eXBlbmFtZSBQaXhlbFR5cGUsIGJvb2wgSXMxNmJpdD4gc3RhdGljIHZvaWQgX3JvdGF0ZUJpdG1h cChTaGFyZWRCaXRtYXAqIGRlc3RCbXAsIGNvbnN0IFNoYXJlZEJpdG1hcCogc291cmNlQm1wLCBj b25zdCBSb3RhdGlvblRyYW5zZm9ybSYgdHJhbnNmb3JtKQpAQCAtNjQ0LDQxICs2NDQsMzMgQEAg dm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiAgICAg ICAgIHJldHVybjsKICAgICB0clJlY3QubW92ZSh0cmFuc3BhcmVudERDLnRvU2hpZnQoKSk7CiAK LSAgICBIR0RJT0JKIGJydXNoID0gMDsKKyAgICBPd25QdHI8SEJSVVNIPiBicnVzaDsKICAgICBI R0RJT0JKIG9sZEJydXNoOwogICAgIGlmIChmaWxsQ29sb3IoKS5hbHBoYSgpKSB7CiAgICAgICAg IGJydXNoID0gY3JlYXRlQnJ1c2goZmlsbENvbG9yKCkpOwotICAgICAgICBvbGRCcnVzaCA9IFNl bGVjdE9iamVjdChkYywgYnJ1c2gpOworICAgICAgICBvbGRCcnVzaCA9IFNlbGVjdE9iamVjdChk YywgYnJ1c2guZ2V0KCkpOwogICAgIH0gZWxzZQotICAgICAgICBTZWxlY3RPYmplY3QoZGMsIEdl dFN0b2NrT2JqZWN0KE5VTExfQlJVU0gpKTsKKyAgICAgICAgb2xkQnJ1c2ggPSBTZWxlY3RPYmpl Y3QoZGMsIEdldFN0b2NrT2JqZWN0KE5VTExfQlJVU0gpKTsKIAotICAgIEhHRElPQkogcGVuID0g MDsKKyAgICBPd25QdHI8SFBFTj4gcGVuOwogICAgIEhHRElPQkogb2xkUGVuOwogICAgIGlmIChz dHJva2VTdHlsZSgpICE9IE5vU3Ryb2tlKSB7CiAgICAgICAgIHBlbiA9IGNyZWF0ZVBlbihzdHJv a2VDb2xvcigpLCBzdHJva2VUaGlja25lc3MoKSwgc3Ryb2tlU3R5bGUoKSk7Ci0gICAgICAgIG9s ZFBlbiA9IFNlbGVjdE9iamVjdChkYywgcGVuKTsKKyAgICAgICAgb2xkUGVuID0gU2VsZWN0T2Jq ZWN0KGRjLCBwZW4uZ2V0KCkpOwogICAgIH0gZWxzZQotICAgICAgICBTZWxlY3RPYmplY3QoZGMs IEdldFN0b2NrT2JqZWN0KE5VTExfUEVOKSk7CisgICAgICAgIG9sZFBlbiA9IFNlbGVjdE9iamVj dChkYywgR2V0U3RvY2tPYmplY3QoTlVMTF9QRU4pKTsKIAotICAgIGlmICghYnJ1c2ggJiYgIXBl bikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKHRyUmVjdC53aWR0aCgpIDw9IDApCi0gICAg ICAgIHRyUmVjdC5zZXRXaWR0aCgxKTsKLSAgICBpZiAodHJSZWN0LmhlaWdodCgpIDw9IDApCi0g ICAgICAgIHRyUmVjdC5zZXRIZWlnaHQoMSk7Ci0KLSAgICBSZWN0YW5nbGUoZGMsIHRyUmVjdC54 KCksIHRyUmVjdC55KCksIHRyUmVjdC5yaWdodCgpLCB0clJlY3QuYm90dG9tKCkpOworICAgIGlm IChicnVzaCB8fCBwZW4pIHsKKyAgICAgICAgaWYgKHRyUmVjdC53aWR0aCgpIDw9IDApCisgICAg ICAgICAgICB0clJlY3Quc2V0V2lkdGgoMSk7CisgICAgICAgIGlmICh0clJlY3QuaGVpZ2h0KCkg PD0gMCkKKyAgICAgICAgICAgIHRyUmVjdC5zZXRIZWlnaHQoMSk7CiAKLSAgICBpZiAocGVuKSB7 Ci0gICAgICAgIFNlbGVjdE9iamVjdChkYywgb2xkUGVuKTsKLSAgICAgICAgRGVsZXRlT2JqZWN0 KHBlbik7CisgICAgICAgIFJlY3RhbmdsZShkYywgdHJSZWN0LngoKSwgdHJSZWN0LnkoKSwgdHJS ZWN0LnJpZ2h0KCksIHRyUmVjdC5ib3R0b20oKSk7CiAgICAgfQogCi0gICAgaWYgKGJydXNoKSB7 Ci0gICAgICAgIFNlbGVjdE9iamVjdChkYywgb2xkQnJ1c2gpOwotICAgICAgICBEZWxldGVPYmpl Y3QoYnJ1c2gpOwotICAgIH0KKyAgICBTZWxlY3RPYmplY3QoZGMsIG9sZFBlbik7CisgICAgU2Vs ZWN0T2JqZWN0KGRjLCBvbGRCcnVzaCk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3 TGluZShjb25zdCBJbnRQb2ludCYgcG9pbnQxLCBjb25zdCBJbnRQb2ludCYgcG9pbnQyKQpAQCAt NzAyLDE0ICs2OTQsMTMgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lKGNvbnN0IElu dFBvaW50JiBwb2ludDEsIGNvbnN0IEludFBvaW50JiBwb2ludDIpCiAgICAgdHJQb2ludDEgKz0g dHJhbnNwYXJlbnREQy50b1NoaWZ0KCk7CiAgICAgdHJQb2ludDIgKz0gdHJhbnNwYXJlbnREQy50 b1NoaWZ0KCk7CiAKLSAgICBIR0RJT0JKIHBlbiA9IGNyZWF0ZVBlbihzdHJva2VDb2xvcigpLCBz dHJva2VUaGlja25lc3MoKSwgc3Ryb2tlU3R5bGUoKSk7Ci0gICAgSEdESU9CSiBvbGRQZW4gPSBT ZWxlY3RPYmplY3QoZGMsIHBlbik7CisgICAgT3duUHRyPEhQRU4+IHBlbiA9IGNyZWF0ZVBlbihz dHJva2VDb2xvcigpLCBzdHJva2VUaGlja25lc3MoKSwgc3Ryb2tlU3R5bGUoKSk7CisgICAgSEdE SU9CSiBvbGRQZW4gPSBTZWxlY3RPYmplY3QoZGMsIHBlbi5nZXQoKSk7CiAKICAgICBNb3ZlVG9F eChkYywgdHJQb2ludDEueCgpLCB0clBvaW50MS55KCksIDApOwogICAgIExpbmVUbyhkYywgdHJQ b2ludDIueCgpLCB0clBvaW50Mi55KCkpOwogCiAgICAgU2VsZWN0T2JqZWN0KGRjLCBvbGRQZW4p OwotICAgIERlbGV0ZU9iamVjdChwZW4pOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJh d0VsbGlwc2UoY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTcyOCwzMiArNzE5LDI3IEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpkcmF3RWxsaXBzZShjb25zdCBJbnRSZWN0JiByZWN0KQogICAgICAg ICByZXR1cm47CiAgICAgdHJSZWN0Lm1vdmUodHJhbnNwYXJlbnREQy50b1NoaWZ0KCkpOwogCi0g ICAgSEdESU9CSiBicnVzaCA9IDA7CisgICAgT3duUHRyPEhCUlVTSD4gYnJ1c2g7CiAgICAgSEdE SU9CSiBvbGRCcnVzaDsKICAgICBpZiAoZmlsbENvbG9yKCkuYWxwaGEoKSkgewogICAgICAgICBi cnVzaCA9IGNyZWF0ZUJydXNoKGZpbGxDb2xvcigpKTsKLSAgICAgICAgb2xkQnJ1c2ggPSBTZWxl Y3RPYmplY3QoZGMsIGJydXNoKTsKKyAgICAgICAgb2xkQnJ1c2ggPSBTZWxlY3RPYmplY3QoZGMs IGJydXNoLmdldCgpKTsKICAgICB9IGVsc2UKLSAgICAgICAgU2VsZWN0T2JqZWN0KGRjLCBHZXRT dG9ja09iamVjdChOVUxMX0JSVVNIKSk7Ci0gICAgSEdESU9CSiBwZW4gPSAwOwotICAgIEhHRElP Qkogb2xkUGVuOworICAgICAgICBvbGRCcnVzaCA9IFNlbGVjdE9iamVjdChkYywgR2V0U3RvY2tP YmplY3QoTlVMTF9CUlVTSCkpOworCisgICAgT3duUHRyPEhQRU4+IHBlbjsKKyAgICBIR0RJT0JK IG9sZFBlbiA9IDA7CiAgICAgaWYgKHN0cm9rZVN0eWxlKCkgIT0gTm9TdHJva2UpIHsKICAgICAg ICAgcGVuID0gY3JlYXRlUGVuKHN0cm9rZUNvbG9yKCksIHN0cm9rZVRoaWNrbmVzcygpLCBzdHJv a2VTdHlsZSgpKTsKLSAgICAgICAgb2xkUGVuID0gU2VsZWN0T2JqZWN0KGRjLCBwZW4pOworICAg ICAgICBvbGRQZW4gPSBTZWxlY3RPYmplY3QoZGMsIHBlbi5nZXQoKSk7CiAgICAgfSBlbHNlCi0g ICAgICAgIFNlbGVjdE9iamVjdChkYywgR2V0U3RvY2tPYmplY3QoTlVMTF9QRU4pKTsKLQotICAg IEVsbGlwc2UoZGMsIHRyUmVjdC54KCksIHRyUmVjdC55KCksIHRyUmVjdC5yaWdodCgpLCB0clJl Y3QuYm90dG9tKCkpOworICAgICAgICBvbGRQZW4gPSBTZWxlY3RPYmplY3QoZGMsIEdldFN0b2Nr T2JqZWN0KE5VTExfUEVOKSk7CiAKLSAgICBpZiAocGVuKSB7Ci0gICAgICAgIFNlbGVjdE9iamVj dChkYywgb2xkUGVuKTsKLSAgICAgICAgRGVsZXRlT2JqZWN0KHBlbik7Ci0gICAgfQorICAgIGlm IChicnVzaCB8fCBwZW4pCisgICAgICAgIEVsbGlwc2UoZGMsIHRyUmVjdC54KCksIHRyUmVjdC55 KCksIHRyUmVjdC5yaWdodCgpLCB0clJlY3QuYm90dG9tKCkpOwogCi0gICAgaWYgKGJydXNoKSB7 Ci0gICAgICAgIFNlbGVjdE9iamVjdChkYywgb2xkQnJ1c2gpOwotICAgICAgICBEZWxldGVPYmpl Y3QoYnJ1c2gpOwotICAgIH0KKyAgICBTZWxlY3RPYmplY3QoZGMsIG9sZFBlbik7CisgICAgU2Vs ZWN0T2JqZWN0KGRjLCBvbGRCcnVzaCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBlcXVhbEFu Z2xlKGRvdWJsZSBhLCBkb3VibGUgYikgCkBAIC04MTUsOCArODAxLDggQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQ6OnN0cm9rZUFyYyhjb25zdCBJbnRSZWN0JiByZWN0LCBpbnQgc3RhcnRBbmdsZSwg aW50IGFuZ2xlU3AKICAgICAgICAgcmV0dXJuOwogICAgIHRyUmVjdC5tb3ZlKHRyYW5zcGFyZW50 REMudG9TaGlmdCgpKTsKIAotICAgIEhHRElPQkogcGVuID0gY3JlYXRlUGVuKHN0cm9rZUNvbG9y KCksIHN0cm9rZVRoaWNrbmVzcygpLCBzdHJva2VTdHlsZSgpKTsKLSAgICBIR0RJT0JKIG9sZFBl biA9IFNlbGVjdE9iamVjdChkYywgcGVuKTsKKyAgICBPd25QdHI8SFBFTj4gcGVuID0gY3JlYXRl UGVuKHN0cm9rZUNvbG9yKCksIHN0cm9rZVRoaWNrbmVzcygpLCBzdHJva2VTdHlsZSgpKTsKKyAg ICBIR0RJT0JKIG9sZFBlbiA9IFNlbGVjdE9iamVjdChkYywgcGVuLmdldCgpKTsKIAogICAgIGRv dWJsZSBhID0gdHJSZWN0LndpZHRoKCkgKiAwLjU7CiAgICAgZG91YmxlIGIgPSB0clJlY3QuaGVp Z2h0KCkgKiAwLjU7CkBAIC04NzIsNyArODU4LDYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0 cm9rZUFyYyhjb25zdCBJbnRSZWN0JiByZWN0LCBpbnQgc3RhcnRBbmdsZSwgaW50IGFuZ2xlU3AK ICAgICAgICAgU2VsZWN0Q2xpcFJnbihkYywgY2xpcFJnbi5nZXQoKSk7CiAKICAgICBTZWxlY3RP YmplY3QoZGMsIG9sZFBlbik7Ci0gICAgRGVsZXRlT2JqZWN0KHBlbik7CiB9CiAKIHZvaWQgR3Jh cGhpY3NDb250ZXh0OjpkcmF3Q29udmV4UG9seWdvbihzaXplX3QgbnBvaW50cywgY29uc3QgRmxv YXRQb2ludCogcG9pbnRzLCBib29sIHNob3VsZEFudGlhbGlhcykKQEAgLTkxNiwzNiArOTAxLDI3 IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Q29udmV4UG9seWdvbihzaXplX3QgbnBvaW50 cywgY29uc3QgRmxvYXRQb2ludCogcG9pbnRzCiAgICAgICAgIHdpblBvaW50c1tpXS55ICs9IHRy YW5zcGFyZW50REMudG9TaGlmdCgpLmhlaWdodCgpOwogICAgIH0KIAotICAgIEhHRElPQkogYnJ1 c2ggPSAwOworICAgIE93blB0cjxIQlJVU0g+IGJydXNoOwogICAgIEhHRElPQkogb2xkQnJ1c2g7 CiAgICAgaWYgKGZpbGxDb2xvcigpLmFscGhhKCkpIHsKICAgICAgICAgYnJ1c2ggPSBjcmVhdGVC cnVzaChmaWxsQ29sb3IoKSk7Ci0gICAgICAgIG9sZEJydXNoID0gU2VsZWN0T2JqZWN0KGRjLCBi cnVzaCk7CisgICAgICAgIG9sZEJydXNoID0gU2VsZWN0T2JqZWN0KGRjLCBicnVzaC5nZXQoKSk7 CiAgICAgfSBlbHNlCi0gICAgICAgIFNlbGVjdE9iamVjdChkYywgR2V0U3RvY2tPYmplY3QoTlVM TF9CUlVTSCkpOworICAgICAgICBvbGRCcnVzaCA9IFNlbGVjdE9iamVjdChkYywgR2V0U3RvY2tP YmplY3QoTlVMTF9CUlVTSCkpOwogCi0gICAgSEdESU9CSiBwZW4gPSAwOworICAgIE93blB0cjxI UEVOPiBwZW47CiAgICAgSEdESU9CSiBvbGRQZW47CiAgICAgaWYgKHN0cm9rZVN0eWxlKCkgIT0g Tm9TdHJva2UpIHsKICAgICAgICAgcGVuID0gY3JlYXRlUGVuKHN0cm9rZUNvbG9yKCksIHN0cm9r ZVRoaWNrbmVzcygpLCBzdHJva2VTdHlsZSgpKTsKLSAgICAgICAgb2xkUGVuID0gU2VsZWN0T2Jq ZWN0KGRjLCBwZW4pOworICAgICAgICBvbGRQZW4gPSBTZWxlY3RPYmplY3QoZGMsIHBlbi5nZXQo KSk7CiAgICAgfSBlbHNlCi0gICAgICAgIFNlbGVjdE9iamVjdChkYywgR2V0U3RvY2tPYmplY3Qo TlVMTF9QRU4pKTsKLQotICAgIGlmICghYnJ1c2ggJiYgIXBlbikKLSAgICAgICAgcmV0dXJuOwot Ci0gICAgUG9seWdvbihkYywgd2luUG9pbnRzLmRhdGEoKSwgbnBvaW50cyk7CisgICAgICAgIG9s ZFBlbiA9IFNlbGVjdE9iamVjdChkYywgR2V0U3RvY2tPYmplY3QoTlVMTF9QRU4pKTsKIAotICAg IGlmIChwZW4pIHsKLSAgICAgICAgU2VsZWN0T2JqZWN0KGRjLCBvbGRQZW4pOwotICAgICAgICBE ZWxldGVPYmplY3QocGVuKTsKLSAgICB9CisgICAgaWYgKGJydXNoIHx8IHBlbikKKyAgICAgICAg UG9seWdvbihkYywgd2luUG9pbnRzLmRhdGEoKSwgbnBvaW50cyk7CiAKLSAgICBpZiAoYnJ1c2gp IHsKLSAgICAgICAgU2VsZWN0T2JqZWN0KGRjLCBvbGRCcnVzaCk7Ci0gICAgICAgIERlbGV0ZU9i amVjdChicnVzaCk7Ci0gICAgfQorICAgIFNlbGVjdE9iamVjdChkYywgb2xkUGVuKTsKKyAgICBT ZWxlY3RPYmplY3QoZGMsIG9sZEJydXNoKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNs aXBDb252ZXhQb2x5Z29uKHNpemVfdCBudW1Qb2ludHMsIGNvbnN0IEZsb2F0UG9pbnQqIHBvaW50 cywgYm9vbCBhbnRpYWxpYXNlZCkKQEAgLTExMjQsOCArMTEwMCw4IEBAIHZvaWQgR3JhcGhpY3ND b250ZXh0OjpzdHJva2VSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgZmxvYXQgd2lkdGgpCiAg ICAgICAgIHJldHVybjsKICAgICB0clJlY3QubW92ZSh0cmFuc3BhcmVudERDLnRvU2hpZnQoKSk7 CiAKLSAgICBIR0RJT0JKIHBlbiA9IGNyZWF0ZVBlbihzdHJva2VDb2xvcigpLCBzdHJva2VUaGlj a25lc3MoKSwgc3Ryb2tlU3R5bGUoKSk7Ci0gICAgSEdESU9CSiBvbGRQZW4gPSBTZWxlY3RPYmpl Y3QoZGMsIHBlbik7CisgICAgT3duUHRyPEhQRU4+IHBlbiA9IGNyZWF0ZVBlbihzdHJva2VDb2xv cigpLCBzdHJva2VUaGlja25lc3MoKSwgc3Ryb2tlU3R5bGUoKSk7CisgICAgSEdESU9CSiBvbGRQ ZW4gPSBTZWxlY3RPYmplY3QoZGMsIHBlbi5nZXQoKSk7CiAKICAgICBpbnQgcmlnaHQgPSB0clJl Y3QucmlnaHQoKSAtIDE7CiAgICAgaW50IGJvdHRvbSA9IHRyUmVjdC5ib3R0b20oKSAtIDE7CkBA IC0xMTQxLDcgKzExMTcsNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUmVjdChjb25z dCBGbG9hdFJlY3QmIHJlY3QsIGZsb2F0IHdpZHRoKQogICAgIFBvbHlsaW5lKGRjLCBpbnRQb2lu dHMsIDUpOwogCiAgICAgU2VsZWN0T2JqZWN0KGRjLCBvbGRQZW4pOwotICAgIERlbGV0ZU9iamVj dChwZW4pOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6YmVnaW5UcmFuc3BhcmVuY3lMYXll cihmbG9hdCBvcGFjaXR5KQpAQCAtMTI4Niw5ICsxMjYxLDkgQEAgdm9pZCBHcmFwaGljc0NvbnRl eHQ6OmZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiBmaWxsUmVjdCwgY29uc3QgSW50U2l6 ZSYgdG8KIAogICAgIFJFQ1QgcmVjdFdpbiA9IGRzdFJlY3Q7CiAKLSAgICBIR0RJT0JKIGJydXNo ID0gY3JlYXRlQnJ1c2goc2hhZG93Q29sb3IpOwotICAgIEhHRElPQkogb2xkQnJ1c2ggPSBTZWxl Y3RPYmplY3QoZGMsIGJydXNoKTsKLSAgIAorICAgIE93blB0cjxIQlJVU0g+IGJydXNoID0gY3Jl YXRlQnJ1c2goc2hhZG93Q29sb3IpOworICAgIEhHRElPQkogb2xkQnJ1c2ggPSBTZWxlY3RPYmpl Y3QoZGMsIGJydXNoLmdldCgpKTsKKwogICAgIFNlbGVjdE9iamVjdChkYywgR2V0U3RvY2tPYmpl Y3QoTlVMTF9QRU4pKTsKIAogICAgIEludFBvaW50IGNlbnRlclBvaW50ID0gcmVjdENlbnRlclBv aW50KHJlY3RXaW4pOwpAQCAtMTMyNCw3ICsxMjk5LDYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6 OmZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiBmaWxsUmVjdCwgY29uc3QgSW50U2l6ZSYg dG8KICAgICBkcmF3Um91bmRDb3JuZXIobmVlZHNOZXdDbGlwLCBjbGlwUmVjdCwgcmVjdFdpbiwg ZGMsIHN0YWJsZVJvdW5kKG5ld0JvdHRvbVJpZ2h0LndpZHRoKCkgKiAyKSwgc3RhYmxlUm91bmQo bmV3Qm90dG9tUmlnaHQuaGVpZ2h0KCkgKiAyKSk7CiAKICAgICBTZWxlY3RPYmplY3QoZGMsIG9s ZEJydXNoKTsKLSAgICBEZWxldGVPYmplY3QoYnJ1c2gpOwogfQogCiAKQEAgLTEzODIsOCArMTM1 Niw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUGF0aCgpCiAgICAgaWYgKCFtX2RhdGEt Pm1fZGMpCiAgICAgICAgIHJldHVybjsKIAorICAgIE93blB0cjxIQlJVU0g+IGJydXNoID0gY3Jl YXRlQnJ1c2goYyk7CisKICAgICBpZiAobV9kYXRhLT5tX29wYWNpdHkgPCAxLjBmIHx8IG1fZGF0 YS0+aGFzQWxwaGEoKSkgewotICAgICAgICBIR0RJT0JKIGJydXNoID0gY3JlYXRlQnJ1c2goYyk7 CiAgICAgICAgIGZvciAoVmVjdG9yPFBhdGg+Ojpjb25zdF9pdGVyYXRvciBpID0gbV9kYXRhLT5t X3BhdGhzLmJlZ2luKCk7IGkgIT0gbV9kYXRhLT5tX3BhdGhzLmVuZCgpOyArK2kpIHsKICAgICAg ICAgICAgIEludFJlY3QgdHJSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChtX2RhdGEtPm1hcFJlY3Qo aS0+Ym91bmRpbmdSZWN0KCkpKTsKICAgICAgICAgICAgIHRyUmVjdC5pbmZsYXRlKDEpOwpAQCAt MTM5NiwxOSArMTM3MSwxNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoKQogICAg ICAgICAgICAgdHIudHJhbnNsYXRlKHRyYW5zcGFyZW50REMudG9TaGlmdCgpLndpZHRoKCksIHRy YW5zcGFyZW50REMudG9TaGlmdCgpLmhlaWdodCgpKTsKIAogICAgICAgICAgICAgU2VsZWN0T2Jq ZWN0KGRjLCBHZXRTdG9ja09iamVjdChOVUxMX1BFTikpOwotICAgICAgICAgICAgSEdESU9CSiBv bGRCcnVzaCA9IFNlbGVjdE9iamVjdChkYywgYnJ1c2gpOworICAgICAgICAgICAgSEdESU9CSiBv bGRCcnVzaCA9IFNlbGVjdE9iamVjdChkYywgYnJ1c2guZ2V0KCkpOwogICAgICAgICAgICAgaS0+ cGxhdGZvcm1QYXRoKCktPmZpbGxQYXRoKGRjLCAmdHIpOwogICAgICAgICAgICAgU2VsZWN0T2Jq ZWN0KGRjLCBvbGRCcnVzaCk7CiAgICAgICAgIH0KLSAgICAgICAgRGVsZXRlT2JqZWN0KGJydXNo KTsKICAgICB9IGVsc2UgewogICAgICAgICBTZWxlY3RPYmplY3QobV9kYXRhLT5tX2RjLCBHZXRT dG9ja09iamVjdChOVUxMX1BFTikpOwotICAgICAgICBIR0RJT0JKIGJydXNoID0gY3JlYXRlQnJ1 c2goYyk7Ci0gICAgICAgIEhHRElPQkogb2xkQnJ1c2ggPSBTZWxlY3RPYmplY3QobV9kYXRhLT5t X2RjLCBicnVzaCk7CisgICAgICAgIEhHRElPQkogb2xkQnJ1c2ggPSBTZWxlY3RPYmplY3QobV9k YXRhLT5tX2RjLCBicnVzaC5nZXQoKSk7CiAgICAgICAgIGZvciAoVmVjdG9yPFBhdGg+Ojpjb25z dF9pdGVyYXRvciBpID0gbV9kYXRhLT5tX3BhdGhzLmJlZ2luKCk7IGkgIT0gbV9kYXRhLT5tX3Bh dGhzLmVuZCgpOyArK2kpCiAgICAgICAgICAgICBpLT5wbGF0Zm9ybVBhdGgoKS0+ZmlsbFBhdGgo bV9kYXRhLT5tX2RjLCAmbV9kYXRhLT5tX3RyYW5zZm9ybSk7CiAgICAgICAgIFNlbGVjdE9iamVj dChtX2RhdGEtPm1fZGMsIG9sZEJydXNoKTsKLSAgICAgICAgRGVsZXRlT2JqZWN0KGJydXNoKTsK ICAgICB9CiB9CiAKQEAgLTE0MjIsOCArMTM5NCw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpz dHJva2VQYXRoKCkKICAgICBpZiAoIW1fZGF0YS0+bV9kYykKICAgICAgICAgcmV0dXJuOwogCisg ICAgT3duUHRyPEhQRU4+IHBlbiA9IGNyZWF0ZVBlbihzdHJva2VDb2xvcigpLCBzdHJva2VUaGlj a25lc3MoKSwgc3Ryb2tlU3R5bGUoKSk7CisKICAgICBpZiAobV9kYXRhLT5tX29wYWNpdHkgPCAx LjBmIHx8IG1fZGF0YS0+aGFzQWxwaGEoKSkgewotICAgICAgICBIR0RJT0JKIHBlbiA9IGNyZWF0 ZVBlbihzdHJva2VDb2xvcigpLCBzdHJva2VUaGlja25lc3MoKSwgc3Ryb2tlU3R5bGUoKSk7CiAg ICAgICAgIGZvciAoVmVjdG9yPFBhdGg+Ojpjb25zdF9pdGVyYXRvciBpID0gbV9kYXRhLT5tX3Bh dGhzLmJlZ2luKCk7IGkgIT0gbV9kYXRhLT5tX3BhdGhzLmVuZCgpOyArK2kpIHsKICAgICAgICAg ICAgIEludFJlY3QgdHJSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChtX2RhdGEtPm1hcFJlY3QoaS0+ Ym91bmRpbmdSZWN0KCkpKTsKICAgICAgICAgICAgIHRyUmVjdC5pbmZsYXRlKDEpOwpAQCAtMTQz NiwxOSArMTQwOSwxNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aCgpCiAgICAg ICAgICAgICB0ci50cmFuc2xhdGUodHJhbnNwYXJlbnREQy50b1NoaWZ0KCkud2lkdGgoKSwgdHJh bnNwYXJlbnREQy50b1NoaWZ0KCkuaGVpZ2h0KCkpOwogCiAgICAgICAgICAgICBTZWxlY3RPYmpl Y3QoZGMsIEdldFN0b2NrT2JqZWN0KE5VTExfQlJVU0gpKTsKLSAgICAgICAgICAgIEhHRElPQkog b2xkUGVuID0gU2VsZWN0T2JqZWN0KGRjLCBwZW4pOworICAgICAgICAgICAgSEdESU9CSiBvbGRQ ZW4gPSBTZWxlY3RPYmplY3QoZGMsIHBlbi5nZXQoKSk7CiAgICAgICAgICAgICBpLT5wbGF0Zm9y bVBhdGgoKS0+c3Ryb2tlUGF0aChkYywgJnRyKTsKICAgICAgICAgICAgIFNlbGVjdE9iamVjdChk Yywgb2xkUGVuKTsKICAgICAgICAgfQotICAgICAgICBEZWxldGVPYmplY3QocGVuKTsKICAgICB9 IGVsc2UgewogICAgICAgICBTZWxlY3RPYmplY3QobV9kYXRhLT5tX2RjLCBHZXRTdG9ja09iamVj dChOVUxMX0JSVVNIKSk7Ci0gICAgICAgIEhHRElPQkogcGVuID0gY3JlYXRlUGVuKHN0cm9rZUNv bG9yKCksIHN0cm9rZVRoaWNrbmVzcygpLCBzdHJva2VTdHlsZSgpKTsKLSAgICAgICAgSEdESU9C SiBvbGRQZW4gPSBTZWxlY3RPYmplY3QobV9kYXRhLT5tX2RjLCBwZW4pOworICAgICAgICBIR0RJ T0JKIG9sZFBlbiA9IFNlbGVjdE9iamVjdChtX2RhdGEtPm1fZGMsIHBlbi5nZXQoKSk7CiAgICAg ICAgIGZvciAoVmVjdG9yPFBhdGg+Ojpjb25zdF9pdGVyYXRvciBpID0gbV9kYXRhLT5tX3BhdGhz LmJlZ2luKCk7IGkgIT0gbV9kYXRhLT5tX3BhdGhzLmVuZCgpOyArK2kpCiAgICAgICAgICAgICBp LT5wbGF0Zm9ybVBhdGgoKS0+c3Ryb2tlUGF0aChtX2RhdGEtPm1fZGMsICZtX2RhdGEtPm1fdHJh bnNmb3JtKTsKICAgICAgICAgU2VsZWN0T2JqZWN0KG1fZGF0YS0+bV9kYywgb2xkUGVuKTsKLSAg ICAgICAgRGVsZXRlT2JqZWN0KHBlbik7CiAgICAgfQogfQogCg==