87400 2012-05-24 10:17:25 -0700 Web Inspector: add profile type for native memory snapshots 2012-05-25 02:50:15 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 87262 0 yurys yurys alph apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 632904 0 yurys 2012-05-24 10:17:25 -0700 We need a new profile type and view for native memory snapshots like we have for other profiles. 632912 1 143845 yurys 2012-05-24 10:21:42 -0700 Created attachment 143845 Patch 633760 2 yurys 2012-05-25 02:50:15 -0700 Committed r118504: <http://trac.webkit.org/changeset/118504> 143845 2012-05-24 10:21:42 -0700 2012-05-25 01:06:18 -0700 Patch bug-87400-20120524212140.patch text/plain 12615 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM2MDUxMjNmOTY5OTU1 YzYzODFmZmRmMDY1NGQ1ZmQyNjI0YmM1Yy4uYWVlN2RlMzU3NmE5YmUzZjA4NDM3NzY2NTI0Y2Fk YzE4NzY3YmUwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEyLTA1LTI0ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBwcm9maWxlIHR5cGUgZm9yIG5hdGl2ZSBtZW1vcnkgc25hcHNob3RzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzQwMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludHJvZHVjZWQgbmV3IHBy b2ZpbGUgdHlwZSBhbmQgdmlldyBjbGFzc2VzIGZvciBuYXRpdmUgbWVtb3J5IHNuYXBzaG90cy4K KyAgICAgICAgQWxsIHRoZSBzdHVmZiBpcyBoaWRkZW4gYmVoaW5kIGFuIGV4cGVyaW1lbnRhbCBz ZXR0aW5nLgorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUudmNw cm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9jb21waWxlLWZyb250LWVu ZC5weToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90 Vmlldy5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5U25hcHNo b3RWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcu cHJvdG90eXBlLmRpc3Bvc2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVNu YXBzaG90Vmlldy5wcm90b3R5cGUuZ2V0IHN0YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcucHJvdG90eXBlLmdldCBwcm9maWxlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlVHlwZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmlsZVR5cGUucHJvdG90eXBlLmdldCBidXR0 b25Ub29sdGlwKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlVHlw ZS5wcm90b3R5cGUuYnV0dG9uQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZl TWVtb3J5UHJvZmlsZVR5cGUucHJvdG90eXBlLmdldCB0cmVlSXRlbVRpdGxlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlVHlwZS5wcm90b3R5cGUuZ2V0IGRlc2Ny aXB0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlVHlwZS5w cm90b3R5cGUuY3JlYXRlVGVtcG9yYXJ5UHJvZmlsZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmF0aXZlTWVtb3J5UHJvZmlsZVR5cGUucHJvdG90eXBlLmNyZWF0ZVByb2ZpbGUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVByb2ZpbGVIZWFkZXIpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVByb2ZpbGVIZWFkZXIucHJvdG90eXBlLmNyZWF0ZVNpZGVi YXJUcmVlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmls ZUhlYWRlci5wcm90b3R5cGUuY3JlYXRlVmlldyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9Qcm9maWxlc1BhbmVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0 dGluZ3MuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5ncyk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisKIDIwMTItMDUtMjQgIFZpdmVrIEdhbGF0 YWdlICA8dml2ZWtnYWxhdGFnZUBnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog QnJlYWtwb2ludHMgUGFuZSBzaG91bGQgbm90IHNob3cgY29udGV4dCBtZW51IHdpdGggbm8gYnJl YWtwb2ludHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCBmYzIyNzBmYzVmMDJjYWNjNGU0Yjg3MDhmMmFj ODExYzkzNDdmY2Q5Li5iODBlYmIxNjk3NzJjZDE4OGNiYWY1OWY5YmRiYzA0YjE4NTZmZDQ3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXBpCkBAIC02NDMwLDYgKzY0MzAsNyBAQAogICAgICAgICAgICAgJ2luc3Bl Y3Rvci9mcm9udC1lbmQvTGlua2lmaWVyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJv bnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9u dC1lbmQvTWV0cmljc1NpZGViYXJQYW5lLmpzJywKKyAgICAgICAgICAgICdpbnNwZWN0b3IvZnJv bnQtZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcycsCiAgICAgICAgICAgICAnaW5zcGVj dG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JPdmVybGF5Q29udHJvbGxlci5qcycsCiAgICAgICAgICAg ICAnaW5zcGVjdG9yL2Zyb250LWVuZC9OYXZpZ2F0b3JWaWV3LmpzJywKICAgICAgICAgICAgICdp bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtJdGVtVmlldy5qcycsCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCmluZGV4IGYyNjFjYWY1ZjQzM2NlOGJkMjdh MTczMjk2ZTk3MGJkZTdmZjljZGMuLjY3ZDIyZjIyMzUyYWVlMjIxMzQ4ODExYjZjNjM3Y2I3N2Yz MDM3NTQgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUu dmNwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9q CkBAIC03NDYyMiw2ICs3NDYyMiwxMCBAQAogCQkJCQk+CiAJCQkJPC9GaWxlPgogCQkJCTxGaWxl CisJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxOYXRpdmVNZW1vcnlT bmFwc2hvdFZpZXcuanMiCisJCQkJCT4KKwkJCQk8L0ZpbGU+CisJCQkJPEZpbGUKIAkJCQkJUmVs YXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXE5hdmlnYXRvclZpZXcuanMiCiAJCQkJ CT4KIAkJCQk8L0ZpbGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29t cGlsZS1mcm9udC1lbmQucHkgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9u dC1lbmQucHkKaW5kZXggNGE3YTkzYjgwZDAzZTM0NmUwNGY3NDZhZDBmNGNhZTc1M2Y5MWZjMC4u MmYxZDdhODgwMDc2OWMxNjRjYjc2NDQ2ZmJhZGU1OTI4YWNiNjMxMCAxMDA3NTUKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weQpAQCAtMzA0LDYgKzMwNCw3IEBA IG1vZHVsZXMgPSBbCiAgICAgICAgICAgICAiSGVhcFNuYXBzaG90Vmlldy5qcyIsCiAgICAgICAg ICAgICAiSGVhcFNuYXBzaG90V29ya2VyLmpzIiwKICAgICAgICAgICAgICJIZWFwU25hcHNob3RX b3JrZXJEaXNwYXRjaGVyLmpzIiwKKyAgICAgICAgICAgICJOYXRpdmVNZW1vcnlTbmFwc2hvdFZp ZXcuanMiLAogICAgICAgICAgICAgIlByb2ZpbGVEYXRhR3JpZFRyZWUuanMiLAogICAgICAgICAg ICAgIlByb2ZpbGVzUGFuZWwuanMiLAogICAgICAgICAgICAgIlByb2ZpbGVMYXVuY2hlclZpZXcu anMiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRp dmVNZW1vcnlTbmFwc2hvdFZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL05hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wZmQ3MDk3ZjE3ZWY3 MjE5NTk0OTcyZjMzYjJkNjhkNmY5YmE1YzIzCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OYXRpdmVNZW1vcnlTbmFwc2hvdFZpZXcuanMKQEAg LTAsMCArMSwxNTcgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAq IG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0 IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFt ZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1h eSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAq IHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24u CisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERF UlMgQU5EIENPTlRSSUJVVE9SUworICogIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElF RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBM SUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQ QVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBD T1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisg KiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KKyAqLworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3Bl Y3Rvci5WaWV3fQorICovCitXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5U25hcHNob3RWaWV3ID0g ZnVuY3Rpb24ocHJvZmlsZSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRoaXMpOwor ICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJtZW1vcnktY2hhcnQtdmlldyIpOworICAg IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IikudGV4dENvbnRlbnQgPSAiTWVtb3J5IGNo YXJ0IjsKKyAgICB0aGlzLl9wcm9maWxlID0gcHJvZmlsZTsKK30KKworV2ViSW5zcGVjdG9yLk5h dGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5wcm90b3R5cGUgPSB7CisgICAgZGlzcG9zZTogZnVuY3Rp b24oKQorICAgIHsKKyAgICB9LAorCisgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKKyAgICB7Cisg ICAgICAgIHJldHVybiBbXTsKKyAgICB9LAorCisgICAgZ2V0IHByb2ZpbGUoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX3Byb2ZpbGU7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuTmF0 aXZlTWVtb3J5U25hcHNob3RWaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3Iu Vmlldy5wcm90b3R5cGU7CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2Vi SW5zcGVjdG9yLlByb2ZpbGVUeXBlfQorICovCitXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJv ZmlsZVR5cGUgPSBmdW5jdGlvbigpCit7CisgICAgV2ViSW5zcGVjdG9yLlByb2ZpbGVUeXBlLmNh bGwodGhpcywgV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVByb2ZpbGVUeXBlLlR5cGVJZCwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJUYWtlIE5hdGl2ZSBNZW1vcnkgU25hcHNob3QiKSk7CisgICAg dGhpcy5fcHJvZmlsZUluZGV4ID0gMTsKK30KKworV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVBy b2ZpbGVUeXBlLlR5cGVJZCA9ICJOQVRJVkVfTUVNT1JZIjsKKworV2ViSW5zcGVjdG9yLk5hdGl2 ZU1lbW9yeVByb2ZpbGVUeXBlLnByb3RvdHlwZSA9IHsKKyAgICBnZXQgYnV0dG9uVG9vbHRpcCgp CisgICAgeworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUYWtlIG5hdGl2 ZSBtZW1vcnkgc25hcHNob3QuIik7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBvdmVycmlk ZQorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICovCisgICAgYnV0dG9uQ2xpY2tlZDog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIHByb2ZpbGVzUGFuZWwgPSBXZWJJbnNwZWN0 b3IucGFuZWxzLnByb2ZpbGVzOworICAgICAgICB2YXIgcHJvZmlsZUhlYWRlciA9IG5ldyBXZWJJ bnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmlsZUhlYWRlcih0aGlzLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNuYXBzaG90ICVkIiwgdGhpcy5fcHJvZmlsZUluZGV4KyspLCAtMSk7CisgICAgICAg IHByb2ZpbGVzUGFuZWwuYWRkUHJvZmlsZUhlYWRlcihwcm9maWxlSGVhZGVyKTsKKyAgICAgICAg cHJvZmlsZXNQYW5lbC5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlByb2Zp bGVzUGFuZWwuRXZlbnRUeXBlcy5Qcm9maWxlU3RhcnRlZCk7CisgICAgICAgIHByb2ZpbGVzUGFu ZWwuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLkV2 ZW50VHlwZXMuUHJvZmlsZUZpbmlzaGVkKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0s CisKKyAgICBnZXQgdHJlZUl0ZW1UaXRsZSgpCisgICAgeworICAgICAgICByZXR1cm4gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJNRU1PUlkgRElTVFJJQlVUSU9OIik7CisgICAgfSwKKworICAgIGdl dCBkZXNjcmlwdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJOYXRpdmUgbWVtb3J5IHNuYXBzaG90IHByb2ZpbGVzIHNob3cgbWVtb3J5IGRpc3RyaWJ1 dGlvbiBhbW9uZyBicm93c2VyIHN1YnN5c3RlbXMiKTsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQG92ZXJyaWRlCisgICAgICogQHBhcmFtIHtzdHJpbmc9fSB0aXRsZQorICAgICAqIEByZXR1 cm4ge1dlYkluc3BlY3Rvci5Qcm9maWxlSGVhZGVyfQorICAgICAqLworICAgIGNyZWF0ZVRlbXBv cmFyeVByb2ZpbGU6IGZ1bmN0aW9uKHRpdGxlKQorICAgIHsKKyAgICAgICAgdGl0bGUgPSB0aXRs ZSB8fCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNuYXBzaG90dGluZ1x1MjAyNiIpOworICAgICAg ICByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlSGVhZGVyKHRoaXMs IHRpdGxlKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQG92ZXJyaWRlCisgICAgICogQHBh cmFtIHtQcm9maWxlckFnZW50LlByb2ZpbGVIZWFkZXJ9IHByb2ZpbGUKKyAgICAgKiBAcmV0dXJu IHtXZWJJbnNwZWN0b3IuUHJvZmlsZUhlYWRlcn0KKyAgICAgKi8KKyAgICBjcmVhdGVQcm9maWxl OiBmdW5jdGlvbihwcm9maWxlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0 b3IuTmF0aXZlTWVtb3J5UHJvZmlsZUhlYWRlcih0aGlzLCBwcm9maWxlLnRpdGxlLCAtMSk7Cisg ICAgfQorfQorCitXZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmlsZVR5cGUucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5Qcm9maWxlVHlwZS5wcm90b3R5cGU7CisKKy8qKgor ICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlByb2ZpbGVIZWFkZXJ9 CisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlVHlwZX0gdHlwZQor ICogQHBhcmFtIHtzdHJpbmd9IHRpdGxlCisgKiBAcGFyYW0ge251bWJlcj19IHVpZAorICovCitX ZWJJbnNwZWN0b3IuTmF0aXZlTWVtb3J5UHJvZmlsZUhlYWRlciA9IGZ1bmN0aW9uKHR5cGUsIHRp dGxlLCB1aWQpCit7CisgICAgV2ViSW5zcGVjdG9yLlByb2ZpbGVIZWFkZXIuY2FsbCh0aGlzLCB0 eXBlLCB0aXRsZSwgdWlkKTsKK30KKworV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVByb2ZpbGVI ZWFkZXIucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAqIEBvdmVycmlkZQorICAgICAqLwor ICAgIGNyZWF0ZVNpZGViYXJUcmVlRWxlbWVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg cmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuUHJvZmlsZVNpZGViYXJUcmVlRWxlbWVudCh0aGlzLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNuYXBzaG90ICVkIiksICJoZWFwLXNuYXBzaG90LXNpZGVi YXItdHJlZS1pdGVtIik7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBvdmVycmlkZQorICAg ICAqLworICAgIGNyZWF0ZVZpZXc6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiBu ZXcgV2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVNuYXBzaG90VmlldygpOworICAgIH0KK30KKwor V2ViSW5zcGVjdG9yLk5hdGl2ZU1lbW9yeVByb2ZpbGVIZWFkZXIucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5Qcm9maWxlSGVhZGVyLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwppbmRleCA0YTky NmViMTViZTlkN2Y4YzdlZjg4NTg2ZDkyMjNhNmJiOWNiY2MwLi5kZGRiNWJiMDVmZWQ2MDQ2YWMw NGNhMzU4Nzg2OThhNjY5M2Q4MDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Byb2ZpbGVzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCkBAIC0yNDIsNiArMjQyLDggQEAgV2ViSW5z cGVjdG9yLlByb2ZpbGVzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgICAgIHRoaXMuX3JlZ2lzdGVy UHJvZmlsZVR5cGUobmV3IFdlYkluc3BlY3Rvci5DU1NTZWxlY3RvclByb2ZpbGVUeXBlKCkpOwog ICAgIGlmIChDYXBhYmlsaXRpZXMuaGVhcFByb2ZpbGVyUHJlc2VudCkKICAgICAgICAgdGhpcy5f cmVnaXN0ZXJQcm9maWxlVHlwZShuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb2ZpbGVU eXBlKCkpOworICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5uYXRpdmVN ZW1vcnlTbmFwc2hvdHMuaXNFbmFibGVkKCkpCisgICAgICAgIHRoaXMuX3JlZ2lzdGVyUHJvZmls ZVR5cGUobmV3IFdlYkluc3BlY3Rvci5OYXRpdmVNZW1vcnlQcm9maWxlVHlwZSgpKTsKIAogICAg IEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJQcm9maWxlckRpc3BhdGNoZXIobmV3IFdlYkluc3Bl Y3Rvci5Qcm9maWxlckRpc3BhdGNoZXIodGhpcykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCA0ZTNhMjI3MzFkMDk4MmE2Nzg2OTg4 Y2ZlZTgzOTAxNjAzNTg0MDAxLi5hZGRhMDJjNzhjYjEwNGFjNWVhNzYxYjI3YmJmMmUyNmY0YWI5 ZDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRp bmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3Mu anMKQEAgLTE4Miw2ICsxODIsNyBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5ncyA9 IGZ1bmN0aW9uKCkKICAgICAvLyBBZGQgY3VycmVudGx5IHJ1bm5pbmcgZXhwZXJpbWVudHMgaGVy ZS4KICAgICB0aGlzLnNob3dTaGFkb3dET00gPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJzaG93 U2hhZG93RE9NIiwgIlNob3cgc2hhZG93IERPTSIpOwogICAgIHRoaXMuc25pcHBldHNTdXBwb3J0 ID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic25pcHBldHNTdXBwb3J0IiwgIlNuaXBwZXRzIHN1 cHBvcnQiKTsKKyAgICB0aGlzLm5hdGl2ZU1lbW9yeVNuYXBzaG90cyA9IHRoaXMuX2NyZWF0ZUV4 cGVyaW1lbnQoIm5hdGl2ZU1lbW9yeVNuYXBzaG90cyIsICJOYXRpdmUgbWVtb3J5IHByb2ZpbGlu ZyIpOwogCiAgICAgdGhpcy5fY2xlYW5VcFNldHRpbmcoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCA1NDg4OTdlMzEzODYyMGZkMmQ5 ZjhjMjMyN2NjNmEyODJmYzdlMWQ4Li44OTgyYjk1YzdhNDY0MzgyOGViNmI3OGEwN2YxOTFlNWYw NTI5MDgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dl YktpdC5xcmMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQu cXJjCkBAIC04OSw2ICs4OSw3IEBACiAgICAgPGZpbGU+TGlua2lmaWVyLmpzPC9maWxlPgogICAg IDxmaWxlPk1lbW9yeVN0YXRpc3RpY3MuanM8L2ZpbGU+CiAgICAgPGZpbGU+TWV0cmljc1NpZGVi YXJQYW5lLmpzPC9maWxlPgorICAgIDxmaWxlPk5hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qczwv ZmlsZT4KICAgICA8ZmlsZT5OYXZpZ2F0b3JPdmVybGF5Q29udHJvbGxlci5qczwvZmlsZT4KICAg ICA8ZmlsZT5OYXZpZ2F0b3JWaWV3LmpzPC9maWxlPgogICAgIDxmaWxlPk5ldHdvcmtJdGVtVmll dy5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5odG1sCmluZGV4IGFjNTE2Zjc1ZjM4MjYwZTdmZjlmM2UzZDNiOGMyM2U1ZTQ5NTNj YWYuLmFkOTAzZjg3Mjk2MzFlMDk1ZTE0MTI3MDRiOTA1MDcwYjczZjhjMmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtMTc3 LDYgKzE3Nyw3IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iSGVhcFNuYXBzaG90TG9hZGVyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9 InRleHQvamF2YXNjcmlwdCIgc3JjPSJIZWFwU25hcHNob3REYXRhR3JpZHMuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkhlYXBTbmFwc2hvdFZp ZXcuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9 Ik5hdGl2ZU1lbW9yeVNuYXBzaG90Vmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRGVidWdnZXJNb2RlbC5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU291cmNlTWFwcGluZy5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iVUlTb3VyY2VD b2RlLmpzIj48L3NjcmlwdD4K