81327 2012-03-16 03:02:04 -0700 Web Inspector: HeapSnapshot: speedup buildReverseIndex. 2012-03-16 04:55:55 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 580321 0 loislo 2012-03-16 03:02:04 -0700 %subj% 580322 1 132238 loislo 2012-03-16 03:04:24 -0700 Created attachment 132238 Patch 580384 2 132249 loislo 2012-03-16 04:44:32 -0700 Created attachment 132249 Patch 580389 3 loislo 2012-03-16 04:55:55 -0700 Committed r110989: <http://trac.webkit.org/changeset/110989> 132238 2012-03-16 03:04:24 -0700 2012-03-16 04:44:24 -0700 Patch bug-81327-20120316140422.patch text/plain 5178 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwOTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVmNTc2MGIxYTE2MjVk MmM1Njc4NzJiYzU0YTI2Y2I5OTBhMjcyMy4uZTFhYjFlZGIzYzE1Yzc5ZDc0ZDkzMjRiMWNhYmY4 ZTNhODM3YjY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTE2ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBIZWFwU25hcHNob3Q6IHNwZWVkdXAgYnVpbGRSZXZlcnNlSW5kZXguCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTMyNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9IZWFwU25hcHNob3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnBy b3RvdHlwZS5nZXQgbWF4Tm9kZUlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3QucHJvdG90eXBlLl9idWlsZE5vZGVJbmRleCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90LnByb3RvdHlwZS5fZmluZE5lYXJlc3ROb2RlSW5kZXgpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUuX2dldFJldGFpbmVySW5kZXgpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUuX2J1aWxkRG9taW5hdGVk Tm9kZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUpOgor CiAyMDEyLTAzLTE2ICBYaWFvbWVpIEppICA8eGppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBV c2luZyBJQ1UgYnJlYWsgaXRlcmF0b3IgdG8gc2ltcGxpZnkgdmlzdWFsIHdvcmQgbW92ZW1lbnQg aW1wbGVtZW50YXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSGVhcFNuYXBzaG90LmpzCmluZGV4IDI3ZWU1OTQ5ZjkxMTllYTU4ZDNmMzI1YWIwZWE2MDI0 NTFlNGMzYmEuLjBhNGRhODY2ZWFlZTZiNjZjNWE0M2EwNGUwMDAzYzFmNTU2ZTYxNDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Lmpz CkBAIC04NDUsNyArODQ1LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fbWF4Tm9kZUlkOwogICAgICAgICB0aGlzLl9t YXhOb2RlSWQgPSAwOwogICAgICAgICB2YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90Tm9kZSh0aGlzLCB0aGlzLm5vZGVJbmRleGVzWzBdKTsKLSAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCB0aGlzLm5vZGVDb3VudDsgKytpKSB7CisgICAgICAgIGZvciAodmFyIGkgPSAw LCBsID0gdGhpcy5ub2RlQ291bnQ7IGkgPCBsOyArK2kpIHsKICAgICAgICAgICAgIG5vZGUubm9k ZUluZGV4ID0gdGhpcy5ub2RlSW5kZXhlc1tpXTsKICAgICAgICAgICAgIHZhciBpZCA9IG5vZGUu aWQ7CiAgICAgICAgICAgICBpZiAoKGlkICUgMikgJiYgaWQgPiB0aGlzLl9tYXhOb2RlSWQpCkBA IC05NjgsNyArOTY4LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICAoZnVuY3Rpb24gKG5vZGUsIGNhbGxiYWNrKQogICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICAgZm9yICh2YXIgZWRnZXNJdGVyID0gbm9kZS5lZGdlczsgZWRnZXNJ dGVyLmhhc05leHQoKTsgZWRnZXNJdGVyLm5leHQoKSkKLSAgICAgICAgICAgICAgICAgICAgIGNh bGxiYWNrKHRoaXMuX2ZpbmROb2RlUG9zaXRpb25JbkluZGV4KGVkZ2VzSXRlci5lZGdlLm5vZGVJ bmRleCkpOworICAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fbm9kZVBvc2l0aW9u W2VkZ2VzSXRlci5lZGdlLm5vZGVJbmRleF0pOwogICAgICAgICAgICAgIH0pLmJpbmQodGhpcyks CiAgICAgICAgICAgICAoZnVuY3Rpb24gKG5vZGUsIGluZGV4Q2FsbGJhY2ssIGRhdGFDYWxsYmFj aykKICAgICAgICAgICAgICB7CkBAIC0xMDM3LDcgKzEwMzcsNyBAQCBXZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGFnZ3JlZ2F0ZXMgPSB7fTsKICAg ICAgICAgdmFyIGFnZ3JlZ2F0ZXNCeUNsYXNzTmFtZSA9IHt9OwogICAgICAgICB2YXIgbm9kZSA9 IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZSh0aGlzLCB0aGlzLm5vZGVJbmRleGVz WzBdKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLm5vZGVDb3VudDsgKytpKSB7 CisgICAgICAgIGZvciAodmFyIGkgPSAwLCBsID0gdGhpcy5ub2RlQ291bnQ7IGkgPCBsOyArK2kp IHsKICAgICAgICAgICAgIG5vZGUubm9kZUluZGV4ID0gdGhpcy5ub2RlSW5kZXhlc1tpXTsKICAg ICAgICAgICAgIHZhciBjbGFzc0luZGV4ID0gbm9kZS5jbGFzc0luZGV4OwogICAgICAgICAgICAg aWYgKHNob3VsZFNraXAobm9kZSwgY2xhc3NJbmRleCkpCkBAIC0xMTA2LDIxICsxMTA2LDIxIEBA IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAg dmFyIGNvdW50ID0gMDsKICAgICAgICAgZm9yICh2YXIgbm9kZXNJdGVyID0gdGhpcy5fYWxsTm9k ZXM7IG5vZGVzSXRlci5oYXNOZXh0KCk7IG5vZGVzSXRlci5uZXh0KCksICsrY291bnQpOwotICAg ICAgICB0aGlzLl9ub2RlSW5kZXggPSBuZXcgSW50MzJBcnJheShjb3VudCArIDEpOworICAgICAg ICB2YXIgbm9kZUluZGV4ID0gbmV3IEludDMyQXJyYXkoY291bnQgKyAxKTsKKyAgICAgICAgdmFy IG5vZGVQb3NpdGlvbiA9IHt9OwogICAgICAgICBjb3VudCA9IDA7Ci0gICAgICAgIGZvciAodmFy IG5vZGVzSXRlciA9IHRoaXMuX2FsbE5vZGVzOyBub2Rlc0l0ZXIuaGFzTmV4dCgpOyBub2Rlc0l0 ZXIubmV4dCgpLCArK2NvdW50KQotICAgICAgICAgICAgdGhpcy5fbm9kZUluZGV4W2NvdW50XSA9 IG5vZGVzSXRlci5pbmRleDsKLSAgICAgICAgdGhpcy5fbm9kZUluZGV4W2NvdW50XSA9IHRoaXMu X25vZGVzLmxlbmd0aDsKLSAgICB9LAotCi0gICAgX2ZpbmROb2RlUG9zaXRpb25JbkluZGV4OiBm dW5jdGlvbihpbmRleCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBiaW5hcnlTZWFyY2goaW5kZXgs IHRoaXMuX25vZGVJbmRleCwgdGhpcy5fbnVtYmVyc0NvbXBhcmF0b3IpOworICAgICAgICBmb3Ig KHZhciBub2Rlc0l0ZXIgPSB0aGlzLl9hbGxOb2Rlczsgbm9kZXNJdGVyLmhhc05leHQoKTsgbm9k ZXNJdGVyLm5leHQoKSwgKytjb3VudCkgeworICAgICAgICAgICAgbm9kZUluZGV4W2NvdW50XSA9 IG5vZGVzSXRlci5pbmRleDsKKyAgICAgICAgICAgIG5vZGVQb3NpdGlvbltub2Rlc0l0ZXIuaW5k ZXhdID0gY291bnQ7CisgICAgICAgIH0KKyAgICAgICAgbm9kZUluZGV4W2NvdW50XSA9IHRoaXMu X25vZGVzLmxlbmd0aDsKKyAgICAgICAgdGhpcy5fbm9kZUluZGV4ID0gbm9kZUluZGV4OworICAg ICAgICB0aGlzLl9ub2RlUG9zaXRpb24gPSBub2RlUG9zaXRpb247CiAgICAgfSwKIAogICAgIF9m aW5kTmVhcmVzdE5vZGVJbmRleDogZnVuY3Rpb24oaW5kZXgpCiAgICAgewotICAgICAgICB2YXIg cmVzdWx0ID0gdGhpcy5fZmluZE5vZGVQb3NpdGlvbkluSW5kZXgoaW5kZXgpOworICAgICAgICB2 YXIgcmVzdWx0ID0gYmluYXJ5U2VhcmNoKGluZGV4LCB0aGlzLl9ub2RlSW5kZXgsIHRoaXMuX251 bWJlcnNDb21wYXJhdG9yKTsKICAgICAgICAgaWYgKHJlc3VsdCA8IDApIHsKICAgICAgICAgICAg IHJlc3VsdCA9IC1yZXN1bHQgLSAxOwogICAgICAgICAgICAgbm9kZUluZGV4ID0gdGhpcy5fbm9k ZUluZGV4W3Jlc3VsdF07CkBAIC0xMTM0LDcgKzExMzQsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90LnByb3RvdHlwZSA9IHsKIAogICAgIF9nZXRSZXRhaW5lckluZGV4OiBmdW5jdGlvbihu b2RlSW5kZXgpCiAgICAgewotICAgICAgICB2YXIgbm9kZVBvc2l0aW9uID0gdGhpcy5fZmluZE5v ZGVQb3NpdGlvbkluSW5kZXgobm9kZUluZGV4KTsKKyAgICAgICAgdmFyIG5vZGVQb3NpdGlvbiA9 IHRoaXMuX25vZGVQb3NpdGlvbltub2RlSW5kZXhdOwogICAgICAgICByZXR1cm4gdGhpcy5fcmV0 YWluZXJJbmRleFtub2RlUG9zaXRpb25dOwogICAgIH0sCiAKQEAgLTExNDcsNyArMTE0Nyw3IEBA IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlID0gewogICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICAgdmFyIGRvbWluYXRvckluZGV4ID0gbm9kZS5kb21pbmF0b3JJbmRl eDsKICAgICAgICAgICAgICAgICAgaWYgKGRvbWluYXRvckluZGV4ICE9PSBub2RlLm5vZGVJbmRl eCkKLSAgICAgICAgICAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX2ZpbmROb2RlUG9zaXRpb25J bkluZGV4KGRvbWluYXRvckluZGV4KSk7CisgICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayh0 aGlzLl9ub2RlUG9zaXRpb25bZG9taW5hdG9ySW5kZXhdKTsKICAgICAgICAgICAgICB9KS5iaW5k KHRoaXMpLAogICAgICAgICAgICAgKGZ1bmN0aW9uIChub2RlLCBpbmRleENhbGxiYWNrLCBkYXRh Q2FsbGJhY2spCiAgICAgICAgICAgICAgewpAQCAtMTE2MSw3ICsxMTYxLDcgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAKICAgICBfZ2V0RG9taW5hdGVkSW5kZXg6 IGZ1bmN0aW9uKG5vZGVJbmRleCkKICAgICB7Ci0gICAgICAgIHZhciBub2RlUG9zaXRpb24gPSB0 aGlzLl9maW5kTm9kZVBvc2l0aW9uSW5JbmRleChub2RlSW5kZXgpOworICAgICAgICB2YXIgbm9k ZVBvc2l0aW9uID0gdGhpcy5fbm9kZVBvc2l0aW9uW25vZGVJbmRleF07CiAgICAgICAgIHJldHVy biB0aGlzLl9kb21pbmF0ZWRJbmRleFtub2RlUG9zaXRpb25dOwogICAgIH0sCiAK 132249 2012-03-16 04:44:32 -0700 2012-03-16 04:53:03 -0700 Patch bug-81327-20120316154430.patch text/plain 5229 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwOTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVmNTc2MGIxYTE2MjVk MmM1Njc4NzJiYzU0YTI2Y2I5OTBhMjcyMy4uZTFhYjFlZGIzYzE1Yzc5ZDc0ZDkzMjRiMWNhYmY4 ZTNhODM3YjY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTE2ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBIZWFwU25hcHNob3Q6IHNwZWVkdXAgYnVpbGRSZXZlcnNlSW5kZXguCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTMyNworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9IZWFwU25hcHNob3QuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnBy b3RvdHlwZS5nZXQgbWF4Tm9kZUlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3QucHJvdG90eXBlLl9idWlsZE5vZGVJbmRleCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90LnByb3RvdHlwZS5fZmluZE5lYXJlc3ROb2RlSW5kZXgpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUuX2dldFJldGFpbmVySW5kZXgpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUuX2J1aWxkRG9taW5hdGVk Tm9kZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUpOgor CiAyMDEyLTAzLTE2ICBYaWFvbWVpIEppICA8eGppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBV c2luZyBJQ1UgYnJlYWsgaXRlcmF0b3IgdG8gc2ltcGxpZnkgdmlzdWFsIHdvcmQgbW92ZW1lbnQg aW1wbGVtZW50YXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSGVhcFNuYXBzaG90LmpzCmluZGV4IDI3ZWU1OTQ5ZjkxMTllYTU4ZDNmMzI1YWIwZWE2MDI0 NTFlNGMzYmEuLmIxMDlmNGY0OGZkNDRlYTMxYzU0OGZiNjJlZDQ4ZTY1ZDA5YzM0NzUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Lmpz CkBAIC04NDUsNyArODQ1LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICByZXR1cm4gdGhpcy5fbWF4Tm9kZUlkOwogICAgICAgICB0aGlzLl9t YXhOb2RlSWQgPSAwOwogICAgICAgICB2YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90Tm9kZSh0aGlzLCB0aGlzLm5vZGVJbmRleGVzWzBdKTsKLSAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCB0aGlzLm5vZGVDb3VudDsgKytpKSB7CisgICAgICAgIGZvciAodmFyIGkgPSAw LCBsID0gdGhpcy5ub2RlQ291bnQ7IGkgPCBsOyArK2kpIHsKICAgICAgICAgICAgIG5vZGUubm9k ZUluZGV4ID0gdGhpcy5ub2RlSW5kZXhlc1tpXTsKICAgICAgICAgICAgIHZhciBpZCA9IG5vZGUu aWQ7CiAgICAgICAgICAgICBpZiAoKGlkICUgMikgJiYgaWQgPiB0aGlzLl9tYXhOb2RlSWQpCkBA IC05NjgsNyArOTY4LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICAoZnVuY3Rpb24gKG5vZGUsIGNhbGxiYWNrKQogICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICAgZm9yICh2YXIgZWRnZXNJdGVyID0gbm9kZS5lZGdlczsgZWRnZXNJ dGVyLmhhc05leHQoKTsgZWRnZXNJdGVyLm5leHQoKSkKLSAgICAgICAgICAgICAgICAgICAgIGNh bGxiYWNrKHRoaXMuX2ZpbmROb2RlUG9zaXRpb25JbkluZGV4KGVkZ2VzSXRlci5lZGdlLm5vZGVJ bmRleCkpOworICAgICAgICAgICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fbm9kZVBvc2l0aW9u W2VkZ2VzSXRlci5lZGdlLm5vZGVJbmRleF0pOwogICAgICAgICAgICAgIH0pLmJpbmQodGhpcyks CiAgICAgICAgICAgICAoZnVuY3Rpb24gKG5vZGUsIGluZGV4Q2FsbGJhY2ssIGRhdGFDYWxsYmFj aykKICAgICAgICAgICAgICB7CkBAIC0xMDM3LDcgKzEwMzcsNyBAQCBXZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGFnZ3JlZ2F0ZXMgPSB7fTsKICAg ICAgICAgdmFyIGFnZ3JlZ2F0ZXNCeUNsYXNzTmFtZSA9IHt9OwogICAgICAgICB2YXIgbm9kZSA9 IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZSh0aGlzLCB0aGlzLm5vZGVJbmRleGVz WzBdKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLm5vZGVDb3VudDsgKytpKSB7 CisgICAgICAgIGZvciAodmFyIGkgPSAwLCBsID0gdGhpcy5ub2RlQ291bnQ7IGkgPCBsOyArK2kp IHsKICAgICAgICAgICAgIG5vZGUubm9kZUluZGV4ID0gdGhpcy5ub2RlSW5kZXhlc1tpXTsKICAg ICAgICAgICAgIHZhciBjbGFzc0luZGV4ID0gbm9kZS5jbGFzc0luZGV4OwogICAgICAgICAgICAg aWYgKHNob3VsZFNraXAobm9kZSwgY2xhc3NJbmRleCkpCkBAIC0xMTA2LDIxICsxMTA2LDIyIEBA IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAg dmFyIGNvdW50ID0gMDsKICAgICAgICAgZm9yICh2YXIgbm9kZXNJdGVyID0gdGhpcy5fYWxsTm9k ZXM7IG5vZGVzSXRlci5oYXNOZXh0KCk7IG5vZGVzSXRlci5uZXh0KCksICsrY291bnQpOwotICAg ICAgICB0aGlzLl9ub2RlSW5kZXggPSBuZXcgSW50MzJBcnJheShjb3VudCArIDEpOworICAgICAg ICB2YXIgbm9kZUluZGV4ID0gbmV3IEludDMyQXJyYXkoY291bnQgKyAxKTsKKyAgICAgICAgdmFy IG5vZGVQb3NpdGlvbiA9IHt9OwogICAgICAgICBjb3VudCA9IDA7Ci0gICAgICAgIGZvciAodmFy IG5vZGVzSXRlciA9IHRoaXMuX2FsbE5vZGVzOyBub2Rlc0l0ZXIuaGFzTmV4dCgpOyBub2Rlc0l0 ZXIubmV4dCgpLCArK2NvdW50KQotICAgICAgICAgICAgdGhpcy5fbm9kZUluZGV4W2NvdW50XSA9 IG5vZGVzSXRlci5pbmRleDsKLSAgICAgICAgdGhpcy5fbm9kZUluZGV4W2NvdW50XSA9IHRoaXMu X25vZGVzLmxlbmd0aDsKLSAgICB9LAotCi0gICAgX2ZpbmROb2RlUG9zaXRpb25JbkluZGV4OiBm dW5jdGlvbihpbmRleCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBiaW5hcnlTZWFyY2goaW5kZXgs IHRoaXMuX25vZGVJbmRleCwgdGhpcy5fbnVtYmVyc0NvbXBhcmF0b3IpOworICAgICAgICBmb3Ig KHZhciBub2Rlc0l0ZXIgPSB0aGlzLl9hbGxOb2Rlczsgbm9kZXNJdGVyLmhhc05leHQoKTsgbm9k ZXNJdGVyLm5leHQoKSwgKytjb3VudCkgeworICAgICAgICAgICAgbm9kZUluZGV4W2NvdW50XSA9 IG5vZGVzSXRlci5pbmRleDsKKyAgICAgICAgICAgIG5vZGVQb3NpdGlvbltub2Rlc0l0ZXIuaW5k ZXhdID0gY291bnQ7CisgICAgICAgIH0KKyAgICAgICAgbm9kZUluZGV4W2NvdW50XSA9IHRoaXMu X25vZGVzLmxlbmd0aDsKKyAgICAgICAgbm9kZVBvc2l0aW9uW3RoaXMuX25vZGVzLmxlbmd0aF0g PSBjb3VudDsKKyAgICAgICAgdGhpcy5fbm9kZUluZGV4ID0gbm9kZUluZGV4OworICAgICAgICB0 aGlzLl9ub2RlUG9zaXRpb24gPSBub2RlUG9zaXRpb247CiAgICAgfSwKIAogICAgIF9maW5kTmVh cmVzdE5vZGVJbmRleDogZnVuY3Rpb24oaW5kZXgpCiAgICAgewotICAgICAgICB2YXIgcmVzdWx0 ID0gdGhpcy5fZmluZE5vZGVQb3NpdGlvbkluSW5kZXgoaW5kZXgpOworICAgICAgICB2YXIgcmVz dWx0ID0gYmluYXJ5U2VhcmNoKGluZGV4LCB0aGlzLl9ub2RlSW5kZXgsIHRoaXMuX251bWJlcnND b21wYXJhdG9yKTsKICAgICAgICAgaWYgKHJlc3VsdCA8IDApIHsKICAgICAgICAgICAgIHJlc3Vs dCA9IC1yZXN1bHQgLSAxOwogICAgICAgICAgICAgbm9kZUluZGV4ID0gdGhpcy5fbm9kZUluZGV4 W3Jlc3VsdF07CkBAIC0xMTM0LDcgKzExMzUsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 LnByb3RvdHlwZSA9IHsKIAogICAgIF9nZXRSZXRhaW5lckluZGV4OiBmdW5jdGlvbihub2RlSW5k ZXgpCiAgICAgewotICAgICAgICB2YXIgbm9kZVBvc2l0aW9uID0gdGhpcy5fZmluZE5vZGVQb3Np dGlvbkluSW5kZXgobm9kZUluZGV4KTsKKyAgICAgICAgdmFyIG5vZGVQb3NpdGlvbiA9IHRoaXMu X25vZGVQb3NpdGlvbltub2RlSW5kZXhdOwogICAgICAgICByZXR1cm4gdGhpcy5fcmV0YWluZXJJ bmRleFtub2RlUG9zaXRpb25dOwogICAgIH0sCiAKQEAgLTExNDcsNyArMTE0OCw3IEBAIFdlYklu c3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlID0gewogICAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgICAgdmFyIGRvbWluYXRvckluZGV4ID0gbm9kZS5kb21pbmF0b3JJbmRleDsKICAg ICAgICAgICAgICAgICAgaWYgKGRvbWluYXRvckluZGV4ICE9PSBub2RlLm5vZGVJbmRleCkKLSAg ICAgICAgICAgICAgICAgICAgIGNhbGxiYWNrKHRoaXMuX2ZpbmROb2RlUG9zaXRpb25JbkluZGV4 KGRvbWluYXRvckluZGV4KSk7CisgICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayh0aGlzLl9u b2RlUG9zaXRpb25bZG9taW5hdG9ySW5kZXhdKTsKICAgICAgICAgICAgICB9KS5iaW5kKHRoaXMp LAogICAgICAgICAgICAgKGZ1bmN0aW9uIChub2RlLCBpbmRleENhbGxiYWNrLCBkYXRhQ2FsbGJh Y2spCiAgICAgICAgICAgICAgewpAQCAtMTE2MSw3ICsxMTYyLDcgQEAgV2ViSW5zcGVjdG9yLkhl YXBTbmFwc2hvdC5wcm90b3R5cGUgPSB7CiAKICAgICBfZ2V0RG9taW5hdGVkSW5kZXg6IGZ1bmN0 aW9uKG5vZGVJbmRleCkKICAgICB7Ci0gICAgICAgIHZhciBub2RlUG9zaXRpb24gPSB0aGlzLl9m aW5kTm9kZVBvc2l0aW9uSW5JbmRleChub2RlSW5kZXgpOworICAgICAgICB2YXIgbm9kZVBvc2l0 aW9uID0gdGhpcy5fbm9kZVBvc2l0aW9uW25vZGVJbmRleF07CiAgICAgICAgIHJldHVybiB0aGlz Ll9kb21pbmF0ZWRJbmRleFtub2RlUG9zaXRpb25dOwogICAgIH0sCiAK