92390 2012-07-26 09:29:55 -0700 Web Inspector: Profiles: cleanup HeapSnapshotReceiver interface 2012-08-01 00:54:05 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 92348 0 eustas.bug eustas.bug apavlov bweinstein caseq eustas.bug joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 679423 0 eustas.bug 2012-07-26 09:29:55 -0700 Remove callback parameter and return values from methods startLoading and finishLoading. All implementations of HeapSnapshotReceiver honestly override interface methods now. 679432 1 154672 eustas.bug 2012-07-26 09:37:57 -0700 Created attachment 154672 Patch 682979 2 154672 yurys 2012-07-31 06:32:40 -0700 Comment on attachment 154672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154672&action=review Is there a chance we have a test for this? > Source/WebCore/inspector/front-end/HeapSnapshotLoader.js:75 > + if (this._json) What's the reason for splitting this into two methods? 683045 3 154672 eustas.bug 2012-07-31 07:42:09 -0700 Comment on attachment 154672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154672&action=review These changes are covered with tests: see changed test file - it tests both HeapSnapshotLoader and HeapSnapshotLoaderProxy ("loading" file with HeapProfileHeader). >> Source/WebCore/inspector/front-end/HeapSnapshotLoader.js:75 >> + if (this._json) > > What's the reason for splitting this into two methods? To make HeapSnapshotLoader implement receiver interface. Practically we could remove @implements notation, leave this code in peace and declare that "proxy" in not clearly "proxy", but also "adapter"... But this way we would introduce one more entity instead of reducing inconsistency. 683945 4 154672 webkit.review.bot 2012-08-01 00:54:01 -0700 Comment on attachment 154672 Patch Clearing flags on attachment: 154672 Committed r124308: <http://trac.webkit.org/changeset/124308> 683946 5 webkit.review.bot 2012-08-01 00:54:05 -0700 All reviewed patches have been landed. Closing bug. 154672 2012-07-26 09:37:57 -0700 2012-08-01 00:54:00 -0700 Patch bug-92390-20120726203745.patch text/plain 14704 eustas.bug U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNhNzVlZGZlN2ZlY2Fk Y2FjOGU2YTYzOGZiYjEzMTQ5NjdkOWQzOC4uMDcwOWU1MDcwNjk2NGE3YzIzYzAzNjU2NDY1ZjBk ZmVjZjU2MjBhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA3LTI2ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXMuYmlnQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBQcm9maWxlczogY2xlYW51cCBIZWFwU25hcHNob3RSZWNlaXZlciBpbnRlcmZhY2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMzkwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGNh bGxiYWNrIHBhcmFtZXRlciBhbmQgcmV0dXJuIHZhbHVlcyBmcm9tIG1ldGhvZHMgc3RhcnRMb2Fk aW5nCisgICAgICAgIGFuZCBmaW5pc2hMb2FkaW5nLiBBbGwgaW1wbGVtZW50YXRpb25zIG9mIEhl YXBTbmFwc2hvdFJlY2VpdmVyIGhvbmVzdGx5CisgICAgICAgIG92ZXJyaWRlIGludGVyZmFjZSBt ZXRob2RzIG5vdy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90 TG9hZGVyLmpzOiBBZG9wdGVkIG5ldyBBUEkuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9IZWFwU25hcHNob3RQcm94eS5qczogQWRvcHRlZCBuZXcgQVBJLiAKKyAgICAgICAgKFdlYklu c3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXJQcm94eS5wcm90b3R5cGUuaXNTdGFydGVkKTogQWRk ZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90TG9hZGVyUHJveHkucHJvdG90 eXBlLmFkZENvbnN1bWVyKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90TG9hZGVyUHJveHkucHJvdG90eXBlLmZpbmlzaExvYWRpbmcpOgorICAgICAgICBFeHBsaWNp dGx5IGZpbmlzaGVzIGxvYWRpbmcgYW5kIGJ1aWxkIHNuYXBzaG90LgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RSZWNlaXZlci5wcm90b3R5cGUuc3RhcnRMb2FkaW5nKToKKyAgICAgICAg UmVtb3ZlZCBjYWxsYmFjayBwYXJhbWV0ZXIgYW5kIHJldHVybiB2YWx1ZS4KKyAgICAgICAgKFdl Ykluc3BlY3Rvci5IZWFwU25hcHNob3RSZWNlaXZlci5wcm90b3R5cGUuZmluaXNoTG9hZGluZyk6 CisgICAgICAgIFJlbW92ZWQgY2FsbGJhY2sgcGFyYW1ldGVyLgorICAgICAgICAoV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFNhdmVUb0ZpbGVSZWNlaXZlcik6IEFkb3B0ZWQgbmV3IEFQSS4KKwog MjAxMi0wNy0yNCAgU2hhd24gU2luZ2ggIDxzaGF3bnNpbmdoQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBbY2hyb21pdW1dIFJlZmFjdG9yIENDTGF5ZXJUcmVlSG9zdENvbW1vbjogbW92ZSByb290 IGxheWVyIHNwZWNpYWwgY2FzZSBpbml0aWFsaXphdGlvbiBpbnRvIGludGVybmFsIGNvZGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hv dExvYWRlci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBz aG90TG9hZGVyLmpzCmluZGV4IDA4NGVmOTYzNTk2ZDhiYzIxYTA5NmRkYzg5N2YwNTEyNTliMTc4 MjkuLjljYzBjMTI1Y2VhM2YwN2M2MmY0ODJlZTUzMzY3ZDg4ZjI4MmJlMWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90TG9hZGVyLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90TG9h ZGVyLmpzCkBAIC0zOCwxMyArMzgsOCBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90TG9hZGVy ID0gZnVuY3Rpb24oKQogfQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90TG9hZGVyLnByb3Rv dHlwZSA9IHsKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RQcm94eSl9IGNhbGxiYWNrCi0gICAgICogQHJldHVybiB7Ym9vbGVhbn0KLSAg ICAgKi8KLSAgICBzdGFydExvYWRpbmc6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHN0YXJ0TG9h ZGluZzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIAog ICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKQEAgLTc3LDkgKzcyLDEyIEBAIFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RMb2FkZXIucHJvdG90eXBlID0gewogCiAgICAgZmluaXNoTG9hZGluZzogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9qc29uKQotICAgICAgICAgICAgcmV0 dXJuIG51bGw7Ci0gICAgICAgIHRoaXMuX3BhcnNlU3RyaW5nc0FycmF5KCk7CisgICAgICAgIGlm ICh0aGlzLl9qc29uKQorICAgICAgICAgICAgdGhpcy5fcGFyc2VTdHJpbmdzQXJyYXkoKTsKKyAg ICB9LAorCisgICAgYnVpbGRTbmFwc2hvdDogZnVuY3Rpb24oKQorICAgIHsKICAgICAgICAgdmFy IHJlc3VsdCA9IG5ldyBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90KHRoaXMuX3NuYXBzaG90KTsK ICAgICAgICAgdGhpcy5fcmVzZXQoKTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHku anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFByb3h5 LmpzCmluZGV4IDEyNzdkYTU2YmViMjI2ZGRiMjI4OTVjMjBjYTg0ZDBkNmVkZTNlYjAuLjRhYzcx YTMzOWI2YTcyODIzNTY3MmFiZDgyNDJkMDAwM2M4MGI5OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90UHJveHkuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qcwpAQCAt MzYwLDE5ICszNjAsMjggQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFByb3h5T2JqZWN0LnBy b3RvdHlwZSA9IHsKIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXJQcm94eSA9IGZ1bmN0 aW9uKHdvcmtlciwgb2JqZWN0SWQpCiB7CiAgICAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFBy b3h5T2JqZWN0LmNhbGwodGhpcywgd29ya2VyLCBvYmplY3RJZCk7Ci0gICAgdGhpcy5fb25Mb2Fk Q2FsbGJhY2tzID0gW107CisgICAgdGhpcy5fc3RhcnRlZCA9IGZhbHNlOworICAgIHRoaXMuX3Bl bmRpbmdTbmFwc2hvdENvbnN1bWVycyA9IFtdOwogfQogCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90TG9hZGVyUHJveHkucHJvdG90eXBlID0geworICAgIHN0YXJ0TG9hZGluZzogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgdGhpcy5fc3RhcnRlZCA9IHRydWU7CisgICAgICAgIHRoaXMuY2Fs bE1ldGhvZChudWxsLCAic3RhcnRUcmFuc2ZlciIpOworICAgIH0sCisKKyAgICBpc1N0YXJ0ZWQ6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zdGFydGVkOworICAgIH0s CisKICAgICAvKioKICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RQcm94eSl9IGNhbGxiYWNrCi0gICAgICogQHJldHVybiB7Ym9vbGVhbn0KICAgICAgKi8K LSAgICBzdGFydExvYWRpbmc6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIGFkZENvbnN1bWVyOiBm dW5jdGlvbihjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHZhciBsb2FkaW5nSGFzSnVzdFN0YXJ0 ZWQgPSAhdGhpcy5fb25Mb2FkQ2FsbGJhY2tzLmxlbmd0aDsKLSAgICAgICAgdGhpcy5fb25Mb2Fk Q2FsbGJhY2tzLnB1c2goY2FsbGJhY2spOwotICAgICAgICByZXR1cm4gbG9hZGluZ0hhc0p1c3RT dGFydGVkOworICAgICAgICB0aGlzLl9wZW5kaW5nU25hcHNob3RDb25zdW1lcnMucHVzaChjYWxs YmFjayk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMzgzLDI1ICszOTIsMjYgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdExvYWRlclByb3h5LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5j YWxsTWV0aG9kKG51bGwsICJwdXNoSlNPTkNodW5rIiwgY2h1bmspOwogICAgIH0sCiAKLSAgICAv KioKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQcm94 eSl9IGNhbGxiYWNrCi0gICAgICovCi0gICAgZmluaXNoTG9hZGluZzogZnVuY3Rpb24oY2FsbGJh Y2spCisgICAgZmluaXNoTG9hZGluZzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5f b25Mb2FkQ2FsbGJhY2tzLnVuc2hpZnQoY2FsbGJhY2spOwotCisgICAgICAgIGZ1bmN0aW9uIGJ1 aWxkU25hcHNob3QoKQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLmNhbGxGYWN0b3J5TWV0 aG9kKHVwZGF0ZVN0YXRpY0RhdGEuYmluZCh0aGlzKSwgImJ1aWxkU25hcHNob3QiLCAiV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFByb3h5Iik7CisgICAgICAgIH0KICAgICAgICAgZnVuY3Rpb24g dXBkYXRlU3RhdGljRGF0YShzbmFwc2hvdFByb3h5KQogICAgICAgICB7CiAgICAgICAgICAgICB0 aGlzLmRpc3Bvc2UoKTsKLSAgICAgICAgICAgIHNuYXBzaG90UHJveHkudXBkYXRlU3RhdGljRGF0 YShjYWxsTG9hZENhbGxiYWNrcy5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgIHNuYXBzaG90UHJv eHkudXBkYXRlU3RhdGljRGF0YShub3RpZnlQZW5kaW5nQ29uc3VtZXJzLmJpbmQodGhpcykpOwog ICAgICAgICB9Ci0gICAgICAgIGZ1bmN0aW9uIGNhbGxMb2FkQ2FsbGJhY2tzKHNuYXBzaG90UHJv eHkpCisgICAgICAgIGZ1bmN0aW9uIG5vdGlmeVBlbmRpbmdDb25zdW1lcnMoc25hcHNob3RQcm94 eSkKICAgICAgICAgewotICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9vbkxv YWRDYWxsYmFja3MubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICAgICAgdGhpcy5fb25Mb2FkQ2Fs bGJhY2tzW2ldKHNuYXBzaG90UHJveHkpOwotICAgICAgICAgICAgdGhpcy5fb25Mb2FkQ2FsbGJh Y2tzID0gbnVsbDsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fcGVuZGlu Z1NuYXBzaG90Q29uc3VtZXJzLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgICAgIHRoaXMuX3Bl bmRpbmdTbmFwc2hvdENvbnN1bWVyc1tpXShzbmFwc2hvdFByb3h5KTsKKworICAgICAgICAgICAg dGhpcy5fc3RhcnRlZCA9IGZhbHNlOworICAgICAgICAgICAgdGhpcy5fcGVuZGluZ1NuYXBzaG90 Q29uc3VtZXJzID0gW107CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5jYWxsRmFjdG9yeU1ldGhv ZCh1cGRhdGVTdGF0aWNEYXRhLmJpbmQodGhpcyksICJmaW5pc2hMb2FkaW5nIiwgIldlYkluc3Bl Y3Rvci5IZWFwU25hcHNob3RQcm94eSIpOworICAgICAgICB0aGlzLmNhbGxNZXRob2QoYnVpbGRT bmFwc2hvdC5iaW5kKHRoaXMpLCAiZmluaXNoTG9hZGluZyIpOwogICAgIH0KIH07CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Vmll dy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90Vmll dy5qcwppbmRleCBhMTE4M2I3ZTcwZTAyYjM5MTdiNDM4NTRjMTZjNTFkM2MwMGQ5MTcwLi4yODlk OGQ4MzVmNGQwZmUyOTgyOTk0OTRkMmQwNDFjY2FkMjI3NWVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hvdFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RWaWV3LmpzCkBAIC03 OTIsMTEgKzc5Miw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RSZWNlaXZlciA9IGZ1bmN0 aW9uKCkKIH0KIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFJlY2VpdmVyLnByb3RvdHlwZSA9 IHsKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5IZWFwU25h cHNob3RQcm94eSl9IGNhbGxiYWNrCi0gICAgICogQHJldHVybiB7Ym9vbGVhbn0KLSAgICAgKi8K LSAgICBzdGFydExvYWRpbmc6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHN0YXJ0TG9hZGluZzog ZnVuY3Rpb24oKQogICAgIHsKICAgICB9LAogCkBAIC04MDcsMTAgKzgwMyw3IEBAIFdlYkluc3Bl Y3Rvci5IZWFwU25hcHNob3RSZWNlaXZlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgIH0sCiAK LSAgICAvKioKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKFdlYkluc3BlY3Rvci5IZWFwU25hcHNo b3RQcm94eSl9IGNhbGxiYWNrCi0gICAgICovCi0gICAgZmluaXNoTG9hZGluZzogZnVuY3Rpb24o Y2FsbGJhY2spCisgICAgZmluaXNoTG9hZGluZzogZnVuY3Rpb24oKQogICAgIHsKICAgICB9LAog CkBAIC04NzcsMTMgKzg3MCwxNiBAQCBXZWJJbnNwZWN0b3IuSGVhcFByb2ZpbGVIZWFkZXIucHJv dG90eXBlID0gewogCiAgICAgICAgIGlmICghdGhpcy5fcmVjZWl2ZXIpCiAgICAgICAgICAgICB0 aGlzLl9zZXR1cFdvcmtlcigpOworICAgICAgICB2YXIgbG9hZGVyUHJveHkgPSAvKiogQHR5cGUg e1dlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXJQcm94eX0gKi8gdGhpcy5fcmVjZWl2ZXI7 CiAKICAgICAgICAgdGhpcy5fbnVtYmVyT2ZDaHVua3MgPSAwOwotICAgICAgICBpZiAodGhpcy5f cmVjZWl2ZXIuc3RhcnRMb2FkaW5nKGNhbGxiYWNrKSkgeworICAgICAgICBpZiAoIWxvYWRlclBy b3h5LmlzU3RhcnRlZCgpKSB7CisgICAgICAgICAgICBsb2FkZXJQcm94eS5zdGFydExvYWRpbmco KTsKICAgICAgICAgICAgIHRoaXMuc2lkZWJhckVsZW1lbnQuc3VidGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIkxvYWRpbmdcdTIwMjYiKTsKICAgICAgICAgICAgIHRoaXMuc2lkZWJhckVs ZW1lbnQud2FpdCA9IHRydWU7CiAgICAgICAgICAgICBQcm9maWxlckFnZW50LmdldFByb2ZpbGUo dGhpcy5wcm9maWxlVHlwZSgpLmlkLCB0aGlzLnVpZCk7CiAgICAgICAgIH0KKyAgICAgICAgbG9h ZGVyUHJveHkuYWRkQ29uc3VtZXIoY2FsbGJhY2spOwogICAgIH0sCiAKICAgICBfc2V0dXBXb3Jr ZXI6IGZ1bmN0aW9uKCkKQEAgLTg5Myw3ICs4ODksOSBAQCBXZWJJbnNwZWN0b3IuSGVhcFByb2Zp bGVIZWFkZXIucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIHZhciB3b3JrZXIgPSBu ZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFdvcmtlcigpOwogICAgICAgICB3b3JrZXIuYWRk RXZlbnRMaXN0ZW5lcigid2FpdCIsIHNldFByb2ZpbGVXYWl0LCB0aGlzKTsKLSAgICAgICAgdGhp cy5fcmVjZWl2ZXIgPSB3b3JrZXIuY3JlYXRlT2JqZWN0KCJXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90TG9hZGVyIik7CisgICAgICAgIHZhciBsb2FkZXJQcm94eSA9IHdvcmtlci5jcmVhdGVPYmpl Y3QoIldlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXIiKTsKKyAgICAgICAgbG9hZGVyUHJv eHkuYWRkQ29uc3VtZXIodGhpcy5fc25hcHNob3RSZWNlaXZlZC5iaW5kKHRoaXMpKTsKKyAgICAg ICAgdGhpcy5fcmVjZWl2ZXIgPSBsb2FkZXJQcm94eTsKICAgICB9LAogCiAgICAgZGlzcG9zZTog ZnVuY3Rpb24oKQpAQCAtOTEyLDcgKzkxMCw2IEBAIFdlYkluc3BlY3Rvci5IZWFwUHJvZmlsZUhl YWRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChzYXZlZENodW5rc0NvdW50ID09PSB0aGlz Ll90b3RhbE51bWJlck9mQ2h1bmtzKSB7CiAgICAgICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50 LnN1YnRpdGxlID0gTnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5fc25hcHNob3RQcm94eS50b3Rh bFNpemUpOwogICAgICAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC53YWl0ID0gZmFsc2U7Ci0g ICAgICAgICAgICB0aGlzLl9zYXZlZENodW5rc0NvdW50ID0gMDsKICAgICAgICAgfSBlbHNlCiAg ICAgICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnN1YnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJTYXZpbmdcdTIwMjYgJWRcJSIsIChzYXZlZENodW5rc0NvdW50ICogMTAwIC8gdGhp cy5fdG90YWxOdW1iZXJPZkNodW5rcykudG9GaXhlZCgyKSk7CiAgICAgfSwKQEAgLTkyNiw3ICs5 MjMsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFByb2ZpbGVIZWFkZXIucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLl9yZWNlaXZlci5wdXNoSlNPTkNodW5rKGNodW5rKTsKICAgICB9LAogCi0gICAg X3BhcnNlZDogZnVuY3Rpb24oc25hcHNob3RQcm94eSkKKyAgICBfc25hcHNob3RSZWNlaXZlZDog ZnVuY3Rpb24oc25hcHNob3RQcm94eSkKICAgICB7CiAgICAgICAgIHRoaXMuX3JlY2VpdmVyID0g bnVsbDsKICAgICAgICAgaWYgKHNuYXBzaG90UHJveHkpCkBAIC05NDEsOCArOTM4LDggQEAgV2Vi SW5zcGVjdG9yLkhlYXBQcm9maWxlSGVhZGVyLnByb3RvdHlwZSA9IHsKICAgICBmaW5pc2hIZWFw U25hcHNob3Q6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3RvdGFsTnVtYmVyT2ZD aHVua3MgPSB0aGlzLl9udW1iZXJPZkNodW5rczsKLSAgICAgICAgaWYgKHRoaXMuX3JlY2VpdmVy LmZpbmlzaExvYWRpbmcodGhpcy5fcGFyc2VkLmJpbmQodGhpcykpKQotICAgICAgICAgICAgdGhp cy5zaWRlYmFyRWxlbWVudC5zdWJ0aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUGFyc2lu Z1x1MjAyNiIpOworICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnN1YnRpdGxlID0gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJQYXJzaW5nXHUyMDI2Iik7CisgICAgICAgIHRoaXMuX3JlY2VpdmVy LmZpbmlzaExvYWRpbmcoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC05NTEsNyArOTQ4LDcgQEAg V2ViSW5zcGVjdG9yLkhlYXBQcm9maWxlSGVhZGVyLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAg ICBjYW5TYXZlVG9GaWxlOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICByZXR1cm4gIXRoaXMu ZnJvbUZpbGUoKSAmJiB0aGlzLl9zbmFwc2hvdFByb3h5ICYmICF0aGlzLl9zYXZlZENodW5rc0Nv dW50ICYmIFdlYkluc3BlY3Rvci5maWxlTWFuYWdlci5jYW5BcHBlbmQoKTsKKyAgICAgICAgcmV0 dXJuICF0aGlzLmZyb21GaWxlKCkgJiYgdGhpcy5fc25hcHNob3RQcm94eSAmJiAhdGhpcy5fcmVj ZWl2ZXIgJiYgV2ViSW5zcGVjdG9yLmZpbGVNYW5hZ2VyLmNhbkFwcGVuZCgpOwogICAgIH0sCiAK ICAgICAvKioKQEAgLTk2Miw3ICs5NTksNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFByb2ZpbGVIZWFk ZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9maWxlTmFtZSA9IHRoaXMuX2ZpbGVOYW1l IHx8ICJIZWFwLSIgKyBuZXcgRGF0ZSgpLnRvSVNPODYwMUNvbXBhY3QoKSArICIuaGVhcHNuYXBz aG90IjsKICAgICAgICAgdGhpcy5fcmVjZWl2ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdFNhdmVUb0ZpbGVSZWNlaXZlcih0aGlzLl9maWxlTmFtZSwgdGhpcyk7CiAgICAgICAgIHRo aXMuX251bWJlck9mQ2h1bmtzID0gMDsKLSAgICAgICAgdGhpcy5fcmVjZWl2ZXIuc3RhcnRMb2Fk aW5nKGZ1bmN0aW9uKHNuYXBzaG90KSB7IH0pOworICAgICAgICB0aGlzLl9yZWNlaXZlci5zdGFy dExvYWRpbmcoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xMDAwLDcgKzk5Nyw3IEBAIFdlYklu c3BlY3Rvci5IZWFwUHJvZmlsZUhlYWRlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc2lk ZWJhckVsZW1lbnQud2FpdCA9IHRydWU7CiAgICAgICAgIHRoaXMuX3NldHVwV29ya2VyKCk7CiAg ICAgICAgIHRoaXMuX251bWJlck9mQ2h1bmtzID0gMDsKLSAgICAgICAgdGhpcy5fcmVjZWl2ZXIu c3RhcnRMb2FkaW5nKGZ1bmN0aW9uKGlnbm9yZWRTbmFwc2hvdFByb3h5KSB7IH0pOworICAgICAg ICB0aGlzLl9yZWNlaXZlci5zdGFydExvYWRpbmcoKTsKIAogICAgICAgICAvKioKICAgICAgICAg ICogQHBhcmFtIHtFdmVudH0gZXZlbnQKQEAgLTEwNjMsMjQgKzEwNjAsMjAgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFNhdmVUb0ZpbGVSZWNlaXZlciA9IGZ1bmN0aW9uKGZpbGVOYW1lLCBz bmFwc2hvdEhlYWRlcikKICAgICB0aGlzLl9maWxlTmFtZSA9IGZpbGVOYW1lOwogICAgIHRoaXMu X3NuYXBzaG90SGVhZGVyID0gc25hcHNob3RIZWFkZXI7CiAgICAgdGhpcy5fc2F2ZWRDaHVua3Mg PSAwOwotICAgIHRoaXMuX2ZpbmlzaExvYWRpbmdDYWxsYmFja3MgPSBbXTsKIH0KIAogV2ViSW5z cGVjdG9yLkhlYXBTbmFwc2hvdFNhdmVUb0ZpbGVSZWNlaXZlci5wcm90b3R5cGUgPSB7CiAgICAg LyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UHJv eHkpfSBjYWxsYmFjawotICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CisgICAgICogQG92ZXJyaWRl CiAgICAgICovCi0gICAgc3RhcnRMb2FkaW5nOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICBzdGFy dExvYWRpbmc6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5maWxlTWFu YWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GaWxlTWFuYWdlci5FdmVudFR5cGVz LlNhdmVkVVJMLCB0aGlzLl9zdGFydFNhdmluZ1NuYXBzaG90LCB0aGlzKTsKICAgICAgICAgV2Vi SW5zcGVjdG9yLmZpbGVNYW5hZ2VyLnNhdmUodGhpcy5fZmlsZU5hbWUsICIiLCB0cnVlKTsKLSAg ICAgICAgaWYgKGNhbGxiYWNrKQotICAgICAgICAgICAgdGhpcy5fZmluaXNoTG9hZGluZ0NhbGxi YWNrcy5wdXNoKGNhbGxiYWNrKTsKLSAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIAogICAg IC8qKgorICAgICAqIEBvdmVycmlkZQogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBjaHVuawogICAg ICAqLwogICAgIHB1c2hKU09OQ2h1bms6IGZ1bmN0aW9uKGNodW5rKQpAQCAtMTA4OSwxMyArMTA4 MiwxMiBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90U2F2ZVRvRmlsZVJlY2VpdmVyLnByb3Rv dHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbihXZWJJ bnNwZWN0b3IuSGVhcFNuYXBzaG90UHJveHkpfSBjYWxsYmFjaworICAgICAqIEBvdmVycmlkZQog ICAgICAqLwotICAgIGZpbmlzaExvYWRpbmc6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIGZpbmlz aExvYWRpbmc6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2ZpbmlzaExvYWRpbmdD YWxsYmFja3MucHVzaChjYWxsYmFjayk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhp cy5fZmluaXNoTG9hZGluZ0NhbGxiYWNrcy5sZW5ndGg7ICsraSkKLSAgICAgICAgICAgIHRoaXMu X2ZpbmlzaExvYWRpbmdDYWxsYmFja3NbaV0obnVsbCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5m aWxlTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GaWxlTWFuYWdlci5F dmVudFR5cGVzLkFwcGVuZGVkVG9VUkwsIHRoaXMuX3NhdmVTdGF0dXNVcGRhdGUsIHRoaXMpOwor ICAgICAgICB0aGlzLl9zbmFwc2hvdEhlYWRlci5fc25hcHNob3RSZWNlaXZlZChudWxsKTsKICAg ICB9LAogCiAgICAgZGlzcG9zZTogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDM0ODlhMDljMDU4YzhmMjUx MmFmZDg4ZTUzYTE2ZmEwZDczNjQzYTAuLjQwZGE0YzhhZmM4NWU0NmZiOGRlMDE4ZGU2OGFmMDI1 ZWQzMjAyMGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wNy0yNiAgRXVnZW5lIEtseXVj aG5pa292ICA8ZXVzdGFzLmJpZ0BnbWFpbC5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog UHJvZmlsZXM6IGNsZWFudXAgSGVhcFNuYXBzaG90UmVjZWl2ZXIgaW50ZXJmYWNlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjM5MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHRlc3QgdG8gYWRv cHQgbmV3IEFQSS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90 LWxvYWRlci5odG1sOgorCiAyMDEyLTA3LTI1ICBBbmRyZXcgV2lsc29uICA8YXR3aWxzb25AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgY2hyb21pdW0gZXhwZWN0YXRpb25zIGNo YW5nZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9oZWFwLXNu YXBzaG90LWxvYWRlci5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAt c25hcHNob3QtbG9hZGVyLmh0bWwKaW5kZXggMThlMjE4YTgyMzkyZDcyMWQxYmU0ODQzNmI3NTA3 ZDI3N2U1NmVmNC4uMjk3OTBmYzVlOTYxOGI5MzkxYmRhMDQzODk3ZDUxODQxMjY1OWY3MiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtbG9h ZGVyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNo b3QtbG9hZGVyLmh0bWwKQEAgLTIxLDcgKzIxLDggQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAg ICAgICB2YXIgbG9hZGVyID0gbmV3IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RMb2FkZXIoKTsK ICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwLCBsID0gc291cmNlU3RyaW5naWZpZWQubGVuZ3Ro OyBpIDwgbDsgaSArPSBwYXJ0U2l6ZSkKICAgICAgICAgICAgICAgICBsb2FkZXIucHVzaEpTT05D aHVuayhzb3VyY2VTdHJpbmdpZmllZC5zbGljZShpLCBpICsgcGFydFNpemUpKTsKLSAgICAgICAg ICAgIHZhciByZXN1bHQgPSBsb2FkZXIuZmluaXNoTG9hZGluZygpOworICAgICAgICAgICAgbG9h ZGVyLmZpbmlzaExvYWRpbmcoKTsKKyAgICAgICAgICAgIHZhciByZXN1bHQgPSBsb2FkZXIuYnVp bGRTbmFwc2hvdCgpOwogICAgICAgICAgICAgcmVzdWx0Ll9ub2RlcyA9IG5ldyBVaW50MzJBcnJh eShyZXN1bHQuX25vZGVzKTsKICAgICAgICAgICAgIHJlc3VsdC5fY29udGFpbm1lbnRFZGdlcyA9 IG5ldyBVaW50MzJBcnJheShyZXN1bHQuX2NvbnRhaW5tZW50RWRnZXMpOwogICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5hc3NlcnRTbmFwc2hvdEVxdWFscyhuZXcgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdChJbnNwZWN0b3JUZXN0LmNyZWF0ZUhlYXBTbmFwc2hvdE1vY2soKSksIHJlc3VsdCk7 CkBAIC03Nyw3ICs3OCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgICAgIFByb2Zp bGVyQWdlbnQuZ2V0UHJvZmlsZSA9IG9sZEdldFByb2ZpbGU7CiAgICAgICAgICAgICAgICAgbmV4 dCgpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVy KHByb2ZpbGVIZWFkZXIsICJfcGFyc2VkIiwgcGFyc2VkKTsKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuYWRkU25pZmZlcihwcm9maWxlSGVhZGVyLCAiX3NuYXBzaG90UmVjZWl2ZWQiLCBwYXJz ZWQpOwogCiAgICAgICAgICAgICBwYW5lbC5zaG93UHJvZmlsZShwcm9maWxlSGVhZGVyKTsKICAg ICAgICAgfSwKQEAgLTkzLDE1ICs5NCwxNSBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAg ICAgICB3ZWJraXRTbGljZTogZnVuY3Rpb24oYmVnaW4sIGVuZCkgeyByZXR1cm4gdGhpczsgfQog ICAgICAgICAgICAgfTsKIAotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkhlYXBQcm9maWxlSGVh ZGVyLnByb3RvdHlwZS5fY3JlYXRlRmlsZVJlYWRlciA9IGZ1bmN0aW9uKCkgeworICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5vdmVycmlkZShXZWJJbnNwZWN0b3IuSGVhcFByb2ZpbGVIZWFkZXIu cHJvdG90eXBlLCAnX2NyZWF0ZUZpbGVSZWFkZXInLCBmdW5jdGlvbihmaWxlTW9jaywgZGVsZWdh dGUpIHsKICAgICAgICAgICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgICAgICAgICByZWFk QXNUZXh0OiBmdW5jdGlvbihmaWxlUGFydCkgewogICAgICAgICAgICAgICAgICAgICAgICAgdmFy IHByb2ZpbGVIZWFkZXIgPSBwYW5lbC5fcHJvZmlsZXNbcGFuZWwuX3Byb2ZpbGVzLmxlbmd0aCAt IDFdOwotICAgICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKHBy b2ZpbGVIZWFkZXIsICJfcGFyc2VkIiwgZnVuY3Rpb24gcGFyc2VkKCkgeyBuZXh0KCk7IH0pOwog ICAgICAgICAgICAgICAgICAgICAgICAgcHJvZmlsZUhlYWRlci5fbmV4dENodW5rTG9hZGVkKHNv dXJjZVN0cmluZ2lmaWVkKTsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg IH07Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuYWRkU25pZmZlcihXZWJJbnNwZWN0b3IuSGVhcFByb2ZpbGVIZWFkZXIucHJvdG90eXBl LCAiX3NuYXBzaG90UmVjZWl2ZWQiLCBmdW5jdGlvbigpIHsgbmV4dCgpOyB9KTsKICAgICAgICAg ICAgIHBhbmVsLl9sb2FkRnJvbUZpbGUoZmlsZU1vY2spOwogICAgICAgICB9CiAgICAgXSk7Cg==