137688 2014-10-14 04:17:09 -0700 Use modern loops in subtrees selection code 2014-10-15 01:31:14 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihnea mihnea commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1041531 0 mihnea 2014-10-14 04:17:09 -0700 Use modern loops in subtrees selection code 1041532 1 239792 mihnea 2014-10-14 04:20:15 -0700 Created attachment 239792 Patch 1041534 2 commit-queue 2014-10-14 04:22:26 -0700 Attachment 239792 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderView.h:304: The parameter name "end" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebCore/rendering/RenderView.h:307: The parameter name "end" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1041632 3 239792 kling 2014-10-14 11:50:12 -0700 Comment on attachment 239792 Patch r=me 1041812 4 239855 mihnea 2014-10-15 00:47:59 -0700 Created attachment 239855 Patch for landing 1041821 5 239855 commit-queue 2014-10-15 01:31:11 -0700 Comment on attachment 239855 Patch for landing Clearing flags on attachment: 239855 Committed r174725: <http://trac.webkit.org/changeset/174725> 1041822 6 commit-queue 2014-10-15 01:31:14 -0700 All reviewed patches have been landed. Closing bug. 239792 2014-10-14 04:20:15 -0700 2014-10-15 00:47:47 -0700 Patch 137688.patch text/plain 10154 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0Y2IzYzYyLi4wM2M3Mjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMTAtMTQgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgVXNlIG1vZGVybiBsb29wcyBpbiBzdWJ0cmVlcyBzZWxlY3Rpb24gY29kZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3Njg4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFz IG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6c3BsaXRTZWxlY3Rpb25C ZXR3ZWVuU3VidHJlZXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6dXBkYXRlU2Vs ZWN0aW9uRm9yU3VidHJlZXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6Y2xlYXJT dWJ0cmVlU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OmFwcGx5U3Vi dHJlZVNlbGVjdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKwogMjAx NC0xMC0xMyAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IFJlbW92ZSB1bnVzZWQgc3RhbGUgUGFnZSBwcm90b2NvbCBtZXRob2Rz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggZDYwOTUzMS4uN2Nj NzQ4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtODc4LDcg Kzg3OCw3IEBAIHZvaWQgUmVuZGVyVmlldzo6c2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdCogc3Rh cnQsIGludCBzdGFydFBvcywgUmVuZGVyT2JqZWN0KiBlCiAgICAgc3BsaXRTZWxlY3Rpb25CZXR3 ZWVuU3VidHJlZXMoc3RhcnQsIHN0YXJ0UG9zLCBlbmQsIGVuZFBvcywgYmxvY2tSZXBhaW50TW9k ZSk7CiB9CiAKLXZvaWQgUmVuZGVyVmlldzo6c3BsaXRTZWxlY3Rpb25CZXR3ZWVuU3VidHJlZXMo UmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5kZXJPYmplY3QqIGVuZCwgaW50 IGVuZFBvcywgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSkKK3ZvaWQgUmVu ZGVyVmlldzo6c3BsaXRTZWxlY3Rpb25CZXR3ZWVuU3VidHJlZXMoY29uc3QgUmVuZGVyT2JqZWN0 KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBjb25zdCBSZW5kZXJPYmplY3QqIGVuZCwgaW50IGVuZFBv cywgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSkKIHsKICAgICAvLyBDb21w dXRlIHRoZSB2aXNpYmxlIHNlbGVjdGlvbiBlbmQgcG9pbnRzIGZvciBlYWNoIG9mIHRoZSBzdWJ0 cmVlcy4KICAgICBSZW5kZXJTdWJ0cmVlc01hcCByZW5kZXJTdWJ0cmVlc01hcDsKQEAgLTkyMSwx NiArOTIxLDE2IEBAIHZvaWQgUmVuZGVyVmlldzo6c3BsaXRTZWxlY3Rpb25CZXR3ZWVuU3VidHJl ZXMoUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zCiB2b2lkIFJlbmRlclZpZXc6OnVw ZGF0ZVNlbGVjdGlvbkZvclN1YnRyZWVzKFJlbmRlclN1YnRyZWVzTWFwJiByZW5kZXJTdWJ0cmVl c01hcCwgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSkKIHsKICAgICBTdWJ0 cmVlT2xkU2VsZWN0aW9uRGF0YU1hcCBvbGRTZWxlY3Rpb25EYXRhTWFwOwotICAgIGZvciAoYXV0 byBpdCA9IHJlbmRlclN1YnRyZWVzTWFwLmJlZ2luKCk7IGl0ICE9IHJlbmRlclN1YnRyZWVzTWFw LmVuZCgpOyArK2l0KSB7Ci0gICAgICAgIFNlbGVjdGlvblN1YnRyZWVSb290JiBzdWJ0cmVlU2Vs ZWN0aW9uRGF0YSA9IGl0LT52YWx1ZTsKKyAgICBmb3IgKGF1dG8mIHN1YnRyZWVTZWxlY3Rpb25J bmZvIDogcmVuZGVyU3VidHJlZXNNYXApIHsKKyAgICAgICAgU2VsZWN0aW9uU3VidHJlZVJvb3Qm IHN1YnRyZWVTZWxlY3Rpb25EYXRhID0gc3VidHJlZVNlbGVjdGlvbkluZm8udmFsdWU7CiAgICAg ICAgIGlmIChoYXNSZW5kZXJOYW1lZEZsb3dUaHJlYWRzKCkpCiAgICAgICAgICAgICBzdWJ0cmVl U2VsZWN0aW9uRGF0YS5hZGp1c3RGb3JWaXNpYmxlU2VsZWN0aW9uKGRvY3VtZW50KCkpOwogCiAg ICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxPbGRTZWxlY3Rpb25EYXRhPiBvbGRTZWxlY3Rpb25EYXRh ID0gc3RkOjptYWtlX3VuaXF1ZTxPbGRTZWxlY3Rpb25EYXRhPigpOwotICAgICAgICBjbGVhclN1 YnRyZWVTZWxlY3Rpb24oKml0LT5rZXksIGJsb2NrUmVwYWludE1vZGUsICpvbGRTZWxlY3Rpb25E YXRhKTsKLSAgICAgICAgb2xkU2VsZWN0aW9uRGF0YU1hcC5zZXQoaXQtPmtleSwgV1RGOjptb3Zl KG9sZFNlbGVjdGlvbkRhdGEpKTsKKyAgICAgICAgU2VsZWN0aW9uU3VidHJlZVJvb3QmIHJvb3Qg PSAqc3VidHJlZVNlbGVjdGlvbkluZm8ua2V5OworICAgICAgICBjbGVhclN1YnRyZWVTZWxlY3Rp b24ocm9vdCwgYmxvY2tSZXBhaW50TW9kZSwgKm9sZFNlbGVjdGlvbkRhdGEpOworICAgICAgICBv bGRTZWxlY3Rpb25EYXRhTWFwLnNldCgmcm9vdCwgV1RGOjptb3ZlKG9sZFNlbGVjdGlvbkRhdGEp KTsKIAotICAgICAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCA9ICppdC0+a2V5OwogICAg ICAgICByb290LnNldFNlbGVjdGlvblN0YXJ0KHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlv blN0YXJ0KCkpOwogICAgICAgICByb290LnNldFNlbGVjdGlvblN0YXJ0UG9zKHN1YnRyZWVTZWxl Y3Rpb25EYXRhLnNlbGVjdGlvblN0YXJ0UG9zKCkpOwogICAgICAgICByb290LnNldFNlbGVjdGlv bkVuZChzdWJ0cmVlU2VsZWN0aW9uRGF0YS5zZWxlY3Rpb25FbmQoKSk7CkBAIC05NDEsMTQgKzk0 MSwxNCBAQCB2b2lkIFJlbmRlclZpZXc6OnVwZGF0ZVNlbGVjdGlvbkZvclN1YnRyZWVzKFJlbmRl clN1YnRyZWVzTWFwJiByZW5kZXJTdWJ0cmVlc01hcAogICAgIC8vIFRoaXMgbmVlZHMgdG8gYmUg ZG9uZSBhZnRlciB0aGUgcHJldmlvdXMgbG9vcCB1cGRhdGVkIHRoZSBzZWxlY3Rpb25TdGFydC9F bmQKICAgICAvLyBwYXJhbWV0ZXJzIG9mIGFsbCBzdWJ0cmVlcyBiZWNhdXNlIHdlJ3JlIGdvaW5n IHRvIGJlIGNsaW1iaW5nIHVwIHRoZSBjb250YWluaW5nCiAgICAgLy8gYmxvY2sgY2hhaW4gYW5k IHdlIG1pZ2h0IGVuZCB1cCBpbiBhIGRpZmZlcmVudCBzZWxlY3Rpb24gc3VidHJlZS4KLSAgICBm b3IgKGF1dG8gaXQgPSByZW5kZXJTdWJ0cmVlc01hcC5iZWdpbigpOyBpdCAhPSByZW5kZXJTdWJ0 cmVlc01hcC5lbmQoKTsgKytpdCkgewotICAgICAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdCBzdWJ0 cmVlU2VsZWN0aW9uRGF0YSA9IGl0LT52YWx1ZTsKLSAgICAgICAgT2xkU2VsZWN0aW9uRGF0YSYg b2xkU2VsZWN0aW9uRGF0YSA9ICpvbGRTZWxlY3Rpb25EYXRhTWFwLmdldChpdC0+a2V5KTsKLSAg ICAgICAgYXBwbHlTdWJ0cmVlU2VsZWN0aW9uKCppdC0+a2V5LCBzdWJ0cmVlU2VsZWN0aW9uRGF0 YS5zZWxlY3Rpb25TdGFydCgpLCBzdWJ0cmVlU2VsZWN0aW9uRGF0YS5zZWxlY3Rpb25FbmQoKSwg c3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uRW5kUG9zKCksIGJsb2NrUmVwYWludE1vZGUs IG9sZFNlbGVjdGlvbkRhdGEpOworICAgIGZvciAoYXV0byYgc3VidHJlZVNlbGVjdGlvbkluZm8g OiByZW5kZXJTdWJ0cmVlc01hcCkgeworICAgICAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgc3Vi dHJlZVNlbGVjdGlvbkRhdGEgPSBzdWJ0cmVlU2VsZWN0aW9uSW5mby52YWx1ZTsKKyAgICAgICAg T2xkU2VsZWN0aW9uRGF0YSYgb2xkU2VsZWN0aW9uRGF0YSA9ICpvbGRTZWxlY3Rpb25EYXRhTWFw LmdldChzdWJ0cmVlU2VsZWN0aW9uSW5mby5rZXkpOworICAgICAgICBhcHBseVN1YnRyZWVTZWxl Y3Rpb24oKnN1YnRyZWVTZWxlY3Rpb25JbmZvLmtleSwgc3VidHJlZVNlbGVjdGlvbkRhdGEuc2Vs ZWN0aW9uU3RhcnQoKSwgc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uRW5kKCksIHN1YnRy ZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZFBvcygpLCBibG9ja1JlcGFpbnRNb2RlLCBvbGRT ZWxlY3Rpb25EYXRhKTsKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyVmlldzo6Y2xlYXJTdWJ0cmVl U2VsZWN0aW9uKGNvbnN0IFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBTZWxlY3Rpb25SZXBh aW50TW9kZSBibG9ja1JlcGFpbnRNb2RlLCBPbGRTZWxlY3Rpb25EYXRhJiBvbGRTZWxlY3Rpb25E YXRhKQordm9pZCBSZW5kZXJWaWV3OjpjbGVhclN1YnRyZWVTZWxlY3Rpb24oY29uc3QgU2VsZWN0 aW9uU3VidHJlZVJvb3QmIHJvb3QsIFNlbGVjdGlvblJlcGFpbnRNb2RlIGJsb2NrUmVwYWludE1v ZGUsIE9sZFNlbGVjdGlvbkRhdGEmIG9sZFNlbGVjdGlvbkRhdGEpIGNvbnN0CiB7CiAgICAgLy8g UmVjb3JkIHRoZSBvbGQgc2VsZWN0ZWQgb2JqZWN0cy4gIFRoZXNlIHdpbGwgYmUgdXNlZCBsYXRl cgogICAgIC8vIHdoZW4gd2UgY29tcGFyZSBhZ2FpbnN0IHRoZSBuZXcgc2VsZWN0ZWQgb2JqZWN0 cy4KQEAgLTk4MiwxMiArOTgyLDExIEBAIHZvaWQgUmVuZGVyVmlldzo6Y2xlYXJTdWJ0cmVlU2Vs ZWN0aW9uKGNvbnN0IFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBTZWxlY3RpCiAgICAgICAg IG9zID0gc2VsZWN0aW9uSXRlcmF0b3IubmV4dCgpOwogICAgIH0KIAotICAgIGF1dG8gb2xkT2Jq ZWN0c0VuZCA9IG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0ZWRPYmplY3RzLmVuZCgpOwotICAgIGZv ciAoYXV0byBpID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZE9iamVjdHMuYmVnaW4oKTsgaSAh PSBvbGRPYmplY3RzRW5kOyArK2kpCi0gICAgICAgIGktPmtleS0+c2V0U2VsZWN0aW9uU3RhdGVJ Zk5lZWRlZChTZWxlY3Rpb25Ob25lKTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIHNlbGVjdGVkT2Jq ZWN0SW5mbyA6IG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0ZWRPYmplY3RzKQorICAgICAgICBzZWxl Y3RlZE9iamVjdEluZm8ua2V5LT5zZXRTZWxlY3Rpb25TdGF0ZUlmTmVlZGVkKFNlbGVjdGlvbk5v bmUpOwogfQogCi12b2lkIFJlbmRlclZpZXc6OmFwcGx5U3VidHJlZVNlbGVjdGlvbihTZWxlY3Rp b25TdWJ0cmVlUm9vdCYgcm9vdCwgUmVuZGVyT2JqZWN0KiBzdGFydCwgUmVuZGVyT2JqZWN0KiBl bmQsIGludCBlbmRQb3MsIFNlbGVjdGlvblJlcGFpbnRNb2RlIGJsb2NrUmVwYWludE1vZGUsIGNv bnN0IE9sZFNlbGVjdGlvbkRhdGEmIG9sZFNlbGVjdGlvbkRhdGEpCit2b2lkIFJlbmRlclZpZXc6 OmFwcGx5U3VidHJlZVNlbGVjdGlvbihjb25zdCBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCwg UmVuZGVyT2JqZWN0KiBzdGFydCwgUmVuZGVyT2JqZWN0KiBlbmQsIGludCBlbmRQb3MsIFNlbGVj dGlvblJlcGFpbnRNb2RlIGJsb2NrUmVwYWludE1vZGUsIGNvbnN0IE9sZFNlbGVjdGlvbkRhdGEm IG9sZFNlbGVjdGlvbkRhdGEpCiB7CiAgICAgLy8gVXBkYXRlIHRoZSBzZWxlY3Rpb24gc3RhdHVz IG9mIGFsbCBvYmplY3RzIGJldHdlZW4gc2VsZWN0aW9uU3RhcnQgYW5kIHNlbGVjdGlvbkVuZAog ICAgIGlmIChzdGFydCAmJiBzdGFydCA9PSBlbmQpCkBAIC0xMDUyLDExICsxMDUxLDEwIEBAIHZv aWQgUmVuZGVyVmlldzo6YXBwbHlTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1YnRyZWVSb290 JiByb290LCBSZW5kZXJPYmplY3QqCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEhhdmUgYW55 IG9mIHRoZSBvbGQgc2VsZWN0ZWQgb2JqZWN0cyBjaGFuZ2VkIGNvbXBhcmVkIHRvIHRoZSBuZXcg c2VsZWN0aW9uPwotICAgIGF1dG8gb2xkT2JqZWN0c0VuZCA9IG9sZFNlbGVjdGlvbkRhdGEuc2Vs ZWN0ZWRPYmplY3RzLmVuZCgpOwotICAgIGZvciAoYXV0byBpdCA9IG9sZFNlbGVjdGlvbkRhdGEu c2VsZWN0ZWRPYmplY3RzLmJlZ2luKCk7IGl0ICE9IG9sZE9iamVjdHNFbmQ7ICsraXQpIHsKLSAg ICAgICAgUmVuZGVyT2JqZWN0KiBvYmogPSBpdC0+a2V5OworICAgIGZvciAoY29uc3QgYXV0byYg c2VsZWN0ZWRPYmplY3RJbmZvIDogb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZE9iamVjdHMpIHsK KyAgICAgICAgUmVuZGVyT2JqZWN0KiBvYmogPSBzZWxlY3RlZE9iamVjdEluZm8ua2V5OwogICAg ICAgICBSZW5kZXJTZWxlY3Rpb25JbmZvKiBuZXdJbmZvID0gbmV3U2VsZWN0ZWRPYmplY3RzLmdl dChvYmopOwotICAgICAgICBSZW5kZXJTZWxlY3Rpb25JbmZvKiBvbGRJbmZvID0gaXQtPnZhbHVl LmdldCgpOworICAgICAgICBSZW5kZXJTZWxlY3Rpb25JbmZvKiBvbGRJbmZvID0gc2VsZWN0ZWRP YmplY3RJbmZvLnZhbHVlLmdldCgpOwogICAgICAgICBpZiAoIW5ld0luZm8gfHwgb2xkSW5mby0+ cmVjdCgpICE9IG5ld0luZm8tPnJlY3QoKSB8fCBvbGRJbmZvLT5zdGF0ZSgpICE9IG5ld0luZm8t PnN0YXRlKCkKICAgICAgICAgICAgIHx8IChyb290LnNlbGVjdGlvblN0YXJ0KCkgPT0gb2JqICYm IG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uU3RhcnRQb3MgIT0gcm9vdC5zZWxlY3Rpb25TdGFy dFBvcygpKQogICAgICAgICAgICAgfHwgKHJvb3Quc2VsZWN0aW9uRW5kKCkgPT0gb2JqICYmIG9s ZFNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uRW5kUG9zICE9IHJvb3Quc2VsZWN0aW9uRW5kUG9zKCkp KSB7CkBAIC0xMDY5LDE2ICsxMDY3LDE0IEBAIHZvaWQgUmVuZGVyVmlldzo6YXBwbHlTdWJ0cmVl U2VsZWN0aW9uKFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqCiAgICAg fQogCiAgICAgLy8gQW55IG5ldyBvYmplY3RzIHRoYXQgcmVtYWluIHdlcmUgbm90IGZvdW5kIGlu IHRoZSBvbGQgb2JqZWN0cyBkaWN0LCBhbmQgc28gdGhleSBuZWVkIHRvIGJlIHVwZGF0ZWQuCi0g ICAgYXV0byBuZXdPYmplY3RzRW5kID0gbmV3U2VsZWN0ZWRPYmplY3RzLmVuZCgpOwotICAgIGZv ciAoYXV0byBpdCA9IG5ld1NlbGVjdGVkT2JqZWN0cy5iZWdpbigpOyBpdCAhPSBuZXdPYmplY3Rz RW5kOyArK2l0KQotICAgICAgICBpdC0+dmFsdWUtPnJlcGFpbnQoKTsKKyAgICBmb3IgKGNvbnN0 IGF1dG8mIHNlbGVjdGVkT2JqZWN0SW5mbyA6IG5ld1NlbGVjdGVkT2JqZWN0cykKKyAgICAgICAg c2VsZWN0ZWRPYmplY3RJbmZvLnZhbHVlLT5yZXBhaW50KCk7CiAKICAgICAvLyBIYXZlIGFueSBv ZiB0aGUgb2xkIGJsb2NrcyBjaGFuZ2VkPwotICAgIGF1dG8gb2xkQmxvY2tzRW5kID0gb2xkU2Vs ZWN0aW9uRGF0YS5zZWxlY3RlZEJsb2Nrcy5lbmQoKTsKLSAgICBmb3IgKGF1dG8gaXQgPSBvbGRT ZWxlY3Rpb25EYXRhLnNlbGVjdGVkQmxvY2tzLmJlZ2luKCk7IGl0ICE9IG9sZEJsb2Nrc0VuZDsg KytpdCkgewotICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSBpdC0+a2V5OworICAgIGZvciAo Y29uc3QgYXV0byYgc2VsZWN0ZWRCbG9ja0luZm8gOiBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVk QmxvY2tzKSB7CisgICAgICAgIFJlbmRlckJsb2NrKiBibG9jayA9IHNlbGVjdGVkQmxvY2tJbmZv LmtleTsKICAgICAgICAgUmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZvKiBuZXdJbmZvID0gbmV3U2Vs ZWN0ZWRCbG9ja3MuZ2V0KGJsb2NrKTsKLSAgICAgICAgUmVuZGVyQmxvY2tTZWxlY3Rpb25JbmZv KiBvbGRJbmZvID0gaXQtPnZhbHVlLmdldCgpOworICAgICAgICBSZW5kZXJCbG9ja1NlbGVjdGlv bkluZm8qIG9sZEluZm8gPSBzZWxlY3RlZEJsb2NrSW5mby52YWx1ZS5nZXQoKTsKICAgICAgICAg aWYgKCFuZXdJbmZvIHx8IG9sZEluZm8tPnJlY3RzKCkgIT0gbmV3SW5mby0+cmVjdHMoKSB8fCBv bGRJbmZvLT5zdGF0ZSgpICE9IG5ld0luZm8tPnN0YXRlKCkpIHsKICAgICAgICAgICAgIG9sZElu Zm8tPnJlcGFpbnQoKTsKICAgICAgICAgICAgIGlmIChuZXdJbmZvKSB7CkBAIC0xMDg5LDkgKzEw ODUsOCBAQCB2b2lkIFJlbmRlclZpZXc6OmFwcGx5U3VidHJlZVNlbGVjdGlvbihTZWxlY3Rpb25T dWJ0cmVlUm9vdCYgcm9vdCwgUmVuZGVyT2JqZWN0KgogICAgIH0KIAogICAgIC8vIEFueSBuZXcg YmxvY2tzIHRoYXQgcmVtYWluIHdlcmUgbm90IGZvdW5kIGluIHRoZSBvbGQgYmxvY2tzIGRpY3Qs IGFuZCBzbyB0aGV5IG5lZWQgdG8gYmUgdXBkYXRlZC4KLSAgICBhdXRvIG5ld0Jsb2Nrc0VuZCA9 IG5ld1NlbGVjdGVkQmxvY2tzLmVuZCgpOwotICAgIGZvciAoYXV0byBpdCA9IG5ld1NlbGVjdGVk QmxvY2tzLmJlZ2luKCk7IGl0ICE9IG5ld0Jsb2Nrc0VuZDsgKytpdCkKLSAgICAgICAgaXQtPnZh bHVlLT5yZXBhaW50KCk7CisgICAgZm9yIChjb25zdCBhdXRvJiBzZWxlY3RlZEJsb2NrSW5mbyA6 IG5ld1NlbGVjdGVkQmxvY2tzKQorICAgICAgICBzZWxlY3RlZEJsb2NrSW5mby52YWx1ZS0+cmVw YWludCgpOwogfQogCiB2b2lkIFJlbmRlclZpZXc6OmdldFNlbGVjdGlvbihSZW5kZXJPYmplY3Qq JiBzdGFydFJlbmRlcmVyLCBpbnQmIHN0YXJ0T2Zmc2V0LCBSZW5kZXJPYmplY3QqJiBlbmRSZW5k ZXJlciwgaW50JiBlbmRPZmZzZXQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZp ZXcuaAppbmRleCA1NjdjNTNmLi5mMmE1YjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJWaWV3LmgKQEAgLTMwMSwxMCArMzAxLDEwIEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIGJv b2wgaXNTY3JvbGxhYmxlT3JSdWJiZXJiYW5kYWJsZUJveCgpIGNvbnN0IG92ZXJyaWRlOwogCi0g ICAgdm9pZCBzcGxpdFNlbGVjdGlvbkJldHdlZW5TdWJ0cmVlcyhSZW5kZXJPYmplY3QqIHN0YXJ0 LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25S ZXBhaW50TW9kZSBibG9ja1JlcGFpbnRNb2RlKTsKLSAgICB2b2lkIGNsZWFyU3VidHJlZVNlbGVj dGlvbihjb25zdCBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYsIFNlbGVjdGlvblJlcGFpbnRNb2RlLCBP bGRTZWxlY3Rpb25EYXRhJik7CisgICAgdm9pZCBzcGxpdFNlbGVjdGlvbkJldHdlZW5TdWJ0cmVl cyhjb25zdCBSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3MsIGNvbnN0IFJlbmRlck9i amVjdCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFpbnRN b2RlKTsKKyAgICB2b2lkIGNsZWFyU3VidHJlZVNlbGVjdGlvbihjb25zdCBTZWxlY3Rpb25TdWJ0 cmVlUm9vdCYsIFNlbGVjdGlvblJlcGFpbnRNb2RlLCBPbGRTZWxlY3Rpb25EYXRhJikgY29uc3Q7 CiAgICAgdm9pZCB1cGRhdGVTZWxlY3Rpb25Gb3JTdWJ0cmVlcyhSZW5kZXJTdWJ0cmVlc01hcCYs IFNlbGVjdGlvblJlcGFpbnRNb2RlKTsKLSAgICB2b2lkIGFwcGx5U3VidHJlZVNlbGVjdGlvbihT ZWxlY3Rpb25TdWJ0cmVlUm9vdCYsIFJlbmRlck9iamVjdCogc3RhcnQsIFJlbmRlck9iamVjdCog ZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSwgY29uc3QgT2xkU2VsZWN0aW9u RGF0YSYpOworICAgIHZvaWQgYXBwbHlTdWJ0cmVlU2VsZWN0aW9uKGNvbnN0IFNlbGVjdGlvblN1 YnRyZWVSb290JiwgUmVuZGVyT2JqZWN0KiBzdGFydCwgUmVuZGVyT2JqZWN0KiBlbmQsIGludCBl bmRQb3MsIFNlbGVjdGlvblJlcGFpbnRNb2RlLCBjb25zdCBPbGRTZWxlY3Rpb25EYXRhJik7CiAg ICAgTGF5b3V0UmVjdCBzdWJ0cmVlU2VsZWN0aW9uQm91bmRzKGNvbnN0IFNlbGVjdGlvblN1YnRy ZWVSb290JiwgYm9vbCBjbGlwVG9WaXNpYmxlQ29udGVudCA9IHRydWUpIGNvbnN0OwogICAgIHZv aWQgcmVwYWludFN1YnRyZWVTZWxlY3Rpb24oY29uc3QgU2VsZWN0aW9uU3VidHJlZVJvb3QmKSBj b25zdDsKIAo= 239855 2014-10-15 00:47:59 -0700 2014-10-15 01:31:11 -0700 Patch for landing bug-137688-20141015104802.patch text/plain 10401 mihnea U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWYwN2FkMTI0MzVjNjJj M2Q2ZTc4OThjZDk0M2E2NmU1ZWVhZGRhNy4uNDVmNDk5MTU3NzJlODc1MzIyYmEzYmE4OTNiNGM3 YWRmYmVhZDg2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTEwLTE1ICBNaWhu ZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgorCisgICAgICAgIFVzZSBtb2Rlcm4gbG9v cHMgaW4gc3VidHJlZXMgc2VsZWN0aW9uIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZHJl YXMgS2xpbmcuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIG5vIGNoYW5nZSBpbiBmdW5jdGlv bmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVmlldzo6c3BsaXRTZWxlY3Rpb25CZXR3ZWVuU3VidHJlZXMpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6dXBkYXRlU2VsZWN0aW9uRm9yU3VidHJlZXMpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6Y2xlYXJTdWJ0cmVlU2VsZWN0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclZpZXc6OmFwcGx5U3VidHJlZVNlbGVjdGlvbik6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuaDoKKwogMjAxNC0xMC0xNCAgR3l1eW91bmcgS2lt ICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIENsZWFuIHVwIHVubmVjZXNz YXJ5IFBhc3NPd25QdHIuaCBpbmNsdXNpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJW aWV3LmNwcAppbmRleCBkNjA5NTMxNWNhYzVjNzM1MzQxYzhiMDk0YzhmODJiY2IyYjc3NjU1Li43 Y2M3NDgxZDNjMmI5NDU4OTY1Y2JkOTliOWFlNTVhNDE0M2JmMDI2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC04NzgsNyArODc4LDcgQEAgdm9pZCBSZW5kZXJW aWV3OjpzZXRTZWxlY3Rpb24oUmVuZGVyT2JqZWN0KiBzdGFydCwgaW50IHN0YXJ0UG9zLCBSZW5k ZXJPYmplY3QqIGUKICAgICBzcGxpdFNlbGVjdGlvbkJldHdlZW5TdWJ0cmVlcyhzdGFydCwgc3Rh cnRQb3MsIGVuZCwgZW5kUG9zLCBibG9ja1JlcGFpbnRNb2RlKTsKIH0KIAotdm9pZCBSZW5kZXJW aWV3OjpzcGxpdFNlbGVjdGlvbkJldHdlZW5TdWJ0cmVlcyhSZW5kZXJPYmplY3QqIHN0YXJ0LCBp bnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBh aW50TW9kZSBibG9ja1JlcGFpbnRNb2RlKQordm9pZCBSZW5kZXJWaWV3OjpzcGxpdFNlbGVjdGlv bkJldHdlZW5TdWJ0cmVlcyhjb25zdCBSZW5kZXJPYmplY3QqIHN0YXJ0LCBpbnQgc3RhcnRQb3Ms IGNvbnN0IFJlbmRlck9iamVjdCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9k ZSBibG9ja1JlcGFpbnRNb2RlKQogewogICAgIC8vIENvbXB1dGUgdGhlIHZpc2libGUgc2VsZWN0 aW9uIGVuZCBwb2ludHMgZm9yIGVhY2ggb2YgdGhlIHN1YnRyZWVzLgogICAgIFJlbmRlclN1YnRy ZWVzTWFwIHJlbmRlclN1YnRyZWVzTWFwOwpAQCAtOTIxLDE2ICs5MjEsMTYgQEAgdm9pZCBSZW5k ZXJWaWV3OjpzcGxpdFNlbGVjdGlvbkJldHdlZW5TdWJ0cmVlcyhSZW5kZXJPYmplY3QqIHN0YXJ0 LCBpbnQgc3RhcnRQb3MKIHZvaWQgUmVuZGVyVmlldzo6dXBkYXRlU2VsZWN0aW9uRm9yU3VidHJl ZXMoUmVuZGVyU3VidHJlZXNNYXAmIHJlbmRlclN1YnRyZWVzTWFwLCBTZWxlY3Rpb25SZXBhaW50 TW9kZSBibG9ja1JlcGFpbnRNb2RlKQogewogICAgIFN1YnRyZWVPbGRTZWxlY3Rpb25EYXRhTWFw IG9sZFNlbGVjdGlvbkRhdGFNYXA7Ci0gICAgZm9yIChhdXRvIGl0ID0gcmVuZGVyU3VidHJlZXNN YXAuYmVnaW4oKTsgaXQgIT0gcmVuZGVyU3VidHJlZXNNYXAuZW5kKCk7ICsraXQpIHsKLSAgICAg ICAgU2VsZWN0aW9uU3VidHJlZVJvb3QmIHN1YnRyZWVTZWxlY3Rpb25EYXRhID0gaXQtPnZhbHVl OworICAgIGZvciAoYXV0byYgc3VidHJlZVNlbGVjdGlvbkluZm8gOiByZW5kZXJTdWJ0cmVlc01h cCkgeworICAgICAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgc3VidHJlZVNlbGVjdGlvbkRhdGEg PSBzdWJ0cmVlU2VsZWN0aW9uSW5mby52YWx1ZTsKICAgICAgICAgaWYgKGhhc1JlbmRlck5hbWVk Rmxvd1RocmVhZHMoKSkKICAgICAgICAgICAgIHN1YnRyZWVTZWxlY3Rpb25EYXRhLmFkanVzdEZv clZpc2libGVTZWxlY3Rpb24oZG9jdW1lbnQoKSk7CiAKICAgICAgICAgc3RkOjp1bmlxdWVfcHRy PE9sZFNlbGVjdGlvbkRhdGE+IG9sZFNlbGVjdGlvbkRhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPE9s ZFNlbGVjdGlvbkRhdGE+KCk7Ci0gICAgICAgIGNsZWFyU3VidHJlZVNlbGVjdGlvbigqaXQtPmtl eSwgYmxvY2tSZXBhaW50TW9kZSwgKm9sZFNlbGVjdGlvbkRhdGEpOwotICAgICAgICBvbGRTZWxl Y3Rpb25EYXRhTWFwLnNldChpdC0+a2V5LCBXVEY6Om1vdmUob2xkU2VsZWN0aW9uRGF0YSkpOwor ICAgICAgICBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCA9ICpzdWJ0cmVlU2VsZWN0aW9uSW5m by5rZXk7CisgICAgICAgIGNsZWFyU3VidHJlZVNlbGVjdGlvbihyb290LCBibG9ja1JlcGFpbnRN b2RlLCAqb2xkU2VsZWN0aW9uRGF0YSk7CisgICAgICAgIG9sZFNlbGVjdGlvbkRhdGFNYXAuc2V0 KCZyb290LCBXVEY6Om1vdmUob2xkU2VsZWN0aW9uRGF0YSkpOwogCi0gICAgICAgIFNlbGVjdGlv blN1YnRyZWVSb290JiByb290ID0gKml0LT5rZXk7CiAgICAgICAgIHJvb3Quc2V0U2VsZWN0aW9u U3RhcnQoc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uU3RhcnQoKSk7CiAgICAgICAgIHJv b3Quc2V0U2VsZWN0aW9uU3RhcnRQb3Moc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0aW9uU3Rh cnRQb3MoKSk7CiAgICAgICAgIHJvb3Quc2V0U2VsZWN0aW9uRW5kKHN1YnRyZWVTZWxlY3Rpb25E YXRhLnNlbGVjdGlvbkVuZCgpKTsKQEAgLTk0MSwxNCArOTQxLDE0IEBAIHZvaWQgUmVuZGVyVmll dzo6dXBkYXRlU2VsZWN0aW9uRm9yU3VidHJlZXMoUmVuZGVyU3VidHJlZXNNYXAmIHJlbmRlclN1 YnRyZWVzTWFwCiAgICAgLy8gVGhpcyBuZWVkcyB0byBiZSBkb25lIGFmdGVyIHRoZSBwcmV2aW91 cyBsb29wIHVwZGF0ZWQgdGhlIHNlbGVjdGlvblN0YXJ0L0VuZAogICAgIC8vIHBhcmFtZXRlcnMg b2YgYWxsIHN1YnRyZWVzIGJlY2F1c2Ugd2UncmUgZ29pbmcgdG8gYmUgY2xpbWJpbmcgdXAgdGhl IGNvbnRhaW5pbmcKICAgICAvLyBibG9jayBjaGFpbiBhbmQgd2UgbWlnaHQgZW5kIHVwIGluIGEg ZGlmZmVyZW50IHNlbGVjdGlvbiBzdWJ0cmVlLgotICAgIGZvciAoYXV0byBpdCA9IHJlbmRlclN1 YnRyZWVzTWFwLmJlZ2luKCk7IGl0ICE9IHJlbmRlclN1YnRyZWVzTWFwLmVuZCgpOyArK2l0KSB7 Ci0gICAgICAgIFNlbGVjdGlvblN1YnRyZWVSb290IHN1YnRyZWVTZWxlY3Rpb25EYXRhID0gaXQt PnZhbHVlOwotICAgICAgICBPbGRTZWxlY3Rpb25EYXRhJiBvbGRTZWxlY3Rpb25EYXRhID0gKm9s ZFNlbGVjdGlvbkRhdGFNYXAuZ2V0KGl0LT5rZXkpOwotICAgICAgICBhcHBseVN1YnRyZWVTZWxl Y3Rpb24oKml0LT5rZXksIHN1YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvblN0YXJ0KCksIHN1 YnRyZWVTZWxlY3Rpb25EYXRhLnNlbGVjdGlvbkVuZCgpLCBzdWJ0cmVlU2VsZWN0aW9uRGF0YS5z ZWxlY3Rpb25FbmRQb3MoKSwgYmxvY2tSZXBhaW50TW9kZSwgb2xkU2VsZWN0aW9uRGF0YSk7Cisg ICAgZm9yIChhdXRvJiBzdWJ0cmVlU2VsZWN0aW9uSW5mbyA6IHJlbmRlclN1YnRyZWVzTWFwKSB7 CisgICAgICAgIFNlbGVjdGlvblN1YnRyZWVSb290JiBzdWJ0cmVlU2VsZWN0aW9uRGF0YSA9IHN1 YnRyZWVTZWxlY3Rpb25JbmZvLnZhbHVlOworICAgICAgICBPbGRTZWxlY3Rpb25EYXRhJiBvbGRT ZWxlY3Rpb25EYXRhID0gKm9sZFNlbGVjdGlvbkRhdGFNYXAuZ2V0KHN1YnRyZWVTZWxlY3Rpb25J bmZvLmtleSk7CisgICAgICAgIGFwcGx5U3VidHJlZVNlbGVjdGlvbigqc3VidHJlZVNlbGVjdGlv bkluZm8ua2V5LCBzdWJ0cmVlU2VsZWN0aW9uRGF0YS5zZWxlY3Rpb25TdGFydCgpLCBzdWJ0cmVl U2VsZWN0aW9uRGF0YS5zZWxlY3Rpb25FbmQoKSwgc3VidHJlZVNlbGVjdGlvbkRhdGEuc2VsZWN0 aW9uRW5kUG9zKCksIGJsb2NrUmVwYWludE1vZGUsIG9sZFNlbGVjdGlvbkRhdGEpOwogICAgIH0K IH0KIAotdm9pZCBSZW5kZXJWaWV3OjpjbGVhclN1YnRyZWVTZWxlY3Rpb24oY29uc3QgU2VsZWN0 aW9uU3VidHJlZVJvb3QmIHJvb3QsIFNlbGVjdGlvblJlcGFpbnRNb2RlIGJsb2NrUmVwYWludE1v ZGUsIE9sZFNlbGVjdGlvbkRhdGEmIG9sZFNlbGVjdGlvbkRhdGEpCit2b2lkIFJlbmRlclZpZXc6 OmNsZWFyU3VidHJlZVNlbGVjdGlvbihjb25zdCBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYgcm9vdCwg U2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSwgT2xkU2VsZWN0aW9uRGF0YSYg b2xkU2VsZWN0aW9uRGF0YSkgY29uc3QKIHsKICAgICAvLyBSZWNvcmQgdGhlIG9sZCBzZWxlY3Rl ZCBvYmplY3RzLiAgVGhlc2Ugd2lsbCBiZSB1c2VkIGxhdGVyCiAgICAgLy8gd2hlbiB3ZSBjb21w YXJlIGFnYWluc3QgdGhlIG5ldyBzZWxlY3RlZCBvYmplY3RzLgpAQCAtOTgyLDEyICs5ODIsMTEg QEAgdm9pZCBSZW5kZXJWaWV3OjpjbGVhclN1YnRyZWVTZWxlY3Rpb24oY29uc3QgU2VsZWN0aW9u U3VidHJlZVJvb3QmIHJvb3QsIFNlbGVjdGkKICAgICAgICAgb3MgPSBzZWxlY3Rpb25JdGVyYXRv ci5uZXh0KCk7CiAgICAgfQogCi0gICAgYXV0byBvbGRPYmplY3RzRW5kID0gb2xkU2VsZWN0aW9u RGF0YS5zZWxlY3RlZE9iamVjdHMuZW5kKCk7Ci0gICAgZm9yIChhdXRvIGkgPSBvbGRTZWxlY3Rp b25EYXRhLnNlbGVjdGVkT2JqZWN0cy5iZWdpbigpOyBpICE9IG9sZE9iamVjdHNFbmQ7ICsraSkK LSAgICAgICAgaS0+a2V5LT5zZXRTZWxlY3Rpb25TdGF0ZUlmTmVlZGVkKFNlbGVjdGlvbk5vbmUp OworICAgIGZvciAoY29uc3QgYXV0byYgc2VsZWN0ZWRPYmplY3RJbmZvIDogb2xkU2VsZWN0aW9u RGF0YS5zZWxlY3RlZE9iamVjdHMpCisgICAgICAgIHNlbGVjdGVkT2JqZWN0SW5mby5rZXktPnNl dFNlbGVjdGlvblN0YXRlSWZOZWVkZWQoU2VsZWN0aW9uTm9uZSk7CiB9CiAKLXZvaWQgUmVuZGVy Vmlldzo6YXBwbHlTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBS ZW5kZXJPYmplY3QqIHN0YXJ0LCBSZW5kZXJPYmplY3QqIGVuZCwgaW50IGVuZFBvcywgU2VsZWN0 aW9uUmVwYWludE1vZGUgYmxvY2tSZXBhaW50TW9kZSwgY29uc3QgT2xkU2VsZWN0aW9uRGF0YSYg b2xkU2VsZWN0aW9uRGF0YSkKK3ZvaWQgUmVuZGVyVmlldzo6YXBwbHlTdWJ0cmVlU2VsZWN0aW9u KGNvbnN0IFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBSZW5kZXJPYmplY3QqIHN0YXJ0LCBS ZW5kZXJPYmplY3QqIGVuZCwgaW50IGVuZFBvcywgU2VsZWN0aW9uUmVwYWludE1vZGUgYmxvY2tS ZXBhaW50TW9kZSwgY29uc3QgT2xkU2VsZWN0aW9uRGF0YSYgb2xkU2VsZWN0aW9uRGF0YSkKIHsK ICAgICAvLyBVcGRhdGUgdGhlIHNlbGVjdGlvbiBzdGF0dXMgb2YgYWxsIG9iamVjdHMgYmV0d2Vl biBzZWxlY3Rpb25TdGFydCBhbmQgc2VsZWN0aW9uRW5kCiAgICAgaWYgKHN0YXJ0ICYmIHN0YXJ0 ID09IGVuZCkKQEAgLTEwNTIsMTEgKzEwNTEsMTAgQEAgdm9pZCBSZW5kZXJWaWV3OjphcHBseVN1 YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3VidHJlZVJvb3QmIHJvb3QsIFJlbmRlck9iamVjdCoK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gSGF2ZSBhbnkgb2YgdGhlIG9sZCBzZWxlY3RlZCBv YmplY3RzIGNoYW5nZWQgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24/Ci0gICAgYXV0byBv bGRPYmplY3RzRW5kID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZE9iamVjdHMuZW5kKCk7Ci0g ICAgZm9yIChhdXRvIGl0ID0gb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3RlZE9iamVjdHMuYmVnaW4o KTsgaXQgIT0gb2xkT2JqZWN0c0VuZDsgKytpdCkgewotICAgICAgICBSZW5kZXJPYmplY3QqIG9i aiA9IGl0LT5rZXk7CisgICAgZm9yIChjb25zdCBhdXRvJiBzZWxlY3RlZE9iamVjdEluZm8gOiBv bGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVkT2JqZWN0cykgeworICAgICAgICBSZW5kZXJPYmplY3Qq IG9iaiA9IHNlbGVjdGVkT2JqZWN0SW5mby5rZXk7CiAgICAgICAgIFJlbmRlclNlbGVjdGlvbklu Zm8qIG5ld0luZm8gPSBuZXdTZWxlY3RlZE9iamVjdHMuZ2V0KG9iaik7Ci0gICAgICAgIFJlbmRl clNlbGVjdGlvbkluZm8qIG9sZEluZm8gPSBpdC0+dmFsdWUuZ2V0KCk7CisgICAgICAgIFJlbmRl clNlbGVjdGlvbkluZm8qIG9sZEluZm8gPSBzZWxlY3RlZE9iamVjdEluZm8udmFsdWUuZ2V0KCk7 CiAgICAgICAgIGlmICghbmV3SW5mbyB8fCBvbGRJbmZvLT5yZWN0KCkgIT0gbmV3SW5mby0+cmVj dCgpIHx8IG9sZEluZm8tPnN0YXRlKCkgIT0gbmV3SW5mby0+c3RhdGUoKQogICAgICAgICAgICAg fHwgKHJvb3Quc2VsZWN0aW9uU3RhcnQoKSA9PSBvYmogJiYgb2xkU2VsZWN0aW9uRGF0YS5zZWxl Y3Rpb25TdGFydFBvcyAhPSByb290LnNlbGVjdGlvblN0YXJ0UG9zKCkpCiAgICAgICAgICAgICB8 fCAocm9vdC5zZWxlY3Rpb25FbmQoKSA9PSBvYmogJiYgb2xkU2VsZWN0aW9uRGF0YS5zZWxlY3Rp b25FbmRQb3MgIT0gcm9vdC5zZWxlY3Rpb25FbmRQb3MoKSkpIHsKQEAgLTEwNjksMTYgKzEwNjcs MTQgQEAgdm9pZCBSZW5kZXJWaWV3OjphcHBseVN1YnRyZWVTZWxlY3Rpb24oU2VsZWN0aW9uU3Vi dHJlZVJvb3QmIHJvb3QsIFJlbmRlck9iamVjdCoKICAgICB9CiAKICAgICAvLyBBbnkgbmV3IG9i amVjdHMgdGhhdCByZW1haW4gd2VyZSBub3QgZm91bmQgaW4gdGhlIG9sZCBvYmplY3RzIGRpY3Qs IGFuZCBzbyB0aGV5IG5lZWQgdG8gYmUgdXBkYXRlZC4KLSAgICBhdXRvIG5ld09iamVjdHNFbmQg PSBuZXdTZWxlY3RlZE9iamVjdHMuZW5kKCk7Ci0gICAgZm9yIChhdXRvIGl0ID0gbmV3U2VsZWN0 ZWRPYmplY3RzLmJlZ2luKCk7IGl0ICE9IG5ld09iamVjdHNFbmQ7ICsraXQpCi0gICAgICAgIGl0 LT52YWx1ZS0+cmVwYWludCgpOworICAgIGZvciAoY29uc3QgYXV0byYgc2VsZWN0ZWRPYmplY3RJ bmZvIDogbmV3U2VsZWN0ZWRPYmplY3RzKQorICAgICAgICBzZWxlY3RlZE9iamVjdEluZm8udmFs dWUtPnJlcGFpbnQoKTsKIAogICAgIC8vIEhhdmUgYW55IG9mIHRoZSBvbGQgYmxvY2tzIGNoYW5n ZWQ/Ci0gICAgYXV0byBvbGRCbG9ja3NFbmQgPSBvbGRTZWxlY3Rpb25EYXRhLnNlbGVjdGVkQmxv Y2tzLmVuZCgpOwotICAgIGZvciAoYXV0byBpdCA9IG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0ZWRC bG9ja3MuYmVnaW4oKTsgaXQgIT0gb2xkQmxvY2tzRW5kOyArK2l0KSB7Ci0gICAgICAgIFJlbmRl ckJsb2NrKiBibG9jayA9IGl0LT5rZXk7CisgICAgZm9yIChjb25zdCBhdXRvJiBzZWxlY3RlZEJs b2NrSW5mbyA6IG9sZFNlbGVjdGlvbkRhdGEuc2VsZWN0ZWRCbG9ja3MpIHsKKyAgICAgICAgUmVu ZGVyQmxvY2sqIGJsb2NrID0gc2VsZWN0ZWRCbG9ja0luZm8ua2V5OwogICAgICAgICBSZW5kZXJC bG9ja1NlbGVjdGlvbkluZm8qIG5ld0luZm8gPSBuZXdTZWxlY3RlZEJsb2Nrcy5nZXQoYmxvY2sp OwotICAgICAgICBSZW5kZXJCbG9ja1NlbGVjdGlvbkluZm8qIG9sZEluZm8gPSBpdC0+dmFsdWUu Z2V0KCk7CisgICAgICAgIFJlbmRlckJsb2NrU2VsZWN0aW9uSW5mbyogb2xkSW5mbyA9IHNlbGVj dGVkQmxvY2tJbmZvLnZhbHVlLmdldCgpOwogICAgICAgICBpZiAoIW5ld0luZm8gfHwgb2xkSW5m by0+cmVjdHMoKSAhPSBuZXdJbmZvLT5yZWN0cygpIHx8IG9sZEluZm8tPnN0YXRlKCkgIT0gbmV3 SW5mby0+c3RhdGUoKSkgewogICAgICAgICAgICAgb2xkSW5mby0+cmVwYWludCgpOwogICAgICAg ICAgICAgaWYgKG5ld0luZm8pIHsKQEAgLTEwODksOSArMTA4NSw4IEBAIHZvaWQgUmVuZGVyVmll dzo6YXBwbHlTdWJ0cmVlU2VsZWN0aW9uKFNlbGVjdGlvblN1YnRyZWVSb290JiByb290LCBSZW5k ZXJPYmplY3QqCiAgICAgfQogCiAgICAgLy8gQW55IG5ldyBibG9ja3MgdGhhdCByZW1haW4gd2Vy ZSBub3QgZm91bmQgaW4gdGhlIG9sZCBibG9ja3MgZGljdCwgYW5kIHNvIHRoZXkgbmVlZCB0byBi ZSB1cGRhdGVkLgotICAgIGF1dG8gbmV3QmxvY2tzRW5kID0gbmV3U2VsZWN0ZWRCbG9ja3MuZW5k KCk7Ci0gICAgZm9yIChhdXRvIGl0ID0gbmV3U2VsZWN0ZWRCbG9ja3MuYmVnaW4oKTsgaXQgIT0g bmV3QmxvY2tzRW5kOyArK2l0KQotICAgICAgICBpdC0+dmFsdWUtPnJlcGFpbnQoKTsKKyAgICBm b3IgKGNvbnN0IGF1dG8mIHNlbGVjdGVkQmxvY2tJbmZvIDogbmV3U2VsZWN0ZWRCbG9ja3MpCisg ICAgICAgIHNlbGVjdGVkQmxvY2tJbmZvLnZhbHVlLT5yZXBhaW50KCk7CiB9CiAKIHZvaWQgUmVu ZGVyVmlldzo6Z2V0U2VsZWN0aW9uKFJlbmRlck9iamVjdComIHN0YXJ0UmVuZGVyZXIsIGludCYg c3RhcnRPZmZzZXQsIFJlbmRlck9iamVjdComIGVuZFJlbmRlcmVyLCBpbnQmIGVuZE9mZnNldCkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCmluZGV4IDU2N2M1M2ZiNTY4 YjY4MDY3YmM5MTJjNDMzNjg5ZjA1ZjljMTAyOTcuLmE5ODBiZGE4M2YyNDFmMzc5ZDE5YjdhYzBj YmRmZDdkNTFkMWY3ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaApAQCAt MzAxLDEwICszMDEsMTAgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgYm9vbCBpc1Njcm9sbGFi bGVPclJ1YmJlcmJhbmRhYmxlQm94KCkgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICB2b2lkIHNwbGl0 U2VsZWN0aW9uQmV0d2VlblN1YnRyZWVzKFJlbmRlck9iamVjdCogc3RhcnQsIGludCBzdGFydFBv cywgUmVuZGVyT2JqZWN0KiBlbmQsIGludCBlbmRQb3MsIFNlbGVjdGlvblJlcGFpbnRNb2RlIGJs b2NrUmVwYWludE1vZGUpOwotICAgIHZvaWQgY2xlYXJTdWJ0cmVlU2VsZWN0aW9uKGNvbnN0IFNl bGVjdGlvblN1YnRyZWVSb290JiwgU2VsZWN0aW9uUmVwYWludE1vZGUsIE9sZFNlbGVjdGlvbkRh dGEmKTsKKyAgICB2b2lkIHNwbGl0U2VsZWN0aW9uQmV0d2VlblN1YnRyZWVzKGNvbnN0IFJlbmRl ck9iamVjdCogc3RhcnRSZW5kZXJlciwgaW50IHN0YXJ0UG9zLCBjb25zdCBSZW5kZXJPYmplY3Qq IGVuZFJlbmRlcmVyLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSBibG9ja1JlcGFp bnRNb2RlKTsKKyAgICB2b2lkIGNsZWFyU3VidHJlZVNlbGVjdGlvbihjb25zdCBTZWxlY3Rpb25T dWJ0cmVlUm9vdCYsIFNlbGVjdGlvblJlcGFpbnRNb2RlLCBPbGRTZWxlY3Rpb25EYXRhJikgY29u c3Q7CiAgICAgdm9pZCB1cGRhdGVTZWxlY3Rpb25Gb3JTdWJ0cmVlcyhSZW5kZXJTdWJ0cmVlc01h cCYsIFNlbGVjdGlvblJlcGFpbnRNb2RlKTsKLSAgICB2b2lkIGFwcGx5U3VidHJlZVNlbGVjdGlv bihTZWxlY3Rpb25TdWJ0cmVlUm9vdCYsIFJlbmRlck9iamVjdCogc3RhcnQsIFJlbmRlck9iamVj dCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSwgY29uc3QgT2xkU2VsZWN0 aW9uRGF0YSYpOworICAgIHZvaWQgYXBwbHlTdWJ0cmVlU2VsZWN0aW9uKGNvbnN0IFNlbGVjdGlv blN1YnRyZWVSb290JiwgUmVuZGVyT2JqZWN0KiBzdGFydFJlbmRlcmVyLCBSZW5kZXJPYmplY3Qq IGVuZFJlbmRlcmVyLCBpbnQgZW5kUG9zLCBTZWxlY3Rpb25SZXBhaW50TW9kZSwgY29uc3QgT2xk U2VsZWN0aW9uRGF0YSYpOwogICAgIExheW91dFJlY3Qgc3VidHJlZVNlbGVjdGlvbkJvdW5kcyhj b25zdCBTZWxlY3Rpb25TdWJ0cmVlUm9vdCYsIGJvb2wgY2xpcFRvVmlzaWJsZUNvbnRlbnQgPSB0 cnVlKSBjb25zdDsKICAgICB2b2lkIHJlcGFpbnRTdWJ0cmVlU2VsZWN0aW9uKGNvbnN0IFNlbGVj dGlvblN1YnRyZWVSb290JikgY29uc3Q7CiAK