99211 2012-10-12 14:44:53 -0700 When ScrollingStateNodes are destroyed, they should be removed ScrollingCoordinator's HashMap 2012-10-12 16:52:01 -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 741231 0 bdakin 2012-10-12 14:44:53 -0700 There is a FIXME in ScrollingCoordinatorMac::detachFromStateTree() that says: // FIXME: removeNode() will destroy children, and those children might still be in the HashMap. // This will be a big problem once there are actually children in the tree. This bugs is to track resolving that FIXME. 741239 1 168489 bdakin 2012-10-12 14:51:52 -0700 Created attachment 168489 Patch 741305 2 168489 beidson 2012-10-12 16:25:00 -0700 Comment on attachment 168489 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168489&action=review > Source/WebCore/page/scrolling/ScrollingStateTree.cpp:58 > + // Copy and clear the array of node IDs representing nodes that have been removed since the last > + // time we committed the tree. > + size_t size = m_nodesRemovedSinceLastCommit->size(); > + for (size_t i = 0; i < size; ++i) > + treeState->didRemoveNode(m_nodesRemovedSinceLastCommit->at(i)); > + m_nodesRemovedSinceLastCommit->clear(); I don't see where the copy is that the comment alludes to. I might be missing something here: doesn't didRemoveNode() just call back in to the same m_nodesRemovedSinceLastCommit? 741320 3 168513 bdakin 2012-10-12 16:49:28 -0700 Created attachment 168513 Patch 741324 4 bdakin 2012-10-12 16:52:01 -0700 Thanks Sam and Brady! http://trac.webkit.org/changeset/131238 168489 2012-10-12 14:51:52 -0700 2012-10-12 16:49:28 -0700 Patch for-review.txt text/plain 6036 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTIyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDEyLTEwLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTkyMTEKKyAgICAgICAgV2hlbiBTY3JvbGxpbmdTdGF0ZU5vZGVz IGFyZSBkZXN0cm95ZWQsIHRoZXkgc2hvdWxkIGJlIHJlbW92ZWQgCisgICAgICAgIFNjcm9sbGlu Z0Nvb3JkaW5hdG9yJ3MgSGFzaE1hcAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIG5ldyBtZW1iZXIgdmFyaWFibGUgdG8g U2Nyb2xsaW5nU3RhdGVUcmVlLiBJdCdzIGEgCisgICAgICAgIFZlY3RvciBvZiBTY3JvbGxpbmdO b2RlSURzLiBJdCB3aWxsIGNvbnRhaW4gdGhlIElEcyBvZiBub2RlcyB0aGF0IAorICAgICAgICBo YXZlIGJlZW4gcmVtb3ZlZCBmcm9tIHRoZSB0cmVlIHNpbmNlIHRoZSBsYXN0IHRpbWUgdGhlIHRy ZWUgd2FzIAorICAgICAgICBjb21taXR0ZWQuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJl ZTo6U2Nyb2xsaW5nU3RhdGVUcmVlKToKKworICAgICAgICBXaGVuIHdlIGRvIGNvbW1pdCwgY29w eSB0aGUgVmVjdG9yIG92ZXIgaW50byB0aGUgY2xvbmVkIHRyZWUsIGFuZCAKKyAgICAgICAgdGhl biBjbGVhciBvdXIgb3duIFZlY3Rvci4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRl VHJlZTo6Y29tbWl0KToKKworICAgICAgICBDYWxsIGRpZFJlbW92ZU5vZGUoKS4KKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJlZTo6cmVtb3ZlTm9kZSk6CisKKyAgICAgICAgQXBw ZW5kIHRoZSByZW1vdmVkIG5vZGUncyBpZCB0byB0aGUgdmVjdG9yLgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsaW5nU3RhdGVUcmVlOjpkaWRSZW1vdmVOb2RlKToKKyAgICAgICAgKFdlYkNvcmUp OgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5oOgorICAgICAg ICAoU2Nyb2xsaW5nU3RhdGVUcmVlKToKKworICAgICAgICBDYWxsIGRpZFJlbW92ZU5vZGUoKS4K KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2RlOjpyZW1vdmVDaGlsZCk6CisKKyAgICAgICAg Rml4IHRoZSBGSVhNRSEKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29v cmRpbmF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvck1h Yzo6ZGV0YWNoRnJvbVN0YXRlVHJlZSk6CisKIDIwMTItMTAtMTIgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIFFEYXRhU3RyZWFtIGZ1bmN0aW9u cyBpbnRvIEhpc3RvcnlJdGVtUXQuY3BwCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAJKHJldmlzaW9uIDEzMTIyMSkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgyLDcgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZU5vZGU6 OnJlbW92ZUNoaWxkKFNjcgogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoc2l6ZV90IGluZGV4 ID0gbV9jaGlsZHJlbi0+ZmluZChub2RlKSkgeworICAgICAgICBtX3Njcm9sbGluZ1N0YXRlVHJl ZS0+ZGlkUmVtb3ZlTm9kZShub2RlLT5zY3JvbGxpbmdOb2RlSUQoKSk7CiAgICAgICAgIG1fY2hp bGRyZW4tPnJlbW92ZShpbmRleCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5j cHAJKHJldmlzaW9uIDEzMTEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1N0YXRlVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2LDggQEAgUGFz c093blB0cjxTY3JvbGxpbmdTdGF0ZVRyZWU+IFNjcm9sbGluZwogfQogCiBTY3JvbGxpbmdTdGF0 ZVRyZWU6OlNjcm9sbGluZ1N0YXRlVHJlZSgpCi0gICAgOiBtX2hhc0NoYW5nZWRQcm9wZXJ0aWVz KGZhbHNlKQorICAgIDogbV9ub2Rlc1JlbW92ZWRTaW5jZUxhc3RDb21taXQoYWRvcHRQdHIobmV3 IFZlY3RvcjxTY3JvbGxpbmdOb2RlSUQ+KSkKKyAgICAsIG1faGFzQ2hhbmdlZFByb3BlcnRpZXMo ZmFsc2UpCiB7CiB9CiAKQEAgLTQ5LDYgKzUwLDEzIEBAIFBhc3NPd25QdHI8U2Nyb2xsaW5nU3Rh dGVUcmVlPiBTY3JvbGxpbmcKICAgICBPd25QdHI8U2Nyb2xsaW5nU3RhdGVUcmVlPiB0cmVlU3Rh dGUgPSBTY3JvbGxpbmdTdGF0ZVRyZWU6OmNyZWF0ZSgpOwogICAgIHRyZWVTdGF0ZS0+c2V0Um9v dFN0YXRlTm9kZShzdGF0aWNfcG9pbnRlcl9jYXN0PFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9k ZT4obV9yb290U3RhdGVOb2RlLT5jbG9uZUFuZFJlc2V0Tm9kZSgpKSk7CiAKKyAgICAvLyBDb3B5 IGFuZCBjbGVhciB0aGUgYXJyYXkgb2Ygbm9kZSBJRHMgcmVwcmVzZW50aW5nIG5vZGVzIHRoYXQg aGF2ZSBiZWVuIHJlbW92ZWQgc2luY2UgdGhlIGxhc3QKKyAgICAvLyB0aW1lIHdlIGNvbW1pdHRl ZCB0aGUgdHJlZS4KKyAgICBzaXplX3Qgc2l6ZSA9IG1fbm9kZXNSZW1vdmVkU2luY2VMYXN0Q29t bWl0LT5zaXplKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCisgICAg ICAgIHRyZWVTdGF0ZS0+ZGlkUmVtb3ZlTm9kZShtX25vZGVzUmVtb3ZlZFNpbmNlTGFzdENvbW1p dC0+YXQoaSkpOworICAgIG1fbm9kZXNSZW1vdmVkU2luY2VMYXN0Q29tbWl0LT5jbGVhcigpOwor CiAgICAgLy8gTm93IHRoZSBjbG9uZSB0cmVlIGhhcyBjaGFuZ2VkIHByb3BlcnRpZXMsIGFuZCB0 aGUgb3JpZ2luYWwgdHJlZSBkb2VzIG5vdC4KICAgICB0cmVlU3RhdGUtPnNldEhhc0NoYW5nZWRQ cm9wZXJ0aWVzKHRydWUpOwogICAgIG1faGFzQ2hhbmdlZFByb3BlcnRpZXMgPSBmYWxzZTsKQEAg LTYxLDYgKzY5LDcgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZVRyZWU6OnJlbW92ZU5vZGUoU2Nybwog ICAgIEFTU0VSVChtX3Jvb3RTdGF0ZU5vZGUpOwogCiAgICAgaWYgKG5vZGUgPT0gbV9yb290U3Rh dGVOb2RlKSB7CisgICAgICAgIGRpZFJlbW92ZU5vZGUobV9yb290U3RhdGVOb2RlLT5zY3JvbGxp bmdOb2RlSUQoKSk7CiAgICAgICAgIG1fcm9vdFN0YXRlTm9kZSA9IDA7CiAgICAgICAgIHJldHVy bjsKICAgICB9CkBAIC02OCw2ICs3NywxMSBAQCB2b2lkIFNjcm9sbGluZ1N0YXRlVHJlZTo6cmVt b3ZlTm9kZShTY3JvCiAgICAgbV9yb290U3RhdGVOb2RlLT5yZW1vdmVDaGlsZChub2RlKTsKIH0K IAordm9pZCBTY3JvbGxpbmdTdGF0ZVRyZWU6OmRpZFJlbW92ZU5vZGUoU2Nyb2xsaW5nTm9kZUlE IG5vZGVJRCkKK3sKKyAgICBtX25vZGVzUmVtb3ZlZFNpbmNlTGFzdENvbW1pdC0+YXBwZW5kKG5v ZGVJRCk7Cit9CisKIHZvaWQgU2Nyb2xsaW5nU3RhdGVUcmVlOjpyb290TGF5ZXJEaWRDaGFuZ2Uo KQogewogICAgIC8vIElmIHRoZSByb290IGxheWVyIGhhcyBjaGFuZ2VkLCB0aGVuIGRlc3Ryb3ll ZCBhbmQgcmUtY3JlYXRlZCB0aGUgcm9vdCBzdGF0ZSBub2RlLiBUaGF0IG1lYW5zIHRoYXQgdGhl CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdT dGF0ZVRyZWUuaAkocmV2aXNpb24gMTMxMTM2KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nU3RhdGVUcmVlLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDgg QEAgcHVibGljOgogICAgIFBhc3NPd25QdHI8U2Nyb2xsaW5nU3RhdGVUcmVlPiBjb21taXQoKTsK IAogICAgIHZvaWQgcmVtb3ZlTm9kZShTY3JvbGxpbmdTdGF0ZU5vZGUqKTsKKyAgICB2b2lkIGRp ZFJlbW92ZU5vZGUoU2Nyb2xsaW5nTm9kZUlEKTsKKyAgICBWZWN0b3I8U2Nyb2xsaW5nTm9kZUlE PiogcmVtb3ZlZE5vZGVzKCkgY29uc3QgeyByZXR1cm4gbV9ub2Rlc1JlbW92ZWRTaW5jZUxhc3RD b21taXQuZ2V0KCk7IH0KIAogICAgIHZvaWQgcm9vdExheWVyRGlkQ2hhbmdlKCk7CiAKQEAgLTcx LDYgKzczLDcgQEAgcHJpdmF0ZToKICAgICBTY3JvbGxpbmdTdGF0ZVRyZWUoKTsKIAogICAgIE93 blB0cjxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+IG1fcm9vdFN0YXRlTm9kZTsKKyAgICBP d25QdHI8VmVjdG9yPFNjcm9sbGluZ05vZGVJRD4gPiBtX25vZGVzUmVtb3ZlZFNpbmNlTGFzdENv bW1pdDsKICAgICBib29sIG1faGFzQ2hhbmdlZFByb3BlcnRpZXM7CiB9OwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGlu Z0Nvb3JkaW5hdG9yTWFjLm1tCShyZXZpc2lvbiAxMzEyMjEpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0JKHdvcmtpbmcgY29w eSkKQEAgLTI1OCwxMCArMjU4LDE0IEBAIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6OmRl dGFjaEZyb20KICAgICAgICAgcmV0dXJuOwogCiAgICAgU2Nyb2xsaW5nU3RhdGVOb2RlKiBub2Rl ID0gbV9zdGF0ZU5vZGVNYXAudGFrZShzY3JvbGxMYXllcklEKTsKLQotICAgIC8vIEZJWE1FOiBy ZW1vdmVOb2RlKCkgd2lsbCBkZXN0cm95IGNoaWxkcmVuLCBhbmQgdGhvc2UgY2hpbGRyZW4gbWln aHQgc3RpbGwgYmUgaW4gdGhlIEhhc2hNYXAuCi0gICAgLy8gVGhpcyB3aWxsIGJlIGEgYmlnIHBy b2JsZW0gb25jZSB0aGVyZSBhcmUgYWN0dWFsbHkgY2hpbGRyZW4gaW4gdGhlIHRyZWUuCiAgICAg bV9zY3JvbGxpbmdTdGF0ZVRyZWUtPnJlbW92ZU5vZGUobm9kZSk7CisKKyAgICAvLyBTY3JvbGxp bmdTdGF0ZVRyZWU6OnJlbW92ZU5vZGUoKSB3aWxsIGRlc3Ryb3kgY2hpbGRyZW4sIHNvIHdlIGhh dmUgdG8gbWFrZSBzdXJlIHdlIHJlbW92ZSB0aG9zZSBjaGlsZHJlbgorICAgIC8vIGZyb20gdGhl IEhhc2hNYXAuCisgICAgVmVjdG9yPFNjcm9sbGluZ05vZGVJRD4qIHJlbW92ZWROb2RlcyA9IG1f c2Nyb2xsaW5nU3RhdGVUcmVlLT5yZW1vdmVkTm9kZXMoKTsKKyAgICBzaXplX3Qgc2l6ZSA9IHJl bW92ZWROb2Rlcy0+c2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6ZTsgKytp KQorICAgICAgICBtX3N0YXRlTm9kZU1hcC5yZW1vdmUocmVtb3ZlZE5vZGVzLT5hdChpKSk7CiB9 CiAKIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6OmNsZWFyU3RhdGVUcmVlKCkK 168513 2012-10-12 16:49:28 -0700 2012-10-12 16:50:01 -0700 Patch for-review-2.txt text/plain 6218 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTIyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDEyLTEwLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTkyMTEKKyAgICAgICAgV2hlbiBTY3JvbGxpbmdTdGF0ZU5vZGVz IGFyZSBkZXN0cm95ZWQsIHRoZXkgc2hvdWxkIGJlIHJlbW92ZWQgCisgICAgICAgIFNjcm9sbGlu Z0Nvb3JkaW5hdG9yJ3MgSGFzaE1hcAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhIG5ldyBtZW1iZXIgdmFyaWFibGUgdG8g U2Nyb2xsaW5nU3RhdGVUcmVlLiBJdCdzIGEgCisgICAgICAgIFZlY3RvciBvZiBTY3JvbGxpbmdO b2RlSURzLiBJdCB3aWxsIGNvbnRhaW4gdGhlIElEcyBvZiBub2RlcyB0aGF0IAorICAgICAgICBo YXZlIGJlZW4gcmVtb3ZlZCBmcm9tIHRoZSB0cmVlIHNpbmNlIHRoZSBsYXN0IHRpbWUgdGhlIHRy ZWUgd2FzIAorICAgICAgICBjb21taXR0ZWQuCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nU3RhdGVUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJl ZTo6U2Nyb2xsaW5nU3RhdGVUcmVlKToKKworICAgICAgICBXaGVuIHdlIGRvIGNvbW1pdCwgY29w eSB0aGUgVmVjdG9yIG92ZXIgaW50byB0aGUgY2xvbmVkIHRyZWUsIGFuZCAKKyAgICAgICAgdGhl biBjbGVhciBvdXIgb3duIFZlY3Rvci4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRl VHJlZTo6Y29tbWl0KToKKworICAgICAgICBDYWxsIGRpZFJlbW92ZU5vZGUoKS4KKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1N0YXRlVHJlZTo6cmVtb3ZlTm9kZSk6CisKKyAgICAgICAgQXBw ZW5kIHRoZSByZW1vdmVkIG5vZGUncyBpZCB0byB0aGUgdmVjdG9yLgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsaW5nU3RhdGVUcmVlOjpkaWRSZW1vdmVOb2RlKToKKyAgICAgICAgKFdlYkNvcmUp OgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5oOgorICAgICAg ICAoU2Nyb2xsaW5nU3RhdGVUcmVlKToKKworICAgICAgICBDYWxsIGRpZFJlbW92ZU5vZGUoKS4K KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nU3RhdGVOb2RlOjpyZW1vdmVDaGlsZCk6CisKKyAgICAgICAg Rml4IHRoZSBGSVhNRSEKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nQ29v cmRpbmF0b3JNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvck1h Yzo6ZGV0YWNoRnJvbVN0YXRlVHJlZSk6CisKIDIwMTItMTAtMTIgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIFFEYXRhU3RyZWFtIGZ1bmN0aW9u cyBpbnRvIEhpc3RvcnlJdGVtUXQuY3BwCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAJKHJldmlzaW9uIDEzMTIyMSkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgyLDcgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZU5vZGU6 OnJlbW92ZUNoaWxkKFNjcgogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoc2l6ZV90IGluZGV4 ID0gbV9jaGlsZHJlbi0+ZmluZChub2RlKSkgeworICAgICAgICBtX3Njcm9sbGluZ1N0YXRlVHJl ZS0+ZGlkUmVtb3ZlTm9kZShub2RlLT5zY3JvbGxpbmdOb2RlSUQoKSk7CiAgICAgICAgIG1fY2hp bGRyZW4tPnJlbW92ZShpbmRleCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5j cHAJKHJldmlzaW9uIDEzMTEzNikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1N0YXRlVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDE0ICs0NiwxOCBAQCBT Y3JvbGxpbmdTdGF0ZVRyZWU6On5TY3JvbGxpbmdTdGF0ZVRyZWUoCiAKIFBhc3NPd25QdHI8U2Ny b2xsaW5nU3RhdGVUcmVlPiBTY3JvbGxpbmdTdGF0ZVRyZWU6OmNvbW1pdCgpCiB7Ci0gICAgT3du UHRyPFNjcm9sbGluZ1N0YXRlVHJlZT4gdHJlZVN0YXRlID0gU2Nyb2xsaW5nU3RhdGVUcmVlOjpj cmVhdGUoKTsKLSAgICB0cmVlU3RhdGUtPnNldFJvb3RTdGF0ZU5vZGUoc3RhdGljX3BvaW50ZXJf Y2FzdDxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+KG1fcm9vdFN0YXRlTm9kZS0+Y2xvbmVB bmRSZXNldE5vZGUoKSkpOworICAgIC8vIFRoaXMgZnVuY3Rpb24gY2xvbmVzIGFuZCByZXNldHMg dGhlIGN1cnJlbnQgc3RhdGUgdHJlZSwgYnV0IGxlYXZlcyB0aGUgdHJlZSBzdHJ1Y3R1cmUgaW50 YWN0LiAKKyAgICBPd25QdHI8U2Nyb2xsaW5nU3RhdGVUcmVlPiB0cmVlU3RhdGVDbG9uZSA9IFNj cm9sbGluZ1N0YXRlVHJlZTo6Y3JlYXRlKCk7CisgICAgdHJlZVN0YXRlQ2xvbmUtPnNldFJvb3RT dGF0ZU5vZGUoc3RhdGljX3BvaW50ZXJfY2FzdDxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+ KG1fcm9vdFN0YXRlTm9kZS0+Y2xvbmVBbmRSZXNldE5vZGUoKSkpOworCisgICAgLy8gQ29weSB0 aGUgSURzIG9mIHRoZSBub2RlcyB0aGF0IGhhdmUgYmVlbiByZW1vdmVkIHNpbmNlIHRoZSBsYXN0 IGNvbW1pdCBpbnRvIHRoZSBjbG9uZS4KKyAgICB0cmVlU3RhdGVDbG9uZS0+bV9ub2Rlc1JlbW92 ZWRTaW5jZUxhc3RDb21taXQuc3dhcChtX25vZGVzUmVtb3ZlZFNpbmNlTGFzdENvbW1pdCk7CiAK ICAgICAvLyBOb3cgdGhlIGNsb25lIHRyZWUgaGFzIGNoYW5nZWQgcHJvcGVydGllcywgYW5kIHRo ZSBvcmlnaW5hbCB0cmVlIGRvZXMgbm90LgotICAgIHRyZWVTdGF0ZS0+c2V0SGFzQ2hhbmdlZFBy b3BlcnRpZXModHJ1ZSk7CisgICAgdHJlZVN0YXRlQ2xvbmUtPm1faGFzQ2hhbmdlZFByb3BlcnRp ZXMgPSB0cnVlOwogICAgIG1faGFzQ2hhbmdlZFByb3BlcnRpZXMgPSBmYWxzZTsKIAotICAgIHJl dHVybiB0cmVlU3RhdGUucmVsZWFzZSgpOworICAgIHJldHVybiB0cmVlU3RhdGVDbG9uZS5yZWxl YXNlKCk7CiB9CiAKIHZvaWQgU2Nyb2xsaW5nU3RhdGVUcmVlOjpyZW1vdmVOb2RlKFNjcm9sbGlu Z1N0YXRlTm9kZSogbm9kZSkKQEAgLTYxLDYgKzY1LDcgQEAgdm9pZCBTY3JvbGxpbmdTdGF0ZVRy ZWU6OnJlbW92ZU5vZGUoU2NybwogICAgIEFTU0VSVChtX3Jvb3RTdGF0ZU5vZGUpOwogCiAgICAg aWYgKG5vZGUgPT0gbV9yb290U3RhdGVOb2RlKSB7CisgICAgICAgIGRpZFJlbW92ZU5vZGUobV9y b290U3RhdGVOb2RlLT5zY3JvbGxpbmdOb2RlSUQoKSk7CiAgICAgICAgIG1fcm9vdFN0YXRlTm9k ZSA9IDA7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC02OCw2ICs3MywxMSBAQCB2b2lkIFNj cm9sbGluZ1N0YXRlVHJlZTo6cmVtb3ZlTm9kZShTY3JvCiAgICAgbV9yb290U3RhdGVOb2RlLT5y ZW1vdmVDaGlsZChub2RlKTsKIH0KIAordm9pZCBTY3JvbGxpbmdTdGF0ZVRyZWU6OmRpZFJlbW92 ZU5vZGUoU2Nyb2xsaW5nTm9kZUlEIG5vZGVJRCkKK3sKKyAgICBtX25vZGVzUmVtb3ZlZFNpbmNl TGFzdENvbW1pdC5hcHBlbmQobm9kZUlEKTsKK30KKwogdm9pZCBTY3JvbGxpbmdTdGF0ZVRyZWU6 OnJvb3RMYXllckRpZENoYW5nZSgpCiB7CiAgICAgLy8gSWYgdGhlIHJvb3QgbGF5ZXIgaGFzIGNo YW5nZWQsIHRoZW4gZGVzdHJveWVkIGFuZCByZS1jcmVhdGVkIHRoZSByb290IHN0YXRlIG5vZGUu IFRoYXQgbWVhbnMgdGhhdCB0aGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5n L1Njcm9sbGluZ1N0YXRlVHJlZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlVHJlZS5oCShyZXZpc2lvbiAxMzExMzYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuaAkod29ya2luZyBj b3B5KQpAQCAtNjEsNiArNjEsOCBAQCBwdWJsaWM6CiAgICAgUGFzc093blB0cjxTY3JvbGxpbmdT dGF0ZVRyZWU+IGNvbW1pdCgpOwogCiAgICAgdm9pZCByZW1vdmVOb2RlKFNjcm9sbGluZ1N0YXRl Tm9kZSopOworICAgIHZvaWQgZGlkUmVtb3ZlTm9kZShTY3JvbGxpbmdOb2RlSUQpOworICAgIGNv bnN0IFZlY3RvcjxTY3JvbGxpbmdOb2RlSUQ+JiByZW1vdmVkTm9kZXMoKSBjb25zdCB7IHJldHVy biBtX25vZGVzUmVtb3ZlZFNpbmNlTGFzdENvbW1pdDsgfQogCiAgICAgdm9pZCByb290TGF5ZXJE aWRDaGFuZ2UoKTsKIApAQCAtNzAsNyArNzIsMTAgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBT Y3JvbGxpbmdTdGF0ZVRyZWUoKTsKIAorICAgIFBhc3NPd25QdHI8U2Nyb2xsaW5nU3RhdGVUcmVl PiBjbG9uZSgpOworCiAgICAgT3duUHRyPFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZT4gbV9y b290U3RhdGVOb2RlOworICAgIFZlY3RvcjxTY3JvbGxpbmdOb2RlSUQ+IG1fbm9kZXNSZW1vdmVk U2luY2VMYXN0Q29tbWl0OwogICAgIGJvb2wgbV9oYXNDaGFuZ2VkUHJvcGVydGllczsKIH07CiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGlu YXRvck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9t YWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0JKHJldmlzaW9uIDEzMTIyMSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtMjU4LDEwICsyNTgsMTQgQEAgdm9pZCBTY3JvbGxpbmdDb29yZGlu YXRvck1hYzo6ZGV0YWNoRnJvbQogICAgICAgICByZXR1cm47CiAKICAgICBTY3JvbGxpbmdTdGF0 ZU5vZGUqIG5vZGUgPSBtX3N0YXRlTm9kZU1hcC50YWtlKHNjcm9sbExheWVySUQpOwotCi0gICAg Ly8gRklYTUU6IHJlbW92ZU5vZGUoKSB3aWxsIGRlc3Ryb3kgY2hpbGRyZW4sIGFuZCB0aG9zZSBj aGlsZHJlbiBtaWdodCBzdGlsbCBiZSBpbiB0aGUgSGFzaE1hcC4KLSAgICAvLyBUaGlzIHdpbGwg YmUgYSBiaWcgcHJvYmxlbSBvbmNlIHRoZXJlIGFyZSBhY3R1YWxseSBjaGlsZHJlbiBpbiB0aGUg dHJlZS4KICAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+cmVtb3ZlTm9kZShub2RlKTsKKworICAg IC8vIFNjcm9sbGluZ1N0YXRlVHJlZTo6cmVtb3ZlTm9kZSgpIHdpbGwgZGVzdHJveSBjaGlsZHJl biwgc28gd2UgaGF2ZSB0byBtYWtlIHN1cmUgd2UgcmVtb3ZlIHRob3NlIGNoaWxkcmVuCisgICAg Ly8gZnJvbSB0aGUgSGFzaE1hcC4KKyAgIGNvbnN0IFZlY3RvcjxTY3JvbGxpbmdOb2RlSUQ+JiBy ZW1vdmVkTm9kZXMgPSBtX3Njcm9sbGluZ1N0YXRlVHJlZS0+cmVtb3ZlZE5vZGVzKCk7CisgICAg c2l6ZV90IHNpemUgPSByZW1vdmVkTm9kZXMuc2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgc2l6ZTsgKytpKQorICAgICAgICBtX3N0YXRlTm9kZU1hcC5yZW1vdmUocmVtb3ZlZE5v ZGVzW2ldKTsKIH0KIAogdm9pZCBTY3JvbGxpbmdDb29yZGluYXRvck1hYzo6Y2xlYXJTdGF0ZVRy ZWUoKQo=