83682 2012-04-11 02:14:50 -0700 Web Inspector: showing summary view is very slow on a snapshot with thousands of constructors 2012-04-11 05:52:24 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 600149 0 yurys 2012-04-11 02:14:50 -0700 We can create constructor nodes content lazily to fix this. 600198 1 136657 yurys 2012-04-11 04:35:08 -0700 Created attachment 136657 Patch 600199 2 136658 yurys 2012-04-11 04:40:41 -0700 Created attachment 136658 Patch 600205 3 136658 loislo 2012-04-11 05:07:31 -0700 Comment on attachment 136658 Patch This patch will help us to speed-up only the initial show. We also need to speed-up the class filter use-case. lgtm. 600211 4 yurys 2012-04-11 05:52:24 -0700 Committed r113851: <http://trac.webkit.org/changeset/113851> 136657 2012-04-11 04:35:08 -0700 2012-04-11 04:40:34 -0700 Patch bug-83682-20120411153506.patch text/plain 10878 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI3MTVmMWY3ODk0ZmYz YjkzYjU1OThmNzljZDU0MWIzYWUxYjVmOC4uMGU4YTczNWQwOWRmYjIwMDkzMWFkNjExNTc5OWU0 ZWY4OTZkZTU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA0LTExICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNob3dpbmcgc3VtbWFyeSB2aWV3IGlzIHZlcnkgc2xvdyBvbiBhIHNuYXBzaG90IHdpdGgg dGhvdXNhbmRzIG9mIGNvbnN0cnVjdG9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODM2ODIKKworICAgICAgICBOb2RlIGNvbnRlbnQgaXMgY3JlYXRl ZCBvbmx5IHdoZW4gdGhlIG5vZGUgYmVjb21lcyB2aXNpYmxlIGluIHRoZSBjb3JyZXNwb25kaW5n IHZpZXcuCisgICAgICAgIFRoaXMgc2F2ZXMgYSBsb3Qgb2YgdGltZSB3aGVuIG9wZW5uaW5nIHN1 bW1hcnkvY29tcGFyaXNvbiB2aWV3IG9mIGEgc25hcHNob3QKKyAgICAgICAgd2l0aCBsb3RzIG9m IGRpZmZlcmVudCBjbGFzc2VzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5v ZGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3Rv dHlwZS5lbnN1cmVDb250ZW50Q3JlYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90TGF6eUdyaWROb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RM YXp5R3JpZE5vZGUucHJvdG90eXBlLmVuc3VyZUNvbnRlbnRDcmVhdGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RMYXp5R3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNlbGxz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1Y3Rvck5vZGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlLnVwZGF0ZVZpc2li bGVOb2Rlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVEYXRh R3JpZC5wcm90b3R5cGUub25SZXNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlLl9vblNjcm9sbCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVEYXRhR3JpZC5wcm90b3R5cGUuX3BlcmZvcm1T b3J0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1Y3RvcnNE YXRhR3JpZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RGlmZkRhdGFHcmlk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90Vmlldy5wcm90b3R5cGUu X2NoYW5nZU5hbWVGaWx0ZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNu YXBzaG90UHJveHkuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90V29ya2Vy KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2hlYXBQcm9maWxlci5jc3M6CisgICAg ICAgICguZGV0YWlsZWQtaGVhcHNob3QtdmlldyAuZGF0YS1ncmlkIHRyOmVtcHR5KToKKwogMjAx Mi0wNC0wMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBEYXRhYmFzZTo6RGF0YWJhc2U6OmlkIGZpZWxkIGluIHRoZSBwcm90 b2NvbCBzaG91bGQgaGF2ZSB0eXBlIGludGVnZXIgbm90IHN0cmluZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVz LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90 R3JpZE5vZGVzLmpzCmluZGV4IDMxNzM0MWIxYjE5N2UwYTNlMmQyMTc4ZWVkZWM0Yzc3ZjkyOTAz YWMuLjk0MGRlNDVlYjc1NGZjMjM2MTlhMmRiZmJiMjZjN2ZkODg2YjQ4ZGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWRO b2Rlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVk SGVhcHNob3RHcmlkTm9kZXMuanMKQEAgLTM3LDYgKzM3LDExIEBAIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RHcmlkTm9kZSA9IGZ1bmN0aW9uKHRyZWUsIGhhc0NoaWxkcmVuKQogfQogCiBXZWJJ bnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlID0geworICAgIGVuc3VyZUNv bnRlbnRDcmVhdGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAvLyBNYXkgYmUgb3ZlcnJp ZGVuIGluIGRlc2NlbmRhbnRzIHdpdGggbGF6eSBjb250ZW50LgorICAgIH0sCisKICAgICBjcmVh dGVDZWxsOiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQogICAgIHsKICAgICAgICAgdmFyIGNl bGwgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5jcmVhdGVDZWxsLmNhbGwo dGhpcywgY29sdW1uSWRlbnRpZmllcik7CkBAIC0xOTgsNiArMjAzLDMxIEBAIFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkRhdGFH cmlkTm9kZS5wcm90b3R5cGU7CiAKK1dlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMYXp5R3JpZE5v ZGUgPSBmdW5jdGlvbih0cmVlLCBoYXNDaGlsZHJlbikKK3sKKyAgICBXZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90R3JpZE5vZGUuY2FsbCh0aGlzLCB0cmVlLCBoYXNDaGlsZHJlbik7CisgICAgdGhp cy5fZGVmZXJDb250ZW50Q3JlYXRpb24gPSB0cnVlOworfQorCitXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90TGF6eUdyaWROb2RlLnByb3RvdHlwZSA9IHsKKyAgICBlbnN1cmVDb250ZW50Q3JlYXRl ZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9kZWZlckNvbnRlbnRDcmVh dGlvbikKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fZGVmZXJDb250ZW50Q3Jl YXRpb24gPSBmYWxzZTsKKyAgICAgICAgdGhpcy5jcmVhdGVDZWxscygpOworICAgIH0sCisKKyAg ICBjcmVhdGVDZWxsczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2RlZmVy Q29udGVudENyZWF0aW9uKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBXZWJJbnNwZWN0 b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNlbGxzLmNhbGwodGhpcyk7 CisgICAgfQorfTsKKworV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdExhenlHcmlkTm9kZS5wcm90 b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3Rv dHlwZTsKKwogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlID0gZnVu Y3Rpb24odHJlZSwgbm9kZSkKIHsKICAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5v ZGUuY2FsbCh0aGlzLCB0cmVlLCBmYWxzZSk7CkBAIC01NjksNyArNTk5LDcgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdEluc3RhbmNlTm9kZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLkhlYXBTbmEKIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yTm9k ZSA9IGZ1bmN0aW9uKHRyZWUsIGNsYXNzTmFtZSwgYWdncmVnYXRlLCBhZ2dyZWdhdGVzS2V5KQog ewotICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHcmlkTm9kZS5jYWxsKHRoaXMsIHRyZWUs IGFnZ3JlZ2F0ZS5jb3VudCA+IDApOworICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMYXp5 R3JpZE5vZGUuY2FsbCh0aGlzLCB0cmVlLCBhZ2dyZWdhdGUuY291bnQgPiAwKTsKICAgICB0aGlz Ll9uYW1lID0gY2xhc3NOYW1lOwogICAgIHRoaXMuX2Rpc3RhbmNlVG9XaW5kb3cgPSBhZ2dyZWdh dGUuZGlzdGFuY2VUb1dpbmRvdzsKICAgICB0aGlzLl9jb3VudCA9IGFnZ3JlZ2F0ZS5jb3VudDsK QEAgLTY1MSw3ICs2ODEsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JO b2RlLnByb3RvdHlwZSA9IHsKICAgICB9CiB9OwogCi1XZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 Q29uc3RydWN0b3JOb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90R3JpZE5vZGUucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0 cnVjdG9yTm9kZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dExhenlHcmlkTm9kZS5wcm90b3R5cGU7CiAKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RJdGVy YXRvcnNUdXBsZSA9IGZ1bmN0aW9uKGl0MSwgaXQyKQogewpAQCAtNjc4LDcgKzcwOCw3IEBAIFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RJdGVyYXRvcnNUdXBsZS5wcm90b3R5cGUgPSB7CiAKIFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3REaWZmTm9kZSA9IGZ1bmN0aW9uKHRyZWUsIGNsYXNzTmFt ZSwgYmFzZUFnZ3JlZ2F0ZSwgYWdncmVnYXRlKQogewotICAgIFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RHcmlkTm9kZS5jYWxsKHRoaXMsIHRyZWUsIHRydWUpOworICAgIFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RMYXp5R3JpZE5vZGUuY2FsbCh0aGlzLCB0cmVlLCB0cnVlKTsKICAgICB0aGlz Ll9uYW1lID0gY2xhc3NOYW1lOwogICAgIHRoaXMuX2Jhc2VJbmRleGVzID0gYmFzZUFnZ3JlZ2F0 ZSA/IGJhc2VBZ2dyZWdhdGUuaWR4cyA6IFtdOwogICAgIHRoaXMuX2luZGV4ZXMgPSBhZ2dyZWdh dGUgPyBhZ2dyZWdhdGUuaWR4cyA6IFtdOwpAQCAtODE5LDcgKzg0OSw3IEBAIFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3REaWZmTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgfQogfTsKIAotV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNw ZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90TGF6eUdyaWROb2RlLnByb3RvdHlwZTsKIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dERvbWluYXRvck9iamVjdE5vZGUgPSBmdW5jdGlvbih0cmVlLCBub2RlKQogewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmll dy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hv dFZpZXcuanMKaW5kZXggYWQyZjM0NmZlMmFlOGI0OTg4NDJjYmQ1YjRjOTY0Zjk4NTU2OTExMC4u YWQ0YmRlMDI2MWU0YjQ4OTNlNzNlOThhZTJiNTZiNDI0ZjgyOGI1NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RW aWV3LmpzCkBAIC0yOCwxMCArMjgsMTQgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQgPSBmdW5jdGlvbihjb2x1bW5zKQor V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQgPSBmdW5jdGlvbihjb2x1 bW5zLCBkZWZlck5vZGVDb250ZW50Q3JlYXRpb24pCiB7CiAgICAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkLmNhbGwodGhpcywgY29sdW1ucyk7CiAgICAgdGhpcy5hZGRFdmVudExpc3RlbmVyKCJzb3J0 aW5nIGNoYW5nZWQiLCB0aGlzLnNvcnRpbmdDaGFuZ2VkLCB0aGlzKTsKKworICAgIHRoaXMuX2Rl ZmVyTm9kZUNvbnRlbnRDcmVhdGlvbiA9IGRlZmVyTm9kZUNvbnRlbnRDcmVhdGlvbjsKKyAgICBp ZiAoZGVmZXJOb2RlQ29udGVudENyZWF0aW9uKQorICAgICAgICB0aGlzLnNjcm9sbENvbnRhaW5l ci5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9vblNjcm9sbC5iaW5kKHRoaXMpLCB0 cnVlKTsKIH0KIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJv dG90eXBlID0gewpAQCAtNzYsNiArODAsNDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNv cnRhYmxlRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9wZXJmb3JtU29ydGlu ZyhTb3J0QnlUd29GaWVsZHMpOwogICAgIH0sCiAKKyAgICB1cGRhdGVWaXNpYmxlTm9kZXM6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fZGVmZXJOb2RlQ29udGVudENyZWF0 aW9uKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIgc2Nyb2xsVG9wID0gdGhpcy5z Y3JvbGxDb250YWluZXIuc2Nyb2xsVG9wOworICAgICAgICB2YXIgcm93SGVpZ2h0ID0gMTY7CisK KyAgICAgICAgdmFyIGhlaWdodCA9IHRoaXMuc2Nyb2xsQ29udGFpbmVyLm9mZnNldEhlaWdodDsK KyAgICAgICAgdmFyIHZpc2libGVSb3dzQ291bnQgPSBNYXRoLnJvdW5kKGhlaWdodCAvIHJvd0hl aWdodCkgKyAxOworCisgICAgICAgIHZhciBjaGlsZHJlbiA9IHRoaXMuY2hpbGRyZW47CisKKyAg ICAgICAgdmFyIGkgPSAwOworICAgICAgICB3aGlsZSAoaSA8IGNoaWxkcmVuLmxlbmd0aCkgewor ICAgICAgICAgICAgaWYgKGNoaWxkcmVuW2ldLnJldmVhbGVkKSB7CisgICAgICAgICAgICAgICAg dmFyIHRvcCA9IGNoaWxkcmVuW2ldLmVsZW1lbnQub2Zmc2V0VG9wOworICAgICAgICAgICAgICAg IGlmICh0b3AgPj0gc2Nyb2xsVG9wKQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICsraTsKKyAgICAgICAgfQorCisgICAgICAgIHdoaWxlIChp IDwgY2hpbGRyZW4ubGVuZ3RoICYmIHZpc2libGVSb3dzQ291bnQpIHsKKyAgICAgICAgICAgIGlm IChjaGlsZHJlbltpXS5yZXZlYWxlZCkgeworICAgICAgICAgICAgICAgIGNoaWxkcmVuW2ldLmVu c3VyZUNvbnRlbnRDcmVhdGVkKCk7CisgICAgICAgICAgICAgICAgLS12aXNpYmxlUm93c0NvdW50 OworICAgICAgICAgICAgfQorICAgICAgICAgICAgKytpOworICAgICAgICB9CisgICAgfSwKKwor ICAgIG9uUmVzaXplOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLnVwZGF0ZVZpc2li bGVOb2RlcygpOworICAgIH0sCisKKyAgICBfb25TY3JvbGw6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgdGhpcy51cGRhdGVWaXNpYmxlTm9kZXMoKTsKKyAgICB9LAorCiAgICAgX3Bl cmZvcm1Tb3J0aW5nOiBmdW5jdGlvbihzb3J0RnVuY3Rpb24pCiAgICAgewogICAgICAgICB0aGlz LnJlY3Vyc2l2ZVNvcnRpbmdFbnRlcigpOwpAQCAtOTEsNiArMTM2LDcgQEAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAg ICAgIGNoaWxkLnNvcnQoKTsKICAgICAgICAgfQogICAgICAgICB0aGlzLnJlY3Vyc2l2ZVNvcnRp bmdMZWF2ZSgpOworICAgICAgICB0aGlzLnVwZGF0ZVZpc2libGVOb2RlcygpOwogICAgIH0sCiAK ICAgICByZWN1cnNpdmVTb3J0aW5nRW50ZXI6IGZ1bmN0aW9uKCkKQEAgLTIyNCw3ICsyNzAsNyBA QCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JzRGF0YUdyaWQgPSBmdW5jdGlv bigpCiAgICAgICAgIHNoYWxsb3dTaXplOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNoYWxsb3cgU2l6ZSIpLCB3aWR0aDogIjEyMHB4Iiwgc29ydGFibGU6IHRydWUgfSwKICAgICAg ICAgcmV0YWluZWRTaXplOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJldGFpbmVk IFNpemUiKSwgd2lkdGg6ICIxMjBweCIsIHNvcnQ6ICJkZXNjZW5kaW5nIiwgc29ydGFibGU6IHRy dWUgfQogICAgIH07Ci0gICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdy aWQuY2FsbCh0aGlzLCBjb2x1bW5zKTsKKyAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29y dGFibGVEYXRhR3JpZC5jYWxsKHRoaXMsIGNvbHVtbnMsIHRydWUpOwogICAgIHRoaXMuX3Byb2Zp bGVJbmRleCA9IC0xOwogfQogCkBAIC0yOTksNyArMzQ1LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdERpZmZEYXRhR3JpZCA9IGZ1bmN0aW9uKCkKICAgICAgICAgcmVtb3ZlZFNpemU6IHsg dGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJlZWQgU2l6ZSIpLCB3aWR0aDogIjcycHgi LCBzb3J0YWJsZTogdHJ1ZSB9LAogICAgICAgICBzaXplRGVsdGE6IHsgdGl0bGU6ICJTaXplIERl bHRhIiwgd2lkdGg6ICI3MnB4Iiwgc29ydGFibGU6IHRydWUgfQogICAgIH07Ci0gICAgV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQuY2FsbCh0aGlzLCBjb2x1bW5zKTsK KyAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVEYXRhR3JpZC5jYWxsKHRoaXMs IGNvbHVtbnMsIHRydWUpOwogfQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RGlmZkRhdGFH cmlkLnByb3RvdHlwZSA9IHsKQEAgLTc5NCw2ICs4NDAsNyBAQCBXZWJJbnNwZWN0b3IuRGV0YWls ZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKG5vZGUuZGVwdGgg PT09IDApCiAgICAgICAgICAgICAgICAgbm9kZS5yZXZlYWxlZCA9IG5vZGUuX25hbWUudG9Mb3dl ckNhc2UoKS5pbmRleE9mKGZpbHRlcikgIT09IC0xOwogICAgICAgICB9CisgICAgICAgIHRoaXMu ZGF0YUdyaWQudXBkYXRlVmlzaWJsZU5vZGVzKCk7CiAgICAgfSwKIAogICAgIF9wcm9maWxlczog ZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9IZWFwU25hcHNob3RQcm94eS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSGVhcFNuYXBzaG90UHJveHkuanMKaW5kZXggZmRmN2NjZjg4MDJkNGViODBlYjExYjA0NzA5 MWRjZWFiMzk1MzhiZi4uOTc3YmI2MzRlOGY5ZTZjZWI5MTg2M2EyNWJlNDUxMGEwYmZkODI3MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNo b3RQcm94eS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBT bmFwc2hvdFByb3h5LmpzCkBAIC05Myw3ICs5Myw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RXb3JrZXIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fY2FsbGJhY2tzID0gW107CiAgICAgdGhp cy5fcHJldmlvdXNDYWxsYmFja3MgPSBbXTsKICAgICAvLyBUaGVyZSBpcyBubyBzdXBwb3J0IGZv ciB3b3JrZXJzIGluIENocm9taXVtIERSVC4KLSAgICB0aGlzLl93b3JrZXIgPSB0eXBlb2YgSW5z cGVjdG9yVGVzdCA9PT0gInVuZGVmaW5lZCIgPyBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dFJlYWxXb3JrZXIoKSA6IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RmFrZVdvcmtlcigp OworICAgIHRoaXMuX3dvcmtlciA9IC8qdHlwZW9mIEluc3BlY3RvclRlc3QgPT09ICJ1bmRlZmlu ZWQiID8gbmV3IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RSZWFsV29ya2VyKCkgOiovIG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RmFrZVdvcmtlcigpOwogICAgIHRoaXMuX3dvcmtlci5h ZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgdGhpcy5fbWVzc2FnZVJlY2VpdmVkLmJpbmQodGhp cyksIGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9oZWFwUHJvZmlsZXIuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9oZWFwUHJvZmlsZXIuY3NzCmluZGV4IGM3NTI3ZGQwNTNlMTZjMjdhOTU1OTEzZTk2ODU1 NTQ2ODE1NDY5NmYuLjc1N2ZmMGYwMjhiZTZjMTllZGFiNDMyNWVmNGE0MDhmNWUyZTRhZGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaGVhcFByb2ZpbGVy LmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2hlYXBQcm9maWxl ci5jc3MKQEAgLTc1LDYgKzc1LDExIEBAIGJvZHkuaW5hY3RpdmUgLmhlYXAtc25hcHNob3Qtc2lk ZWJhci10cmVlLWl0ZW0ud2FpdC5zZWxlY3RlZCAuaWNvbiB7CiAgICAgZGlzcGxheTogYmxvY2s7 CiB9CiAKKy5kZXRhaWxlZC1oZWFwc2hvdC12aWV3IC5kYXRhLWdyaWQgdHI6ZW1wdHkgeworICAg IGhlaWdodDogMTZweDsKKyAgICB2aXNpYmlsaXR5OiBoaWRkZW47Cit9CisKIC5kZXRhaWxlZC1o ZWFwc2hvdC12aWV3IC5kYXRhLWdyaWQgewogICAgIGJvcmRlcjogbm9uZTsKIH0K 136658 2012-04-11 04:40:41 -0700 2012-04-11 05:47:58 -0700 Patch bug-83682-20120411154039.patch text/plain 9960 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI3MTVmMWY3ODk0ZmYz YjkzYjU1OThmNzljZDU0MWIzYWUxYjVmOC4uMGU4YTczNWQwOWRmYjIwMDkzMWFkNjExNTc5OWU0 ZWY4OTZkZTU1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA0LTExICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNob3dpbmcgc3VtbWFyeSB2aWV3IGlzIHZlcnkgc2xvdyBvbiBhIHNuYXBzaG90IHdpdGgg dGhvdXNhbmRzIG9mIGNvbnN0cnVjdG9ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODM2ODIKKworICAgICAgICBOb2RlIGNvbnRlbnQgaXMgY3JlYXRl ZCBvbmx5IHdoZW4gdGhlIG5vZGUgYmVjb21lcyB2aXNpYmxlIGluIHRoZSBjb3JyZXNwb25kaW5n IHZpZXcuCisgICAgICAgIFRoaXMgc2F2ZXMgYSBsb3Qgb2YgdGltZSB3aGVuIG9wZW5uaW5nIHN1 bW1hcnkvY29tcGFyaXNvbiB2aWV3IG9mIGEgc25hcHNob3QKKyAgICAgICAgd2l0aCBsb3RzIG9m IGRpZmZlcmVudCBjbGFzc2VzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5v ZGVzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3Rv dHlwZS5lbnN1cmVDb250ZW50Q3JlYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90TGF6eUdyaWROb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RM YXp5R3JpZE5vZGUucHJvdG90eXBlLmVuc3VyZUNvbnRlbnRDcmVhdGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RMYXp5R3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNlbGxz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1Y3Rvck5vZGUpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlLnVwZGF0ZVZpc2li bGVOb2Rlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVEYXRh R3JpZC5wcm90b3R5cGUub25SZXNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlLl9vblNjcm9sbCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVEYXRhR3JpZC5wcm90b3R5cGUuX3BlcmZvcm1T b3J0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RDb25zdHJ1Y3RvcnNE YXRhR3JpZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RGlmZkRhdGFHcmlk KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZXRhaWxlZEhlYXBzaG90Vmlldy5wcm90b3R5cGUu X2NoYW5nZU5hbWVGaWx0ZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNu YXBzaG90UHJveHkuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90V29ya2Vy KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2hlYXBQcm9maWxlci5jc3M6CisgICAg ICAgICguZGV0YWlsZWQtaGVhcHNob3QtdmlldyAuZGF0YS1ncmlkIHRyOmVtcHR5KToKKwogMjAx Mi0wNC0wMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBEYXRhYmFzZTo6RGF0YWJhc2U6OmlkIGZpZWxkIGluIHRoZSBwcm90 b2NvbCBzaG91bGQgaGF2ZSB0eXBlIGludGVnZXIgbm90IHN0cmluZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVz LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90 R3JpZE5vZGVzLmpzCmluZGV4IDMxNzM0MWIxYjE5N2UwYTNlMmQyMTc4ZWVkZWM0Yzc3ZjkyOTAz YWMuLjk0MGRlNDVlYjc1NGZjMjM2MTlhMmRiZmJiMjZjN2ZkODg2YjQ4ZGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWRO b2Rlcy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVk SGVhcHNob3RHcmlkTm9kZXMuanMKQEAgLTM3LDYgKzM3LDExIEBAIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RHcmlkTm9kZSA9IGZ1bmN0aW9uKHRyZWUsIGhhc0NoaWxkcmVuKQogfQogCiBXZWJJ bnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlID0geworICAgIGVuc3VyZUNv bnRlbnRDcmVhdGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAvLyBNYXkgYmUgb3ZlcnJp ZGVuIGluIGRlc2NlbmRhbnRzIHdpdGggbGF6eSBjb250ZW50LgorICAgIH0sCisKICAgICBjcmVh dGVDZWxsOiBmdW5jdGlvbihjb2x1bW5JZGVudGlmaWVyKQogICAgIHsKICAgICAgICAgdmFyIGNl bGwgPSBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5jcmVhdGVDZWxsLmNhbGwo dGhpcywgY29sdW1uSWRlbnRpZmllcik7CkBAIC0xOTgsNiArMjAzLDMxIEBAIFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5IZWFw U25hcHNob3RHcmlkTm9kZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkRhdGFH cmlkTm9kZS5wcm90b3R5cGU7CiAKK1dlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMYXp5R3JpZE5v ZGUgPSBmdW5jdGlvbih0cmVlLCBoYXNDaGlsZHJlbikKK3sKKyAgICBXZWJJbnNwZWN0b3IuSGVh cFNuYXBzaG90R3JpZE5vZGUuY2FsbCh0aGlzLCB0cmVlLCBoYXNDaGlsZHJlbik7CisgICAgdGhp cy5fZGVmZXJDb250ZW50Q3JlYXRpb24gPSB0cnVlOworfQorCitXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90TGF6eUdyaWROb2RlLnByb3RvdHlwZSA9IHsKKyAgICBlbnN1cmVDb250ZW50Q3JlYXRl ZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9kZWZlckNvbnRlbnRDcmVh dGlvbikKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fZGVmZXJDb250ZW50Q3Jl YXRpb24gPSBmYWxzZTsKKyAgICAgICAgdGhpcy5jcmVhdGVDZWxscygpOworICAgIH0sCisKKyAg ICBjcmVhdGVDZWxsczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2RlZmVy Q29udGVudENyZWF0aW9uKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBXZWJJbnNwZWN0 b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNlbGxzLmNhbGwodGhpcyk7 CisgICAgfQorfTsKKworV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdExhenlHcmlkTm9kZS5wcm90 b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdyaWROb2RlLnByb3Rv dHlwZTsKKwogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlID0gZnVu Y3Rpb24odHJlZSwgbm9kZSkKIHsKICAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5v ZGUuY2FsbCh0aGlzLCB0cmVlLCBmYWxzZSk7CkBAIC01NjksNyArNTk5LDcgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdEluc3RhbmNlTm9kZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLkhlYXBTbmEKIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0cnVjdG9yTm9k ZSA9IGZ1bmN0aW9uKHRyZWUsIGNsYXNzTmFtZSwgYWdncmVnYXRlLCBhZ2dyZWdhdGVzS2V5KQog ewotICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHcmlkTm9kZS5jYWxsKHRoaXMsIHRyZWUs IGFnZ3JlZ2F0ZS5jb3VudCA+IDApOworICAgIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMYXp5 R3JpZE5vZGUuY2FsbCh0aGlzLCB0cmVlLCBhZ2dyZWdhdGUuY291bnQgPiAwKTsKICAgICB0aGlz Ll9uYW1lID0gY2xhc3NOYW1lOwogICAgIHRoaXMuX2Rpc3RhbmNlVG9XaW5kb3cgPSBhZ2dyZWdh dGUuZGlzdGFuY2VUb1dpbmRvdzsKICAgICB0aGlzLl9jb3VudCA9IGFnZ3JlZ2F0ZS5jb3VudDsK QEAgLTY1MSw3ICs2ODEsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JO b2RlLnByb3RvdHlwZSA9IHsKICAgICB9CiB9OwogCi1XZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90 Q29uc3RydWN0b3JOb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90R3JpZE5vZGUucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdENvbnN0 cnVjdG9yTm9kZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dExhenlHcmlkTm9kZS5wcm90b3R5cGU7CiAKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RJdGVy YXRvcnNUdXBsZSA9IGZ1bmN0aW9uKGl0MSwgaXQyKQogewpAQCAtNjc4LDcgKzcwOCw3IEBAIFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RJdGVyYXRvcnNUdXBsZS5wcm90b3R5cGUgPSB7CiAKIFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3REaWZmTm9kZSA9IGZ1bmN0aW9uKHRyZWUsIGNsYXNzTmFt ZSwgYmFzZUFnZ3JlZ2F0ZSwgYWdncmVnYXRlKQogewotICAgIFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RHcmlkTm9kZS5jYWxsKHRoaXMsIHRyZWUsIHRydWUpOworICAgIFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RMYXp5R3JpZE5vZGUuY2FsbCh0aGlzLCB0cmVlLCB0cnVlKTsKICAgICB0aGlz Ll9uYW1lID0gY2xhc3NOYW1lOwogICAgIHRoaXMuX2Jhc2VJbmRleGVzID0gYmFzZUFnZ3JlZ2F0 ZSA/IGJhc2VBZ2dyZWdhdGUuaWR4cyA6IFtdOwogICAgIHRoaXMuX2luZGV4ZXMgPSBhZ2dyZWdh dGUgPyBhZ2dyZWdhdGUuaWR4cyA6IFtdOwpAQCAtODE5LDcgKzg0OSw3IEBAIFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3REaWZmTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgfQogfTsKIAotV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNw ZWN0b3IuSGVhcFNuYXBzaG90R3JpZE5vZGUucHJvdG90eXBlOworV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuSGVhcFNu YXBzaG90TGF6eUdyaWROb2RlLnByb3RvdHlwZTsKIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dERvbWluYXRvck9iamVjdE5vZGUgPSBmdW5jdGlvbih0cmVlLCBub2RlKQogewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmll dy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hv dFZpZXcuanMKaW5kZXggYWQyZjM0NmZlMmFlOGI0OTg4NDJjYmQ1YjRjOTY0Zjk4NTU2OTExMC4u YWQ0YmRlMDI2MWU0YjQ4OTNlNzNlOThhZTJiNTZiNDI0ZjgyOGI1NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RW aWV3LmpzCkBAIC0yOCwxMCArMjgsMTQgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQgPSBmdW5jdGlvbihjb2x1bW5zKQor V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQgPSBmdW5jdGlvbihjb2x1 bW5zLCBkZWZlck5vZGVDb250ZW50Q3JlYXRpb24pCiB7CiAgICAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkLmNhbGwodGhpcywgY29sdW1ucyk7CiAgICAgdGhpcy5hZGRFdmVudExpc3RlbmVyKCJzb3J0 aW5nIGNoYW5nZWQiLCB0aGlzLnNvcnRpbmdDaGFuZ2VkLCB0aGlzKTsKKworICAgIHRoaXMuX2Rl ZmVyTm9kZUNvbnRlbnRDcmVhdGlvbiA9IGRlZmVyTm9kZUNvbnRlbnRDcmVhdGlvbjsKKyAgICBp ZiAoZGVmZXJOb2RlQ29udGVudENyZWF0aW9uKQorICAgICAgICB0aGlzLnNjcm9sbENvbnRhaW5l ci5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9vblNjcm9sbC5iaW5kKHRoaXMpLCB0 cnVlKTsKIH0KIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJv dG90eXBlID0gewpAQCAtNzYsNiArODAsNDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNv cnRhYmxlRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9wZXJmb3JtU29ydGlu ZyhTb3J0QnlUd29GaWVsZHMpOwogICAgIH0sCiAKKyAgICB1cGRhdGVWaXNpYmxlTm9kZXM6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fZGVmZXJOb2RlQ29udGVudENyZWF0 aW9uKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIgc2Nyb2xsVG9wID0gdGhpcy5z Y3JvbGxDb250YWluZXIuc2Nyb2xsVG9wOworICAgICAgICB2YXIgcm93SGVpZ2h0ID0gMTY7CisK KyAgICAgICAgdmFyIGhlaWdodCA9IHRoaXMuc2Nyb2xsQ29udGFpbmVyLm9mZnNldEhlaWdodDsK KyAgICAgICAgdmFyIHZpc2libGVSb3dzQ291bnQgPSBNYXRoLnJvdW5kKGhlaWdodCAvIHJvd0hl aWdodCkgKyAxOworCisgICAgICAgIHZhciBjaGlsZHJlbiA9IHRoaXMuY2hpbGRyZW47CisKKyAg ICAgICAgdmFyIGkgPSAwOworICAgICAgICB3aGlsZSAoaSA8IGNoaWxkcmVuLmxlbmd0aCkgewor ICAgICAgICAgICAgaWYgKGNoaWxkcmVuW2ldLnJldmVhbGVkKSB7CisgICAgICAgICAgICAgICAg dmFyIHRvcCA9IGNoaWxkcmVuW2ldLmVsZW1lbnQub2Zmc2V0VG9wOworICAgICAgICAgICAgICAg IGlmICh0b3AgPj0gc2Nyb2xsVG9wKQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICsraTsKKyAgICAgICAgfQorCisgICAgICAgIHdoaWxlIChp IDwgY2hpbGRyZW4ubGVuZ3RoICYmIHZpc2libGVSb3dzQ291bnQpIHsKKyAgICAgICAgICAgIGlm IChjaGlsZHJlbltpXS5yZXZlYWxlZCkgeworICAgICAgICAgICAgICAgIGNoaWxkcmVuW2ldLmVu c3VyZUNvbnRlbnRDcmVhdGVkKCk7CisgICAgICAgICAgICAgICAgLS12aXNpYmxlUm93c0NvdW50 OworICAgICAgICAgICAgfQorICAgICAgICAgICAgKytpOworICAgICAgICB9CisgICAgfSwKKwor ICAgIG9uUmVzaXplOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLnVwZGF0ZVZpc2li bGVOb2RlcygpOworICAgIH0sCisKKyAgICBfb25TY3JvbGw6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgdGhpcy51cGRhdGVWaXNpYmxlTm9kZXMoKTsKKyAgICB9LAorCiAgICAgX3Bl cmZvcm1Tb3J0aW5nOiBmdW5jdGlvbihzb3J0RnVuY3Rpb24pCiAgICAgewogICAgICAgICB0aGlz LnJlY3Vyc2l2ZVNvcnRpbmdFbnRlcigpOwpAQCAtOTEsNiArMTM2LDcgQEAgV2ViSW5zcGVjdG9y LkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAg ICAgIGNoaWxkLnNvcnQoKTsKICAgICAgICAgfQogICAgICAgICB0aGlzLnJlY3Vyc2l2ZVNvcnRp bmdMZWF2ZSgpOworICAgICAgICB0aGlzLnVwZGF0ZVZpc2libGVOb2RlcygpOwogICAgIH0sCiAK ICAgICByZWN1cnNpdmVTb3J0aW5nRW50ZXI6IGZ1bmN0aW9uKCkKQEAgLTIyNCw3ICsyNzAsNyBA QCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JzRGF0YUdyaWQgPSBmdW5jdGlv bigpCiAgICAgICAgIHNoYWxsb3dTaXplOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNoYWxsb3cgU2l6ZSIpLCB3aWR0aDogIjEyMHB4Iiwgc29ydGFibGU6IHRydWUgfSwKICAgICAg ICAgcmV0YWluZWRTaXplOiB7IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJldGFpbmVk IFNpemUiKSwgd2lkdGg6ICIxMjBweCIsIHNvcnQ6ICJkZXNjZW5kaW5nIiwgc29ydGFibGU6IHRy dWUgfQogICAgIH07Ci0gICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdy aWQuY2FsbCh0aGlzLCBjb2x1bW5zKTsKKyAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29y dGFibGVEYXRhR3JpZC5jYWxsKHRoaXMsIGNvbHVtbnMsIHRydWUpOwogICAgIHRoaXMuX3Byb2Zp bGVJbmRleCA9IC0xOwogfQogCkBAIC0yOTksNyArMzQ1LDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdERpZmZEYXRhR3JpZCA9IGZ1bmN0aW9uKCkKICAgICAgICAgcmVtb3ZlZFNpemU6IHsg dGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRnJlZWQgU2l6ZSIpLCB3aWR0aDogIjcycHgi LCBzb3J0YWJsZTogdHJ1ZSB9LAogICAgICAgICBzaXplRGVsdGE6IHsgdGl0bGU6ICJTaXplIERl bHRhIiwgd2lkdGg6ICI3MnB4Iiwgc29ydGFibGU6IHRydWUgfQogICAgIH07Ci0gICAgV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFNvcnRhYmxlRGF0YUdyaWQuY2FsbCh0aGlzLCBjb2x1bW5zKTsK KyAgICBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U29ydGFibGVEYXRhR3JpZC5jYWxsKHRoaXMs IGNvbHVtbnMsIHRydWUpOwogfQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RGlmZkRhdGFH cmlkLnByb3RvdHlwZSA9IHsKQEAgLTc5NCw2ICs4NDAsNyBAQCBXZWJJbnNwZWN0b3IuRGV0YWls ZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKG5vZGUuZGVwdGgg PT09IDApCiAgICAgICAgICAgICAgICAgbm9kZS5yZXZlYWxlZCA9IG5vZGUuX25hbWUudG9Mb3dl ckNhc2UoKS5pbmRleE9mKGZpbHRlcikgIT09IC0xOwogICAgICAgICB9CisgICAgICAgIHRoaXMu ZGF0YUdyaWQudXBkYXRlVmlzaWJsZU5vZGVzKCk7CiAgICAgfSwKIAogICAgIF9wcm9maWxlczog ZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9oZWFwUHJvZmlsZXIuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9o ZWFwUHJvZmlsZXIuY3NzCmluZGV4IGM3NTI3ZGQwNTNlMTZjMjdhOTU1OTEzZTk2ODU1NTQ2ODE1 NDY5NmYuLjc1N2ZmMGYwMjhiZTZjMTllZGFiNDMyNWVmNGE0MDhmNWUyZTRhZGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaGVhcFByb2ZpbGVyLmNzcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2hlYXBQcm9maWxlci5jc3MK QEAgLTc1LDYgKzc1LDExIEBAIGJvZHkuaW5hY3RpdmUgLmhlYXAtc25hcHNob3Qtc2lkZWJhci10 cmVlLWl0ZW0ud2FpdC5zZWxlY3RlZCAuaWNvbiB7CiAgICAgZGlzcGxheTogYmxvY2s7CiB9CiAK Ky5kZXRhaWxlZC1oZWFwc2hvdC12aWV3IC5kYXRhLWdyaWQgdHI6ZW1wdHkgeworICAgIGhlaWdo dDogMTZweDsKKyAgICB2aXNpYmlsaXR5OiBoaWRkZW47Cit9CisKIC5kZXRhaWxlZC1oZWFwc2hv dC12aWV3IC5kYXRhLWdyaWQgewogICAgIGJvcmRlcjogbm9uZTsKIH0K