131452 2014-04-09 14:25:26 -0700 Avoid Vector copies in RenderGrid::placeItemsOnGrid() 2014-04-11 10:57:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan commit-queue esprehn+autocc glenn jfernandez kondapallykalyan rego svillar oldest_to_newest 999293 0 zan 2014-04-09 14:25:26 -0700 Avoid Vector copies in RenderGrid::placeItemsOnGrid() 999295 1 228982 zan 2014-04-09 14:27:20 -0700 Created attachment 228982 Patch 999461 2 228982 svillar 2014-04-10 00:45:07 -0700 Comment on attachment 228982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228982&action=review > Source/WebCore/ChangeLog:9 > + placeAutoMajorAxisItemsOnGrid() methods which take the vectors by value. There is actually no reason to pass them by value. Let's just use references there. Actually we should use const references as the vectors are not modified at all. 999801 3 229111 zan 2014-04-10 22:55:57 -0700 Created attachment 229111 Patch 999822 4 229111 svillar 2014-04-11 01:02:41 -0700 Comment on attachment 229111 Patch Nice changes! You need to modify the prototypes to fix the build though :) 999832 5 229118 zan 2014-04-11 01:31:20 -0700 Created attachment 229118 Patch for landing Testing it againg through EWSs. 999935 6 229118 zan 2014-04-11 10:57:10 -0700 Comment on attachment 229118 Patch for landing Clearing flags on attachment: 229118 Committed r167134: <http://trac.webkit.org/changeset/167134> 999936 7 zan 2014-04-11 10:57:20 -0700 All reviewed patches have been landed. Closing bug. 228982 2014-04-09 14:27:20 -0700 2014-04-10 22:55:50 -0700 Patch bug-131452-20140409142658.patch text/plain 1487 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzAzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA0LTA5ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBBdm9pZCBWZWN0b3IgY29w aWVzIGluIFJlbmRlckdyaWQ6OnBsYWNlSXRlbXNPbkdyaWQoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDUyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0aGUgdHdvIHRlbXBvcmFyeSB2ZWN0 b3JzIGludG8gdGhlIHBsYWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoKSBhbmQKKyAg ICAgICAgcGxhY2VBdXRvTWFqb3JBeGlzSXRlbXNPbkdyaWQoKSBtZXRob2RzIHdoaWNoIHRha2Ug dGhlIHZlY3RvcnMgYnkgdmFsdWUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpwbGFjZUl0ZW1zT25HcmlkKToKKwog MjAxNC0wNC0wOCAgU2FtdWVsIFdoaXRlICA8c2FtdWVsX3doaXRlQGFwcGxlLmNvbT4KIAogICAg ICAgICBBWDogSW5pdGlhbCB0ZXh0IHNlbGVjdGlvbiBwb2ludCBzaG91bGQgcmVzcGVjdCBlbGVt ZW50IGZvY3VzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAko cmV2aXNpb24gMTY2ODg2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OTMsOCArNjkzLDggQEAgdm9pZCBSZW5kZXJHcmlkOjpw bGFjZUl0ZW1zT25HcmlkKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIHBsYWNlU3Bl Y2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoc3BlY2lmaWVkTWFqb3JBeGlzQXV0b0dyaWRJdGVt cyk7Ci0gICAgcGxhY2VBdXRvTWFqb3JBeGlzSXRlbXNPbkdyaWQoYXV0b01ham9yQXhpc0F1dG9H cmlkSXRlbXMpOworICAgIHBsYWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoc3RkOjpt b3ZlKHNwZWNpZmllZE1ham9yQXhpc0F1dG9HcmlkSXRlbXMpKTsKKyAgICBwbGFjZUF1dG9NYWpv ckF4aXNJdGVtc09uR3JpZChzdGQ6Om1vdmUoYXV0b01ham9yQXhpc0F1dG9HcmlkSXRlbXMpKTsK IH0KIAogdm9pZCBSZW5kZXJHcmlkOjpwb3B1bGF0ZUV4cGxpY2l0R3JpZEFuZE9yZGVySXRlcmF0 b3IoKQo= 229111 2014-04-10 22:55:57 -0700 2014-04-11 01:31:14 -0700 Patch bug-131452-20140410225535.patch text/plain 3194 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzExMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA0LTEwICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBBdm9pZCBWZWN0b3IgY29w aWVzIGluIFJlbmRlckdyaWQ6OnBsYWNlSXRlbXNPbkdyaWQoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDUyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpwbGFjZVNwZWNpZmllZE1ham9yQXhpc0l0 ZW1zT25HcmlkKTogVGFrZSBpbiBhIGNvbnN0IHJlZmVyZW5jZSB0byB0aGUKKyAgICAgICAgVmVj dG9yIG9iamVjdC4gTWFrZSB0aGUgZm9yLWxvb3AgdGhhdCBpdGVyYXRlcyB0aHJvdWdoIGl0IHJh bmdlLWJhc2VkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JB eGlzSXRlbXNPbkdyaWQpOiBEaXR0by4KKwogMjAxNC0wNC0xMCAgRGFyaW4gQWRsZXIgIDxkYXJp bkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViR0w6IG5lZWQgZXJyb3IgY2hlY2tpbmcgYWZ0ZXIg dGV4dHVyZSBhbmQgYnVmZmVyIHVwbG9hZHMgaW4gc29tZSBjYXNlcwpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAkocmV2aXNpb24gMTY3MTEzKQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MzAs MjcgKzczMCwyNyBAQCB2b2lkIFJlbmRlckdyaWQ6OnBvcHVsYXRlRXhwbGljaXRHcmlkQW5kCiAg ICAgbV9vcmRlckl0ZXJhdG9yLnNldE9yZGVyVmFsdWVzKHN0ZDo6bW92ZShvcmRlclZhbHVlcykp OwogfQogCi12b2lkIFJlbmRlckdyaWQ6OnBsYWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdy aWQoVmVjdG9yPFJlbmRlckJveCo+IGF1dG9HcmlkSXRlbXMpCit2b2lkIFJlbmRlckdyaWQ6OnBs YWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoY29uc3QgVmVjdG9yPFJlbmRlckJveCo+ JiBhdXRvR3JpZEl0ZW1zKQogewotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXV0b0dyaWRJ dGVtcy5zaXplKCk7ICsraSkgewotICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8R3JpZFNwYW4+IG1h am9yQXhpc1Bvc2l0aW9ucyA9IHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKGF1dG9Hcmlk SXRlbXNbaV0sIGF1dG9QbGFjZW1lbnRNYWpvckF4aXNEaXJlY3Rpb24oKSk7CisgICAgZm9yIChh dXRvJiBhdXRvR3JpZEl0ZW0gOiBhdXRvR3JpZEl0ZW1zKSB7CisgICAgICAgIHN0ZDo6dW5pcXVl X3B0cjxHcmlkU3Bhbj4gbWFqb3JBeGlzUG9zaXRpb25zID0gcmVzb2x2ZUdyaWRQb3NpdGlvbnNG cm9tU3R5bGUoYXV0b0dyaWRJdGVtLCBhdXRvUGxhY2VtZW50TWFqb3JBeGlzRGlyZWN0aW9uKCkp OwogICAgICAgICBHcmlkSXRlcmF0b3IgaXRlcmF0b3IobV9ncmlkLCBhdXRvUGxhY2VtZW50TWFq b3JBeGlzRGlyZWN0aW9uKCksIG1ham9yQXhpc1Bvc2l0aW9ucy0+aW5pdGlhbFBvc2l0aW9uSW5k ZXgpOwogICAgICAgICBpZiAoc3RkOjp1bmlxdWVfcHRyPEdyaWRDb29yZGluYXRlPiBlbXB0eUdy aWRBcmVhID0gaXRlcmF0b3IubmV4dEVtcHR5R3JpZEFyZWEoKSkgewotICAgICAgICAgICAgaW5z ZXJ0SXRlbUludG9HcmlkKGF1dG9HcmlkSXRlbXNbaV0sIGVtcHR5R3JpZEFyZWEtPnJvd3MuaW5p dGlhbFBvc2l0aW9uSW5kZXgsIGVtcHR5R3JpZEFyZWEtPmNvbHVtbnMuaW5pdGlhbFBvc2l0aW9u SW5kZXgpOworICAgICAgICAgICAgaW5zZXJ0SXRlbUludG9HcmlkKGF1dG9HcmlkSXRlbSwgZW1w dHlHcmlkQXJlYS0+cm93cy5pbml0aWFsUG9zaXRpb25JbmRleCwgZW1wdHlHcmlkQXJlYS0+Y29s dW1ucy5pbml0aWFsUG9zaXRpb25JbmRleCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQogCiAgICAgICAgIGdyb3dHcmlkKGF1dG9QbGFjZW1lbnRNaW5vckF4aXNEaXJlY3Rpb24o KSk7CiAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxHcmlkQ29vcmRpbmF0ZT4gZW1wdHlHcmlkQXJl YSA9IGl0ZXJhdG9yLm5leHRFbXB0eUdyaWRBcmVhKCk7CiAgICAgICAgIEFTU0VSVChlbXB0eUdy aWRBcmVhKTsKLSAgICAgICAgaW5zZXJ0SXRlbUludG9HcmlkKGF1dG9HcmlkSXRlbXNbaV0sIGVt cHR5R3JpZEFyZWEtPnJvd3MuaW5pdGlhbFBvc2l0aW9uSW5kZXgsIGVtcHR5R3JpZEFyZWEtPmNv bHVtbnMuaW5pdGlhbFBvc2l0aW9uSW5kZXgpOworICAgICAgICBpbnNlcnRJdGVtSW50b0dyaWQo YXV0b0dyaWRJdGVtLCBlbXB0eUdyaWRBcmVhLT5yb3dzLmluaXRpYWxQb3NpdGlvbkluZGV4LCBl bXB0eUdyaWRBcmVhLT5jb2x1bW5zLmluaXRpYWxQb3NpdGlvbkluZGV4KTsKICAgICB9CiB9CiAK LXZvaWQgUmVuZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JBeGlzSXRlbXNPbkdyaWQoVmVjdG9yPFJl bmRlckJveCo+IGF1dG9HcmlkSXRlbXMpCit2b2lkIFJlbmRlckdyaWQ6OnBsYWNlQXV0b01ham9y QXhpc0l0ZW1zT25HcmlkKGNvbnN0IFZlY3RvcjxSZW5kZXJCb3gqPiYgYXV0b0dyaWRJdGVtcykK IHsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF1dG9HcmlkSXRlbXMuc2l6ZSgpOyArK2kp Ci0gICAgICAgIHBsYWNlQXV0b01ham9yQXhpc0l0ZW1PbkdyaWQoYXV0b0dyaWRJdGVtc1tpXSk7 CisgICAgZm9yIChhdXRvJiBhdXRvR3JpZEl0ZW0gOiBhdXRvR3JpZEl0ZW1zKQorICAgICAgICBw bGFjZUF1dG9NYWpvckF4aXNJdGVtT25HcmlkKGF1dG9HcmlkSXRlbSk7CiB9CiAKIHZvaWQgUmVu ZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JBeGlzSXRlbU9uR3JpZChSZW5kZXJCb3gqIGdyaWRJdGVt KQo= 229118 2014-04-11 01:31:20 -0700 2014-04-11 10:57:10 -0700 Patch for landing bug-131452-20140411013058.patch text/plain 4098 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzExNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA0LTExICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBBdm9pZCBWZWN0b3IgY29w aWVzIGluIFJlbmRlckdyaWQ6OnBsYWNlSXRlbXNPbkdyaWQoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNDUyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgU2VyZ2lvIFZpbGxhciBTZW5pbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlk LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnBsYWNlU3BlY2lmaWVkTWFqb3JB eGlzSXRlbXNPbkdyaWQpOiBUYWtlIGluIGEgY29uc3QgcmVmZXJlbmNlIHRvIHRoZQorICAgICAg ICBWZWN0b3Igb2JqZWN0LiBNYWtlIHRoZSBmb3ItbG9vcCB0aGF0IGl0ZXJhdGVzIHRocm91Z2gg aXQgcmFuZ2UtYmFzZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpwbGFjZUF1dG9N YWpvckF4aXNJdGVtc09uR3JpZCk6IERpdHRvLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJH cmlkLmg6CisKIDIwMTQtMDQtMTAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYkdMOiBuZWVkIGVycm9yIGNoZWNraW5nIGFmdGVyIHRleHR1cmUgYW5kIGJ1ZmZl ciB1cGxvYWRzIGluIHNvbWUgY2FzZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJHcmlkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5jcHAJKHJldmlzaW9uIDE2NzExNikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJHcmlkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzMwLDI3ICs3MzAsMjcgQEAgdm9p ZCBSZW5kZXJHcmlkOjpwb3B1bGF0ZUV4cGxpY2l0R3JpZEFuZAogICAgIG1fb3JkZXJJdGVyYXRv ci5zZXRPcmRlclZhbHVlcyhzdGQ6Om1vdmUob3JkZXJWYWx1ZXMpKTsKIH0KIAotdm9pZCBSZW5k ZXJHcmlkOjpwbGFjZVNwZWNpZmllZE1ham9yQXhpc0l0ZW1zT25HcmlkKFZlY3RvcjxSZW5kZXJC b3gqPiBhdXRvR3JpZEl0ZW1zKQordm9pZCBSZW5kZXJHcmlkOjpwbGFjZVNwZWNpZmllZE1ham9y QXhpc0l0ZW1zT25HcmlkKGNvbnN0IFZlY3RvcjxSZW5kZXJCb3gqPiYgYXV0b0dyaWRJdGVtcykK IHsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF1dG9HcmlkSXRlbXMuc2l6ZSgpOyArK2kp IHsKLSAgICAgICAgc3RkOjp1bmlxdWVfcHRyPEdyaWRTcGFuPiBtYWpvckF4aXNQb3NpdGlvbnMg PSByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZShhdXRvR3JpZEl0ZW1zW2ldLCBhdXRvUGxh Y2VtZW50TWFqb3JBeGlzRGlyZWN0aW9uKCkpOworICAgIGZvciAoYXV0byYgYXV0b0dyaWRJdGVt IDogYXV0b0dyaWRJdGVtcykgeworICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8R3JpZFNwYW4+IG1h am9yQXhpc1Bvc2l0aW9ucyA9IHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKGF1dG9Hcmlk SXRlbSwgYXV0b1BsYWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpKTsKICAgICAgICAgR3JpZEl0 ZXJhdG9yIGl0ZXJhdG9yKG1fZ3JpZCwgYXV0b1BsYWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigp LCBtYWpvckF4aXNQb3NpdGlvbnMtPmluaXRpYWxQb3NpdGlvbkluZGV4KTsKICAgICAgICAgaWYg KHN0ZDo6dW5pcXVlX3B0cjxHcmlkQ29vcmRpbmF0ZT4gZW1wdHlHcmlkQXJlYSA9IGl0ZXJhdG9y Lm5leHRFbXB0eUdyaWRBcmVhKCkpIHsKLSAgICAgICAgICAgIGluc2VydEl0ZW1JbnRvR3JpZChh dXRvR3JpZEl0ZW1zW2ldLCBlbXB0eUdyaWRBcmVhLT5yb3dzLmluaXRpYWxQb3NpdGlvbkluZGV4 LCBlbXB0eUdyaWRBcmVhLT5jb2x1bW5zLmluaXRpYWxQb3NpdGlvbkluZGV4KTsKKyAgICAgICAg ICAgIGluc2VydEl0ZW1JbnRvR3JpZChhdXRvR3JpZEl0ZW0sIGVtcHR5R3JpZEFyZWEtPnJvd3Mu aW5pdGlhbFBvc2l0aW9uSW5kZXgsIGVtcHR5R3JpZEFyZWEtPmNvbHVtbnMuaW5pdGlhbFBvc2l0 aW9uSW5kZXgpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICBn cm93R3JpZChhdXRvUGxhY2VtZW50TWlub3JBeGlzRGlyZWN0aW9uKCkpOwogICAgICAgICBzdGQ6 OnVuaXF1ZV9wdHI8R3JpZENvb3JkaW5hdGU+IGVtcHR5R3JpZEFyZWEgPSBpdGVyYXRvci5uZXh0 RW1wdHlHcmlkQXJlYSgpOwogICAgICAgICBBU1NFUlQoZW1wdHlHcmlkQXJlYSk7Ci0gICAgICAg IGluc2VydEl0ZW1JbnRvR3JpZChhdXRvR3JpZEl0ZW1zW2ldLCBlbXB0eUdyaWRBcmVhLT5yb3dz LmluaXRpYWxQb3NpdGlvbkluZGV4LCBlbXB0eUdyaWRBcmVhLT5jb2x1bW5zLmluaXRpYWxQb3Np dGlvbkluZGV4KTsKKyAgICAgICAgaW5zZXJ0SXRlbUludG9HcmlkKGF1dG9HcmlkSXRlbSwgZW1w dHlHcmlkQXJlYS0+cm93cy5pbml0aWFsUG9zaXRpb25JbmRleCwgZW1wdHlHcmlkQXJlYS0+Y29s dW1ucy5pbml0aWFsUG9zaXRpb25JbmRleCk7CiAgICAgfQogfQogCi12b2lkIFJlbmRlckdyaWQ6 OnBsYWNlQXV0b01ham9yQXhpc0l0ZW1zT25HcmlkKFZlY3RvcjxSZW5kZXJCb3gqPiBhdXRvR3Jp ZEl0ZW1zKQordm9pZCBSZW5kZXJHcmlkOjpwbGFjZUF1dG9NYWpvckF4aXNJdGVtc09uR3JpZChj b25zdCBWZWN0b3I8UmVuZGVyQm94Kj4mIGF1dG9HcmlkSXRlbXMpCiB7Ci0gICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBhdXRvR3JpZEl0ZW1zLnNpemUoKTsgKytpKQotICAgICAgICBwbGFjZUF1 dG9NYWpvckF4aXNJdGVtT25HcmlkKGF1dG9HcmlkSXRlbXNbaV0pOworICAgIGZvciAoYXV0byYg YXV0b0dyaWRJdGVtIDogYXV0b0dyaWRJdGVtcykKKyAgICAgICAgcGxhY2VBdXRvTWFqb3JBeGlz SXRlbU9uR3JpZChhdXRvR3JpZEl0ZW0pOwogfQogCiB2b2lkIFJlbmRlckdyaWQ6OnBsYWNlQXV0 b01ham9yQXhpc0l0ZW1PbkdyaWQoUmVuZGVyQm94KiBncmlkSXRlbSkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAkocmV2aXNpb24gMTY3MTE2KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAkod29ya2luZyBjb3B5KQpAQCAtODAsOCArODAs OCBAQCBwcml2YXRlOgogICAgIHZvaWQgaW5zZXJ0SXRlbUludG9HcmlkKFJlbmRlckJveCosIGNv bnN0IEdyaWRDb29yZGluYXRlJik7CiAgICAgdm9pZCBwbGFjZUl0ZW1zT25HcmlkKCk7CiAgICAg dm9pZCBwb3B1bGF0ZUV4cGxpY2l0R3JpZEFuZE9yZGVySXRlcmF0b3IoKTsKLSAgICB2b2lkIHBs YWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoVmVjdG9yPFJlbmRlckJveCo+KTsKLSAg ICB2b2lkIHBsYWNlQXV0b01ham9yQXhpc0l0ZW1zT25HcmlkKFZlY3RvcjxSZW5kZXJCb3gqPik7 CisgICAgdm9pZCBwbGFjZVNwZWNpZmllZE1ham9yQXhpc0l0ZW1zT25HcmlkKGNvbnN0IFZlY3Rv cjxSZW5kZXJCb3gqPiYpOworICAgIHZvaWQgcGxhY2VBdXRvTWFqb3JBeGlzSXRlbXNPbkdyaWQo Y29uc3QgVmVjdG9yPFJlbmRlckJveCo+Jik7CiAgICAgdm9pZCBwbGFjZUF1dG9NYWpvckF4aXNJ dGVtT25HcmlkKFJlbmRlckJveCopOwogICAgIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBhdXRv UGxhY2VtZW50TWFqb3JBeGlzRGlyZWN0aW9uKCkgY29uc3Q7CiAgICAgR3JpZFRyYWNrU2l6aW5n RGlyZWN0aW9uIGF1dG9QbGFjZW1lbnRNaW5vckF4aXNEaXJlY3Rpb24oKSBjb25zdDsK