82621 2012-03-29 09:06:41 -0700 Web Inspector: check more likely condition first in HeapSnapshot._buildAggregates 2012-03-29 09:25:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy tkent webkit.review.bot yurys oldest_to_newest 591231 0 yurys 2012-03-29 09:06:41 -0700 Check more likely condition first in HeapSnapshot._buildAggregates. 591232 1 134597 yurys 2012-03-29 09:10:46 -0700 Created attachment 134597 Patch 591235 2 yurys 2012-03-29 09:12:54 -0700 (In reply to comment #1) > Created an attachment (id=134597) [details] > Patch Results of PerformanceTests/inspector/detailed-heapshots-smoke-test.html With the patch applied: RESULT heap-snapshot: _buildAggregates= 4565 ms RESULT heap-snapshot: switch-to-containment-view= 4901 ms Without the patch: RESULT heap-snapshot: _buildAggregates= 5593 ms RESULT heap-snapshot: switch-to-containment-view= 5838 ms 591237 3 134598 yurys 2012-03-29 09:14:35 -0700 Created attachment 134598 Patch 591240 4 134598 pfeldman 2012-03-29 09:16:44 -0700 Comment on attachment 134598 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134598&action=review > Source/WebCore/inspector/front-end/HeapSnapshot.js:1094 > + if (node.selfSize === 0 && !node.isNative) We don't compare to 0 in WebKit, use !node.selfSize. 591246 5 yurys 2012-03-29 09:21:39 -0700 (In reply to comment #4) > (From update of attachment 134598 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=134598&action=review > > > Source/WebCore/inspector/front-end/HeapSnapshot.js:1094 > > + if (node.selfSize === 0 && !node.isNative) > > We don't compare to 0 in WebKit, use !node.selfSize. Done. 591250 6 yurys 2012-03-29 09:25:44 -0700 Committed r112540: <http://trac.webkit.org/changeset/112540> 134597 2012-03-29 09:10:46 -0700 2012-03-29 09:14:27 -0700 Patch bug-82621-20120329201044.patch text/plain 5362 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRmNjczYjlmZmY3YjVk MDZiNmM3NWZkZjZmMDkyMjc3NDU3M2YwYy4uMjg4YWZhNGJmYzQ3MWY3MjBmOTFmODdjYzk3MTFl OTEwZDRlMmE0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTI5ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGNoZWNrIG1vcmUgbGlrZWx5IGNvbmRpdGlvbiBmaXJzdCBpbiBIZWFwU25hcHNob3QuX2J1 aWxkQWdncmVnYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODI2MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90LmpzOiBzZWxmU2l6ZSA9PT0g MCBpcyBxdWl0ZSByYXJlLCBtb3ZpbmcgdGhpcyBjb25kaXRpb24KKyAgICAgICAgdG8gdGhlIGZp cnN0IHBsYWNlIHNhdmVzIDEgb2YgNiBzZWNzIG9uIHRoZSBoZWFwIHByb2ZpbGVyIHBlcmYgdGVz dC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlLl9idWlsZEFn Z3JlZ2F0ZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUu X2J1aWxkRG9taW5hdGVkTm9kZXMpOiByb290IG5vZGUgaXMgYWx3YXlzIHRoZSBmaXJzdAorICAg ICAgICBvbmUgYW5kIGlzIHRoZSBvbmx5IG9uZSB0aGF0IGRvZXNuJ3QgaGF2ZSBkb21pbmF0b3Is IHNvIHdlIG1heSBzdGFydCBpdGVyYXRpbmcgbm9kZXMgZnJvbQorICAgICAgICB0aGUgc2Vjb25k IG5vZGUgYW5kIGF2b2lkIGFkZGl0aW9uYWwgY2hlY2sgaW4gdGhlIGxvb3AuCisKIDIwMTItMDMt MjkgIFphbGFuIEJ1anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgogCiAgICAgICAgIFJlbW92ZSBy ZWR1bmRhbnQgdXBkYXRlVmlld3BvcnRBcmd1bWVudHMoKSBjYWxsIHdoZW4gcGFnZSBpcyByZXN0 b3JlZCBmcm9tIHBhZ2UgY2FjaGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSGVhcFNuYXBzaG90LmpzCmluZGV4IGI1OTAzYmY1MTQwYzUwMTc3NDEwOTcyYjI1 NDcxZDEzZjg5ZjM2NTkuLmMyZTc4ZGVjNTQ2ZGE1ODM3MjVjZmExZjg4OWRhYjMyYWZhNDU0OWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90LmpzCkBAIC0xMDkxLDcgKzEwOTEsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnBy b3RvdHlwZSA9IHsKICAgICAgICAgewogICAgICAgICAgICAgaWYgKGZpbHRlciAmJiAhZmlsdGVy KG5vZGUpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgaWYgKCFu b2RlLmlzTmF0aXZlICYmIG5vZGUuc2VsZlNpemUgPT09IDApCisgICAgICAgICAgICBpZiAobm9k ZS5zZWxmU2l6ZSA9PT0gMCAmJiAhbm9kZS5pc05hdGl2ZSkKICAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQpAQCAtMTE3Niwy OSArMTE3NiwyOSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAg ICAgICAgLy8gQWxsIG5vZGVzIGV4Y2VwdCB0aGUgcm9vdCBoYXZlIGRvbWluYXRvcnMuCiAgICAg ICAgIHZhciBkb21pbmF0ZWROb2RlcyA9IHRoaXMuX2RvbWluYXRlZE5vZGVzID0gbmV3IFVpbnQz MkFycmF5KHRoaXMubm9kZUNvdW50IC0gMSk7CiAKLSAgICAgICAgLy8gQ291bnQgdGhlIG51bWJl ciBvZiBkb21pbmF0ZWQgbm9kZXMgZm9yIGVhY2ggbm9kZQotICAgICAgICBmb3IgKHZhciBub2Rl SW5kZXggPSAwOyBub2RlSW5kZXggPCB0aGlzLl9vbmx5Tm9kZXMubGVuZ3RoOyBub2RlSW5kZXgg Kz0gdGhpcy5fbm9kZUZpZWxkQ291bnQpIHsKKyAgICAgICAgLy8gQ291bnQgdGhlIG51bWJlciBv ZiBkb21pbmF0ZWQgbm9kZXMgZm9yIGVhY2ggbm9kZS4gU2tpcCB0aGUgcm9vdCAobm9kZSBhdAor ICAgICAgICAvLyBpbmRleCAwKSBhcyBpdCBpcyB0aGUgb25seSBub2RlIHRoYXQgZG9taW5hdGVz IGl0c2VsZi4KKyAgICAgICAgZm9yICh2YXIgbm9kZUluZGV4ID0gdGhpcy5fbm9kZUZpZWxkQ291 bnQ7IG5vZGVJbmRleCA8IHRoaXMuX29ubHlOb2Rlcy5sZW5ndGg7IG5vZGVJbmRleCArPSB0aGlz Ll9ub2RlRmllbGRDb3VudCkgewogICAgICAgICAgICAgdmFyIGRvbWluYXRvckluZGV4ID0gdGhp cy5fb25seU5vZGVzW25vZGVJbmRleCArIHRoaXMuX2RvbWluYXRvck9mZnNldF07CiAgICAgICAg ICAgICBpZiAoZG9taW5hdG9ySW5kZXggJSB0aGlzLl9ub2RlRmllbGRDb3VudCkKICAgICAgICAg ICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIldyb25nIGRvbWluYXRvckluZGV4ICIgKyBkb21pbmF0 b3JJbmRleCArICIgbm9kZUluZGV4ID0gIiArIG5vZGVJbmRleCArICIgbm9kZUNvdW50ID0gIiAr IHRoaXMubm9kZUNvdW50KTsKLSAgICAgICAgICAgIC8vIFNraXAgcm9vdCBub2RlLiBXZSBtYXkg c2ltcGxpZnkgdGhpcyBieSBzdGFydGluZyBpdGVyYXRpb24gZnJvbSBzZWNvbmQgbm9kZS4KLSAg ICAgICAgICAgIGlmIChub2RlSW5kZXggPT09IGRvbWluYXRvckluZGV4KSBjb250aW51ZTsKICAg ICAgICAgICAgICsraW5kZXhBcnJheVtkb21pbmF0b3JJbmRleCAvIHRoaXMuX25vZGVGaWVsZENv dW50XTsKICAgICAgICAgfQogICAgICAgICAvLyBQdXQgaW4gdGhlIGZpcnN0IHNsb3Qgb2YgZWFj aCBkb21pbmF0ZWROb2RlcyBzbGljZSB0aGUgY291bnQgb2YgZW50cmllcwogICAgICAgICAvLyB0 aGF0IHdpbGwgYmUgZmlsbGVkLgogICAgICAgICB2YXIgZmlyc3REb21pbmF0ZWROb2RlSW5kZXgg PSAwOwotICAgICAgICBmb3IgKGkgPSAwOyBpIDw9IHRoaXMubm9kZUNvdW50OyArK2kpIHsKKyAg ICAgICAgZm9yIChpID0gMDsgaSA8IHRoaXMubm9kZUNvdW50OyArK2kpIHsKICAgICAgICAgICAg IHZhciBkb21pbmF0ZWRDb3VudCA9IGRvbWluYXRlZE5vZGVzW2ZpcnN0RG9taW5hdGVkTm9kZUlu ZGV4XSA9IGluZGV4QXJyYXlbaV07CiAgICAgICAgICAgICBpbmRleEFycmF5W2ldID0gZmlyc3RE b21pbmF0ZWROb2RlSW5kZXg7CiAgICAgICAgICAgICBmaXJzdERvbWluYXRlZE5vZGVJbmRleCAr PSBkb21pbmF0ZWRDb3VudDsKICAgICAgICAgfQotICAgICAgICAvLyBGaWxsIHVwIHRoZSBkb21p bmF0ZWROb2RlcyBhcnJheSB3aXRoIGluZGV4ZXMgb2YgZG9taW5hdGVkIG5vZGVzLgotICAgICAg ICBmb3IgKHZhciBub2RlSW5kZXggPSAwOyBub2RlSW5kZXggPCB0aGlzLl9vbmx5Tm9kZXMubGVu Z3RoOyBub2RlSW5kZXggKz0gdGhpcy5fbm9kZUZpZWxkQ291bnQpIHsKKyAgICAgICAgaW5kZXhB cnJheVt0aGlzLm5vZGVDb3VudF0gPSBkb21pbmF0ZWROb2Rlcy5sZW5ndGg7CisgICAgICAgIC8v IEZpbGwgdXAgdGhlIGRvbWluYXRlZE5vZGVzIGFycmF5IHdpdGggaW5kZXhlcyBvZiBkb21pbmF0 ZWQgbm9kZXMuIFNraXAgdGhlIHJvb3QgKG5vZGUgYXQKKyAgICAgICAgLy8gaW5kZXggMCkgYXMg aXQgaXMgdGhlIG9ubHkgbm9kZSB0aGF0IGRvbWluYXRlcyBpdHNlbGYuCisgICAgICAgIGZvciAo dmFyIG5vZGVJbmRleCA9IHRoaXMuX25vZGVGaWVsZENvdW50OyBub2RlSW5kZXggPCB0aGlzLl9v bmx5Tm9kZXMubGVuZ3RoOyBub2RlSW5kZXggKz0gdGhpcy5fbm9kZUZpZWxkQ291bnQpIHsKICAg ICAgICAgICAgIHZhciBkb21pbmF0b3JJbmRleCA9IHRoaXMuX29ubHlOb2Rlc1tub2RlSW5kZXgg KyB0aGlzLl9kb21pbmF0b3JPZmZzZXRdOwogICAgICAgICAgICAgaWYgKGRvbWluYXRvckluZGV4 ICUgdGhpcy5fbm9kZUZpZWxkQ291bnQpCiAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9y KCJXcm9uZyBkb21pbmF0b3JJbmRleCAiICsgZG9taW5hdG9ySW5kZXgpOwotICAgICAgICAgICAg aWYgKG5vZGVJbmRleCA9PT0gZG9taW5hdG9ySW5kZXgpIGNvbnRpbnVlOwogICAgICAgICAgICAg dmFyIGRvbWluYXRvclBvcyA9IGRvbWluYXRvckluZGV4IC8gdGhpcy5fbm9kZUZpZWxkQ291bnQ7 CiAgICAgICAgICAgICB2YXIgZG9taW5hdGVkUmVmSW5kZXggPSBpbmRleEFycmF5W2RvbWluYXRv clBvc107CiAgICAgICAgICAgICBkb21pbmF0ZWRSZWZJbmRleCArPSAoLS1kb21pbmF0ZWROb2Rl c1tkb21pbmF0ZWRSZWZJbmRleF0pOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDQ5NjNjNzlkNGE1MGQ0MmMwNDM4YzhjODVjMDIx ZTgxMGI4ODQzMzcuLjQwNmY2NzE5NjQyY2U0YTVjYTQxMzcxOTAxZGZjYjE3MzBjOGEwZTUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0R1bXBSZW5kZXJUcmVlLmNw cAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5jcHAK QEAgLTI0OCwxMSArMjQ4LDExIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAg ICAgICAgIHNoZWxsLnNldEphdmFTY3JpcHRGbGFncyhqYXZhU2NyaXB0RmxhZ3MpOwogICAgICAg ICBzaGVsbC5zZXRTdHJlc3NPcHQoc3RyZXNzT3B0KTsKICAgICAgICAgc2hlbGwuc2V0U3RyZXNz RGVvcHQoc3RyZXNzRGVvcHQpOworICAgICAgICBzaGVsbC5pbml0aWFsaXplKCk7CiAgICAgICAg IGlmIChub1RpbWVvdXQpIHsKICAgICAgICAgICAgIC8vIDB4MjAwMDAwMDBtcyBpcyBiaWcgZW5v dWdoIGZvciB0aGUgcHVycG9zZSB0byBhdm9pZCB0aW1lb3V0IGluIGRlYnVnZ2luZy4KICAgICAg ICAgICAgIHNoZWxsLnNldExheW91dFRlc3RUaW1lb3V0KDB4MjAwMDAwMDApOwogICAgICAgICB9 Ci0gICAgICAgIHNoZWxsLmluaXRpYWxpemUoKTsKICAgICAgICAgaWYgKHNlcnZlck1vZGUgJiYg IXRlc3RzLnNpemUoKSkgewogI2lmIE9TKEFORFJPSUQpCiAgICAgICAgICAgICAvLyBTZW5kIGEg c2lnbmFsIHRvIGhvc3QgdG8gaW5kaWNhdGUgRFJUIGlzIHJlYWR5IHRvIHByb2Nlc3MgY29tbWFu ZHMuCg== 134598 2012-03-29 09:14:35 -0700 2012-03-29 09:16:43 -0700 Patch bug-82621-20120329201433.patch text/plain 4469 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRmNjczYjlmZmY3YjVk MDZiNmM3NWZkZjZmMDkyMjc3NDU3M2YwYy4uMjg4YWZhNGJmYzQ3MWY3MjBmOTFmODdjYzk3MTFl OTEwZDRlMmE0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAzLTI5ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGNoZWNrIG1vcmUgbGlrZWx5IGNvbmRpdGlvbiBmaXJzdCBpbiBIZWFwU25hcHNob3QuX2J1 aWxkQWdncmVnYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODI2MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90LmpzOiBzZWxmU2l6ZSA9PT0g MCBpcyBxdWl0ZSByYXJlLCBtb3ZpbmcgdGhpcyBjb25kaXRpb24KKyAgICAgICAgdG8gdGhlIGZp cnN0IHBsYWNlIHNhdmVzIDEgb2YgNiBzZWNzIG9uIHRoZSBoZWFwIHByb2ZpbGVyIHBlcmYgdGVz dC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3QucHJvdG90eXBlLl9idWlsZEFn Z3JlZ2F0ZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdC5wcm90b3R5cGUu X2J1aWxkRG9taW5hdGVkTm9kZXMpOiByb290IG5vZGUgaXMgYWx3YXlzIHRoZSBmaXJzdAorICAg ICAgICBvbmUgYW5kIGlzIHRoZSBvbmx5IG9uZSB0aGF0IGRvZXNuJ3QgaGF2ZSBkb21pbmF0b3Is IHNvIHdlIG1heSBzdGFydCBpdGVyYXRpbmcgbm9kZXMgZnJvbQorICAgICAgICB0aGUgc2Vjb25k IG5vZGUgYW5kIGF2b2lkIGFkZGl0aW9uYWwgY2hlY2sgaW4gdGhlIGxvb3AuCisKIDIwMTItMDMt MjkgIFphbGFuIEJ1anRhcyAgPHpidWp0YXNAZ21haWwuY29tPgogCiAgICAgICAgIFJlbW92ZSBy ZWR1bmRhbnQgdXBkYXRlVmlld3BvcnRBcmd1bWVudHMoKSBjYWxsIHdoZW4gcGFnZSBpcyByZXN0 b3JlZCBmcm9tIHBhZ2UgY2FjaGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvSGVhcFNuYXBzaG90LmpzCmluZGV4IGI1OTAzYmY1MTQwYzUwMTc3NDEwOTcyYjI1 NDcxZDEzZjg5ZjM2NTkuLmMyZTc4ZGVjNTQ2ZGE1ODM3MjVjZmExZjg4OWRhYjMyYWZhNDU0OWEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90LmpzCkBAIC0xMDkxLDcgKzEwOTEsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnBy b3RvdHlwZSA9IHsKICAgICAgICAgewogICAgICAgICAgICAgaWYgKGZpbHRlciAmJiAhZmlsdGVy KG5vZGUpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgaWYgKCFu b2RlLmlzTmF0aXZlICYmIG5vZGUuc2VsZlNpemUgPT09IDApCisgICAgICAgICAgICBpZiAobm9k ZS5zZWxmU2l6ZSA9PT0gMCAmJiAhbm9kZS5pc05hdGl2ZSkKICAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQpAQCAtMTE3Niwy OSArMTE3NiwyOSBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAg ICAgICAgLy8gQWxsIG5vZGVzIGV4Y2VwdCB0aGUgcm9vdCBoYXZlIGRvbWluYXRvcnMuCiAgICAg ICAgIHZhciBkb21pbmF0ZWROb2RlcyA9IHRoaXMuX2RvbWluYXRlZE5vZGVzID0gbmV3IFVpbnQz MkFycmF5KHRoaXMubm9kZUNvdW50IC0gMSk7CiAKLSAgICAgICAgLy8gQ291bnQgdGhlIG51bWJl ciBvZiBkb21pbmF0ZWQgbm9kZXMgZm9yIGVhY2ggbm9kZQotICAgICAgICBmb3IgKHZhciBub2Rl SW5kZXggPSAwOyBub2RlSW5kZXggPCB0aGlzLl9vbmx5Tm9kZXMubGVuZ3RoOyBub2RlSW5kZXgg Kz0gdGhpcy5fbm9kZUZpZWxkQ291bnQpIHsKKyAgICAgICAgLy8gQ291bnQgdGhlIG51bWJlciBv ZiBkb21pbmF0ZWQgbm9kZXMgZm9yIGVhY2ggbm9kZS4gU2tpcCB0aGUgcm9vdCAobm9kZSBhdAor ICAgICAgICAvLyBpbmRleCAwKSBhcyBpdCBpcyB0aGUgb25seSBub2RlIHRoYXQgZG9taW5hdGVz IGl0c2VsZi4KKyAgICAgICAgZm9yICh2YXIgbm9kZUluZGV4ID0gdGhpcy5fbm9kZUZpZWxkQ291 bnQ7IG5vZGVJbmRleCA8IHRoaXMuX29ubHlOb2Rlcy5sZW5ndGg7IG5vZGVJbmRleCArPSB0aGlz Ll9ub2RlRmllbGRDb3VudCkgewogICAgICAgICAgICAgdmFyIGRvbWluYXRvckluZGV4ID0gdGhp cy5fb25seU5vZGVzW25vZGVJbmRleCArIHRoaXMuX2RvbWluYXRvck9mZnNldF07CiAgICAgICAg ICAgICBpZiAoZG9taW5hdG9ySW5kZXggJSB0aGlzLl9ub2RlRmllbGRDb3VudCkKICAgICAgICAg ICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIldyb25nIGRvbWluYXRvckluZGV4ICIgKyBkb21pbmF0 b3JJbmRleCArICIgbm9kZUluZGV4ID0gIiArIG5vZGVJbmRleCArICIgbm9kZUNvdW50ID0gIiAr IHRoaXMubm9kZUNvdW50KTsKLSAgICAgICAgICAgIC8vIFNraXAgcm9vdCBub2RlLiBXZSBtYXkg c2ltcGxpZnkgdGhpcyBieSBzdGFydGluZyBpdGVyYXRpb24gZnJvbSBzZWNvbmQgbm9kZS4KLSAg ICAgICAgICAgIGlmIChub2RlSW5kZXggPT09IGRvbWluYXRvckluZGV4KSBjb250aW51ZTsKICAg ICAgICAgICAgICsraW5kZXhBcnJheVtkb21pbmF0b3JJbmRleCAvIHRoaXMuX25vZGVGaWVsZENv dW50XTsKICAgICAgICAgfQogICAgICAgICAvLyBQdXQgaW4gdGhlIGZpcnN0IHNsb3Qgb2YgZWFj aCBkb21pbmF0ZWROb2RlcyBzbGljZSB0aGUgY291bnQgb2YgZW50cmllcwogICAgICAgICAvLyB0 aGF0IHdpbGwgYmUgZmlsbGVkLgogICAgICAgICB2YXIgZmlyc3REb21pbmF0ZWROb2RlSW5kZXgg PSAwOwotICAgICAgICBmb3IgKGkgPSAwOyBpIDw9IHRoaXMubm9kZUNvdW50OyArK2kpIHsKKyAg ICAgICAgZm9yIChpID0gMDsgaSA8IHRoaXMubm9kZUNvdW50OyArK2kpIHsKICAgICAgICAgICAg IHZhciBkb21pbmF0ZWRDb3VudCA9IGRvbWluYXRlZE5vZGVzW2ZpcnN0RG9taW5hdGVkTm9kZUlu ZGV4XSA9IGluZGV4QXJyYXlbaV07CiAgICAgICAgICAgICBpbmRleEFycmF5W2ldID0gZmlyc3RE b21pbmF0ZWROb2RlSW5kZXg7CiAgICAgICAgICAgICBmaXJzdERvbWluYXRlZE5vZGVJbmRleCAr PSBkb21pbmF0ZWRDb3VudDsKICAgICAgICAgfQotICAgICAgICAvLyBGaWxsIHVwIHRoZSBkb21p bmF0ZWROb2RlcyBhcnJheSB3aXRoIGluZGV4ZXMgb2YgZG9taW5hdGVkIG5vZGVzLgotICAgICAg ICBmb3IgKHZhciBub2RlSW5kZXggPSAwOyBub2RlSW5kZXggPCB0aGlzLl9vbmx5Tm9kZXMubGVu Z3RoOyBub2RlSW5kZXggKz0gdGhpcy5fbm9kZUZpZWxkQ291bnQpIHsKKyAgICAgICAgaW5kZXhB cnJheVt0aGlzLm5vZGVDb3VudF0gPSBkb21pbmF0ZWROb2Rlcy5sZW5ndGg7CisgICAgICAgIC8v IEZpbGwgdXAgdGhlIGRvbWluYXRlZE5vZGVzIGFycmF5IHdpdGggaW5kZXhlcyBvZiBkb21pbmF0 ZWQgbm9kZXMuIFNraXAgdGhlIHJvb3QgKG5vZGUgYXQKKyAgICAgICAgLy8gaW5kZXggMCkgYXMg aXQgaXMgdGhlIG9ubHkgbm9kZSB0aGF0IGRvbWluYXRlcyBpdHNlbGYuCisgICAgICAgIGZvciAo dmFyIG5vZGVJbmRleCA9IHRoaXMuX25vZGVGaWVsZENvdW50OyBub2RlSW5kZXggPCB0aGlzLl9v bmx5Tm9kZXMubGVuZ3RoOyBub2RlSW5kZXggKz0gdGhpcy5fbm9kZUZpZWxkQ291bnQpIHsKICAg ICAgICAgICAgIHZhciBkb21pbmF0b3JJbmRleCA9IHRoaXMuX29ubHlOb2Rlc1tub2RlSW5kZXgg KyB0aGlzLl9kb21pbmF0b3JPZmZzZXRdOwogICAgICAgICAgICAgaWYgKGRvbWluYXRvckluZGV4 ICUgdGhpcy5fbm9kZUZpZWxkQ291bnQpCiAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9y KCJXcm9uZyBkb21pbmF0b3JJbmRleCAiICsgZG9taW5hdG9ySW5kZXgpOwotICAgICAgICAgICAg aWYgKG5vZGVJbmRleCA9PT0gZG9taW5hdG9ySW5kZXgpIGNvbnRpbnVlOwogICAgICAgICAgICAg dmFyIGRvbWluYXRvclBvcyA9IGRvbWluYXRvckluZGV4IC8gdGhpcy5fbm9kZUZpZWxkQ291bnQ7 CiAgICAgICAgICAgICB2YXIgZG9taW5hdGVkUmVmSW5kZXggPSBpbmRleEFycmF5W2RvbWluYXRv clBvc107CiAgICAgICAgICAgICBkb21pbmF0ZWRSZWZJbmRleCArPSAoLS1kb21pbmF0ZWROb2Rl c1tkb21pbmF0ZWRSZWZJbmRleF0pOwo=