98806 2012-10-09 11:40:22 -0700 [BlackBerry] Cleanup FatFingers.cpp 2013-01-04 08:59:45 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rwlbuis rwlbuis mifenton tonikitoo webkit.review.bot oldest_to_newest 738001 0 rwlbuis 2012-10-09 11:40:22 -0700 SSIA 738028 1 167808 rwlbuis 2012-10-09 12:01:47 -0700 Created attachment 167808 Patch 738033 2 webkit.review.bot 2012-10-09 12:04:58 -0700 Attachment 167808 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/blackberry/ChangeLog', u'Sou..." exit_code: 1 Source/WebKit/blackberry/WebKitSupport/FatFingers.cpp:354: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 800232 3 rwlbuis 2013-01-04 08:59:45 -0800 This was landed in r130804, closing. 167808 2012-10-09 12:01:47 -0700 2012-10-09 13:26:35 -0700 Patch bug-98806-20121009150420.patch text/plain 12713 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA4ZTI3OGQ0MjMyNTczYmYyYTI4NGE0MjIzYjczNTdlNzE1OTYxNGJlLi4yZWJiZTQxMGZh YWE5YjdlYTc4ZjI5NWE4YjI1MGQ5NjcxZjE2MTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0xMC0wOSAgUm9iIEJ1aXMgIDxyYnVpc0ByaW0u Y29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBDbGVhbnVwIEZhdEZpbmdlcnMuY3BwCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODgwNgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFudXAgbmFtZXNw YWNlIHVzYWdlIGFuZCBzeW5jIHVwIEZhdEZpbmdlcnMuY3BwLgorCisgICAgICAgICogV2ViS2l0 U3VwcG9ydC9GYXRGaW5nZXJzLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6Y29t cGFyZURpc3RhbmNlQmV0d2VlblBvaW50cyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OkZhdEZpbmdlcnM6OmZpbmRCZXN0UG9pbnQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpGYXRGaW5nZXJzOjpjaGVja0ZpbmdlckludGVyc2VjdGlvbik6CisgICAgICAgIChCbGFja0Jl cnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmZpbmRJbnRlcnNlY3RpbmdSZWdpb25zKToKKyAgICAg ICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6Y2hlY2tGb3JDbGlja2FibGVFbGVt ZW50KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6Y2hlY2tGb3JU ZXh0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyczo6Z2V0Tm9kZXNG cm9tUmVjdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnM6OmdldFJl bGV2YW50SW5mb0Zyb21Qb2ludCk6CisKIDIwMTItMTAtMDkgIEFudG9uaW8gR29tZXMgIDxhZ29t ZXNAcmltLmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9mIEZJWEVEX1BPU0lUSU9OX0NSRUFURVNf U1RBQ0tJTkdfQ09OVEVYVCBpbiBmYXZvciBvZiBTZXR0aW5nczo6Zml4ZWRQb3NpdGlvbkNyZWF0 ZXNTdGFja2luZ0NvbnRleHQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvRmF0RmluZ2Vycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmNwcAppbmRleCBlMTg0YTJmNTQ5MzY2ZWRiYjYxMGRk MjcyYWNlYTcxYWQ3YzVmZGFkLi43N2EwMDU1MTQxOGE3MzQ2NjgxNjA3YWM4MThjOTQwY2Y5ODFh ZjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9G YXRGaW5nZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9GYXRGaW5nZXJzLmNwcApAQCAtNTAsNyArNTAsNiBAQAogdXNpbmcgQmxhY2tCZXJyeTo6UGxh dGZvcm06OkxvZ0xldmVsSW5mbzsKIHVzaW5nIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpsb2c7CiB1 c2luZyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdFJlZ2lvbjsKLXVzaW5nIFdURjo6UmVm UHRyOwogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTM3LDcgKzEzNiw3IEBAIHN0 YXRpYyBpbmxpbmUgaW50IGRpc3RhbmNlQmV0d2VlblBvaW50cyhjb25zdCBJbnRQb2ludCYgcDEs IGNvbnN0IEludFBvaW50JiBwMikKICAgICByZXR1cm4gc3FydCgoZG91YmxlKSgoZHggKiBkeCkg KyAoZHkgKiBkeSkpKTsKIH0KIAotc3RhdGljIGJvb2wgY29tcGFyZURpc3RhbmNlQmV0d2VlblBv aW50cyhjb25zdCBQbGF0Zm9ybTo6SW50UG9pbnQmIHAsIGNvbnN0IFBsYXRmb3JtOjpJbnRSZWN0 UmVnaW9uJiByMSwgY29uc3QgUGxhdGZvcm06OkludFJlY3RSZWdpb24mIHIyKQorc3RhdGljIGJv b2wgY29tcGFyZURpc3RhbmNlQmV0d2VlblBvaW50cyhjb25zdCBQbGF0Zm9ybTo6SW50UG9pbnQm IHAsIGNvbnN0IEludFJlY3RSZWdpb24mIHIxLCBjb25zdCBJbnRSZWN0UmVnaW9uJiByMikKIHsK ICAgICByZXR1cm4gZGlzdGFuY2VCZXR3ZWVuUG9pbnRzKHAsIHIxLmV4dGVudHMoKS5jZW50ZXIo KSkgPiBkaXN0YW5jZUJldHdlZW5Qb2ludHMocCwgcjIuZXh0ZW50cygpLmNlbnRlcigpKTsKIH0K QEAgLTIwOCwxMiArMjA3LDEyIEBAIGNvbnN0IEZhdEZpbmdlcnNSZXN1bHQgRmF0RmluZ2Vyczo6 ZmluZEJlc3RQb2ludCgpCiAjZW5kaWYKIAogICAgIFZlY3RvcjxJbnRlcnNlY3RpbmdSZWdpb24+ IGludGVyc2VjdGluZ1JlZ2lvbnM7Ci0gICAgUGxhdGZvcm06OkludFJlY3RSZWdpb24gcmVtYWlu aW5nRmluZ2VyUmVnaW9uID0gUGxhdGZvcm06OkludFJlY3RSZWdpb24oZmluZ2VyUmVjdEZvclBv aW50KG1fY29udGVudFBvcykpOworICAgIEludFJlY3RSZWdpb24gcmVtYWluaW5nRmluZ2VyUmVn aW9uID0gSW50UmVjdFJlZ2lvbihmaW5nZXJSZWN0Rm9yUG9pbnQobV9jb250ZW50UG9zKSk7CiAK ICAgICBib29sIGZvdW5kT25lID0gZmluZEludGVyc2VjdGluZ1JlZ2lvbnMobV93ZWJQYWdlLT5t X21haW5GcmFtZS0+ZG9jdW1lbnQoKSwgaW50ZXJzZWN0aW5nUmVnaW9ucywgcmVtYWluaW5nRmlu Z2VyUmVnaW9uKTsKICAgICBpZiAoIWZvdW5kT25lKSB7CiAgICAgICAgIG1fbWF0Y2hpbmdBcHBy b2FjaCA9IE1hZGVDbGlja2FibGVCeVRoZVdlYnBhZ2U7Ci0gICAgICAgIHJlbWFpbmluZ0Zpbmdl clJlZ2lvbiA9IFBsYXRmb3JtOjpJbnRSZWN0UmVnaW9uKGZpbmdlclJlY3RGb3JQb2ludChtX2Nv bnRlbnRQb3MpKTsKKyAgICAgICAgcmVtYWluaW5nRmluZ2VyUmVnaW9uID0gSW50UmVjdFJlZ2lv bihmaW5nZXJSZWN0Rm9yUG9pbnQobV9jb250ZW50UG9zKSk7CiAgICAgICAgIGZvdW5kT25lID0g ZmluZEludGVyc2VjdGluZ1JlZ2lvbnMobV93ZWJQYWdlLT5tX21haW5GcmFtZS0+ZG9jdW1lbnQo KSwgaW50ZXJzZWN0aW5nUmVnaW9ucywgcmVtYWluaW5nRmluZ2VyUmVnaW9uKTsKICAgICB9CiAK QEAgLTIyNCwxNCArMjIzLDEzIEBAIGNvbnN0IEZhdEZpbmdlcnNSZXN1bHQgRmF0RmluZ2Vyczo6 ZmluZEJlc3RQb2ludCgpCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAKICAgICBOb2RlKiBiZXN0 Tm9kZSA9IDA7Ci0gICAgUGxhdGZvcm06OkludFJlY3RSZWdpb24gbGFyZ2VzdEludGVyc2VjdGlv blJlZ2lvbjsKLSAgICBJbnRQb2ludCBiZXN0UG9pbnQ7CisgICAgSW50UmVjdFJlZ2lvbiBsYXJn ZXN0SW50ZXJzZWN0aW9uUmVnaW9uOwogICAgIGludCBsYXJnZXN0SW50ZXJzZWN0aW9uUmVnaW9u QXJlYSA9IDA7CiAKICAgICBWZWN0b3I8SW50ZXJzZWN0aW5nUmVnaW9uPjo6Y29uc3RfaXRlcmF0 b3IgZW5kSXQgPSBpbnRlcnNlY3RpbmdSZWdpb25zLmVuZCgpOwogICAgIGZvciAoVmVjdG9yPElu dGVyc2VjdGluZ1JlZ2lvbj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gaW50ZXJzZWN0aW5nUmVnaW9u cy5iZWdpbigpOyBpdCAhPSBlbmRJdDsgKytpdCkgewogICAgICAgICBOb2RlKiBjdXJyZW50Tm9k ZSA9IGl0LT5maXJzdDsKLSAgICAgICAgUGxhdGZvcm06OkludFJlY3RSZWdpb24gY3VycmVudElu dGVyc2VjdGlvblJlZ2lvbiA9IGl0LT5zZWNvbmQ7CisgICAgICAgIEludFJlY3RSZWdpb24gY3Vy cmVudEludGVyc2VjdGlvblJlZ2lvbiA9IGl0LT5zZWNvbmQ7CiAKICAgICAgICAgaW50IGN1cnJl bnRJbnRlcnNlY3Rpb25SZWdpb25BcmVhID0gY3VycmVudEludGVyc2VjdGlvblJlZ2lvbi5hcmVh KCk7CiAgICAgICAgIGlmIChjdXJyZW50SW50ZXJzZWN0aW9uUmVnaW9uQXJlYSA+IGxhcmdlc3RJ bnRlcnNlY3Rpb25SZWdpb25BcmVhCkBAIC0yNTksMTcgKzI1NywxNiBAQCBjb25zdCBGYXRGaW5n ZXJzUmVzdWx0IEZhdEZpbmdlcnM6OmZpbmRCZXN0UG9pbnQoKQogLy8gJ3JlbWFpbmluZ0Zpbmdl clJlZ2lvbicgYW5kICdpbnRlcnNlY3RpbmdSZWdpb25zJyB3aWxsIGFsd2F5cyBiZSBpbiBtYWlu IGZyYW1lIGNvbnRlbnRzCiAvLyBjb29yZGluYXRlcy4KIC8vIFRodXMsIGJlZm9yZSBjb21wYXJp bmcsIHdlIG5lZWQgdG8gbWFwIHRoZSBmb3JtZXIgdG8gbWFpbiBmcmFtZSBjb250ZW50cyBjb29y ZGluYXRlcy4KLWJvb2wgRmF0RmluZ2Vyczo6Y2hlY2tGaW5nZXJJbnRlcnNlY3Rpb24oY29uc3Qg UGxhdGZvcm06OkludFJlY3RSZWdpb24mIHJlZ2lvbiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgUGxhdGZvcm06OkludFJlY3RSZWdpb24mIHJlbWFpbmlu Z0ZpbmdlclJlZ2lvbiwKK2Jvb2wgRmF0RmluZ2Vyczo6Y2hlY2tGaW5nZXJJbnRlcnNlY3Rpb24o Y29uc3QgSW50UmVjdFJlZ2lvbiYgcmVnaW9uLCBjb25zdCBJbnRSZWN0UmVnaW9uJiByZW1haW5p bmdGaW5nZXJSZWdpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IE5vZGUqIG5vZGUsIFZlY3RvcjxJbnRlcnNlY3RpbmdSZWdpb24+JiBpbnRlcnNlY3RpbmdSZWdp b25zKQogewogICAgIEFTU0VSVChub2RlKTsKIAotICAgIFBsYXRmb3JtOjpJbnRSZWN0UmVnaW9u IHJlZ2lvbkNvcHkocmVnaW9uKTsKKyAgICBJbnRSZWN0UmVnaW9uIHJlZ2lvbkNvcHkocmVnaW9u KTsKICAgICBXZWJDb3JlOjpJbnRQb2ludCBmcmFtZVBvcyhtX3dlYlBhZ2UtPmZyYW1lT2Zmc2V0 KG5vZGUtPmRvY3VtZW50KCktPmZyYW1lKCkpKTsKICAgICByZWdpb25Db3B5Lm1vdmUoZnJhbWVQ b3MueCgpLCBmcmFtZVBvcy55KCkpOwogCi0gICAgUGxhdGZvcm06OkludFJlY3RSZWdpb24gaW50 ZXJzZWN0aW9uID0gaW50ZXJzZWN0UmVnaW9ucyhyZWdpb25Db3B5LCByZW1haW5pbmdGaW5nZXJS ZWdpb24pOworICAgIEludFJlY3RSZWdpb24gaW50ZXJzZWN0aW9uID0gaW50ZXJzZWN0UmVnaW9u cyhyZWdpb25Db3B5LCByZW1haW5pbmdGaW5nZXJSZWdpb24pOwogICAgIGlmIChpbnRlcnNlY3Rp b24uaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTI5Miw4ICsyODksNyBA QCBib29sIEZhdEZpbmdlcnM6OmNoZWNrRmluZ2VySW50ZXJzZWN0aW9uKGNvbnN0IFBsYXRmb3Jt OjpJbnRSZWN0UmVnaW9uJiByZWdpb24sCiAKIC8vIGludGVyc2VjdGluZ1JlZ2lvbnMgYW5kIHJl bWFpbmluZ0ZpbmdlclJlZ2lvbiBhcmUgYWxsIGluIG1haW4gZnJhbWUgY29udGVudHMgY29vcmRp bmF0ZXMsCiAvLyBldmVuIG9uIHJlY3Vyc2l2ZSBjYWxscyBvZiA6OmZpbmRJbnRlcnNlY3RpbmdS ZWdpb25zLgotYm9vbCBGYXRGaW5nZXJzOjpmaW5kSW50ZXJzZWN0aW5nUmVnaW9ucyhEb2N1bWVu dCogZG9jdW1lbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZl Y3RvcjxJbnRlcnNlY3RpbmdSZWdpb24+JiBpbnRlcnNlY3RpbmdSZWdpb25zLCBQbGF0Zm9ybTo6 SW50UmVjdFJlZ2lvbiYgcmVtYWluaW5nRmluZ2VyUmVnaW9uKQorYm9vbCBGYXRGaW5nZXJzOjpm aW5kSW50ZXJzZWN0aW5nUmVnaW9ucyhEb2N1bWVudCogZG9jdW1lbnQsIFZlY3RvcjxJbnRlcnNl Y3RpbmdSZWdpb24+JiBpbnRlcnNlY3RpbmdSZWdpb25zLCBJbnRSZWN0UmVnaW9uJiByZW1haW5p bmdGaW5nZXJSZWdpb24pCiB7CiAgICAgaWYgKCFkb2N1bWVudCB8fCAhZG9jdW1lbnQtPmZyYW1l KCktPnZpZXcoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzU1LDE4ICszNTEsMTggQEAg Ym9vbCBGYXRGaW5nZXJzOjpmaW5kSW50ZXJzZWN0aW5nUmVnaW9ucyhEb2N1bWVudCogZG9jdW1l bnQsCiAKIGJvb2wgRmF0RmluZ2Vyczo6Y2hlY2tGb3JDbGlja2FibGVFbGVtZW50KEVsZW1lbnQq IGN1ckVsZW1lbnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBW ZWN0b3I8SW50ZXJzZWN0aW5nUmVnaW9uPiYgaW50ZXJzZWN0aW5nUmVnaW9ucywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBsYXRmb3JtOjpJbnRSZWN0UmVnaW9u JiByZW1haW5pbmdGaW5nZXJSZWdpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBJbnRSZWN0UmVnaW9uJiByZW1haW5pbmdGaW5nZXJSZWdpb24sCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBSZW5kZXJMYXllciomIGxvd2VzdFBv c2l0aW9uZWRFbmNsb3NpbmdMYXllclNvRmFyKQogewogICAgIEFTU0VSVChjdXJFbGVtZW50KTsK IAogICAgIGJvb2wgaW50ZXJzZWN0cyA9IGZhbHNlOwotICAgIFBsYXRmb3JtOjpJbnRSZWN0UmVn aW9uIGVsZW1lbnRSZWdpb247CisgICAgSW50UmVjdFJlZ2lvbiBlbGVtZW50UmVnaW9uOwogCiAg ICAgYm9vbCBpc0NsaWNrYWJsZUVsZW1lbnQgPSBpc0VsZW1lbnRDbGlja2FibGUoY3VyRWxlbWVu dCk7CiAgICAgaWYgKGlzQ2xpY2thYmxlRWxlbWVudCkgewogICAgICAgICBpZiAoY3VyRWxlbWVu dC0+aXNMaW5rKCkpIHsKLSAgICAgICAgICAgIC8vIExpbmtzIGNhbiB3cmFwIGxpbmVzLCBhbmQg aW4gc3VjaCBjYXNlcyBOb2RlOjpnZXRSZWN0KCkgY2FuIGdpdmUgdXMKKyAgICAgICAgICAgIC8v IExpbmtzIGNhbiB3cmFwIGxpbmVzLCBhbmQgaW4gc3VjaCBjYXNlcyBOb2RlOjpib3VuZGluZ0Jv eCgpIGNhbiBnaXZlIHVzCiAgICAgICAgICAgICAvLyBub3QgYWNjdXJhdGUgcmVjdHMsIHNpbmNl IGl0IHVuaXRlcyBhbGwgSW5saW5lQm94J3MgcmVjdHMuIEluIHRoZXNlCiAgICAgICAgICAgICAv LyBjYXNlcywgd2UgY2FuIHByb2Nlc3MgZWFjaCBsaW5lIG9mIHRoZSBsaW5rIHNlcGFyYXRlbHkg d2l0aCBvdXIKICAgICAgICAgICAgIC8vIGludGVyc2VjdGlvbiByZWN0LCBnZXR0aW5nIGEgbW9y ZSBhY2N1cmF0ZSBjbGlja2luZy4KQEAgLTM3OSwxMCArMzc1LDEwIEBAIGJvb2wgRmF0RmluZ2Vy czo6Y2hlY2tGb3JDbGlja2FibGVFbGVtZW50KEVsZW1lbnQqIGN1ckVsZW1lbnQsCiAgICAgICAg ICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG47ICsraSkKICAgICAgICAgICAgICAgICBlbGVt ZW50UmVnaW9uID0gdW5pb25SZWdpb25zKGVsZW1lbnRSZWdpb24sIFBsYXRmb3JtOjpJbnRSZWN0 KHF1YWRzW2ldLmVuY2xvc2luZ0JvdW5kaW5nQm94KCkpKTsKICAgICAgICAgfSBlbHNlCi0gICAg ICAgICAgICBlbGVtZW50UmVnaW9uID0gUGxhdGZvcm06OkludFJlY3RSZWdpb24oY3VyRWxlbWVu dC0+cmVuZGVyZXIoKS0+YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QodHJ1ZSAvKnVzZSB0cmFuc2Zv cm1zKi8pKTsKKyAgICAgICAgICAgIGVsZW1lbnRSZWdpb24gPSBJbnRSZWN0UmVnaW9uKGN1ckVs ZW1lbnQtPnJlbmRlcmVyKCktPmFic29sdXRlQm91bmRpbmdCb3hSZWN0KHRydWUgLyp1c2UgdHJh bnNmb3JtcyovKSk7CiAKICAgICB9IGVsc2UKLSAgICAgICAgZWxlbWVudFJlZ2lvbiA9IFBsYXRm b3JtOjpJbnRSZWN0UmVnaW9uKGN1ckVsZW1lbnQtPnJlbmRlcmVyKCktPmFic29sdXRlQm91bmRp bmdCb3hSZWN0KHRydWUgLyp1c2UgdHJhbnNmb3JtcyovKSk7CisgICAgICAgIGVsZW1lbnRSZWdp b24gPSBJbnRSZWN0UmVnaW9uKGN1ckVsZW1lbnQtPnJlbmRlcmVyKCktPmFic29sdXRlQm91bmRp bmdCb3hSZWN0KHRydWUgLyp1c2UgdHJhbnNmb3JtcyovKSk7CiAKICAgICBpZiAobG93ZXN0UG9z aXRpb25lZEVuY2xvc2luZ0xheWVyU29GYXIpIHsKICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckVs ZW1lbnRSZW5kZXJMYXllciA9IG1fd2ViUGFnZS0+ZW5jbG9zaW5nUG9zaXRpb25lZEFuY2VzdG9y T3JTZWxmSWZQb3NpdGlvbmVkKGN1ckVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVy KCkpOwpAQCAtMzkxLDcgKzM4Nyw3IEBAIGJvb2wgRmF0RmluZ2Vyczo6Y2hlY2tGb3JDbGlja2Fi bGVFbGVtZW50KEVsZW1lbnQqIGN1ckVsZW1lbnQsCiAgICAgICAgICAgICAvLyBlbGVtZW50UmVn aW9uIHdpbGwgYWx3YXlzIGJlIGluIGNvbnRlbnRzIGNvb3JkaW5hdGVzIG9mIGl0cyBjb250YWlu ZXIgZnJhbWUuIEl0IG5lZWRzIHRvIGJlCiAgICAgICAgICAgICAvLyBtYXBwZWQgdG8gbWFpbiBm cmFtZSBjb250ZW50cyBjb29yZGluYXRlcyBpbiBvcmRlciB0byBzdWJ0cmFjdCB0aGUgZmluZ2Vy UmVnaW9uLCB0aGVuLgogICAgICAgICAgICAgV2ViQ29yZTo6SW50UG9pbnQgZnJhbWVQb3MobV93 ZWJQYWdlLT5mcmFtZU9mZnNldChjdXJFbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpKSk7Ci0g ICAgICAgICAgICBQbGF0Zm9ybTo6SW50UmVjdFJlZ2lvbiBsYXllclJlZ2lvbihQbGF0Zm9ybTo6 SW50UmVjdChsb3dlc3RQb3NpdGlvbmVkRW5jbG9zaW5nTGF5ZXJTb0Zhci0+cmVuZGVyZXIoKS0+ YWJzb2x1dGVCb3VuZGluZ0JveFJlY3QodHJ1ZS8qdXNlIHRyYW5zZm9ybXMqLykpKTsKKyAgICAg ICAgICAgIEludFJlY3RSZWdpb24gbGF5ZXJSZWdpb24oUGxhdGZvcm06OkludFJlY3QobG93ZXN0 UG9zaXRpb25lZEVuY2xvc2luZ0xheWVyU29GYXItPnJlbmRlcmVyKCktPmFic29sdXRlQm91bmRp bmdCb3hSZWN0KHRydWUvKnVzZSB0cmFuc2Zvcm1zKi8pKSk7CiAgICAgICAgICAgICBsYXllclJl Z2lvbi5tb3ZlKGZyYW1lUG9zLngoKSwgZnJhbWVQb3MueSgpKTsKIAogICAgICAgICAgICAgcmVt YWluaW5nRmluZ2VyUmVnaW9uID0gc3VidHJhY3RSZWdpb25zKHJlbWFpbmluZ0ZpbmdlclJlZ2lv biwgbGF5ZXJSZWdpb24pOwpAQCAtNDA3LDE0ICs0MDMsMTQgQEAgYm9vbCBGYXRGaW5nZXJzOjpj aGVja0ZvckNsaWNrYWJsZUVsZW1lbnQoRWxlbWVudCogY3VyRWxlbWVudCwKICAgICByZXR1cm4g aW50ZXJzZWN0czsKIH0KIAotYm9vbCBGYXRGaW5nZXJzOjpjaGVja0ZvclRleHQoTm9kZSogY3Vy Tm9kZSwgVmVjdG9yPEludGVyc2VjdGluZ1JlZ2lvbj4mIGludGVyc2VjdGluZ1JlZ2lvbnMsIFBs YXRmb3JtOjpJbnRSZWN0UmVnaW9uJiBmaW5nZXJSZWdpb24pCitib29sIEZhdEZpbmdlcnM6OmNo ZWNrRm9yVGV4dChOb2RlKiBjdXJOb2RlLCBWZWN0b3I8SW50ZXJzZWN0aW5nUmVnaW9uPiYgaW50 ZXJzZWN0aW5nUmVnaW9ucywgSW50UmVjdFJlZ2lvbiYgZmluZ2VyUmVnaW9uKQogewogICAgIEFT U0VSVChjdXJOb2RlKTsKICAgICBpZiAoaXNGaWVsZFdpdGhUZXh0KGN1ck5vZGUpKSB7CiAgICAg ICAgIC8vIEZJWE1FOiBGaW5kIGFsbCB0ZXh0IGluIHRoZSBmaWVsZCBhbmQgZmluZCB0aGUgYmVz dCB3b3JkLgogICAgICAgICAvLyBGb3Igbm93LCB3ZSB3aWxsIGp1c3Qgc2VsZWN0IHRoZSB3aG9s ZSBmaWVsZC4KICAgICAgICAgSW50UmVjdCBib3VuZGluZ1JlY3QgPSBjdXJOb2RlLT5yZW5kZXJl cigpLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdCh0cnVlIC8qdXNlIHRyYW5zZm9ybXMqLyk7Ci0g ICAgICAgIFBsYXRmb3JtOjpJbnRSZWN0UmVnaW9uIG5vZGVSZWdpb24oYm91bmRpbmdSZWN0KTsK KyAgICAgICAgSW50UmVjdFJlZ2lvbiBub2RlUmVnaW9uKGJvdW5kaW5nUmVjdCk7CiAgICAgICAg IHJldHVybiBjaGVja0ZpbmdlckludGVyc2VjdGlvbihub2RlUmVnaW9uLCBmaW5nZXJSZWdpb24s IGN1ck5vZGUsIGludGVyc2VjdGluZ1JlZ2lvbnMpOwogICAgIH0KIApAQCAtNDM5LDcgKzQzNSw3 IEBAIGJvb2wgRmF0RmluZ2Vyczo6Y2hlY2tGb3JUZXh0KE5vZGUqIGN1ck5vZGUsIFZlY3RvcjxJ bnRlcnNlY3RpbmdSZWdpb24+JiBpbnRlcnNlCiAjaWYgREVCVUdfRkFUX0ZJTkdFUlMKICAgICAg ICAgICAgICAgICBsb2coTG9nTGV2ZWxJbmZvLCAiQ2hlY2tpbmcgd29yZCAnJXMnIiwgcmFuZ2Ut PnRleHQoKS5sYXRpbjEoKS5kYXRhKCkpOwogI2VuZGlmCi0gICAgICAgICAgICAgICAgUGxhdGZv cm06OkludFJlY3RSZWdpb24gcmFuZ2VSZWdpb24oRE9NU3VwcG9ydDo6dHJhbnNmb3JtZWRCb3Vu ZGluZ0JveEZvclJhbmdlKCpyYW5nZSkpOworICAgICAgICAgICAgICAgIEludFJlY3RSZWdpb24g cmFuZ2VSZWdpb24oRE9NU3VwcG9ydDo6dHJhbnNmb3JtZWRCb3VuZGluZ0JveEZvclJhbmdlKCpy YW5nZSkpOwogICAgICAgICAgICAgICAgIGZvdW5kT25lIHw9IGNoZWNrRmluZ2VySW50ZXJzZWN0 aW9uKHJhbmdlUmVnaW9uLCBmaW5nZXJSZWdpb24sIGN1ck5vZGUsIGludGVyc2VjdGluZ1JlZ2lv bnMpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgbGFzdE9mZnNldCA9IG9mZnNldDsKQEAg LTQ3Nyw3ICs0NzMsNyBAQCBGYXRGaW5nZXJzOjpDYWNoZWRSZXN1bHRzU3RyYXRlZ3kgRmF0Rmlu Z2Vyczo6Y2FjaGluZ1N0cmF0ZWd5KCkgY29uc3QKICAgICB9CiB9CiAKLXZvaWQgRmF0RmluZ2Vy czo6Z2V0Tm9kZXNGcm9tUmVjdChEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IEludFBvaW50JiBj b250ZW50UG9zLCBMaXN0SGFzaFNldDxSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gPiYgaW50ZXJzZWN0 ZWROb2RlcykKK3ZvaWQgRmF0RmluZ2Vyczo6Z2V0Tm9kZXNGcm9tUmVjdChEb2N1bWVudCogZG9j dW1lbnQsIGNvbnN0IEludFBvaW50JiBjb250ZW50UG9zLCBMaXN0SGFzaFNldDxSZWZQdHI8Tm9k ZT4gPiYgaW50ZXJzZWN0ZWROb2RlcykKIHsKICAgICBGYXRGaW5nZXJzOjpDYWNoZWRSZXN1bHRz U3RyYXRlZ3kgY2FjaGVSZXNvbHZpbmdTdHJhdGVneSA9IGNhY2hpbmdTdHJhdGVneSgpOwogCkBA IC00OTIsMTMgKzQ4OCwxNCBAQCB2b2lkIEZhdEZpbmdlcnM6OmdldE5vZGVzRnJvbVJlY3QoRG9j dW1lbnQqIGRvY3VtZW50LCBjb25zdCBJbnRQb2ludCYgY29udGVudFBvcwogICAgIHVuc2lnbmVk IHRvcFBhZGRpbmcsIHJpZ2h0UGFkZGluZywgYm90dG9tUGFkZGluZywgbGVmdFBhZGRpbmc7CiAg ICAgZ2V0UGFkZGluZ3ModG9wUGFkZGluZywgcmlnaHRQYWRkaW5nLCBib3R0b21QYWRkaW5nLCBs ZWZ0UGFkZGluZyk7CiAKLSAgICBIaXRUZXN0UmVxdWVzdCByZXF1ZXN0KEhpdFRlc3RSZXF1ZXN0 OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBY3RpdmUgfCBIaXRUZXN0UmVxdWVzdDo6SWdu b3JlQ2xpcHBpbmcpOwogICAgIC8vIFRoZSB1c2VyIGZ1bmN0aW9ucyBjaGVja0ZvclRleHQoKSBh bmQgZmluZEludGVyc2VjdGluZ1JlZ2lvbnMoKSB1c2VzIHRoZSBOb2RlLndob2xlVGV4dCgpIHRv IGNoZWNrRmluZ2VySW50ZXJzZWN0aW9uKCkKICAgICAvLyBub3QgdGhlIHRleHQgaW4gaXRzIHNo YWRvdyB0cmVlLgotICAgIFNoYWRvd0NvbnRlbnRGaWx0ZXJQb2xpY3kgYWxsb3dTaGFkb3cgPSBt X3RhcmdldFR5cGUgPT0gVGV4dCA/IERvTm90QWxsb3dTaGFkb3dDb250ZW50IDogQWxsb3dTaGFk b3dDb250ZW50OwotICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0KGNvbnRlbnRQb3MsIHRvcFBhZGRp bmcsIHJpZ2h0UGFkZGluZywgYm90dG9tUGFkZGluZywgbGVmdFBhZGRpbmcsIGFsbG93U2hhZG93 KTsKKyAgICBIaXRUZXN0UmVxdWVzdDo6SGl0VGVzdFJlcXVlc3RUeXBlIHJlcXVlc3RUeXBlID0g SGl0VGVzdFJlcXVlc3Q6OlJlYWRPbmx5IHwgSGl0VGVzdFJlcXVlc3Q6OkFjdGl2ZSB8IEhpdFRl c3RSZXF1ZXN0OjpJZ25vcmVDbGlwcGluZzsKKyAgICBpZiAobV90YXJnZXRUeXBlICE9IFRleHQp CisgICAgICAgIHJlcXVlc3RUeXBlIHw9IEhpdFRlc3RSZXF1ZXN0OjpBbGxvd1NoYWRvd0NvbnRl bnQ7CisgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQoY29udGVudFBvcywgdG9wUGFkZGluZywgcmln aHRQYWRkaW5nLCBib3R0b21QYWRkaW5nLCBsZWZ0UGFkZGluZyk7CiAKLSAgICBkb2N1bWVudC0+ cmVuZGVyVmlldygpLT5sYXllcigpLT5oaXRUZXN0KHJlcXVlc3QsIHJlc3VsdCk7CisgICAgZG9j dW1lbnQtPnJlbmRlclZpZXcoKS0+bGF5ZXIoKS0+aGl0VGVzdChyZXF1ZXN0VHlwZSwgcmVzdWx0 KTsKICAgICBpbnRlcnNlY3RlZE5vZGVzID0gcmVzdWx0LnJlY3RCYXNlZFRlc3RSZXN1bHQoKTsK ICAgICBtX2NhY2hlZFJlY3RIaXRUZXN0UmVzdWx0cy5hZGQoZG9jdW1lbnQsIGludGVyc2VjdGVk Tm9kZXMpOwogfQpAQCAtNTExLDcgKzUwOCw3IEBAIHZvaWQgRmF0RmluZ2Vyczo6Z2V0UmVsZXZh bnRJbmZvRnJvbVBvaW50KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgSW50UG9pbnQmIGNvCiAg ICAgaWYgKCFkb2N1bWVudCB8fCAhZG9jdW1lbnQtPnJlbmRlcmVyKCkgfHwgIWRvY3VtZW50LT5m cmFtZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCAgPSBk b2N1bWVudC0+ZnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhpdFRlc3RSZXN1bHRBdFBvaW50KGNv bnRlbnRQb3MsIHRydWUgLyphbGxvd1NoYWRvd0NvbnRlbnQqLyk7CisgICAgSGl0VGVzdFJlc3Vs dCByZXN1bHQgID0gZG9jdW1lbnQtPmZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5oaXRUZXN0UmVz dWx0QXRQb2ludChjb250ZW50UG9zLCBIaXRUZXN0UmVxdWVzdDo6UmVhZE9ubHkgfCBIaXRUZXN0 UmVxdWVzdDo6QWN0aXZlIHwgSGl0VGVzdFJlcXVlc3Q6OkFsbG93U2hhZG93Q29udGVudCk7CiAg ICAgTm9kZSogbm9kZSA9IHJlc3VsdC5pbm5lck5vZGUoKTsKICAgICB3aGlsZSAobm9kZSAmJiAh bm9kZS0+aXNFbGVtZW50Tm9kZSgpKQogICAgICAgICBub2RlID0gbm9kZS0+cGFyZW50Tm9kZSgp Owo=