148161 2015-08-18 20:53:18 -0700 Web Inspector: Show the computed value in an overlay for numerical Visual Editors 2015-08-18 21:51:03 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 147563 1 hi hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1118793 0 hi 2015-08-18 20:53:18 -0700 Instead of actually selecting the computed value, add an "Unchanged" option similar to the keyword editor. 1118795 1 webkit-bug-importer 2015-08-18 20:53:30 -0700 <rdar://problem/22338091> 1118797 2 259347 hi 2015-08-18 20:59:06 -0700 Created attachment 259347 Patch 1118817 3 259347 commit-queue 2015-08-18 21:50:59 -0700 Comment on attachment 259347 Patch Clearing flags on attachment: 259347 Committed r188628: <http://trac.webkit.org/changeset/188628> 1118818 4 commit-queue 2015-08-18 21:51:03 -0700 All reviewed patches have been landed. Closing bug. 259347 2015-08-18 20:59:06 -0700 2015-08-18 21:50:59 -0700 Patch bug-148161-20150818205903.patch text/plain 9922 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGUwMTU0NTA2MmI0YmViMTNmYzgwYTYzNjFjYTQ2 YTExMWFjYzg5NWQuLjZhYzllZjgxZWExMGEyYWVjNmIyNGNkYTI3MDQ2YTAyYTRkMTQyNDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE1LTA4LTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBT aG93IHRoZSBjb21wdXRlZCB2YWx1ZSBpbiBhbiBvdmVybGF5IGZvciBudW1lcmljYWwgVmlzdWFs IEVkaXRvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0ODE2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZHMgYW4gIlVuY2hhbmdlZCIgb3B0aW9uIHRvIHRoZSBudW1iZXItYmFzZWQgVmlzdWFsIGVk aXRvcnMgdGhhdCBzaG93cyB0aGUKKyAgICAgICAgY29tcHV0ZWQgdmFsdWUgaWYgaXQgaXMgbm90 IGEgbnVtYmVyIChpdCB3b3VsZCB0aGVyZWZvcmUgYmUgYSBrZXl3b3JkKS4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5jc3M6CisgICAg ICAgICgudmlzdWFsLXN0eWxlLXByb3BlcnR5LWNvbnRhaW5lciA+IC52aXN1YWwtc3R5bGUtcHJv cGVydHktdmFsdWUtY29udGFpbmVyID4gLm51bWJlci1pbnB1dC1jb250YWluZXIpOgorICAgICAg ICAoLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIgPiAudmlzdWFsLXN0eWxlLXByb3Bl cnR5LXZhbHVlLWNvbnRhaW5lciA+IC5udW1iZXItaW5wdXQtY29udGFpbmVyOm5vdCguaGFzLXZh bHVlKSA+IHNwYW4pOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZU51bWJlcklucHV0Qm94LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVt YmVySW5wdXRCb3gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5w dXRCb3gucHJvdG90eXBlLnNldCB2YWx1ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFs U3R5bGVOdW1iZXJJbnB1dEJveC5wcm90b3R5cGUuZ2V0IHVuaXRzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94LnByb3RvdHlwZS5zZXQgdW5pdHMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3gucHJvdG90eXBl LnNldCBwbGFjZWhvbGRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1i ZXJJbnB1dEJveC5wcm90b3R5cGUuZ2V0IHN5bnRoZXNpemVkVmFsdWUpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3gucHJvdG90eXBlLnNldCBfdW5pdHNF bGVtZW50VGV4dENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVt YmVySW5wdXRCb3gucHJvdG90eXBlLl9tYXJrVW5pdHNDb250YWluZXJJZklucHV0SGFzVmFsdWUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3gucHJvdG90 eXBlLl9rZXl3b3JkQ2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVO dW1iZXJJbnB1dEJveC5wcm90b3R5cGUuX3ZhbHVlTnVtYmVySW5wdXRLZXlEb3duKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94LnByb3RvdHlwZS5fbnVt YmVySW5wdXRDaGFuZ2VkKToKKworMjAxNS0wOC0xOCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogVmlzdWFsIGVkaXRvciBsaW5rcyBz aG91bGQgdW5saW5rIHdoZW4gc3dpdGNoaW5nIHN0eWxlcwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MTUzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRC b3guY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVOdW1iZXJJbnB1dEJveC5jc3MKaW5kZXggYmUwZmUwOTZkZTQzYWFhOTcyNTMxYTg0NmU3 YjAxMmUwYmZmMzUyMC4uYWVlMWNlZWU1MzhjMjBjYWRkY2FlNjEzZTdhODExNjVmZjlhYTliNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlz dWFsU3R5bGVOdW1iZXJJbnB1dEJveC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5jc3MKQEAgLTQ3LDcg KzQ3LDcgQEAKICAgICBsaW5lLWhlaWdodDogMTZweDsKICAgICB0ZXh0LWFsaWduOiByaWdodDsK ICAgICBib3JkZXItcmFkaXVzOiA0cHg7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDAsIDEw MCUsIDEwMCUpOworICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOwogICAgIHBvaW50ZXItZXZl bnRzOiBub25lOwogICAgIG92ZXJmbG93OiBoaWRkZW47CiAgICAgd2hpdGUtc3BhY2U6IG5vd3Jh cDsKQEAgLTcyLDMgKzcyLDcgQEAKIC52aXN1YWwtc3R5bGUtcHJvcGVydHktY29udGFpbmVyID4g LnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS12YWx1ZS1jb250YWluZXIgPiAubnVtYmVyLWlucHV0LWNv bnRhaW5lciA+IHNwYW4gewogICAgIG1pbi13aWR0aDogLXdlYmtpdC1maXQtY29udGVudDsKIH0K KworLnZpc3VhbC1zdHlsZS1wcm9wZXJ0eS1jb250YWluZXIgPiAudmlzdWFsLXN0eWxlLXByb3Bl cnR5LXZhbHVlLWNvbnRhaW5lciA+IC5udW1iZXItaW5wdXQtY29udGFpbmVyOm5vdCguaGFzLXZh bHVlKSA+IHNwYW4geworICAgIGNvbG9yOiBoc2woMCwgMCUsIDYwJSk7Cit9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZU51 bWJlcklucHV0Qm94LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveC5qcwppbmRleCBmMDU0MjFmNDY2MmY0ZTFmMDAy YzIwN2ZkNWIwNWZhZGE1OGViN2MyLi45ZGVlZWZlOWEzMTdhZjg5Njk3Y2Y0ZjNjNTg5YmI3OWJk YTQwOGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3guanMKQEAg LTQ0LDYgKzQ0LDEzIEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94ID0g Y2xhc3MgVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCBleHRlbmRzCiAgICAgICAgIGlmICh0aGlz Ll9wb3NzaWJsZVVuaXRzLmFkdmFuY2VkKQogICAgICAgICAgICAgdGhpcy5fa2V5d29yZFNlbGVj dEVsZW1lbnQudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk9wdGlvbi1jbGljayB0byBz aG93IGFsbCB1bml0cyIpOwogCisgICAgICAgIHRoaXMuX3VuY2hhbmdlZE9wdGlvbkVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJvcHRpb24iKTsKKyAgICAgICAgdGhpcy5fdW5jaGFu Z2VkT3B0aW9uRWxlbWVudC52YWx1ZSA9ICIiOworICAgICAgICB0aGlzLl91bmNoYW5nZWRPcHRp b25FbGVtZW50LnRleHQgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlVuY2hhbmdlZCIpOworICAg ICAgICB0aGlzLl9rZXl3b3JkU2VsZWN0RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl91bmNoYW5n ZWRPcHRpb25FbGVtZW50KTsKKworICAgICAgICB0aGlzLl9rZXl3b3JkU2VsZWN0RWxlbWVudC5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJociIpKTsKKwogICAgICAgICBpZiAo dGhpcy5fcG9zc2libGVWYWx1ZXMpIHsKICAgICAgICAgICAgIHRoaXMuX2NyZWF0ZVZhbHVlT3B0 aW9ucyh0aGlzLl9wb3NzaWJsZVZhbHVlcy5iYXNpYyk7CiAgICAgICAgICAgICB0aGlzLl9rZXl3 b3JkU2VsZWN0RWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJociIp KTsKQEAgLTc0LDYgKzgxLDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRC b3ggPSBjbGFzcyBWaXN1YWxTdHlsZU51bWJlcklucHV0Qm94IGV4dGVuZHMKIAogICAgICAgICB0 aGlzLl91bml0c0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CiAgICAg ICAgIHRoaXMuX251bWJlclVuaXRzQ29udGFpbmVyLmFwcGVuZENoaWxkKHRoaXMuX3VuaXRzRWxl bWVudCk7CisKICAgICAgICAgdGhpcy5jb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9u dW1iZXJVbml0c0NvbnRhaW5lcik7CiAKICAgICAgICAgdGhpcy5fbnVtYmVySW5wdXRJc0VkaXRh YmxlID0gdHJ1ZTsKQEAgLTgxLDcgKzg5LDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVt YmVySW5wdXRCb3ggPSBjbGFzcyBWaXN1YWxTdHlsZU51bWJlcklucHV0Qm94IGV4dGVuZHMKICAg ICAgICAgdGhpcy5fdmFsdWVOdW1iZXJJbnB1dEVsZW1lbnQudmFsdWUgPSBudWxsOwogICAgICAg ICB0aGlzLl92YWx1ZU51bWJlcklucHV0RWxlbWVudC5zZXRBdHRyaWJ1dGUoInBsYWNlaG9sZGVy IiwgMCk7CiAgICAgICAgIGlmICh0aGlzLl9oYXNVbml0cyAmJiB0aGlzLnZhbHVlSXNTdXBwb3J0 ZWRVbml0KCJweCIpKQotICAgICAgICAgICAgdGhpcy5fdW5pdHNFbGVtZW50LnRleHRDb250ZW50 ID0gdGhpcy5fa2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWUgPSAicHgiOworICAgICAgICAgICAg dGhpcy5fdW5pdHNFbGVtZW50VGV4dENvbnRlbnQgPSB0aGlzLl9rZXl3b3JkU2VsZWN0RWxlbWVu dC52YWx1ZSA9ICJweCI7CiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC0xMDIsNiArMTEwLDE2 IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94ID0gY2xhc3MgVmlzdWFs U3R5bGVOdW1iZXJJbnB1dEJveCBleHRlbmRzCiAgICAgICAgIGlmICh2YWx1ZSAmJiB2YWx1ZSA9 PT0gdGhpcy52YWx1ZSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBpZiAodGhpcy5f dXBkYXRlZFZhbHVlcy5wcm9wZXJ0eU1pc3NpbmcgJiYgaXNOYU4odmFsdWUpKSB7CisgICAgICAg ICAgICB0aGlzLl91bmNoYW5nZWRPcHRpb25FbGVtZW50LnNlbGVjdGVkID0gdHJ1ZTsKKyAgICAg ICAgICAgIHRoaXMuX251bWJlcklucHV0SXNFZGl0YWJsZSA9IGZhbHNlOworICAgICAgICAgICAg dGhpcy5jb250ZW50RWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKCJudW1iZXItaW5wdXQtZWRpdGFi bGUiKTsKKyAgICAgICAgICAgIHRoaXMuc3BlY2lhbFByb3BlcnR5UGxhY2Vob2xkZXJFbGVtZW50 LmhpZGRlbiA9IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAg ICAgdGhpcy5zcGVjaWFsUHJvcGVydHlQbGFjZWhvbGRlckVsZW1lbnQuaGlkZGVuID0gdHJ1ZTsK KwogICAgICAgICBpZiAoIWlzTmFOKHZhbHVlKSkgewogICAgICAgICAgICAgdGhpcy5fbnVtYmVy SW5wdXRJc0VkaXRhYmxlID0gdHJ1ZTsKICAgICAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQu Y2xhc3NMaXN0LmFkZCgibnVtYmVyLWlucHV0LWVkaXRhYmxlIik7CkBAIC0xMjQsMTUgKzE0Miwy MSBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCA9IGNsYXNzIFZpc3Vh bFN0eWxlTnVtYmVySW5wdXRCb3ggZXh0ZW5kcwogCiAgICAgZ2V0IHVuaXRzKCkKICAgICB7Cisg ICAgICAgIGlmICh0aGlzLl91bmNoYW5nZWRPcHRpb25FbGVtZW50LnNlbGVjdGVkKQorICAgICAg ICAgICAgcmV0dXJuIG51bGw7CisKICAgICAgICAgbGV0IGtleXdvcmQgPSB0aGlzLl9rZXl3b3Jk U2VsZWN0RWxlbWVudC52YWx1ZTsKICAgICAgICAgaWYgKCF0aGlzLnZhbHVlSXNTdXBwb3J0ZWRV bml0KGtleXdvcmQpKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIG51 bGw7CiAKICAgICAgICAgcmV0dXJuIGtleXdvcmQ7CiAgICAgfQogCiAgICAgc2V0IHVuaXRzKHVu aXQpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fdW5jaGFuZ2VkT3B0aW9uRWxlbWVudC5zZWxl Y3RlZCkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBpZiAoIXVuaXQgfHwgdW5pdCA9 PT0gdGhpcy51bml0cykKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMTQ1LDkgKzE2OSw3IEBA IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94ID0gY2xhc3MgVmlzdWFsU3R5 bGVOdW1iZXJJbnB1dEJveCBleHRlbmRzCiAgICAgICAgIHRoaXMuX251bWJlcklucHV0SXNFZGl0 YWJsZSA9IHRydWU7CiAgICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuY2xhc3NMaXN0LmFkZCgi bnVtYmVyLWlucHV0LWVkaXRhYmxlIik7CiAgICAgICAgIHRoaXMuX2tleXdvcmRTZWxlY3RFbGVt ZW50LnZhbHVlID0gdW5pdDsKLQotICAgICAgICBpZiAodGhpcy5faGFzVW5pdHMpCi0gICAgICAg ICAgICB0aGlzLl91bml0c0VsZW1lbnQudGV4dENvbnRlbnQgPSB1bml0OworICAgICAgICB0aGlz Ll91bml0c0VsZW1lbnRUZXh0Q29udGVudCA9IHVuaXQ7CiAgICAgfQogCiAgICAgZ2V0IHBsYWNl aG9sZGVyKCkKQEAgLTE2MiwxMCArMTg0LDE2IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51 bWJlcklucHV0Qm94ID0gY2xhc3MgVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCBleHRlbmRzCiAK ICAgICAgICAgbGV0IG9ubHlOdW1lcmljYWxUZXh0ID0gdGV4dCAmJiAhaXNOYU4odGV4dCkgJiYg KE1hdGgucm91bmQodGV4dCAqIDEwMCkgLyAxMDApOwogICAgICAgICB0aGlzLl92YWx1ZU51bWJl cklucHV0RWxlbWVudC5zZXRBdHRyaWJ1dGUoInBsYWNlaG9sZGVyIiwgb25seU51bWVyaWNhbFRl eHQgfHwgMCk7CisKKyAgICAgICAgaWYgKCFvbmx5TnVtZXJpY2FsVGV4dCkKKyAgICAgICAgICAg IHRoaXMuc3BlY2lhbFByb3BlcnR5UGxhY2Vob2xkZXJFbGVtZW50LnRleHRDb250ZW50ID0gdGhp cy5fY2Fub25pY2FsaXplZEtleXdvcmRGb3JLZXkodGV4dCkgfHwgdGV4dDsKICAgICB9CiAKICAg ICBnZXQgc3ludGhlc2l6ZWRWYWx1ZSgpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fdW5jaGFu Z2VkT3B0aW9uRWxlbWVudC5zZWxlY3RlZCkKKyAgICAgICAgICAgIHJldHVybiBudWxsOworCiAg ICAgICAgIGxldCB2YWx1ZSA9IHRoaXMuX3ZhbHVlTnVtYmVySW5wdXRFbGVtZW50LnZhbHVlOwog ICAgICAgICBpZiAodGhpcy5fbnVtYmVySW5wdXRJc0VkaXRhYmxlICYmICF2YWx1ZSkKICAgICAg ICAgICAgIHJldHVybiBudWxsOwpAQCAtMTkxLDE4ICsyMTksMzYgQEAgV2ViSW5zcGVjdG9yLlZp c3VhbFN0eWxlTnVtYmVySW5wdXRCb3ggPSBjbGFzcyBWaXN1YWxTdHlsZU51bWJlcklucHV0Qm94 IGV4dGVuZHMKIAogICAgIC8vIFByaXZhdGUKIAotICAgIF9rZXl3b3JkQ2hhbmdlZCgpCisgICAg c2V0IF91bml0c0VsZW1lbnRUZXh0Q29udGVudCh0ZXh0KQogICAgIHsKLSAgICAgICAgbGV0IHNl bGVjdGVkS2V5d29yZElzVW5pdCA9IHRoaXMudmFsdWVJc1N1cHBvcnRlZFVuaXQodGhpcy5fa2V5 d29yZFNlbGVjdEVsZW1lbnQudmFsdWUpOwotICAgICAgICBpZiAoIXRoaXMuX251bWJlcklucHV0 SXNFZGl0YWJsZSAmJiBzZWxlY3RlZEtleXdvcmRJc1VuaXQpCi0gICAgICAgICAgICB0aGlzLl92 YWx1ZU51bWJlcklucHV0RWxlbWVudC52YWx1ZSA9IG51bGw7CisgICAgICAgIGlmICghdGhpcy5f aGFzVW5pdHMpCisgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKHRoaXMuX2hhc1Vu aXRzKQotICAgICAgICAgICAgdGhpcy5fdW5pdHNFbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5f a2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWU7CisgICAgICAgIHRoaXMuX3VuaXRzRWxlbWVudC50 ZXh0Q29udGVudCA9IHRleHQ7CisgICAgICAgIHRoaXMuX21hcmtVbml0c0NvbnRhaW5lcklmSW5w dXRIYXNWYWx1ZSgpOworICAgIH0KKworICAgIF9tYXJrVW5pdHNDb250YWluZXJJZklucHV0SGFz VmFsdWUoKQorICAgIHsKKyAgICAgICAgbGV0IG51bWJlcklucHV0VmFsdWUgPSB0aGlzLl92YWx1 ZU51bWJlcklucHV0RWxlbWVudC52YWx1ZTsKKyAgICAgICAgdGhpcy5fbnVtYmVyVW5pdHNDb250 YWluZXIuY2xhc3NMaXN0LnRvZ2dsZSgiaGFzLXZhbHVlIiwgbnVtYmVySW5wdXRWYWx1ZSAmJiBu dW1iZXJJbnB1dFZhbHVlLmxlbmd0aCk7CisgICAgfQorCisgICAgX2tleXdvcmRDaGFuZ2VkKCkK KyAgICB7CisgICAgICAgIGxldCB1bmNoYW5nZWRPcHRpb25TZWxlY3RlZCA9IHRoaXMuX3VuY2hh bmdlZE9wdGlvbkVsZW1lbnQuc2VsZWN0ZWQ7CisgICAgICAgIGlmICghdW5jaGFuZ2VkT3B0aW9u U2VsZWN0ZWQpIHsKKyAgICAgICAgICAgIGxldCBzZWxlY3RlZEtleXdvcmRJc1VuaXQgPSB0aGlz LnZhbHVlSXNTdXBwb3J0ZWRVbml0KHRoaXMuX2tleXdvcmRTZWxlY3RFbGVtZW50LnZhbHVlKTsK KyAgICAgICAgICAgIGlmICghdGhpcy5fbnVtYmVySW5wdXRJc0VkaXRhYmxlICYmIHNlbGVjdGVk S2V5d29yZElzVW5pdCkKKyAgICAgICAgICAgICAgICB0aGlzLl92YWx1ZU51bWJlcklucHV0RWxl bWVudC52YWx1ZSA9IG51bGw7CisKKyAgICAgICAgICAgIHRoaXMuX3VuaXRzRWxlbWVudFRleHRD b250ZW50ID0gdGhpcy5fa2V5d29yZFNlbGVjdEVsZW1lbnQudmFsdWU7CisgICAgICAgICAgICB0 aGlzLl9udW1iZXJJbnB1dElzRWRpdGFibGUgPSBzZWxlY3RlZEtleXdvcmRJc1VuaXQ7CisgICAg ICAgICAgICB0aGlzLmNvbnRlbnRFbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoIm51bWJlci1pbnB1 dC1lZGl0YWJsZSIsIHNlbGVjdGVkS2V5d29yZElzVW5pdCk7CisgICAgICAgIH0KIAotICAgICAg ICB0aGlzLl9udW1iZXJJbnB1dElzRWRpdGFibGUgPSBzZWxlY3RlZEtleXdvcmRJc1VuaXQ7Ci0g ICAgICAgIHRoaXMuY29udGVudEVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgibnVtYmVyLWlucHV0 LWVkaXRhYmxlIiwgc2VsZWN0ZWRLZXl3b3JkSXNVbml0KTsKICAgICAgICAgdGhpcy5fdmFsdWVE aWRDaGFuZ2UoKTsKKyAgICAgICAgdGhpcy5zcGVjaWFsUHJvcGVydHlQbGFjZWhvbGRlckVsZW1l bnQuaGlkZGVuID0gIXVuY2hhbmdlZE9wdGlvblNlbGVjdGVkOwogICAgIH0KIAogICAgIF92YWx1 ZU51bWJlcklucHV0S2V5RG93bihldmVudCkKQEAgLTI0OSw2ICsyOTUsNyBAQCBXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCA9IGNsYXNzIFZpc3VhbFN0eWxlTnVtYmVySW5w dXRCb3ggZXh0ZW5kcwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKKyAgICAgICAg dGhpcy5fbWFya1VuaXRzQ29udGFpbmVySWZJbnB1dEhhc1ZhbHVlKCk7CiAgICAgICAgIHRoaXMu X3ZhbHVlRGlkQ2hhbmdlKCk7CiAgICAgfQogCkBAIC0yNTcsNiArMzA0LDcgQEAgV2ViSW5zcGVj dG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3ggPSBjbGFzcyBWaXN1YWxTdHlsZU51bWJlcklu cHV0Qm94IGV4dGVuZHMKICAgICAgICAgaWYgKCF0aGlzLl9udW1iZXJJbnB1dElzRWRpdGFibGUp CiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5fbWFya1VuaXRzQ29udGFpbmVy SWZJbnB1dEhhc1ZhbHVlKCk7CiAgICAgICAgIHRoaXMuX3ZhbHVlRGlkQ2hhbmdlKCk7CiAgICAg fQogCg==