110878 2013-02-26 06:41:17 -0800 Web Inspector: Migrate FileSystem inspection support to ResourceTreeModel's SecurityOriginAdded/Removed events. 2013-02-26 08:01:42 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 vsevik vsevik apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 841955 0 vsevik 2013-02-26 06:41:17 -0800 Patch to follow 841958 1 190273 vsevik 2013-02-26 06:44:12 -0800 Created attachment 190273 Patch 842006 2 190273 webkit.review.bot 2013-02-26 08:01:38 -0800 Comment on attachment 190273 Patch Clearing flags on attachment: 190273 Committed r144058: <http://trac.webkit.org/changeset/144058> 842007 3 webkit.review.bot 2013-02-26 08:01:42 -0800 All reviewed patches have been landed. Closing bug. 190273 2013-02-26 06:44:12 -0800 2013-02-26 08:01:38 -0800 Patch bug-110878-20130226184026.patch text/plain 8337 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0MDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTRlNTk3NzY1NjNjMDk2 MTM0NTc1NDAzMTE2ODQ3ZWQzOTQ3NDMzNy4uNzY2NGIyYzRlZDJkYmQxN2Y2NzI4YmMxNDgwNDNm ZjMxOWZjZjdkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAyLTI2ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE1pZ3JhdGUgRmlsZVN5c3RlbSBpbnNwZWN0aW9uIHN1cHBvcnQgdG8gUmVzb3VyY2VUcmVl TW9kZWwncyBTZWN1cml0eU9yaWdpbkFkZGVkL1JlbW92ZWQgZXZlbnRzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwODc4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVjZW50bHkgYWRkZWQgU2VjdXJp dHlPcmlnaW5BZGRlZC9SZW1vdmVkIGV2ZW50cyBzdXBwb3J0IHdhcyBlc3NlbnRpYWxseSBkdXBs aWNhdGVkIGluCisgICAgICAgIEZpbGVTeXN0ZW1Nb2RlbC4gVGhpcyBwYXRjaCBtaWdyYXRlcyBG aWxlU3lzdGVtIGluc3BlY3Rpb24gc3VwcG9ydCB0byBuZXcgZXZlbnRzLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lzdGVtTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRmlsZVN5c3RlbU1vZGVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVt TW9kZWwucHJvdG90eXBlLl9yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bU1vZGVsLnByb3RvdHlwZS5fc2VjdXJpdHlPcmlnaW5BZGRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3RvdHlwZS5fc2VjdXJpdHlPcmlnaW5SZW1vdmVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwucHJvdG90eXBlLl9hZGRPcmln aW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUuX3Jl bW92ZU9yaWdpbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3Rv dHlwZS5yZWZyZXNoRmlsZVN5c3RlbUxpc3QpOgorCiAyMDEzLTAyLTI2ICBBbmRyZXkgS29zeWFr b3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjE0NDA0MSwgcjE0NDA0NCwgYW5kIHIxNDQwNDguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1Nb2RlbC5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzCmluZGV4IDk1M2NhY2Uy NWIwNzNhNWU2ODgwMzY5NDVjZTk2NTFiOTZjMTJmOGUuLjE0YzEzNzJjZDQyYjdjNTU4YWVhYjJh MzFlMTUzYTg1NDdiMjY5YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRmlsZVN5c3RlbU1vZGVsLmpzCkBAIC0zNiwxMTkgKzM2LDY3IEBAIFdlYklu c3BlY3Rvci5GaWxlU3lzdGVtTW9kZWwgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9y Lk9iamVjdC5jYWxsKHRoaXMpOwogCi0gICAgdGhpcy5fb3JpZ2luRm9yRnJhbWVJZCA9IHt9Owot ICAgIHRoaXMuX2ZyYW1lSWRzRm9yT3JpZ2luID0ge307CiAgICAgdGhpcy5fZmlsZVN5c3RlbXNG b3JPcmlnaW4gPSB7fTsKIAotICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZy YW1lQWRkZWQsIHRoaXMuX2ZyYW1lQWRkZWQsIHRoaXMpOwotICAgIFdlYkluc3BlY3Rvci5yZXNv dXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVN b2RlbC5FdmVudFR5cGVzLkZyYW1lTmF2aWdhdGVkLCB0aGlzLl9mcmFtZU5hdmlnYXRlZCwgdGhp cyk7Ci0gICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIo V2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuRnJhbWVEZXRhY2hlZCwg dGhpcy5fZnJhbWVEZXRhY2hlZCwgdGhpcyk7CisgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJl ZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2 ZW50VHlwZXMuU2VjdXJpdHlPcmlnaW5BZGRlZCwgdGhpcy5fc2VjdXJpdHlPcmlnaW5BZGRlZCwg dGhpcyk7CisgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuU2VjdXJpdHlPcmln aW5SZW1vdmVkLCB0aGlzLl9zZWN1cml0eU9yaWdpblJlbW92ZWQsIHRoaXMpOwogCiAgICAgRmls ZVN5c3RlbUFnZW50LmVuYWJsZSgpOwogCi0gICAgaWYgKFdlYkluc3BlY3Rvci5yZXNvdXJjZVRy ZWVNb2RlbC5tYWluRnJhbWUpCi0gICAgICAgIHRoaXMuX2F0dGFjaEZyYW1lUmVjdXJzaXZlbHko V2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLm1haW5GcmFtZSk7CisgICAgdGhpcy5fcmVz ZXQoKTsKIH0KIAogV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUgPSB7Ci0g ICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50Ci0gICAgICov Ci0gICAgX2ZyYW1lQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9yZXNldDogZnVuY3Rpb24o KQogICAgIHsKLSAgICAgICAgdmFyIGZyYW1lID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuUmVz b3VyY2VUcmVlRnJhbWV9ICovIChldmVudC5kYXRhKTsKLSAgICAgICAgdGhpcy5fYXR0YWNoRnJh bWVSZWN1cnNpdmVseShmcmFtZSk7CisgICAgICAgIGZvciAodmFyIHNlY3VyaXR5T3JpZ2luIGlu IHRoaXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luKQorICAgICAgICAgICAgdGhpcy5fcmVtb3ZlT3Jp Z2luKHNlY3VyaXR5T3JpZ2luKTsKKyAgICAgICAgdmFyIHNlY3VyaXR5T3JpZ2lucyA9IFdlYklu c3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5zZWN1cml0eU9yaWdpbnMoKTsKKyAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBzZWN1cml0eU9yaWdpbnMubGVuZ3RoOyArK2kpCisgICAgICAgICAg ICB0aGlzLl9hZGRPcmlnaW4oc2VjdXJpdHlPcmlnaW5zW2ldKTsKICAgICB9LAogCiAgICAgLyoq CiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CiAgICAgICovCi0gICAg X2ZyYW1lTmF2aWdhdGVkOiBmdW5jdGlvbihldmVudCkKKyAgICBfc2VjdXJpdHlPcmlnaW5BZGRl ZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgZnJhbWUgPSAvKiogQHR5cGUg e1dlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVGcmFtZX0gKi8gKGV2ZW50LmRhdGEpOwotICAgICAg ICB0aGlzLl9hdHRhY2hGcmFtZVJlY3Vyc2l2ZWx5KGZyYW1lKTsKKyAgICAgICAgdmFyIHNlY3Vy aXR5T3JpZ2luID0gLyoqIEB0eXBlIHtzdHJpbmd9ICovIChldmVudC5kYXRhKTsKKyAgICAgICAg dGhpcy5fYWRkT3JpZ2luKHNlY3VyaXR5T3JpZ2luKTsKICAgICB9LAogCiAgICAgLyoqCiAgICAg ICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CiAgICAgICovCi0gICAgX2ZyYW1l RGV0YWNoZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9zZWN1cml0eU9yaWdpblJlbW92ZWQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIGZyYW1lID0gLyoqIEB0eXBlIHtXZWJJ bnNwZWN0b3IuUmVzb3VyY2VUcmVlRnJhbWV9ICovIChldmVudC5kYXRhKTsKLSAgICAgICAgdGhp cy5fZGV0YWNoRnJhbWVSZWN1cnNpdmVseShmcmFtZSk7CisgICAgICAgIHZhciBzZWN1cml0eU9y aWdpbiA9IC8qKiBAdHlwZSB7c3RyaW5nfSAqLyAoZXZlbnQuZGF0YSk7CisgICAgICAgIHRoaXMu X3JlbW92ZU9yaWdpbihzZWN1cml0eU9yaWdpbik7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAq IEBwYXJhbSB7V2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUZyYW1lfSBmcmFtZQorICAgICAqIEBw YXJhbSB7c3RyaW5nfSBzZWN1cml0eU9yaWdpbgogICAgICAqLwotICAgIF9hdHRhY2hGcmFtZTog ZnVuY3Rpb24oZnJhbWUpCisgICAgX2FkZE9yaWdpbjogZnVuY3Rpb24oc2VjdXJpdHlPcmlnaW4p CiAgICAgewotICAgICAgICBpZiAodGhpcy5fb3JpZ2luRm9yRnJhbWVJZFtmcmFtZS5pZF0pCi0g ICAgICAgICAgICB0aGlzLl9kZXRhY2hGcmFtZVJlY3Vyc2l2ZWx5KGZyYW1lKTsKLQotICAgICAg ICBpZiAoZnJhbWUuc2VjdXJpdHlPcmlnaW4gPT09ICJudWxsIikKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICB0aGlzLl9vcmlnaW5Gb3JGcmFtZUlkW2ZyYW1lLmlkXSA9IGZyYW1lLnNl Y3VyaXR5T3JpZ2luOworICAgICAgICB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltzZWN1cml0 eU9yaWdpbl0gPSB7fTsKIAotICAgICAgICB2YXIgbmV3T3JpZ2luID0gZmFsc2U7Ci0gICAgICAg IGlmICghdGhpcy5fZnJhbWVJZHNGb3JPcmlnaW5bZnJhbWUuc2VjdXJpdHlPcmlnaW5dKSB7Ci0g ICAgICAgICAgICB0aGlzLl9mcmFtZUlkc0Zvck9yaWdpbltmcmFtZS5zZWN1cml0eU9yaWdpbl0g PSB7fTsKLSAgICAgICAgICAgIG5ld09yaWdpbiA9IHRydWU7Ci0gICAgICAgIH0KLSAgICAgICAg dGhpcy5fZnJhbWVJZHNGb3JPcmlnaW5bZnJhbWUuc2VjdXJpdHlPcmlnaW5dW2ZyYW1lLmlkXSA9 IGZyYW1lLmlkOwotICAgICAgICBpZiAobmV3T3JpZ2luKQotICAgICAgICAgICAgdGhpcy5fb3Jp Z2luQWRkZWQoZnJhbWUuc2VjdXJpdHlPcmlnaW4pOworICAgICAgICB2YXIgdHlwZXMgPSBbInBl cnNpc3RlbnQiLCAidGVtcG9yYXJ5Il07CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdHlw ZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlzLl9yZXF1ZXN0RmlsZVN5c3RlbVJvb3Qo c2VjdXJpdHlPcmlnaW4sIHR5cGVzW2ldLCB0aGlzLl9maWxlU3lzdGVtUm9vdFJlY2VpdmVkLmJp bmQodGhpcywgc2VjdXJpdHlPcmlnaW4sIHR5cGVzW2ldLCB0aGlzLl9maWxlU3lzdGVtc0Zvck9y aWdpbltzZWN1cml0eU9yaWdpbl0pKTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRnJhbWV9IGZyYW1lCisgICAgICogQHBhcmFtIHtz dHJpbmd9IHNlY3VyaXR5T3JpZ2luCiAgICAgICovCi0gICAgX2F0dGFjaEZyYW1lUmVjdXJzaXZl bHk6IGZ1bmN0aW9uKGZyYW1lKQorICAgIF9yZW1vdmVPcmlnaW46IGZ1bmN0aW9uKHNlY3VyaXR5 T3JpZ2luKQogICAgIHsKLSAgICAgICAgdGhpcy5fYXR0YWNoRnJhbWUoZnJhbWUpOwotICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IGZyYW1lLmNoaWxkRnJhbWVzLmxlbmd0aDsgKytpKQotICAg ICAgICAgICAgdGhpcy5fYXR0YWNoRnJhbWVSZWN1cnNpdmVseShmcmFtZS5jaGlsZEZyYW1lc1tp XSk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlJlc291 cmNlVHJlZUZyYW1lfSBmcmFtZQotICAgICAqLwotICAgIF9kZXRhY2hGcmFtZTogZnVuY3Rpb24o ZnJhbWUpCi0gICAgewotICAgICAgICBpZiAoIXRoaXMuX29yaWdpbkZvckZyYW1lSWRbZnJhbWUu aWRdKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIgb3JpZ2luID0gdGhpcy5fb3Jp Z2luRm9yRnJhbWVJZFtmcmFtZS5pZF07Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9vcmlnaW5Gb3JG cmFtZUlkW2ZyYW1lLmlkXTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2ZyYW1lSWRzRm9yT3JpZ2lu W29yaWdpbl1bZnJhbWUuaWRdOwotCi0gICAgICAgIHZhciBsYXN0T3JpZ2luID0gT2JqZWN0Lmlz RW1wdHkodGhpcy5fZnJhbWVJZHNGb3JPcmlnaW5bb3JpZ2luXSk7Ci0gICAgICAgIGlmIChsYXN0 T3JpZ2luKSB7Ci0gICAgICAgICAgICBkZWxldGUgdGhpcy5fZnJhbWVJZHNGb3JPcmlnaW5bb3Jp Z2luXTsKLSAgICAgICAgICAgIHRoaXMuX29yaWdpblJlbW92ZWQob3JpZ2luKTsKKyAgICAgICAg Zm9yICh2YXIgdHlwZSBpbiB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltzZWN1cml0eU9yaWdp bl0pIHsKKyAgICAgICAgICAgIHZhciBmaWxlU3lzdGVtID0gdGhpcy5fZmlsZVN5c3RlbXNGb3JP cmlnaW5bc2VjdXJpdHlPcmlnaW5dW3R5cGVdOworICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2Zp bGVTeXN0ZW1zRm9yT3JpZ2luW3NlY3VyaXR5T3JpZ2luXVt0eXBlXTsKKyAgICAgICAgICAgIHRo aXMuX2ZpbGVTeXN0ZW1SZW1vdmVkKGZpbGVTeXN0ZW0pOwogICAgICAgICB9Ci0gICAgfSwKLQot ICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZUZyYW1lfSBm cmFtZQotICAgICAqLwotICAgIF9kZXRhY2hGcmFtZVJlY3Vyc2l2ZWx5OiBmdW5jdGlvbihmcmFt ZSkKLSAgICB7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZnJhbWUuY2hpbGRGcmFtZXMu bGVuZ3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLl9kZXRhY2hGcmFtZVJlY3Vyc2l2ZWx5KGZy YW1lLmNoaWxkRnJhbWVzW2ldKTsKLSAgICAgICAgdGhpcy5fZGV0YWNoRnJhbWUoZnJhbWUpOwot ICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmluZ30gb3JpZ2luCi0gICAgICov Ci0gICAgX29yaWdpbkFkZGVkOiBmdW5jdGlvbihvcmlnaW4pCi0gICAgewotICAgICAgICB0aGlz Ll9maWxlU3lzdGVtc0Zvck9yaWdpbltvcmlnaW5dID0ge307Ci0KLSAgICAgICAgdmFyIHR5cGVz ID0gWyJwZXJzaXN0ZW50IiwgInRlbXBvcmFyeSJdOwotICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IHR5cGVzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgdGhpcy5fcmVxdWVzdEZpbGVTeXN0 ZW1Sb290KG9yaWdpbiwgdHlwZXNbaV0sIHRoaXMuX2ZpbGVTeXN0ZW1Sb290UmVjZWl2ZWQuYmlu ZCh0aGlzLCBvcmlnaW4sIHR5cGVzW2ldLCB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltvcmln aW5dKSk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltzZWN1cml0 eU9yaWdpbl07CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMTc3LDE5ICsxMjUsNiBAQCBXZWJJbnNw ZWN0b3IuRmlsZVN5c3RlbU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0g ICAgICogQHBhcmFtIHtzdHJpbmd9IG9yaWdpbgotICAgICAqLwotICAgIF9vcmlnaW5SZW1vdmVk OiBmdW5jdGlvbihvcmlnaW4pCi0gICAgewotICAgICAgICBmb3IgKHZhciB0eXBlIGluIHRoaXMu X2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29yaWdpbl0pIHsKLSAgICAgICAgICAgIHZhciBmaWxlU3lz dGVtID0gdGhpcy5fZmlsZVN5c3RlbXNGb3JPcmlnaW5bb3JpZ2luXVt0eXBlXTsKLSAgICAgICAg ICAgIGRlbGV0ZSB0aGlzLl9maWxlU3lzdGVtc0Zvck9yaWdpbltvcmlnaW5dW3R5cGVdOwotICAg ICAgICAgICAgdGhpcy5fZmlsZVN5c3RlbVJlbW92ZWQoZmlsZVN5c3RlbSk7Ci0gICAgICAgIH0K LSAgICAgICAgZGVsZXRlIHRoaXMuX2ZpbGVTeXN0ZW1zRm9yT3JpZ2luW29yaWdpbl07Ci0gICAg fSwKLQotICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1Nb2Rl bC5GaWxlU3lzdGVtfSBmaWxlU3lzdGVtCiAgICAgICovCiAgICAgX2ZpbGVTeXN0ZW1BZGRlZDog ZnVuY3Rpb24oZmlsZVN5c3RlbSkKQEAgLTIwNywxMCArMTQyLDcgQEAgV2ViSW5zcGVjdG9yLkZp bGVTeXN0ZW1Nb2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICByZWZyZXNoRmlsZVN5c3RlbUxpc3Q6 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVl TW9kZWwubWFpbkZyYW1lKSB7Ci0gICAgICAgICAgICB0aGlzLl9kZXRhY2hGcmFtZVJlY3Vyc2l2 ZWx5KFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5tYWluRnJhbWUpOwotICAgICAgICAg ICAgdGhpcy5fYXR0YWNoRnJhbWVSZWN1cnNpdmVseShXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVl TW9kZWwubWFpbkZyYW1lKTsKLSAgICAgICAgfQorICAgICAgICB0aGlzLl9yZXNldCgpOwogICAg IH0sCiAKICAgICAvKioK