88847 2012-06-12 02:21:09 -0700 Web Inspector: allow clearing revision history. 2012-06-12 09:57:41 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 646754 0 pfeldman 2012-06-12 02:21:09 -0700 This change also renames "Revision history" to "Local modifications". I intend to list modifications to all files in that view in the subsequent change. 646756 1 147040 pfeldman 2012-06-12 02:23:32 -0700 Created attachment 147040 Patch 647023 2 pfeldman 2012-06-12 09:57:41 -0700 Committed r120086: <http://trac.webkit.org/changeset/120086> 147040 2012-06-12 02:23:32 -0700 2012-06-12 08:49:49 -0700 Patch bug-88847-20120612132325.patch text/plain 9581 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5ODk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAzYWIzZWJhY2JjOWU5 OWY4NzBmM2NhNDM3YTY5Yjg3ODE2ODhlOS4uYjYzZjQ0MTRmYmY3YTEzOWE3NjUwYmY3ZmUxZjU3 ZWZlOGQ2N2RjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA2LTEyICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFsbG93IGNsZWFyaW5nIHJldmlzaW9uIGhpc3RvcnkuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODg0NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIGFsc28gcmVuYW1lcyAiUmV2 aXNpb24gaGlzdG9yeSIgdG8gIkxvY2FsIG1vZGlmaWNhdGlvbnMiLgorICAgICAgICBJIGludGVu ZCB0byBsaXN0IG1vZGlmaWNhdGlvbnMgdG8gYWxsIGZpbGVzIGluIHRoYXQgdmlldyBpbiB0aGUg c3Vic2VxdWVudCBjaGFuZ2UuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0 cmluZ3MuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5fY2xlYXJSZXNvdXJjZUhpc3RvcnkpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmV2aXNpb25IaXN0b3J5Vmlldy5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXZpc2lvbkhpc3RvcnlWaWV3LmVsc2UuY2xlYXJIaXN0b3J5KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXZpc2lvbkhpc3RvcnlWaWV3KToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXZpc2lvbkhpc3RvcnlWaWV3LnByb3RvdHlwZS5fcmV2aXNpb25BZGRlZCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmV2aXNpb25IaXN0b3J5VHJlZUVsZW1lbnQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJldmlzaW9uSGlzdG9yeVRyZWVFbGVtZW50LnByb3RvdHlwZS5f Y3JlYXRlTGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmV2aXNpb25IaXN0b3J5VHJlZUVs ZW1lbnQucHJvdG90eXBlLmFsbG93UmV2ZXJ0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu cHJvdG90eXBlLmFwcGVuZEFwcGxpY2FibGVJdGVtcyk6CisKIDIwMTItMDYtMTEgIFBhdmVsIEZl bGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog dXNlIGpzZGlmZmxpYiBmb3IgcmV2aXNpb24gZGlmZiBjYWxjdWxhdGlvbi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAyNWYxYjJm Mzg5MTE4MzNjMTg4NmVlYzhiMjVlYmU4OGVlMDVhZGFkLi41MDlkOTA4ODg2MzYwMzBkOTE3Nzkz MGQ5YWI2ZTEwM2Q1MjgyMWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC01MDYsNyArNTA2LDYgQEAgbG9jYWxpemVkU3RyaW5n c1siTm8gcmVxdWVzdHMgY2FwdHVyZWQuIFJlbG9hZCB0aGUgcGFnZSB0byBzZWUgZGV0YWlsZWQg aW5mb3JtYXQKIGxvY2FsaXplZFN0cmluZ3NbIlRoaXMgcmVxdWVzdCBoYXMgbm8gY29va2llcy4i XSA9ICJUaGlzIHJlcXVlc3QgaGFzIG5vIGNvb2tpZXMuIjsKIGxvY2FsaXplZFN0cmluZ3NbIihv cmlnaW5hbCkiXSA9ICIob3JpZ2luYWwpIjsKIGxvY2FsaXplZFN0cmluZ3NbIiglZCwgJWQpIl0g PSAiKCVkLCAlZCkiOwotbG9jYWxpemVkU3RyaW5nc1siUmV2ZXJ0IHRvIHRoaXMgcmV2aXNpb24i XSA9ICJSZXZlcnQgdG8gdGhpcyByZXZpc2lvbiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJXZWJTb2Nr ZXRzIl0gPSAiV2ViU29ja2V0cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJGcmFtZXMiXSA9ICJGcmFt ZXMiOwogbG9jYWxpemVkU3RyaW5nc1siVGV4dCJdID0gIlRleHQiOwpAQCAtNjk5LDMgKzY5OCw2 IEBAIGxvY2FsaXplZFN0cmluZ3NbIlNob3cgZGVidWdnZXIiXSA9ICJTaG93IGRlYnVnZ2VyIjsK IGxvY2FsaXplZFN0cmluZ3NbIkhpZGUgZGVidWdnZXIiXSA9ICJIaWRlIGRlYnVnZ2VyIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkNsaXBib2FyZCBhY2Nlc3MgaXMgZGVuaWVkIl0gPSAiQ2xpcGJvYXJk IGFjY2VzcyBpcyBkZW5pZWQiOwogbG9jYWxpemVkU3RyaW5nc1siR28gdG8gc291cmNlIl0gPSAi R28gdG8gc291cmNlIjsKK2xvY2FsaXplZFN0cmluZ3NbIkxvY2FsIG1vZGlmaWNhdGlvbnMuLi4i XSA9ICJMb2NhbCBtb2RpZmljYXRpb25zLi4uIjsKK2xvY2FsaXplZFN0cmluZ3NbInJldmVydCB0 byBvcmlnaW5hbCJdID0gInJldmVydCB0byBvcmlnaW5hbCI7Citsb2NhbGl6ZWRTdHJpbmdzWyJy ZXZlcnQgYW5kIGNsZWFyIGhpc3RvcnkiXSA9ICJyZXZlcnQgYW5kIGNsZWFyIGhpc3RvcnkiOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXgg MzlhYmYyYzBkN2NiNmU0Zjk3ZDVkYWVlOWJkN2EzNTdmYjQyMDQ1MC4uNzhlMWE2OGZhM2Q5MTky ZTFmNGMzOGU5ZjVmNjYxYjFmMDMwYjkxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCkBAIC0xNTIsNiArMTUyLDI1IEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5wZXJzaXN0UmV2aXNpb24gPSBmdW5jdGlvbihyZXZpc2lvbikKICAgICBzZXRU aW1lb3V0KHBlcnNpc3QsIDApOwogfQogCisvKioKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlJl c291cmNlfSByZXNvdXJjZQorICovCitXZWJJbnNwZWN0b3IuUmVzb3VyY2UuX2NsZWFyUmVzb3Vy Y2VIaXN0b3J5ID0gZnVuY3Rpb24ocmVzb3VyY2UpCit7CisgICAgaWYgKCF3aW5kb3cubG9jYWxT dG9yYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAocmVzb3VyY2UudXJsLnN0YXJ0c1dp dGgoImluc3BlY3RvcjovLyIpKQorICAgICAgICByZXR1cm47CisKKyAgICB2YXIgcmVnaXN0cnkg PSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuX3Jlc291cmNlUmV2aXNpb25SZWdpc3RyeSgpOworICAg IHZhciBoaXN0b3J5SXRlbXMgPSByZWdpc3RyeVtyZXNvdXJjZS51cmxdOworICAgIGZvciAodmFy IGkgPSAwOyBoaXN0b3J5SXRlbXMgJiYgaSA8IGhpc3RvcnlJdGVtcy5sZW5ndGg7ICsraSkKKyAg ICAgICAgZGVsZXRlIHdpbmRvdy5sb2NhbFN0b3JhZ2VbaGlzdG9yeUl0ZW1zW2ldLmtleV07Cisg ICAgZGVsZXRlIHJlZ2lzdHJ5W3Jlc291cmNlLnVybF07CisgICAgd2luZG93LmxvY2FsU3RvcmFn ZVsicmVzb3VyY2UtaGlzdG9yeSJdID0gSlNPTi5zdHJpbmdpZnkocmVnaXN0cnkpOworfQorCiBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzID0gewogICAgIFJldmlzaW9uQWRkZWQ6ICJyZXZp c2lvbi1hZGRlZCIsCiAgICAgTWVzc2FnZUFkZGVkOiAibWVzc2FnZS1hZGRlZCIsCkBAIC00NzEs NiArNDkwLDE3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMucmVxdWVzdENvbnRlbnQocmV2ZXJ0LmJpbmQodGhpcykpOwogICAgIH0sCiAKKyAgICBy ZXZlcnRBbmRDbGVhckhpc3Rvcnk6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGZ1bmN0aW9u IHJldmVydChjb250ZW50KQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLnNldENvbnRlbnQo Y29udGVudCwgZmFsc2UsIGZ1bmN0aW9uKCkge30pOworICAgICAgICAgICAgV2ViSW5zcGVjdG9y LlJlc291cmNlLl9jbGVhclJlc291cmNlSGlzdG9yeSh0aGlzKTsKKyAgICAgICAgICAgIHRoaXMu aGlzdG9yeSA9IFtdOworICAgICAgICB9CisgICAgICAgIHRoaXMucmVxdWVzdENvbnRlbnQocmV2 ZXJ0LmJpbmQodGhpcykpOworICAgIH0sCisKICAgICAvKioKICAgICAgKiBAcmV0dXJuIHtib29s ZWFufQogICAgICAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXZpc2lvbkhpc3RvcnlWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXZpc2lvbkhpc3RvcnlWaWV3LmpzCmluZGV4IDU4MWJhYmY1MDk0YTgwODBjZTc1 YTZkZDdhOTBiOTg5OGU2ZWRiZWQuLjU4MzM4ZWE1ZmM3OGJjM2IyZWViYjFhZTg2MWI5ZGRkYTIx MzgxNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmV2 aXNpb25IaXN0b3J5Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1JldmlzaW9uSGlzdG9yeVZpZXcuanMKQEAgLTU1LDcgKzU1LDcgQEAgV2ViSW5zcGVjdG9y LlJldmlzaW9uSGlzdG9yeVZpZXcgPSBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAKICAgICAgICAg Zm9yICh2YXIgaSA9IHJldmlzaW9uQ291bnQgLSAxOyBpID49IDA7IC0taSkgewogICAgICAgICAg ICAgdmFyIHJldmlzaW9uID0gdGhpcy5fcmVzb3VyY2UuaGlzdG9yeVtpXTsKLSAgICAgICAgICAg IHZhciBoaXN0b3J5SXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuUmV2aXNpb25IaXN0b3J5VHJlZUVs ZW1lbnQocmV2aXNpb24sIHRoaXMuX3Jlc291cmNlLmhpc3RvcnlbaSAtIDFdKTsKKyAgICAgICAg ICAgIHZhciBoaXN0b3J5SXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuUmV2aXNpb25IaXN0b3J5VHJl ZUVsZW1lbnQocmV2aXNpb24sIHRoaXMuX3Jlc291cmNlLmhpc3RvcnlbaSAtIDFdLCBpICE9PSBy ZXZpc2lvbkNvdW50IC0gMSk7CiAgICAgICAgICAgICB0aGlzLl90cmVlT3V0bGluZS5hcHBlbmRD aGlsZChoaXN0b3J5SXRlbSk7CiAgICAgICAgIH0KIApAQCAtNjYsNiArNjYsMTYgQEAgV2ViSW5z cGVjdG9yLlJldmlzaW9uSGlzdG9yeVZpZXcgPSBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAg ICAgIHZhciByZXZlcnRUb09yaWdpbmFsID0gYmFzZUl0ZW0ubGlzdEl0ZW1FbGVtZW50LmNyZWF0 ZUNoaWxkKCJzcGFuIiwgInJldmlzaW9uLWhpc3RvcnktbGluayIpOwogICAgICAgICByZXZlcnRU b09yaWdpbmFsLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJyZXZlcnQgdG8g b3JpZ2luYWwiKTsKICAgICAgICAgcmV2ZXJ0VG9PcmlnaW5hbC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHRoaXMuX3Jlc291cmNlLnJldmVydFRvT3JpZ2luYWwuYmluZCh0aGlzLl9yZXNvdXJj ZSkpOworCisgICAgICAgIGZ1bmN0aW9uIGNsZWFySGlzdG9yeSgpCisgICAgICAgIHsKKyAgICAg ICAgICAgIHRoaXMuX3Jlc291cmNlLnJldmVydEFuZENsZWFySGlzdG9yeSgpOworICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLlJldmlzaW9uSGlzdG9yeVZpZXcuc2hvd0hpc3RvcnkodWlTb3VyY2VD b2RlKTsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBjbGVhckhpc3RvcnlFbGVtZW50ID0gYmFz ZUl0ZW0ubGlzdEl0ZW1FbGVtZW50LmNyZWF0ZUNoaWxkKCJzcGFuIiwgInJldmlzaW9uLWhpc3Rv cnktbGluayIpOworICAgICAgICBjbGVhckhpc3RvcnlFbGVtZW50LnRleHRDb250ZW50ID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJyZXZlcnQgYW5kIGNsZWFyIGhpc3RvcnkiKTsKKyAgICAgICAg Y2xlYXJIaXN0b3J5RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGNsZWFySGlzdG9y eS5iaW5kKHRoaXMpKTsKICAgICB9CiAKICAgICB0aGlzLl9zdGF0dXNFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwpAQCAtMTA3LDcgKzExNyw5IEBAIFdlYkluc3BlY3Rv ci5SZXZpc2lvbkhpc3RvcnlWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgfQogICAgICAgICB2YXIgaGlzdG9yeUxlbmd0aCA9IHRoaXMuX3Jlc291cmNlLmhp c3RvcnkubGVuZ3RoOwotICAgICAgICB2YXIgaGlzdG9yeUl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9y LlJldmlzaW9uSGlzdG9yeVRyZWVFbGVtZW50KHRoaXMuX3Jlc291cmNlLmhpc3RvcnlbaGlzdG9y eUxlbmd0aCAtIDFdLCB0aGlzLl9yZXNvdXJjZS5oaXN0b3J5W2hpc3RvcnlMZW5ndGggLSAyXSk7 CisgICAgICAgIHZhciBoaXN0b3J5SXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuUmV2aXNpb25IaXN0 b3J5VHJlZUVsZW1lbnQodGhpcy5fcmVzb3VyY2UuaGlzdG9yeVtoaXN0b3J5TGVuZ3RoIC0gMV0s IHRoaXMuX3Jlc291cmNlLmhpc3RvcnlbaGlzdG9yeUxlbmd0aCAtIDJdLCBmYWxzZSk7CisgICAg ICAgIGlmICh0aGlzLl90cmVlT3V0bGluZS5jaGlsZHJlbi5sZW5ndGgpCisgICAgICAgICAgICB0 aGlzLl90cmVlT3V0bGluZS5jaGlsZHJlblswXS5hbGxvd1JldmVydCgpOwogICAgICAgICB0aGlz Ll90cmVlT3V0bGluZS5pbnNlcnRDaGlsZChoaXN0b3J5SXRlbSwgMCk7CiAgICAgfSwKIApAQCAt MTI1LDkgKzEzNywxMCBAQCBXZWJJbnNwZWN0b3IuUmV2aXNpb25IaXN0b3J5Vmlldy5wcm90b3R5 cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eQogICogQGNvbnN0cnVjdG9y CiAgKiBAZXh0ZW5kcyB7VHJlZUVsZW1lbnR9CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5SZXNv dXJjZVJldmlzaW9ufSByZXZpc2lvbgotICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VS ZXZpc2lvbj19IGJhc2VSZXZpc2lvbgorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2VS ZXZpc2lvbn0gYmFzZVJldmlzaW9uCisgKiBAcGFyYW0ge2Jvb2xlYW59IGFsbG93UmV2ZXJ0CiAg Ki8KLVdlYkluc3BlY3Rvci5SZXZpc2lvbkhpc3RvcnlUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKHJl dmlzaW9uLCBiYXNlUmV2aXNpb24pCitXZWJJbnNwZWN0b3IuUmV2aXNpb25IaXN0b3J5VHJlZUVs ZW1lbnQgPSBmdW5jdGlvbihyZXZpc2lvbiwgYmFzZVJldmlzaW9uLCBhbGxvd1JldmVydCkKIHsK ICAgICB2YXIgdGl0bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwog ICAgIHRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IHJldmlzaW9uLnRpbWVzdGFtcC50b0xvY2Fs ZVRpbWVTdHJpbmcoKTsKQEAgLTEzOCw5ICsxNTEsMTEgQEAgV2ViSW5zcGVjdG9yLlJldmlzaW9u SGlzdG9yeVRyZWVFbGVtZW50ID0gZnVuY3Rpb24ocmV2aXNpb24sIGJhc2VSZXZpc2lvbikKICAg ICB0aGlzLl9yZXZpc2lvbiA9IHJldmlzaW9uOwogICAgIHRoaXMuX2Jhc2VSZXZpc2lvbiA9IGJh c2VSZXZpc2lvbjsKIAotICAgIHZhciByZXZlcnRFbGVtZW50ID0gdGl0bGVFbGVtZW50LmNyZWF0 ZUNoaWxkKCJzcGFuIiwgInJldmlzaW9uLWhpc3RvcnktbGluayIpOwotICAgIHJldmVydEVsZW1l bnQudGV4dENvbnRlbnQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoInJldmVydCB0byB0aGlzIik7 Ci0gICAgcmV2ZXJ0RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3Jldmlz aW9uLnJldmVydFRvVGhpcy5iaW5kKHRoaXMuX3JldmlzaW9uKSwgZmFsc2UpOworICAgIHRoaXMu X3JldmVydEVsZW1lbnQgPSB0aXRsZUVsZW1lbnQuY3JlYXRlQ2hpbGQoInNwYW4iLCAicmV2aXNp b24taGlzdG9yeS1saW5rIik7CisgICAgdGhpcy5fcmV2ZXJ0RWxlbWVudC50ZXh0Q29udGVudCA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygicmV2ZXJ0IHRvIHRoaXMiKTsKKyAgICB0aGlzLl9yZXZl cnRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcmV2aXNpb24ucmV2ZXJ0 VG9UaGlzLmJpbmQodGhpcy5fcmV2aXNpb24pLCBmYWxzZSk7CisgICAgaWYgKCFhbGxvd1JldmVy dCkKKyAgICAgICAgdGhpcy5fcmV2ZXJ0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsK IH0KIAogV2ViSW5zcGVjdG9yLlJldmlzaW9uSGlzdG9yeVRyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKQEAgLTIzNCw2ICsyNDksMTEgQEAgV2ViSW5zcGVjdG9yLlJldmlzaW9uSGlzdG9yeVRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgY2hpbGQubGlzdEl0ZW1FbGVtZW50LmFwcGVu ZENoaWxkKGNvbnRlbnRTcGFuKTsKICAgICAgICAgY2hpbGQubGlzdEl0ZW1FbGVtZW50LmFkZFN0 eWxlQ2xhc3MoInJldmlzaW9uLWhpc3RvcnktbGluZSIpOwogICAgICAgICBjaGlsZC5saXN0SXRl bUVsZW1lbnQuYWRkU3R5bGVDbGFzcygicmV2aXNpb24taGlzdG9yeS1saW5lLSIgKyBjaGFuZ2VU eXBlKTsKKyAgICB9LAorCisgICAgYWxsb3dSZXZlcnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAg ICAgIHRoaXMuX3JldmVydEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAg fQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1BhbmVsLmpzCmluZGV4IDQ4ZDkzMGFjMWM3YTNiMWYzNTRmMzg1MDIxZWRkOWI5NzExM2M1MGUu LjgxNjkyOWViM2Q1OTdhZTcwNzk1YWMzZmM5OGEzZDNiYjQwZDUwMGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0xMDY2 LDcgKzEwNjYsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gLyoqIEB0eXBl IHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyB0YXJnZXQ7Ci0gICAgICAgIGNvbnRleHRN ZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXZpc2lvbiBoaXN0b3J5Li4u IiksIHRoaXMuX3Nob3dMb2NhbEhpc3RvcnkuYmluZCh0aGlzLCB1aVNvdXJjZUNvZGUpKTsKKyAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2Fs IG1vZGlmaWNhdGlvbnMuLi4iKSwgdGhpcy5fc2hvd0xvY2FsSGlzdG9yeS5iaW5kKHRoaXMsIHVp U291cmNlQ29kZSkpOwogICAgICAgICBpZiAodWlTb3VyY2VDb2RlLnJlc291cmNlKCkgJiYgdWlT b3VyY2VDb2RlLnJlc291cmNlKCkucmVxdWVzdCkKICAgICAgICAgICAgIGNvbnRleHRNZW51LmFw cGVuZEFwcGxpY2FibGVJdGVtcyh1aVNvdXJjZUNvZGUucmVzb3VyY2UoKS5yZXF1ZXN0KTsKICAg ICB9LAo=