113576 2013-03-29 06:36:33 -0700 Web Inspector: Prompt before closing dirty tab. 2013-03-29 10:05:01 -0700 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 yurys oldest_to_newest 866126 0 vsevik 2013-03-29 06:36:33 -0700 We should never silently close tabs with dirty uiSourceCodes 866138 1 195741 vsevik 2013-03-29 06:57:23 -0700 Created attachment 195741 Patch 866210 2 195741 pfeldman 2013-03-29 10:01:38 -0700 Comment on attachment 195741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195741&action=review > Source/WebCore/inspector/front-end/TabbedEditorContainer.js:190 > + // FIXME(vsevik): this should be replaced with common Save/Discard/Cancel dialog. Please remove vsevik. 866212 3 vsevik 2013-03-29 10:05:01 -0700 Committed r147226: <http://trac.webkit.org/changeset/147226> 195741 2013-03-29 06:57:23 -0700 2013-03-29 10:01:38 -0700 Patch bug-113576-20130329175720.patch text/plain 9859 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA4MmMxNzhhOWJhMjE2 NmM3YjBiY2MyOWRiZmQzMzUwMmJhNzMyNC4uM2JlNDRjZWRkMDMzMzk0MzNhODFkZTE2ODMyMjg4 YTkzY2ZmYWU1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAzLTI5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFByb21wdCBiZWZvcmUgY2xvc2luZyBkaXJ0eSB0YWIuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1NzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVk RWRpdG9yQ29udGFpbmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNv bnRhaW5lcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLnBy b3RvdHlwZS5fbWF5YmVDbG9zZVRhYik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkRWRp dG9yQ29udGFpbmVyLnByb3RvdHlwZS5fY2xvc2VUYWJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5FZGl0b3JDb250YWluZXJUYWJEZWxlZ2F0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWRp dG9yQ29udGFpbmVyVGFiRGVsZWdhdGUucHJvdG90eXBlLmNsb3NlVGFicyk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRhYmJlZFBhbmUucHJvdG90eXBlLnNldFRhYkRlbGVnYXRlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UYWJiZWRQYW5lLnByb3RvdHlwZS5hcHBlbmRUYWIpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRhYmJlZFBhbmUucHJvdG90eXBlLmFsbFRhYnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRhYmJlZFBhbmUucHJvdG90eXBlLm90aGVyVGFicyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGFiYmVkUGFuZVRhYi5wcm90b3R5cGUuc2V0RGVsZWdhdGUpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlLl90YWJDbGlja2VkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZS5fY2xvc2VUYWJzKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UYWJiZWRQYW5lVGFiLnByb3RvdHlwZS5fdGFiQ29udGV4dE1lbnUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVUYWIucHJvdG90eXBlLl90YWJDb250ZXh0TWVu dS5jbG9zZU90aGVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZVRhYi5wcm90 b3R5cGUuX3RhYkNvbnRleHRNZW51LmNsb3NlQWxsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U YWJiZWRQYW5lVGFiRGVsZWdhdGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYmJlZFBhbmVU YWJEZWxlZ2F0ZS5wcm90b3R5cGUuY2xvc2VUYWJzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGUucHJvdG90eXBlLnJlc2V0V29ya2luZ0NvcHkpOgorCiAyMDEzLTAzLTI4ICBQaGlsaXAgUm9n ZXJzICA8cGRyQGdvb2dsZS5jb20+CiAKICAgICAgICAgRml4IGNvbXBpbGVyIHdhcm5pbmcgaW4g SURCVHJhbnNhY3Rpb246Om1vZGVUb1N0cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwppbmRleCA4 NDE3YWM2Yjc0MmNlMzdkZGQzMTE5Yjc1MjRiYzYwZDUwZjA4ZDM1Li5jZjc4N2Q5YmRlMWNjYmZk YjU3YmVkNjM5MDkwMzRlZmY4NzFjYWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qcwpAQCAtNTEs NiArNTEsOCBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyID0gZnVuY3Rpb24o ZGVsZWdhdGUsIHNldHRpbmdOYW1lKQogICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGU7CiAK ICAgICB0aGlzLl90YWJiZWRQYW5lID0gbmV3IFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lKCk7Cisg ICAgdGhpcy5fdGFiYmVkUGFuZS5zZXRUYWJEZWxlZ2F0ZShuZXcgV2ViSW5zcGVjdG9yLkVkaXRv ckNvbnRhaW5lclRhYkRlbGVnYXRlKHRoaXMpKTsKKwogICAgIHRoaXMuX3RhYmJlZFBhbmUuY2xv c2VhYmxlVGFicyA9IHRydWU7CiAgICAgdGhpcy5fdGFiYmVkUGFuZS5lbGVtZW50LmlkID0gInNj cmlwdHMtZWRpdG9yLWNvbnRhaW5lci10YWJiZWQtcGFuZSI7CiAKQEAgLTE3OCw2ICsxODAsNTAg QEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lci5wcm90b3R5cGUgPSB7CiAgICAg fSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAorICAgICAqIEBwYXJhbSB7 c3RyaW5nfSBuZXh0VGFiSWQKKyAgICAgKi8KKyAgICBfbWF5YmVDbG9zZVRhYjogZnVuY3Rpb24o aWQsIG5leHRUYWJJZCkKKyAgICB7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSB0aGlzLl9m aWxlc1tpZF07CisgICAgICAgIHZhciBzaG91bGRQcm9tcHQgPSB1aVNvdXJjZUNvZGUuaXNEaXJ0 eSgpICYmIHVpU291cmNlQ29kZS5wcm9qZWN0KCkuY2FuU2V0RmlsZUNvbnRlbnQoKTsKKyAgICAg ICAgLy8gRklYTUUodnNldmlrKTogdGhpcyBzaG91bGQgYmUgcmVwbGFjZWQgd2l0aCBjb21tb24g U2F2ZS9EaXNjYXJkL0NhbmNlbCBkaWFsb2cuCisgICAgICAgIGlmICghc2hvdWxkUHJvbXB0IHx8 IGNvbmZpcm0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8g Y2xvc2UgdW5zYXZlZCBmaWxlOiAlcz8iLCB1aVNvdXJjZUNvZGUubmFtZSgpKSkpIHsKKyAgICAg ICAgICAgIHVpU291cmNlQ29kZS5yZXNldFdvcmtpbmdDb3B5KCk7CisgICAgICAgICAgICBpZiAo bmV4dFRhYklkKQorICAgICAgICAgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKG5l eHRUYWJJZCwgdHJ1ZSk7CisgICAgICAgICAgICB0aGlzLl90YWJiZWRQYW5lLmNsb3NlVGFiKGlk LCB0cnVlKTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtBcnJheS48c3Ry aW5nPn0gaWRzCisgICAgICovCisgICAgX2Nsb3NlVGFiczogZnVuY3Rpb24oaWRzKQorICAgIHsK KyAgICAgICAgdmFyIGRpcnR5VGFicyA9IFtdOworICAgICAgICB2YXIgY2xlYW5UYWJzID0gW107 CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgaWRzLmxlbmd0aDsgKytpKSB7CisgICAgICAg ICAgICB2YXIgaWQgPSBpZHNbaV07CisgICAgICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gdGhp cy5fZmlsZXNbaWRdOworICAgICAgICAgICAgaWYgKHVpU291cmNlQ29kZS5pc0RpcnR5KCkpCisg ICAgICAgICAgICAgICAgZGlydHlUYWJzLnB1c2goaWQpOworICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgIGNsZWFuVGFicy5wdXNoKGlkKTsKKyAgICAgICAgfQorICAgICAgICBpZiAo ZGlydHlUYWJzLmxlbmd0aCkKKyAgICAgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFi KGRpcnR5VGFic1swXSwgdHJ1ZSk7CisgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuY2xvc2VUYWJz KGNsZWFuVGFicywgdHJ1ZSk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZGlydHlUYWJz Lmxlbmd0aDsgKytpKSB7CisgICAgICAgICAgICB2YXIgbmV4dFRhYklkID0gaSArIDEgPCBkaXJ0 eVRhYnMubGVuZ3RoID8gZGlydHlUYWJzW2kgKyAxXSA6IG51bGw7CisgICAgICAgICAgICBpZiAo IXRoaXMuX21heWJlQ2xvc2VUYWIoZGlydHlUYWJzW2ldLCBuZXh0VGFiSWQpKQorICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJh bSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCiAgICAgICovCiAgICAg YWRkVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCkBAIC02MDYsMyArNjUyLDI0 IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIuSGlzdG9yeS5wcm90b3R5cGUg PSB7CiAKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlCiB9CisK Ky8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLlRhYmJl ZFBhbmVUYWJEZWxlZ2F0ZX0KKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNv bnRhaW5lcn0gZWRpdG9yQ29udGFpbmVyCisgKi8KK1dlYkluc3BlY3Rvci5FZGl0b3JDb250YWlu ZXJUYWJEZWxlZ2F0ZSA9IGZ1bmN0aW9uKGVkaXRvckNvbnRhaW5lcikKK3sKKyAgICB0aGlzLl9l ZGl0b3JDb250YWluZXIgPSBlZGl0b3JDb250YWluZXI7Cit9CisKK1dlYkluc3BlY3Rvci5FZGl0 b3JDb250YWluZXJUYWJEZWxlZ2F0ZS5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHBh cmFtIHtXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZX0gdGFiYmVkUGFuZQorICAgICAqIEBwYXJhbSB7 QXJyYXkuPHN0cmluZz59IGlkcworICAgICAqLworICAgIGNsb3NlVGFiczogZnVuY3Rpb24odGFi YmVkUGFuZSwgaWRzKQorICAgIHsKKyAgICAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLl9jbG9z ZVRhYnMoaWRzKTsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RhYmJlZFBhbmUuanMKaW5kZXggZmMyYTI4ZmNhOTU4ZjMxMTNjODM3YTM4ZjQ4MWRi Y2M0NzViOTI0ZS4uNTQ0NjQxY2Q0MTZjZGUxZWJhM2Q3ZDk0N2ZkZTU2ZmEyYTkxNzEzNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwpA QCAtMTAyLDYgKzEwMiwxNyBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7 CiAgICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRhYmJlZFBh bmVUYWJEZWxlZ2F0ZX0gZGVsZWdhdGUKKyAgICAgKi8KKyAgICBzZXRUYWJEZWxlZ2F0ZTogZnVu Y3Rpb24oZGVsZWdhdGUpCisgICAgeworICAgICAgICB2YXIgdGFicyA9IHRoaXMuX3RhYnMuc2xp Y2UoKTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0YWJzLmxlbmd0aDsgKytpKQorICAg ICAgICAgICAgdGFic1tpXS5zZXREZWxlZ2F0ZShkZWxlZ2F0ZSk7CisgICAgICAgIHRoaXMuX2Rl bGVnYXRlID0gZGVsZWdhdGU7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJhbSB7RXZl bnR9IGV2ZW50CiAgICAgICovCiAgICAgb25Nb3VzZVVwOiBmdW5jdGlvbihldmVudCkKQEAgLTEy MSw2ICsxMzIsNyBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7CiAgICAg YXBwZW5kVGFiOiBmdW5jdGlvbihpZCwgdGFiVGl0bGUsIHZpZXcsIHRhYlRvb2x0aXAsIHVzZXJH ZXN0dXJlKQogICAgIHsKICAgICAgICAgdmFyIHRhYiA9IG5ldyBXZWJJbnNwZWN0b3IuVGFiYmVk UGFuZVRhYih0aGlzLCBpZCwgdGFiVGl0bGUsIHRoaXMuX2Nsb3NlYWJsZVRhYnMsIHZpZXcsIHRh YlRvb2x0aXApOworICAgICAgICB0YWIuc2V0RGVsZWdhdGUodGhpcy5fZGVsZWdhdGUpOwogICAg ICAgICB0aGlzLl90YWJzQnlJZFtpZF0gPSB0YWI7CiAKICAgICAgICAgdGhpcy5fdGFicy5wdXNo KHRhYik7CkBAIC0xNzcsMjggKzE4OSwzMCBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZS5wcm90 b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7Ym9vbGVhbj19IHVz ZXJHZXN0dXJlCisgICAgICogQHJldHVybiB7QXJyYXkuPHN0cmluZz59CiAgICAgICovCi0gICAg Y2xvc2VBbGxUYWJzOiBmdW5jdGlvbih1c2VyR2VzdHVyZSkKKyAgICBhbGxUYWJzOiBmdW5jdGlv bigpCiAgICAgeworICAgICAgICB2YXIgcmVzdWx0ID0gW107CiAgICAgICAgIHZhciB0YWJzID0g dGhpcy5fdGFicy5zbGljZSgpOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRhYnMubGVu Z3RoOyArK2kpCi0gICAgICAgICAgICB0aGlzLl9pbm5lckNsb3NlVGFiKHRhYnNbaV0uaWQsIHVz ZXJHZXN0dXJlKTsKLSAgICAgICAgdGhpcy5fdXBkYXRlVGFiRWxlbWVudHMoKTsKKyAgICAgICAg ICAgIHJlc3VsdC5wdXNoKHRhYnNbaV0uaWQpOworICAgICAgICByZXR1cm4gcmVzdWx0OwogICAg IH0sCiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge3N0cmluZ30gaWQKKyAgICAgKiBAcmV0dXJu IHtBcnJheS48c3RyaW5nPn0KICAgICAgKi8KLSAgICBjbG9zZU90aGVyVGFiczogZnVuY3Rpb24o aWQpCisgICAgb3RoZXJUYWJzOiBmdW5jdGlvbihpZCkKICAgICB7CisgICAgICAgIHZhciByZXN1 bHQgPSBbXTsKICAgICAgICAgdmFyIHRhYnMgPSB0aGlzLl90YWJzLnNsaWNlKCk7CiAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgdGFicy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgaWYg KHRhYnNbaV0uaWQgIT09IGlkKQotICAgICAgICAgICAgICAgIHRoaXMuX2lubmVyQ2xvc2VUYWIo dGFic1tpXS5pZCwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgcmVzdWx0LnB1c2godGFic1tpXS5p ZCk7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5fdXBkYXRlVGFiRWxlbWVudHMoKTsKLSAgICAg ICAgdGhpcy5zZWxlY3RUYWIoaWQsIHRydWUpOworICAgICAgICByZXR1cm4gcmVzdWx0OwogICAg IH0sCiAKICAgICAvKioKQEAgLTY3NCw2ICs2ODgsMTQgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZFBh bmVUYWIucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5UYWJiZWRQYW5lVGFiRGVsZWdhdGV9IGRlbGVnYXRlCisgICAgICovCisgICAg c2V0RGVsZWdhdGU6IGZ1bmN0aW9uKGRlbGVnYXRlKQorICAgIHsKKyAgICAgICAgdGhpcy5fZGVs ZWdhdGUgPSBkZWxlZ2F0ZTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHBhcmFtIHtib29s ZWFufSBtZWFzdXJpbmcKICAgICAgKi8KICAgICBfY3JlYXRlVGFiRWxlbWVudDogZnVuY3Rpb24o bWVhc3VyaW5nKQpAQCAtNzE1LDcgKzczNyw3IEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFi LnByb3RvdHlwZSA9IHsKICAgICBfdGFiQ2xpY2tlZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewog ICAgICAgICBpZiAodGhpcy5fY2xvc2VhYmxlICYmIChldmVudC5idXR0b24gPT09IDEgfHwgZXZl bnQudGFyZ2V0Lmhhc1N0eWxlQ2xhc3MoInRhYmJlZC1wYW5lLWhlYWRlci10YWItY2xvc2UtYnV0 dG9uIikpKQotICAgICAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5jbG9zZVRhYih0aGlzLmlkLCB0 cnVlKTsKKyAgICAgICAgICAgIHRoaXMuX2Nsb3NlVGFicyhbdGhpcy5pZF0pOwogICAgIH0sCiAK ICAgICAvKioKQEAgLTcyOCwyMSArNzUwLDMzIEBAIFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFi LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5zZWxlY3RUYWIodGhpcy5p ZCwgdHJ1ZSk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7QXJyYXkuPHN0cmlu Zz59IGlkcworICAgICAqLworICAgIF9jbG9zZVRhYnM6IGZ1bmN0aW9uKGlkcykKKyAgICB7Cisg ICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZSkgeworICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUu Y2xvc2VUYWJzKHRoaXMuX3RhYmJlZFBhbmUsIGlkcyk7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKyAgICAgICAgdGhpcy5fdGFiYmVkUGFuZS5jbG9zZVRhYnMoaWRzLCB0cnVlKTsK KyAgICB9LAorCiAgICAgX3RhYkNvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAg ICAgICAgIGZ1bmN0aW9uIGNsb3NlKCkKICAgICAgICAgewotICAgICAgICAgICAgdGhpcy5fdGFi YmVkUGFuZS5jbG9zZVRhYih0aGlzLmlkLCB0cnVlKTsKKyAgICAgICAgICAgIHRoaXMuX2Nsb3Nl VGFicyhbdGhpcy5pZF0pOwogICAgICAgICB9CiAgIAogICAgICAgICBmdW5jdGlvbiBjbG9zZU90 aGVycygpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuY2xvc2VPdGhl clRhYnModGhpcy5pZCk7CisgICAgICAgICAgICB0aGlzLl9jbG9zZVRhYnModGhpcy5fdGFiYmVk UGFuZS5vdGhlclRhYnModGhpcy5pZCkpOwogICAgICAgICB9CiAgIAogICAgICAgICBmdW5jdGlv biBjbG9zZUFsbCgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuX3RhYmJlZFBhbmUuY2xv c2VBbGxUYWJzKHRydWUpOworICAgICAgICAgICAgdGhpcy5fY2xvc2VUYWJzKHRoaXMuX3RhYmJl ZFBhbmUuYWxsVGFicyh0aGlzLmlkKSk7CiAgICAgICAgIH0KICAgCiAgICAgICAgIHZhciBjb250 ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQpOwpAQCAtODE3LDMg Kzg1MSwxOCBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZVRhYi5wcm90b3R5cGUgPSB7CiAgICAg ICAgIGRlbGV0ZSB0aGlzLl9kcmFnU3RhcnRYOwogICAgIH0KIH0KKworLyoqCisgKiBAaW50ZXJm YWNlCisgKi8KK1dlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiRGVsZWdhdGUgPSBmdW5jdGlvbigp Cit7Cit9CisKK1dlYkluc3BlY3Rvci5UYWJiZWRQYW5lVGFiRGVsZWdhdGUucHJvdG90eXBlID0g eworICAgIC8qKgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRhYmJlZFBhbmV9IHRhYmJl ZFBhbmUKKyAgICAgKiBAcGFyYW0ge0FycmF5LjxzdHJpbmc+fSBpZHMKKyAgICAgKi8KKyAgICBj bG9zZVRhYnM6IGZ1bmN0aW9uKHRhYmJlZFBhbmUsIGlkcykgeyB9Cit9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IDY0YTJl NzZhNDQ5MWFkZThlOWQ0NGQ0ZGJmMzdmMmYyZmNlMmE2ZGEuLjkyNzRmMGVkNGFjZjMxNjk3OWQ0 MzBiODliY2NhZTVhYzY1NWRiNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzCkBAIC0zOTcsNiArMzk3LDExIEBAIFdlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fY29u dGVudDsKICAgICB9LAogCisgICAgcmVzZXRXb3JraW5nQ29weTogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgdGhpcy5zZXRXb3JraW5nQ29weSh0aGlzLl9jb250ZW50KTsKKyAgICB9LAorCiAg ICAgLyoqCiAgICAgICogQHBhcmFtIHtzdHJpbmd9IG5ld1dvcmtpbmdDb3B5CiAgICAgICovCg==