149686 2015-09-30 17:13:38 -0700 Web Inspector: Reduce `delete` in Timeline related classes 2015-09-30 18:32:56 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1129748 0 joepeck 2015-09-30 17:13:38 -0700 Some more `delete` deletion. 1129750 1 262209 joepeck 2015-09-30 17:15:03 -0700 Created attachment 262209 [PATCH] Proposed Fix 1129788 2 262209 commit-queue 2015-09-30 18:32:52 -0700 Comment on attachment 262209 [PATCH] Proposed Fix Clearing flags on attachment: 262209 Committed r190381: <http://trac.webkit.org/changeset/190381> 1129789 3 commit-queue 2015-09-30 18:32:56 -0700 All reviewed patches have been landed. Closing bug. 262209 2015-09-30 17:15:03 -0700 2015-09-30 18:32:52 -0700 [PATCH] Proposed Fix reduce-2.patch text/plain 8337 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI0MmE5ODEuLjdlZmU1OWIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE1LTA5LTMwICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVkdWNl IGBkZWxldGVgIGluIFRpbWVsaW5lIHJlbGF0ZWQgY2xhc3NlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5Njg2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L1RpbWVsaW5lTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFn ZXIucHJvdG90eXBlLmNhcHR1cmluZ1N0b3BwZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVEYXRhR3JpZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZURhdGFHcmlkLnByb3RvdHlwZS5fcmVmcmVzaERpcnR5RGF0YUdyaWROb2Rlcyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVEYXRhR3JpZC5wcm90b3R5cGUuX3NvcnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQucHJvdG90eXBlLl91cGRhdGVQb3BvdmVy Rm9yU2VsZWN0ZWROb2RlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l T3ZlcnZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90 b3R5cGUudXBkYXRlTGF5b3V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3LnByb3RvdHlwZS5faGFuZGxlU2Nyb2xsRXZlbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvVHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UcmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyLnByb3RvdHlwZS5fdHJl ZU91dGxpbmVTY3JvbGxlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVHJlZU91dGxpbmVEYXRh R3JpZFN5bmNocm9uaXplci5wcm90b3R5cGUuX2RhdGFHcmlkU2Nyb2xsZWQpOgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERhdGFHcmlkLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlByb2JlU2V0RGF0YUdyaWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2Jl U2V0RGF0YUdyaWQucHJvdG90eXBlLl90ZWFyZG93bkRhdGEpOgorICAgICAgICBSZW1vdmUgYW4g dW51c2VkIG1lbWJlciB2YXJpYWJsZSBhcyB3ZWxsLgorCisyMDE1LTA5LTMwICBKb3NlcGggUGVj b3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogVGhv dXNhbmRzIG9mIHRpbWVycyBmaXJlIGFmdGVyIHN3aXRjaGluZyB0byBKYXZhU2NyaXB0IGFuZCBF dmVudHMgdGltZWxpbmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0OTY4MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXgg MTZjMjk4Yy4uN2VlZWNmMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMK QEAgLTE2NywxMiArMTY3LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIgPSBjbGFz cyBUaW1lbGluZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAg aWYgKHRoaXMuX3N0b3BDYXB0dXJpbmdUaW1lb3V0KSB7CiAgICAgICAgICAgICBjbGVhclRpbWVv dXQodGhpcy5fc3RvcENhcHR1cmluZ1RpbWVvdXQpOwotICAgICAgICAgICAgZGVsZXRlIHRoaXMu X3N0b3BDYXB0dXJpbmdUaW1lb3V0OworICAgICAgICAgICAgdGhpcy5fc3RvcENhcHR1cmluZ1Rp bWVvdXQgPSB1bmRlZmluZWQ7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5fZGVhZFRp bWVUaW1lb3V0KSB7CiAgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fZGVhZFRpbWVUaW1l b3V0KTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9kZWFkVGltZVRpbWVvdXQ7CisgICAgICAg ICAgICB0aGlzLl9kZWFkVGltZVRpbWVvdXQgPSB1bmRlZmluZWQ7CiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLl9pc0NhcHR1cmluZyA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Byb2JlU2V0RGF0YUdyaWQuanMK aW5kZXggOThiZDBlNC4uYmM5MzBmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUHJvYmVTZXREYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qcm9iZVNldERhdGFHcmlkLmpzCkBAIC00 Myw2ICs0Myw3IEBAIFdlYkluc3BlY3Rvci5Qcm9iZVNldERhdGFHcmlkID0gY2xhc3MgUHJvYmVT ZXREYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRhCiAgICAgICAgIHRoaXMuZWxlbWVu dC5jbGFzc0xpc3QuYWRkKCJpbmxpbmUiKTsKIAogICAgICAgICB0aGlzLl9mcmFtZU5vZGVzID0g bmV3IE1hcDsKKyAgICAgICAgdGhpcy5fbGFzdFVwZGF0ZWRGcmFtZSA9IG51bGw7CiAgICAgICAg IHRoaXMuX25vZGVzU2luY2VMYXN0TmF2aWdhdGlvbiA9IFtdOwogCiAgICAgICAgIHRoaXMuX2xp c3RlbmVycyA9IG5ldyBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lclNldCh0aGlzLCAiUHJvYmVT ZXREYXRhR3JpZCBpbnN0YW5jZSBsaXN0ZW5lcnMiKTsKQEAgLTEwMyw4ICsxMDQsNyBAQCBXZWJJ bnNwZWN0b3IuUHJvYmVTZXREYXRhR3JpZCA9IGNsYXNzIFByb2JlU2V0RGF0YUdyaWQgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuRGF0YQogICAgICAgICB0aGlzLl9kYXRhTGlzdGVuZXJzLnVuaW5zdGFs bCh0cnVlKTsKICAgICAgICAgdGhpcy5yZW1vdmVDaGlsZHJlbigpOwogICAgICAgICB0aGlzLl9m cmFtZU5vZGVzID0gbmV3IE1hcDsKLSAgICAgICAgdGhpcy5fc2VwYXJhdG9ycyA9IG5ldyBNYXA7 Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9sYXN0VXBkYXRlZEZyYW1lOworICAgICAgICB0aGlzLl9s YXN0VXBkYXRlZEZyYW1lID0gbnVsbDsKICAgICB9CiAKICAgICBfdXBkYXRlTm9kZUZvckZyYW1l KGZyYW1lKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVEYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWQuanMKaW5kZXggNGY5MzllNy4uMDhkODRlOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVEYXRhR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkLmpzCkBAIC0xOTQsNyArMTk0LDcgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLkRhdGEKICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9zY2hlZHVsZWREYXRhR3Jp ZE5vZGVSZWZyZXNoSWRlbnRpZmllcikgewogICAgICAgICAgICAgY2FuY2VsQW5pbWF0aW9uRnJh bWUodGhpcy5fc2NoZWR1bGVkRGF0YUdyaWROb2RlUmVmcmVzaElkZW50aWZpZXIpOwotICAgICAg ICAgICAgZGVsZXRlIHRoaXMuX3NjaGVkdWxlZERhdGFHcmlkTm9kZVJlZnJlc2hJZGVudGlmaWVy OworICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVkRGF0YUdyaWROb2RlUmVmcmVzaElkZW50aWZp ZXIgPSB1bmRlZmluZWQ7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXRoaXMuX2RpcnR5RGF0 YUdyaWROb2RlcykKQEAgLTIzNiwxMyArMjM2LDEzIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZURh dGFHcmlkID0gY2xhc3MgVGltZWxpbmVEYXRhR3JpZCBleHRlbmRzIFdlYkluc3BlY3Rvci5EYXRh CiAKICAgICAgICAgICAgIGlmIChkYXRhR3JpZE5vZGUgPT09IHNlbGVjdGVkTm9kZSkgewogICAg ICAgICAgICAgICAgIHNlbGVjdGVkTm9kZS5yZXZlYWxBbmRTZWxlY3QoKTsKLSAgICAgICAgICAg ICAgICBkZWxldGUgdGhpcy5faWdub3JlU2VsZWN0aW9uRXZlbnQ7CisgICAgICAgICAgICAgICAg dGhpcy5faWdub3JlU2VsZWN0aW9uRXZlbnQgPSBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogCiAgICAgICAgIHRoaXMuX3RyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6ZXIuZW5h YmxlZCA9IHRydWU7CiAKLSAgICAgICAgZGVsZXRlIHRoaXMuX2RpcnR5RGF0YUdyaWROb2RlczsK KyAgICAgICAgdGhpcy5fZGlydHlEYXRhR3JpZE5vZGVzID0gbnVsbDsKICAgICB9CiAKICAgICBf c29ydCgpCkBAIC0zMDAsNyArMzAwLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRGF0YUdyaWQg PSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2ViSW5zcGVjdG9yLkRhdGEKICAgICAg ICAgaWYgKHNlbGVjdGVkTm9kZSkKICAgICAgICAgICAgIHNlbGVjdGVkTm9kZS5yZXZlYWxBbmRT ZWxlY3QoKTsKIAotICAgICAgICBkZWxldGUgdGhpcy5faWdub3JlU2VsZWN0aW9uRXZlbnQ7Cisg ICAgICAgIHRoaXMuX2lnbm9yZVNlbGVjdGlvbkV2ZW50ID0gZmFsc2U7CiAgICAgfQogCiAgICAg X3NvcnRDb21wYXJhdG9yKG5vZGUxLCBub2RlMikKQEAgLTQwMyw3ICs0MDMsNyBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVEYXRhR3JpZCA9IGNsYXNzIFRpbWVsaW5lRGF0YUdyaWQgZXh0ZW5kcyBX ZWJJbnNwZWN0b3IuRGF0YQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3Nob3dQb3BvdmVyVGlt ZW91dCkgewogICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRoaXMuX3Nob3dQb3BvdmVyVGltZW91 dCk7Ci0gICAgICAgICAgICBkZWxldGUgdGhpcy5fc2hvd1BvcG92ZXJUaW1lb3V0OworICAgICAg ICAgICAgdGhpcy5fc2hvd1BvcG92ZXJUaW1lb3V0ID0gdW5kZWZpbmVkOwogICAgICAgICB9CiAK ICAgICAgICAgaWYgKHRoaXMuX3BvcG92ZXIpCkBAIC00MzgsNyArNDM4LDcgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lRGF0YUdyaWQgPSBjbGFzcyBUaW1lbGluZURhdGFHcmlkIGV4dGVuZHMgV2Vi SW5zcGVjdG9yLkRhdGEKIAogICAgICAgICBpZiAodGhpcy5faGlkZVBvcG92ZXJDb250ZW50Q2xl YXJUaW1lb3V0KSB7CiAgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5faGlkZVBvcG92ZXJD b250ZW50Q2xlYXJUaW1lb3V0KTsKLSAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9oaWRlUG9wb3Zl ckNvbnRlbnRDbGVhclRpbWVvdXQ7CisgICAgICAgICAgICB0aGlzLl9oaWRlUG9wb3ZlckNvbnRl bnRDbGVhclRpbWVvdXQgPSB1bmRlZmluZWQ7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodXBk YXRlQ29udGVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCmluZGV4IDJjYWJkNGIuLjdkODM0 MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lT3ZlcnZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwpAQCAtMzEzLDcgKzMxMyw3IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRz IFdlYkluc3BlY3Rvci5PYmplCiAgICAgewogICAgICAgICBpZiAodGhpcy5fc2NoZWR1bGVkTGF5 b3V0VXBkYXRlSWRlbnRpZmllcikgewogICAgICAgICAgICAgY2FuY2VsQW5pbWF0aW9uRnJhbWUo dGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllcik7Ci0gICAgICAgICAgICBkZWxl dGUgdGhpcy5fc2NoZWR1bGVkTGF5b3V0VXBkYXRlSWRlbnRpZmllcjsKKyAgICAgICAgICAgIHRo aXMuX3NjaGVkdWxlZExheW91dFVwZGF0ZUlkZW50aWZpZXIgPSB1bmRlZmluZWQ7CiAgICAgICAg IH0KIAogICAgICAgICAvLyBDYWxjdWxhdGUgdGhlIHJlcXVpcmVkIHdpZHRoIGJhc2VkIG9uIHRo ZSBkdXJhdGlvbiBhbmQgc2Vjb25kcyBwZXIgcGl4ZWwuCkBAIC00MDUsNyArNDA1LDcgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVu ZHMgV2ViSW5zcGVjdG9yLk9iamUKICAgICBfaGFuZGxlU2Nyb2xsRXZlbnQoZXZlbnQpCiAgICAg ewogICAgICAgICBpZiAodGhpcy5faWdub3JlTmV4dFNjcm9sbEV2ZW50KSB7Ci0gICAgICAgICAg ICBkZWxldGUgdGhpcy5faWdub3JlTmV4dFNjcm9sbEV2ZW50OworICAgICAgICAgICAgdGhpcy5f aWdub3JlTmV4dFNjcm9sbEV2ZW50ID0gZmFsc2U7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIApAQCAtNDE3LDcgKzQxNyw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAg ICAgIC8vIEZvcmNlIGxheW91dCBzbyB3ZSBjYW4gdXBkYXRlIHdpdGggdGhlIHNjcm9sbCBwb3Np dGlvbiBzeW5jaHJvbm91c2x5LgogICAgICAgICB0aGlzLnVwZGF0ZUxheW91dElmTmVlZGVkKCk7 CiAKLSAgICAgICAgZGVsZXRlIHRoaXMuX2RvbnRVcGRhdGVTY3JvbGxMZWZ0OworICAgICAgICB0 aGlzLl9kb250VXBkYXRlU2Nyb2xsTGVmdCA9IGZhbHNlOwogICAgIH0KIAogICAgIF9oYW5kbGVX aGVlbEV2ZW50KGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmVEYXRhR3JpZFN5bmNocm9uaXplci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lRGF0YUdyaWRT eW5jaHJvbml6ZXIuanMKaW5kZXggYzM5OWRjYy4uMWRkNjJiMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmVEYXRhR3JpZFN5 bmNocm9uaXplci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UcmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyLmpzCkBAIC0xNjcsNyArMTY3LDcg QEAgV2ViSW5zcGVjdG9yLlRyZWVPdXRsaW5lRGF0YUdyaWRTeW5jaHJvbml6ZXIgPSBjbGFzcyBU cmVlT3V0bGluZURhdGFHcmlkU3luY2hyb24KICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAg ICBpZiAodGhpcy5faWdub3JlTmV4dFRyZWVPdXRsaW5lU2Nyb2xsRXZlbnQpIHsKLSAgICAgICAg ICAgIGRlbGV0ZSB0aGlzLl9pZ25vcmVOZXh0VHJlZU91dGxpbmVTY3JvbGxFdmVudDsKKyAgICAg ICAgICAgIHRoaXMuX2lnbm9yZU5leHRUcmVlT3V0bGluZVNjcm9sbEV2ZW50ID0gZmFsc2U7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMTkxLDcgKzE5MSw3IEBAIFdlYklu c3BlY3Rvci5UcmVlT3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyID0gY2xhc3MgVHJlZU91dGxp bmVEYXRhR3JpZFN5bmNocm9uCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgaWYgKHRo aXMuX2lnbm9yZU5leHREYXRhR3JpZFNjcm9sbEV2ZW50KSB7Ci0gICAgICAgICAgICBkZWxldGUg dGhpcy5faWdub3JlTmV4dERhdGFHcmlkU2Nyb2xsRXZlbnQ7CisgICAgICAgICAgICB0aGlzLl9p Z25vcmVOZXh0RGF0YUdyaWRTY3JvbGxFdmVudCA9IGZhbHNlOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAK