99204 2012-10-12 13:36:18 -0700 ScrollingStateNodes should keep track of their IDs 2012-10-12 13:50:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin andersca bdakin jamesr tonikitoo webkit.review.bot oldest_to_newest 741156 0 bdakin 2012-10-12 13:36:18 -0700 There is a HashMap in ScrollingCoordinatorMac that maps ScrollingNodeIDs to ScrollingStateNodes. The nodes themselves should keep track of this ID. Then the id can be used to make sure ScrollingStateNodes remove themselves from the HashMap when they are destroyed, and it will also be useful for associating ScrollingStateNodes with ScrollingTreeNodes over on the scrolling thread. 741162 1 168473 bdakin 2012-10-12 13:40:08 -0700 Created attachment 168473 Patch 741166 2 webkit.review.bot 2012-10-12 13:42:32 -0700 Attachment 168473 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/page/scrolling/ScrollingStateNode.h:31: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 741170 3 168474 bdakin 2012-10-12 13:46:57 -0700 Created attachment 168474 Patch 741172 4 bdakin 2012-10-12 13:50:52 -0700 Thanks, Simon! Committed change: http://trac.webkit.org/changeset/131221 168473 2012-10-12 13:40:08 -0700 2012-10-12 13:46:57 -0700 Patch for-review.txt text/plain 7245 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTkyMDQKKyAgICAgICAgU2Nyb2xsaW5nU3RhdGVOb2RlcyBzaG91 bGQga2VlcCB0cmFjayBvZiB0aGVpciBJRHMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGVyZSBpcyBhIEhhc2hNYXAgaW4gU2Nyb2xsaW5nQ29vcmRp bmF0b3JNYWMgdGhhdCBtYXBzIAorICAgICAgICBTY3JvbGxpbmdOb2RlSURzIHRvIFNjcm9sbGlu Z1N0YXRlTm9kZXMuIFRoZSBub2RlcyB0aGVtc2VsdmVzIHNob3VsZCAKKyAgICAgICAga2VlcCB0 cmFjayBvZiB0aGlzIGlkLiBUaGVuIHRoZSBpZCBjYW4gYmUgdXNlZCB0byBtYWtlIHN1cmUgCisg ICAgICAgIFNjcm9sbGluZ1N0YXRlTm9kZXMgcmVtb3ZlIHRoZW1zZWx2ZXMgZnJvbSB0aGUgSGFz aE1hcCB3aGVuIHRoZXkgYXJlIAorICAgICAgICBkZXN0cm95ZWQsIGFuZCBpdCB3aWxsIGFsc28g YmUgdXNlZnVsIGZvciBhc3NvY2lhdGluZyAKKyAgICAgICAgU2Nyb2xsaW5nU3RhdGVOb2RlcyB3 aXRoIFNjcm9sbGluZ1RyZWVOb2RlcyBvdmVyIG9uIHRoZSBzY3JvbGxpbmcgCisgICAgICAgIHRo cmVhZC4KKyAgCisgICAgICAgIFRoaXMgcGF0Y2ggb25seSBoYXMgdGhlIFNjcm9sbGluZ1N0YXRl Tm9kZXMgY2FjaGUgdGhlIGlkLiBJIHdpbGwgCisgICAgICAgIGFjdHVhbGx5IG1ha2UgdXNlIG9m IHRoZSBpZCBpbiBmb2xsb3ctdXAgcGF0Y2hlcy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1N0YXRlTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0 ZU5vZGU6OlNjcm9sbGluZ1N0YXRlTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVOb2RlLmg6CisgICAgICAgIChTY3JvbGxpbmdTdGF0ZU5vZGUpOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2RlOjpzY3JvbGxpbmdOb2RlSUQpOgorICAgICAg ICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVT Y3JvbGxpbmdOb2RlLmg6CisgICAgICAgIChTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUpOgor ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjphdHRhY2hUb1N0YXRl VHJlZSk6CisKIDIwMTItMTAtMTIgIEphbWVzIFNpbW9uc2VuICA8c2ltb25qYW1AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtSZXF1ZXN0QW5pbWF0aW9uRnJhbWVdIFJlbW92ZSB2ZW5kb3IgcHJl Zml4CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5v ZGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1N0YXRlTm9kZS5jcHAJKHJldmlzaW9uIDEzMTEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMy LDggKzMyLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1TY3JvbGxpbmdTdGF0ZU5vZGU6 OlNjcm9sbGluZ1N0YXRlTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUqIHNjcm9sbGluZ1N0YXRlVHJl ZSkKK1Njcm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xsaW5nU3RhdGVOb2RlKFNjcm9sbGluZ1N0YXRl VHJlZSogc2Nyb2xsaW5nU3RhdGVUcmVlLCBTY3JvbGxpbmdOb2RlSUQgaWQpCiAgICAgOiBtX3Nj cm9sbGluZ1N0YXRlVHJlZShzY3JvbGxpbmdTdGF0ZVRyZWUpCisgICAgLCBtX2lkKGlkKQogICAg ICwgbV9wYXJlbnQoMCkKICAgICAsIG1fc2Nyb2xsTGF5ZXJEaWRDaGFuZ2UoZmFsc2UpCiB7CkBA IC00NCw2ICs0NSw3IEBAIFNjcm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xsaW5nU3RhdGVOb2RlKFMK IC8vIG5vZGUuCiBTY3JvbGxpbmdTdGF0ZU5vZGU6OlNjcm9sbGluZ1N0YXRlTm9kZShTY3JvbGxp bmdTdGF0ZU5vZGUqIHN0YXRlTm9kZSkKICAgICA6IG1fc2Nyb2xsaW5nU3RhdGVUcmVlKDApCisg ICAgLCBtX2lkKHN0YXRlTm9kZS0+c2Nyb2xsaW5nTm9kZUlEKCkpCiAgICAgLCBtX3BhcmVudCgw KQogICAgICwgbV9zY3JvbGxMYXllckRpZENoYW5nZShzdGF0ZU5vZGUtPnNjcm9sbExheWVyRGlk Q2hhbmdlKCkpCiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZU5vZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdTdGF0ZU5vZGUuaAkocmV2aXNpb24gMTMxMTM2KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgJKHdvcmtpbmcgY29weSkKQEAg LTI4LDYgKzI4LDcgQEAKIAogI2lmIEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCiAKKyNpbmNs dWRlICJTY3JvbGxpbmdDb29yZGluYXRvci5oIgogI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXIuaCIK ICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KQEAg LTQ1LDcgKzQ2LDcgQEAgY2xhc3MgU2Nyb2xsaW5nU3RhdGVOb2RlIHsKICAgICBXVEZfTUFLRV9O T05DT1BZQUJMRShTY3JvbGxpbmdTdGF0ZU5vZGUpOwogCiBwdWJsaWM6Ci0gICAgU2Nyb2xsaW5n U3RhdGVOb2RlKFNjcm9sbGluZ1N0YXRlVHJlZSopOworICAgIFNjcm9sbGluZ1N0YXRlTm9kZShT Y3JvbGxpbmdTdGF0ZVRyZWUqLCBTY3JvbGxpbmdOb2RlSUQpOwogICAgIHZpcnR1YWwgflNjcm9s bGluZ1N0YXRlTm9kZSgpOwogCiAgICAgdmlydHVhbCBib29sIGlzU2Nyb2xsaW5nU3RhdGVTY3Jv bGxpbmdOb2RlKCkgeyByZXR1cm4gZmFsc2U7IH0KQEAgLTY4LDYgKzY5LDggQEAgcHVibGljOgog ICAgIFNjcm9sbGluZ1N0YXRlVHJlZSogc2Nyb2xsaW5nU3RhdGVUcmVlKCkgY29uc3QgeyByZXR1 cm4gbV9zY3JvbGxpbmdTdGF0ZVRyZWU7IH0KICAgICB2b2lkIHNldFNjcm9sbGluZ1N0YXRlVHJl ZShTY3JvbGxpbmdTdGF0ZVRyZWUqIHRyZWUpIHsgbV9zY3JvbGxpbmdTdGF0ZVRyZWUgPSB0cmVl OyB9CiAKKyAgICBTY3JvbGxpbmdOb2RlSUQgc2Nyb2xsaW5nTm9kZUlEKCkgY29uc3QgeyByZXR1 cm4gbV9pZDsgfQorCiAgICAgU2Nyb2xsaW5nU3RhdGVOb2RlKiBwYXJlbnQoKSBjb25zdCB7IHJl dHVybiBtX3BhcmVudDsgfQogICAgIHZvaWQgc2V0UGFyZW50KFNjcm9sbGluZ1N0YXRlTm9kZSog cGFyZW50KSB7IG1fcGFyZW50ID0gcGFyZW50OyB9CiAKQEAgLTgxLDggKzg0LDkgQEAgcHJvdGVj dGVkOgogICAgIFNjcm9sbGluZ1N0YXRlVHJlZSogbV9zY3JvbGxpbmdTdGF0ZVRyZWU7CiAKIHBy aXZhdGU6Ci0gICAgU2Nyb2xsaW5nU3RhdGVOb2RlKiBtX3BhcmVudDsKKyAgICBTY3JvbGxpbmdO b2RlSUQgbV9pZDsKIAorICAgIFNjcm9sbGluZ1N0YXRlTm9kZSogbV9wYXJlbnQ7CiAgICAgT3du UHRyPFZlY3RvcjxPd25QdHI8U2Nyb2xsaW5nU3RhdGVOb2RlPiA+ID4gbV9jaGlsZHJlbjsKIAog ICAgIGJvb2wgbV9zY3JvbGxMYXllckRpZENoYW5nZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdO b2RlLmNwcAkocmV2aXNpb24gMTMxMTM2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMs MTMgKzMzLDEzIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGFzc093blB0cjxTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU+IFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Y3JlYXRl KFNjcm9sbGluZ1N0YXRlVHJlZSogc3RhdGVUcmVlKQorUGFzc093blB0cjxTY3JvbGxpbmdTdGF0 ZVNjcm9sbGluZ05vZGU+IFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6Y3JlYXRlKFNjcm9s bGluZ1N0YXRlVHJlZSogc3RhdGVUcmVlLCBTY3JvbGxpbmdOb2RlSUQgaWQpCiB7Ci0gICAgcmV0 dXJuIGFkb3B0UHRyKG5ldyBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoc3RhdGVUcmVlKSk7 CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoc3Rh dGVUcmVlLCBpZCkpOwogfQogCi1TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUqIHN0YXRlVHJlZSkKLSAgICA6 IFNjcm9sbGluZ1N0YXRlTm9kZShzdGF0ZVRyZWUpCitTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05v ZGU6OlNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUqIHN0YXRl VHJlZSwgU2Nyb2xsaW5nTm9kZUlEIGlkKQorICAgIDogU2Nyb2xsaW5nU3RhdGVOb2RlKHN0YXRl VHJlZSwgaWQpCiAgICAgLCBtX2NoYW5nZWRQcm9wZXJ0aWVzKDApCiAgICAgLCBtX3doZWVsRXZl bnRIYW5kbGVyQ291bnQoMCkKICAgICAsIG1fc2hvdWxkVXBkYXRlU2Nyb2xsTGF5ZXJQb3NpdGlv bk9uTWFpblRocmVhZCgwKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmgJKHJldmlzaW9uIDEz MTEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogY2xhc3MgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlIDogcHVibGljIFNj cm9sbGluZ1N0YXRlTm9kZSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8U2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlPiBjcmVhdGUoU2Nyb2xsaW5nU3RhdGVUcmVlKik7CisgICAg c3RhdGljIFBhc3NPd25QdHI8U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlPiBjcmVhdGUoU2Ny b2xsaW5nU3RhdGVUcmVlKiwgU2Nyb2xsaW5nTm9kZUlEKTsKICAgICB2aXJ0dWFsIH5TY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGUoKTsKIAogICAgIGVudW0gQ2hhbmdlZFByb3BlcnR5IHsKQEAg LTExMCw3ICsxMTAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCByZXF1ZXN0ZWRTY3JvbGxQb3NpdGlv blJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoKSBjb25zdCB7IHJldHVybiBtX3JlcXVlc3Rl ZFNjcm9sbFBvc2l0aW9uUmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbDsgfQogCiBwcml2YXRl OgotICAgIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUqKTsK KyAgICBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nU3RhdGVUcmVlKiwgU2Ny b2xsaW5nTm9kZUlEKTsKICAgICBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5n U3RhdGVTY3JvbGxpbmdOb2RlKik7CiAKICAgICB1bnNpZ25lZCBtX2NoYW5nZWRQcm9wZXJ0aWVz OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3Jk aW5hdG9yTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQkocmV2aXNpb24gMTMxMTM3KQorKysgU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0yNDcsNyArMjQ3LDcgQEAgU2Nyb2xsaW5nTm9kZUlEIFNjcm9s bGluZ0Nvb3JkaW5hdG9yTWFjOgogICAgIC8vIEZJWE1FOiBJbiB0aGUgZnV0dXJlLCB0aGlzIGZ1 bmN0aW9uIHdpbGwgaGF2ZSB0byB0YWtlIGEgcGFyZW50IElEIHNvIHRoYXQgaXQgY2FuCiAgICAg Ly8gYXBwZW5kIHRoZSBub2RlIGluIHRoZSBhcHByb3ByaWF0ZSBzcG90IGluIHRoZSBzdGF0ZSB0 cmVlLiBGb3Igbm93IHdlIGFsd2F5cyBhc3N1bWUKICAgICAvLyB0aGlzIGlzIHRoZSByb290IG5v ZGUuCi0gICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnNldFJvb3RTdGF0ZU5vZGUoU2Nyb2xsaW5n U3RhdGVTY3JvbGxpbmdOb2RlOjpjcmVhdGUobV9zY3JvbGxpbmdTdGF0ZVRyZWUuZ2V0KCkpKTsK KyAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c2V0Um9vdFN0YXRlTm9kZShTY3JvbGxpbmdTdGF0 ZVNjcm9sbGluZ05vZGU6OmNyZWF0ZShtX3Njcm9sbGluZ1N0YXRlVHJlZS5nZXQoKSwgc2Nyb2xs TGF5ZXJJRCkpOwogICAgIG1fc3RhdGVOb2RlTWFwLnNldChzY3JvbGxMYXllcklELCBtX3Njcm9s bGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgpKTsKICAgICByZXR1cm4gc2Nyb2xsTGF5ZXJJ RDsKIH0K 168474 2012-10-12 13:46:57 -0700 2012-10-12 13:49:08 -0700 Patch for-review-2.txt text/plain 7308 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTIxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEyLTEwLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTkyMDQKKyAgICAgICAgU2Nyb2xsaW5nU3RhdGVOb2RlcyBzaG91 bGQga2VlcCB0cmFjayBvZiB0aGVpciBJRHMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGVyZSBpcyBhIEhhc2hNYXAgaW4gU2Nyb2xsaW5nQ29vcmRp bmF0b3JNYWMgdGhhdCBtYXBzIAorICAgICAgICBTY3JvbGxpbmdOb2RlSURzIHRvIFNjcm9sbGlu Z1N0YXRlTm9kZXMuIFRoZSBub2RlcyB0aGVtc2VsdmVzIHNob3VsZCAKKyAgICAgICAga2VlcCB0 cmFjayBvZiB0aGlzIGlkLiBUaGVuIHRoZSBpZCBjYW4gYmUgdXNlZCB0byBtYWtlIHN1cmUgCisg ICAgICAgIFNjcm9sbGluZ1N0YXRlTm9kZXMgcmVtb3ZlIHRoZW1zZWx2ZXMgZnJvbSB0aGUgSGFz aE1hcCB3aGVuIHRoZXkgYXJlIAorICAgICAgICBkZXN0cm95ZWQsIGFuZCBpdCB3aWxsIGFsc28g YmUgdXNlZnVsIGZvciBhc3NvY2lhdGluZyAKKyAgICAgICAgU2Nyb2xsaW5nU3RhdGVOb2RlcyB3 aXRoIFNjcm9sbGluZ1RyZWVOb2RlcyBvdmVyIG9uIHRoZSBzY3JvbGxpbmcgCisgICAgICAgIHRo cmVhZC4KKyAgCisgICAgICAgIFRoaXMgcGF0Y2ggb25seSBoYXMgdGhlIFNjcm9sbGluZ1N0YXRl Tm9kZXMgY2FjaGUgdGhlIGlkLiBJIHdpbGwgCisgICAgICAgIGFjdHVhbGx5IG1ha2UgdXNlIG9m IHRoZSBpZCBpbiBmb2xsb3ctdXAgcGF0Y2hlcy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1N0YXRlTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0 ZU5vZGU6OlNjcm9sbGluZ1N0YXRlTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVOb2RlLmg6CisgICAgICAgIChTY3JvbGxpbmdTdGF0ZU5vZGUpOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2RlOjpzY3JvbGxpbmdOb2RlSUQpOgorICAgICAg ICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZSk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVT Y3JvbGxpbmdOb2RlLmg6CisgICAgICAgIChTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUpOgor ICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjphdHRhY2hUb1N0YXRl VHJlZSk6CisKIDIwMTItMTAtMTIgIEphbWVzIFNpbW9uc2VuICA8c2ltb25qYW1AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtSZXF1ZXN0QW5pbWF0aW9uRnJhbWVdIFJlbW92ZSB2ZW5kb3IgcHJl Zml4CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5v ZGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1N0YXRlTm9kZS5jcHAJKHJldmlzaW9uIDEzMTEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMy LDggKzMyLDkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1TY3JvbGxpbmdTdGF0ZU5vZGU6 OlNjcm9sbGluZ1N0YXRlTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUqIHNjcm9sbGluZ1N0YXRlVHJl ZSkKK1Njcm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xsaW5nU3RhdGVOb2RlKFNjcm9sbGluZ1N0YXRl VHJlZSogc2Nyb2xsaW5nU3RhdGVUcmVlLCBTY3JvbGxpbmdOb2RlSUQgbm9kZUlEKQogICAgIDog bV9zY3JvbGxpbmdTdGF0ZVRyZWUoc2Nyb2xsaW5nU3RhdGVUcmVlKQorICAgICwgbV9ub2RlSUQo bm9kZUlEKQogICAgICwgbV9wYXJlbnQoMCkKICAgICAsIG1fc2Nyb2xsTGF5ZXJEaWRDaGFuZ2Uo ZmFsc2UpCiB7CkBAIC00NCw2ICs0NSw3IEBAIFNjcm9sbGluZ1N0YXRlTm9kZTo6U2Nyb2xsaW5n U3RhdGVOb2RlKFMKIC8vIG5vZGUuCiBTY3JvbGxpbmdTdGF0ZU5vZGU6OlNjcm9sbGluZ1N0YXRl Tm9kZShTY3JvbGxpbmdTdGF0ZU5vZGUqIHN0YXRlTm9kZSkKICAgICA6IG1fc2Nyb2xsaW5nU3Rh dGVUcmVlKDApCisgICAgLCBtX25vZGVJRChzdGF0ZU5vZGUtPnNjcm9sbGluZ05vZGVJRCgpKQog ICAgICwgbV9wYXJlbnQoMCkKICAgICAsIG1fc2Nyb2xsTGF5ZXJEaWRDaGFuZ2Uoc3RhdGVOb2Rl LT5zY3JvbGxMYXllckRpZENoYW5nZSgpKQogewpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgJKHJldmlzaW9uIDEzMTEzNikK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9M TElORykKIAogI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXIuaCIKKyNpbmNsdWRlICJTY3JvbGxpbmdD b29yZGluYXRvci5oIgogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFz c093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KQEAgLTQ1LDcgKzQ2LDcgQEAgY2xh c3MgU2Nyb2xsaW5nU3RhdGVOb2RlIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShTY3JvbGxp bmdTdGF0ZU5vZGUpOwogCiBwdWJsaWM6Ci0gICAgU2Nyb2xsaW5nU3RhdGVOb2RlKFNjcm9sbGlu Z1N0YXRlVHJlZSopOworICAgIFNjcm9sbGluZ1N0YXRlTm9kZShTY3JvbGxpbmdTdGF0ZVRyZWUq LCBTY3JvbGxpbmdOb2RlSUQpOwogICAgIHZpcnR1YWwgflNjcm9sbGluZ1N0YXRlTm9kZSgpOwog CiAgICAgdmlydHVhbCBib29sIGlzU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlKCkgeyByZXR1 cm4gZmFsc2U7IH0KQEAgLTY4LDYgKzY5LDggQEAgcHVibGljOgogICAgIFNjcm9sbGluZ1N0YXRl VHJlZSogc2Nyb2xsaW5nU3RhdGVUcmVlKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxpbmdTdGF0 ZVRyZWU7IH0KICAgICB2b2lkIHNldFNjcm9sbGluZ1N0YXRlVHJlZShTY3JvbGxpbmdTdGF0ZVRy ZWUqIHRyZWUpIHsgbV9zY3JvbGxpbmdTdGF0ZVRyZWUgPSB0cmVlOyB9CiAKKyAgICBTY3JvbGxp bmdOb2RlSUQgc2Nyb2xsaW5nTm9kZUlEKCkgY29uc3QgeyByZXR1cm4gbV9ub2RlSUQ7IH0KKwog ICAgIFNjcm9sbGluZ1N0YXRlTm9kZSogcGFyZW50KCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnQ7 IH0KICAgICB2b2lkIHNldFBhcmVudChTY3JvbGxpbmdTdGF0ZU5vZGUqIHBhcmVudCkgeyBtX3Bh cmVudCA9IHBhcmVudDsgfQogCkBAIC04MSw4ICs4NCw5IEBAIHByb3RlY3RlZDoKICAgICBTY3Jv bGxpbmdTdGF0ZVRyZWUqIG1fc2Nyb2xsaW5nU3RhdGVUcmVlOwogCiBwcml2YXRlOgotICAgIFNj cm9sbGluZ1N0YXRlTm9kZSogbV9wYXJlbnQ7CisgICAgU2Nyb2xsaW5nTm9kZUlEIG1fbm9kZUlE OwogCisgICAgU2Nyb2xsaW5nU3RhdGVOb2RlKiBtX3BhcmVudDsKICAgICBPd25QdHI8VmVjdG9y PE93blB0cjxTY3JvbGxpbmdTdGF0ZU5vZGU+ID4gPiBtX2NoaWxkcmVuOwogCiAgICAgYm9vbCBt X3Njcm9sbExheWVyRGlkQ2hhbmdlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUuY3BwCShy ZXZpc2lvbiAxMzExMzYpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMywxMyArMzMsMTMg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1QYXNzT3duUHRyPFNjcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZT4gU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpjcmVhdGUoU2Nyb2xsaW5n U3RhdGVUcmVlKiBzdGF0ZVRyZWUpCitQYXNzT3duUHRyPFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5n Tm9kZT4gU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpjcmVhdGUoU2Nyb2xsaW5nU3RhdGVU cmVlKiBzdGF0ZVRyZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiB7Ci0gICAgcmV0dXJuIGFk b3B0UHRyKG5ldyBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoc3RhdGVUcmVlKSk7CisgICAg cmV0dXJuIGFkb3B0UHRyKG5ldyBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoc3RhdGVUcmVl LCBub2RlSUQpKTsKIH0KIAotU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxpbmdT dGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nU3RhdGVUcmVlKiBzdGF0ZVRyZWUpCi0gICAgOiBT Y3JvbGxpbmdTdGF0ZU5vZGUoc3RhdGVUcmVlKQorU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2Rl OjpTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nU3RhdGVUcmVlKiBzdGF0ZVRy ZWUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCisgICAgOiBTY3JvbGxpbmdTdGF0ZU5vZGUoc3Rh dGVUcmVlLCBub2RlSUQpCiAgICAgLCBtX2NoYW5nZWRQcm9wZXJ0aWVzKDApCiAgICAgLCBtX3do ZWVsRXZlbnRIYW5kbGVyQ291bnQoMCkKICAgICAsIG1fc2hvdWxkVXBkYXRlU2Nyb2xsTGF5ZXJQ b3NpdGlvbk9uTWFpblRocmVhZCgwKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlLmgJKHJldmlz aW9uIDEzMTEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0 YXRlU2Nyb2xsaW5nTm9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlIDogcHVi bGljIFNjcm9sbGluZ1N0YXRlTm9kZSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8 U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlPiBjcmVhdGUoU2Nyb2xsaW5nU3RhdGVUcmVlKik7 CisgICAgc3RhdGljIFBhc3NPd25QdHI8U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlPiBjcmVh dGUoU2Nyb2xsaW5nU3RhdGVUcmVlKiwgU2Nyb2xsaW5nTm9kZUlEKTsKICAgICB2aXJ0dWFsIH5T Y3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoKTsKIAogICAgIGVudW0gQ2hhbmdlZFByb3BlcnR5 IHsKQEAgLTExMCw3ICsxMTAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCByZXF1ZXN0ZWRTY3JvbGxQ b3NpdGlvblJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoKSBjb25zdCB7IHJldHVybiBtX3Jl cXVlc3RlZFNjcm9sbFBvc2l0aW9uUmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbDsgfQogCiBw cml2YXRlOgotICAgIFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZShTY3JvbGxpbmdTdGF0ZVRy ZWUqKTsKKyAgICBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoU2Nyb2xsaW5nU3RhdGVUcmVl KiwgU2Nyb2xsaW5nTm9kZUlEKTsKICAgICBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUoU2Ny b2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlKik7CiAKICAgICB1bnNpZ25lZCBtX2NoYW5nZWRQcm9w ZXJ0aWVzOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQkocmV2aXNpb24gMTMxMTM3KQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9y TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNDcsNyArMjQ3LDcgQEAgU2Nyb2xsaW5nTm9kZUlE IFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOgogICAgIC8vIEZJWE1FOiBJbiB0aGUgZnV0dXJlLCB0 aGlzIGZ1bmN0aW9uIHdpbGwgaGF2ZSB0byB0YWtlIGEgcGFyZW50IElEIHNvIHRoYXQgaXQgY2Fu CiAgICAgLy8gYXBwZW5kIHRoZSBub2RlIGluIHRoZSBhcHByb3ByaWF0ZSBzcG90IGluIHRoZSBz dGF0ZSB0cmVlLiBGb3Igbm93IHdlIGFsd2F5cyBhc3N1bWUKICAgICAvLyB0aGlzIGlzIHRoZSBy b290IG5vZGUuCi0gICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnNldFJvb3RTdGF0ZU5vZGUoU2Ny b2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpjcmVhdGUobV9zY3JvbGxpbmdTdGF0ZVRyZWUuZ2V0 KCkpKTsKKyAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+c2V0Um9vdFN0YXRlTm9kZShTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OmNyZWF0ZShtX3Njcm9sbGluZ1N0YXRlVHJlZS5nZXQoKSwg c2Nyb2xsTGF5ZXJJRCkpOwogICAgIG1fc3RhdGVOb2RlTWFwLnNldChzY3JvbGxMYXllcklELCBt X3Njcm9sbGluZ1N0YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgpKTsKICAgICByZXR1cm4gc2Nyb2xs TGF5ZXJJRDsKIH0K