157910 2016-05-19 12:20:43 -0700 Web Inspector: Split Console is auto opening all the time when using Inspect Element context menu 2016-05-20 12:35:03 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy nvasilyev bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1194865 0 timothy 2016-05-19 12:20:43 -0700 This might be happening because the Inspected Element auto logging? It is getting annoying! 1194868 1 webkit-bug-importer 2016-05-19 12:24:53 -0700 <rdar://problem/26374066> 1194992 2 279438 nvasilyev 2016-05-19 15:06:08 -0700 Created attachment 279438 Patch 1194994 3 279438 timothy 2016-05-19 15:08:59 -0700 Comment on attachment 279438 Patch I think this will cause the split console to not open for things like "Log Object" in the heap snapshot. Joe? 1195009 4 279438 joepeck 2016-05-19 15:28:28 -0700 Comment on attachment 279438 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=279438&action=review > Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js:273 > // We only auto show the console if the message is a non-synthetic result. > // This is when the user evaluated something directly in the prompt. Right now "synthetic" means "token". It does not mean frontend added. If we want to distinguish between frontend added immediately evaluations (Log Value and Inspect Element) you would want a new state to work with. 1195177 5 279491 nvasilyev 2016-05-20 11:40:51 -0700 Created attachment 279491 Patch 1195178 6 279492 nvasilyev 2016-05-20 11:42:12 -0700 Created attachment 279492 Patch 1195194 7 279492 commit-queue 2016-05-20 12:34:59 -0700 Comment on attachment 279492 Patch Clearing flags on attachment: 279492 Committed r201222: <http://trac.webkit.org/changeset/201222> 1195195 8 commit-queue 2016-05-20 12:35:03 -0700 All reviewed patches have been landed. Closing bug. 279438 2016-05-19 15:06:08 -0700 2016-05-20 11:40:51 -0700 Patch patch.txt text/plain 1946 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFkMjY3YmQuLjdlMGVkNTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA1LTE5ICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNwbGl0 IENvbnNvbGUgaXMgYXV0byBvcGVuaW5nIGFsbCB0aGUgdGltZSB3aGVuIHVzaW5nIEluc3BlY3Qg RWxlbWVudCBjb250ZXh0IG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NzkxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjYzNzQwNjY+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIucHJvdG90eXBlLl9h cHBlbmRDb25zb2xlTWVzc2FnZVZpZXcpOgorICAgICAgICBEbyBub3Qgb3BlbiB0aGUgY29uc29s ZSBmb3Igc3ludGhldGljIHJlc3VsdCBtZXNzYWdlcy4KKwogMjAxNi0wNS0xOCAgQnJpYW4gQnVy ZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByYWNlIGJldHdl ZW4gZnJvbnRlbmQgYW5kIGJhY2tlbmQgYm90aCBzdGFydGluZyB0aW1lbGluZSByZWNvcmRpbmdz IGNhdXNlcyBjb25zb2xlIGFzc2VydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNj cmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCmluZGV4IGZhZjMwMTMuLmNiNTI3ZmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFT Y3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKQEAg LTI3MSw3ICsyNzEsNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVy ID0gY2xhc3MgSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyIGV4dAogCiAgICAgICAgIC8vIFdl IG9ubHkgYXV0byBzaG93IHRoZSBjb25zb2xlIGlmIHRoZSBtZXNzYWdlIGlzIGEgbm9uLXN5bnRo ZXRpYyByZXN1bHQuCiAgICAgICAgIC8vIFRoaXMgaXMgd2hlbiB0aGUgdXNlciBldmFsdWF0ZWQg c29tZXRoaW5nIGRpcmVjdGx5IGluIHRoZSBwcm9tcHQuCi0gICAgICAgIGlmICghV2ViSW5zcGVj dG9yLmlzU2hvd2luZ0NvbnNvbGVUYWIoKSAmJiBtZXNzYWdlVmlldy5tZXNzYWdlICYmIChtZXNz YWdlVmlldy5tZXNzYWdlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNz YWdlVHlwZS5SZXN1bHQgfHwgbWVzc2FnZVZpZXcubWVzc2FnZS5zeW50aGV0aWMpKQorICAgICAg ICBpZiAoIVdlYkluc3BlY3Rvci5pc1Nob3dpbmdDb25zb2xlVGFiKCkgJiYgbWVzc2FnZVZpZXcu bWVzc2FnZSAmJiAobWVzc2FnZVZpZXcubWVzc2FnZS50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29u c29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuUmVzdWx0ICYmICFtZXNzYWdlVmlldy5tZXNzYWdlLnN5 bnRoZXRpYykpCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NwbGl0Q29uc29sZSgpOwog ICAgIH0KIAo= 279491 2016-05-20 11:40:51 -0700 2016-05-20 11:42:12 -0700 Patch patch.txt text/plain 10211 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDVkZjMwM2UuLjNkNDY4MTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTA1LTIwICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNwbGl0 IENvbnNvbGUgaXMgYXV0byBvcGVuaW5nIGFsbCB0aGUgdGltZSB3aGVuIHVzaW5nIEluc3BlY3Qg RWxlbWVudCBjb250ZXh0IG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NzkxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjYzNzQwNjY+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5 LCAic3ludGhldGljIiBwcm9wZXJ0eSBpcyBvbmx5IHVzZWQgdG8gZGVjaWRlIHdoZXRoZXIgYWRk aW5nIGEgY29uc29sZSBtZXNzYWdlIHNob3VsZAorICAgICAgICBvcGVuIHRoZSBjb25zb2xlIG9y IG5vdC4gUmVwbGFjZSBpdCB3aXRoICJzaG91bGRSZXZlYWxDb25zb2xlIi4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLmluc3BlY3ROb2RlT2JqZWN0Lm5v ZGVBdmFpbGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3Rv dHlwZS5pbnNwZWN0Tm9kZU9iamVjdCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9s bGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5hcHBlbmRJbW1lZGlhdGVF eGVjdXRpb25XaXRoUmVzdWx0LnNhdmVSZXN1bHRDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5hcHBlbmRJbW1lZGlh dGVFeGVjdXRpb25XaXRoUmVzdWx0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 TG9nVmlld0NvbnRyb2xsZXIucHJvdG90eXBlLmNvbnNvbGVQcm9tcHRUZXh0Q29tbWl0dGVkLnBy aW50UmVzdWx0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRy b2xsZXIucHJvdG90eXBlLmNvbnNvbGVQcm9tcHRUZXh0Q29tbWl0dGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIucHJvdG90eXBlLl9hcHBlbmRD b25zb2xlTWVzc2FnZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NvbnNv bGVDb21tYW5kUmVzdWx0TWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xl Q29tbWFuZFJlc3VsdE1lc3NhZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21t YW5kUmVzdWx0TWVzc2FnZS5wcm90b3R5cGUuZ2V0IHNob3VsZFJldmVhbENvbnNvbGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0TWVzc2FnZS5wcm90b3R5cGUu Z2V0IHN5bnRoZXRpYyk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9I ZWFwU25hcHNob3RJbnN0YW5jZURhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RJbnN0YW5jZURhdGFHcmlkTm9kZS5sb2dIZWFwU25hcHNob3ROb2RlLm5v ZGUuc2hvcnRlc3RHQ1Jvb3RQYXRoLik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90SW5zdGFuY2VEYXRhR3JpZE5vZGUubG9nSGVhcFNuYXBzaG90Tm9kZSk6CisKIDIwMTYtMDUt MTkgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVH UkVTU0lPTiAocjE4OTM4NSk6IFdlYiBJbnNwZWN0b3I6IENTUyBwcm9wZXJ0aWVzIG1vZGlmaWVk IHZpYSBKUyBkb24ndCB1cGRhdGUgaW4gdGhlIFN0eWxlcyBzaWRlYmFyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFu YWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0RPTVRyZWVNYW5hZ2VyLmpzCmluZGV4IGNkZWQyOTAuLjBhYmQxODIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5h Z2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xs ZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCkBAIC0zMzYsOCArMzM2LDggQEAgV2ViSW5zcGVjdG9yLkRP TVRyZWVNYW5hZ2VyID0gY2xhc3MgRE9NVHJlZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAgICAgICAgICAgICAgICAgaWYgKCFyZW1vdGVPYmplY3QpCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICBsZXQgc3BlY2lhbExvZ1N0eWxlcyA9IHRy dWU7Ci0gICAgICAgICAgICAgICAgbGV0IHN5bnRoZXRpYyA9IHRydWU7Ci0gICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1lZGlhdGVF eGVjdXRpb25XaXRoUmVzdWx0KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VsZWN0ZWQgRWxlbWVu dCIpLCByZW1vdGVPYmplY3QsIHNwZWNpYWxMb2dTdHlsZXMsIHN5bnRoZXRpYyk7CisgICAgICAg ICAgICAgICAgbGV0IHNob3VsZFJldmVhbENvbnNvbGUgPSBmYWxzZTsKKyAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuY29uc29sZUxvZ1ZpZXdDb250cm9sbGVyLmFwcGVuZEltbWVkaWF0ZUV4 ZWN1dGlvbldpdGhSZXN1bHQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3RlZCBFbGVtZW50 IiksIHJlbW90ZU9iamVjdCwgc3BlY2lhbExvZ1N0eWxlcywgc2hvdWxkUmV2ZWFsQ29uc29sZSk7 CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRy b2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKaW5kZXggZmFmMzAxMy4uZTRiZGUyZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxl ci5qcwpAQCAtMTE4LDcgKzExOCw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0Nv bnRyb2xsZXIgPSBjbGFzcyBKYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAgICAgICAg IGNvbnNvbGVTZXNzaW9uLmVsZW1lbnQuc2Nyb2xsSW50b1ZpZXcoKTsKICAgICB9CiAKLSAgICBh cHBlbmRJbW1lZGlhdGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlc3VsdCwgYWRkU3BlY2lh bFVzZXJMb2dDbGFzcywgc3ludGhldGljKQorICAgIGFwcGVuZEltbWVkaWF0ZUV4ZWN1dGlvbldp dGhSZXN1bHQodGV4dCwgcmVzdWx0LCBhZGRTcGVjaWFsVXNlckxvZ0NsYXNzLCBzaG91bGRSZXZl YWxDb25zb2xlKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQocmVzdWx0IGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdCk7CiAKQEAgLTEyNyw3ICsxMjcsNyBAQCBXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyID0gY2xhc3MgSmF2YVNjcmlwdExv Z1ZpZXdDb250cm9sbGVyIGV4dAogCiAgICAgICAgIGZ1bmN0aW9uIHNhdmVSZXN1bHRDYWxsYmFj ayhzYXZlZFJlc3VsdEluZGV4KQogICAgICAgICB7Ci0gICAgICAgICAgICBsZXQgY29tbWFuZFJl c3VsdE1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0TWVzc2Fn ZShyZXN1bHQsIGZhbHNlLCBzYXZlZFJlc3VsdEluZGV4LCBzeW50aGV0aWMpOworICAgICAgICAg ICAgbGV0IGNvbW1hbmRSZXN1bHRNZXNzYWdlID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29t bWFuZFJlc3VsdE1lc3NhZ2UocmVzdWx0LCBmYWxzZSwgc2F2ZWRSZXN1bHRJbmRleCwgc2hvdWxk UmV2ZWFsQ29uc29sZSk7CiAgICAgICAgICAgICBsZXQgY29tbWFuZFJlc3VsdE1lc3NhZ2VWaWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcoY29tbWFuZFJlc3VsdE1lc3Nh Z2UpOwogICAgICAgICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1lc3NhZ2VWaWV3KGNvbW1hbmRS ZXN1bHRNZXNzYWdlVmlldywgdHJ1ZSk7CiAgICAgICAgIH0KQEAgLTIyNSw4ICsyMjUsOCBAQCBX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyID0gY2xhc3MgSmF2YVNjcmlw dExvZ1ZpZXdDb250cm9sbGVyIGV4dAogICAgICAgICAgICAgaWYgKCFyZXN1bHQgfHwgdGhpcy5f Y2xlYXJlZCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIGxldCBzeW50 aGV0aWMgPSBmYWxzZTsKLSAgICAgICAgICAgIGxldCBjb21tYW5kUmVzdWx0TWVzc2FnZSA9IG5l dyBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmRSZXN1bHRNZXNzYWdlKHJlc3VsdCwgd2FzVGhy b3duLCBzYXZlZFJlc3VsdEluZGV4LCBzeW50aGV0aWMpOworICAgICAgICAgICAgbGV0IHNob3Vs ZFJldmVhbENvbnNvbGUgPSB0cnVlOworICAgICAgICAgICAgbGV0IGNvbW1hbmRSZXN1bHRNZXNz YWdlID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UocmVzdWx0 LCB3YXNUaHJvd24sIHNhdmVkUmVzdWx0SW5kZXgsIHNob3VsZFJldmVhbENvbnNvbGUpOwogICAg ICAgICAgICAgbGV0IGNvbW1hbmRSZXN1bHRNZXNzYWdlVmlldyA9IG5ldyBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2VWaWV3KGNvbW1hbmRSZXN1bHRNZXNzYWdlKTsKICAgICAgICAgICAgIHRo aXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlVmlldyhjb21tYW5kUmVzdWx0TWVzc2FnZVZpZXcsIHRy dWUpOwogICAgICAgICB9CkBAIC0yNzEsNyArMjcxLDcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3Jp cHRMb2dWaWV3Q29udHJvbGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciBl eHQKIAogICAgICAgICAvLyBXZSBvbmx5IGF1dG8gc2hvdyB0aGUgY29uc29sZSBpZiB0aGUgbWVz c2FnZSBpcyBhIG5vbi1zeW50aGV0aWMgcmVzdWx0LgogICAgICAgICAvLyBUaGlzIGlzIHdoZW4g dGhlIHVzZXIgZXZhbHVhdGVkIHNvbWV0aGluZyBkaXJlY3RseSBpbiB0aGUgcHJvbXB0LgotICAg ICAgICBpZiAoIVdlYkluc3BlY3Rvci5pc1Nob3dpbmdDb25zb2xlVGFiKCkgJiYgbWVzc2FnZVZp ZXcubWVzc2FnZSAmJiAobWVzc2FnZVZpZXcubWVzc2FnZS50eXBlID09PSBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVR5cGUuUmVzdWx0IHx8IG1lc3NhZ2VWaWV3Lm1lc3NhZ2Uu c3ludGhldGljKSkKKyAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IuaXNTaG93aW5nQ29uc29sZVRh YigpICYmIG1lc3NhZ2VWaWV3Lm1lc3NhZ2UgJiYgbWVzc2FnZVZpZXcubWVzc2FnZS5zaG91bGRS ZXZlYWxDb25zb2xlKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dTcGxpdENvbnNvbGUo KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01vZGVscy9Db25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29uc29sZUNvbW1hbmRSZXN1bHRNZXNzYWdl LmpzCmluZGV4IGY3MzZkZTUuLjVjMjI5NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Db25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NvbnNvbGVD b21tYW5kUmVzdWx0TWVzc2FnZS5qcwpAQCAtMjksNyArMjksNyBAQAogCiBXZWJJbnNwZWN0b3Iu Q29uc29sZUNvbW1hbmRSZXN1bHRNZXNzYWdlID0gY2xhc3MgQ29uc29sZUNvbW1hbmRSZXN1bHQg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UKIHsKLSAgICBjb25zdHJ1Y3Rvcihy ZXN1bHQsIHdhc1Rocm93biwgc2F2ZWRSZXN1bHRJbmRleCwgc3ludGhldGljKQorICAgIGNvbnN0 cnVjdG9yKHJlc3VsdCwgd2FzVGhyb3duLCBzYXZlZFJlc3VsdEluZGV4LCBzaG91bGRSZXZlYWxD b25zb2xlID0gdHJ1ZSkKICAgICB7CiAgICAgICAgIGxldCBzb3VyY2UgPSBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5KUzsKICAgICAgICAgbGV0IGxldmVsID0gKHdh c1Rocm93biA/IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuRXJyb3Ig OiBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkxvZyk7CkBAIC0zOCw3 ICszOCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UgPSBjbGFz cyBDb25zb2xlQ29tbWFuZFJlc3VsdCBleHRlbmRzIFdlCiAgICAgICAgIHN1cGVyKHNvdXJjZSwg bGV2ZWwsICIiLCB0eXBlLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCAwLCBbcmVz dWx0XSwgdW5kZWZpbmVkLCB1bmRlZmluZWQpOwogCiAgICAgICAgIHRoaXMuX3NhdmVkUmVzdWx0 SW5kZXggPSBzYXZlZFJlc3VsdEluZGV4OwotICAgICAgICB0aGlzLl9zeW50aGV0aWMgPSBzeW50 aGV0aWMgfHwgZmFsc2U7CisgICAgICAgIHRoaXMuX3Nob3VsZFJldmVhbENvbnNvbGUgPSBzaG91 bGRSZXZlYWxDb25zb2xlOwogCiAgICAgICAgIGlmICh0aGlzLl9zYXZlZFJlc3VsdEluZGV4ICYm IHRoaXMuX3NhdmVkUmVzdWx0SW5kZXggPiBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmRSZXN1 bHRNZXNzYWdlLm1heGltdW1TYXZlZFJlc3VsdEluZGV4KQogICAgICAgICAgICAgV2ViSW5zcGVj dG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0TWVzc2FnZS5tYXhpbXVtU2F2ZWRSZXN1bHRJbmRleCA9 IHRoaXMuX3NhdmVkUmVzdWx0SW5kZXg7CkBAIC01OCw5ICs1OCw5IEBAIFdlYkluc3BlY3Rvci5D b25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UgPSBjbGFzcyBDb25zb2xlQ29tbWFuZFJlc3VsdCBl eHRlbmRzIFdlCiAgICAgICAgIHJldHVybiB0aGlzLl9zYXZlZFJlc3VsdEluZGV4OwogICAgIH0K IAotICAgIGdldCBzeW50aGV0aWMoKQorICAgIGdldCBzaG91bGRSZXZlYWxDb25zb2xlKCkKICAg ICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zeW50aGV0aWM7CisgICAgICAgIHJldHVybiB0aGlz Ll9zaG91bGRSZXZlYWxDb25zb2xlOwogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0hlYXBTbmFwc2hvdEluc3RhbmNlRGF0 YUdyaWROb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv SGVhcFNuYXBzaG90SW5zdGFuY2VEYXRhR3JpZE5vZGUuanMKaW5kZXggNzNlZjg5Mi4uOWI2Yzg5 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv SGVhcFNuYXBzaG90SW5zdGFuY2VEYXRhR3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90SW5zdGFuY2VEYXRhR3JpZE5v ZGUuanMKQEAgLTUzLDcgKzUzLDcgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEluc3RhbmNl RGF0YUdyaWROb2RlID0gY2xhc3MgSGVhcFNuYXBzaG90SW5zdGFuY2VEYXRhR3IKICAgICBzdGF0 aWMgbG9nSGVhcFNuYXBzaG90Tm9kZShub2RlKQogICAgIHsKICAgICAgICAgbGV0IGhlYXBPYmpl Y3RJZGVudGlmaWVyID0gbm9kZS5pZDsKLSAgICAgICAgbGV0IHN5bnRoZXRpYyA9IHRydWU7Cisg ICAgICAgIGxldCBzaG91bGRSZXZlYWxDb25zb2xlID0gdHJ1ZTsKICAgICAgICAgbGV0IHRleHQg PSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhlYXAgU25hcHNob3QgT2JqZWN0IChAJWQpIikuZm9y bWF0KGhlYXBPYmplY3RJZGVudGlmaWVyKTsKIAogICAgICAgICBub2RlLnNob3J0ZXN0R0NSb290 UGF0aCgoZ2NSb290UGF0aCkgPT4gewpAQCAtNzMsMjEgKzczLDE5IEBAIFdlYkluc3BlY3Rvci5I ZWFwU25hcHNob3RJbnN0YW5jZURhdGFHcmlkTm9kZSA9IGNsYXNzIEhlYXBTbmFwc2hvdEluc3Rh bmNlRGF0YUdyCiAgICAgICAgICAgICAgICAgICAgICAgICBoZWFwU25hcHNob3RSb290UGF0aCA9 IGhlYXBTbmFwc2hvdFJvb3RQYXRoLmFwcGVuZEVkZ2UoY29tcG9uZW50KTsKICAgICAgICAgICAg ICAgICB9CiAKLSAgICAgICAgICAgICAgICBpZiAoIWhlYXBTbmFwc2hvdFJvb3RQYXRoLmlzRnVs bFBhdGhJbXBvc3NpYmxlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3ludGhldGljID0gZmFs c2U7CisgICAgICAgICAgICAgICAgaWYgKCFoZWFwU25hcHNob3RSb290UGF0aC5pc0Z1bGxQYXRo SW1wb3NzaWJsZSgpKQogICAgICAgICAgICAgICAgICAgICB0ZXh0ID0gaGVhcFNuYXBzaG90Um9v dFBhdGguZnVsbFBhdGg7Ci0gICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICBpZiAobm9kZS5jbGFzc05hbWUgPT09ICJzdHJpbmciKSB7CiAgICAgICAgICAgICAg ICAgSGVhcEFnZW50LmdldFByZXZpZXcoaGVhcE9iamVjdElkZW50aWZpZXIsIGZ1bmN0aW9uKGVy cm9yLCBzdHJpbmcsIGZ1bmN0aW9uRGV0YWlscywgb2JqZWN0UHJldmlld1BheWxvYWQpIHsKICAg ICAgICAgICAgICAgICAgICAgbGV0IHJlbW90ZU9iamVjdCA9IGVycm9yID8gV2ViSW5zcGVjdG9y LlJlbW90ZU9iamVjdC5mcm9tUHJpbWl0aXZlVmFsdWUodW5kZWZpbmVkKSA6IFdlYkluc3BlY3Rv ci5SZW1vdGVPYmplY3QuZnJvbVByaW1pdGl2ZVZhbHVlKHN0cmluZyk7Ci0gICAgICAgICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlTG9nVmlld0NvbnRyb2xsZXIuYXBwZW5kSW1tZWRp YXRlRXhlY3V0aW9uV2l0aFJlc3VsdCh0ZXh0LCByZW1vdGVPYmplY3QsIHN5bnRoZXRpYyk7Cisg ICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jb25zb2xlTG9nVmlld0NvbnRyb2xsZXIu YXBwZW5kSW1tZWRpYXRlRXhlY3V0aW9uV2l0aFJlc3VsdCh0ZXh0LCByZW1vdGVPYmplY3QsIHNo b3VsZFJldmVhbENvbnNvbGUpOwogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfSBl bHNlIHsKICAgICAgICAgICAgICAgICBIZWFwQWdlbnQuZ2V0UmVtb3RlT2JqZWN0KGhlYXBPYmpl Y3RJZGVudGlmaWVyLCBXZWJJbnNwZWN0b3IuUnVudGltZU1hbmFnZXIuQ29uc29sZU9iamVjdEdy b3VwLCBmdW5jdGlvbihlcnJvciwgcmVtb3RlT2JqZWN0UGF5bG9hZCkgewogICAgICAgICAgICAg ICAgICAgICBsZXQgcmVtb3RlT2JqZWN0ID0gZXJyb3IgPyBXZWJJbnNwZWN0b3IuUmVtb3RlT2Jq ZWN0LmZyb21QcmltaXRpdmVWYWx1ZSh1bmRlZmluZWQpIDogV2ViSW5zcGVjdG9yLlJlbW90ZU9i amVjdC5mcm9tUGF5bG9hZChyZW1vdGVPYmplY3RQYXlsb2FkKTsKLSAgICAgICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1lZGlhdGVF eGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgc3ludGhldGljKTsKKyAgICAg ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBl bmRJbW1lZGlhdGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgc2hvdWxk UmV2ZWFsQ29uc29sZSk7CiAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0pOwo= 279492 2016-05-20 11:42:12 -0700 2016-05-20 12:34:59 -0700 Patch patch.txt text/plain 10312 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDVkZjMwM2UuLjNkNDY4MTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTA1LTIwICBOaWtpdGEgVmFzaWx5 ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNwbGl0 IENvbnNvbGUgaXMgYXV0byBvcGVuaW5nIGFsbCB0aGUgdGltZSB3aGVuIHVzaW5nIEluc3BlY3Qg RWxlbWVudCBjb250ZXh0IG1lbnUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NzkxMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjYzNzQwNjY+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5 LCAic3ludGhldGljIiBwcm9wZXJ0eSBpcyBvbmx5IHVzZWQgdG8gZGVjaWRlIHdoZXRoZXIgYWRk aW5nIGEgY29uc29sZSBtZXNzYWdlIHNob3VsZAorICAgICAgICBvcGVuIHRoZSBjb25zb2xlIG9y IG5vdC4gUmVwbGFjZSBpdCB3aXRoICJzaG91bGRSZXZlYWxDb25zb2xlIi4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLmluc3BlY3ROb2RlT2JqZWN0Lm5v ZGVBdmFpbGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3Rv dHlwZS5pbnNwZWN0Tm9kZU9iamVjdCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9s bGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5hcHBlbmRJbW1lZGlhdGVF eGVjdXRpb25XaXRoUmVzdWx0LnNhdmVSZXN1bHRDYWxsYmFjayk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5hcHBlbmRJbW1lZGlh dGVFeGVjdXRpb25XaXRoUmVzdWx0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 TG9nVmlld0NvbnRyb2xsZXIucHJvdG90eXBlLmNvbnNvbGVQcm9tcHRUZXh0Q29tbWl0dGVkLnBy aW50UmVzdWx0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRy b2xsZXIucHJvdG90eXBlLmNvbnNvbGVQcm9tcHRUZXh0Q29tbWl0dGVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIucHJvdG90eXBlLl9hcHBlbmRD b25zb2xlTWVzc2FnZVZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NvbnNv bGVDb21tYW5kUmVzdWx0TWVzc2FnZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xl Q29tbWFuZFJlc3VsdE1lc3NhZ2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21t YW5kUmVzdWx0TWVzc2FnZS5wcm90b3R5cGUuZ2V0IHNob3VsZFJldmVhbENvbnNvbGUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0TWVzc2FnZS5wcm90b3R5cGUu Z2V0IHN5bnRoZXRpYyk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9I ZWFwU25hcHNob3RJbnN0YW5jZURhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3RJbnN0YW5jZURhdGFHcmlkTm9kZS5sb2dIZWFwU25hcHNob3ROb2RlLm5v ZGUuc2hvcnRlc3RHQ1Jvb3RQYXRoLik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBz aG90SW5zdGFuY2VEYXRhR3JpZE5vZGUubG9nSGVhcFNuYXBzaG90Tm9kZSk6CisKIDIwMTYtMDUt MTkgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVH UkVTU0lPTiAocjE4OTM4NSk6IFdlYiBJbnNwZWN0b3I6IENTUyBwcm9wZXJ0aWVzIG1vZGlmaWVk IHZpYSBKUyBkb24ndCB1cGRhdGUgaW4gdGhlIFN0eWxlcyBzaWRlYmFyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9ET01UcmVlTWFu YWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0RPTVRyZWVNYW5hZ2VyLmpzCmluZGV4IGNkZWQyOTAuLjBhYmQxODIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0RPTVRyZWVNYW5h Z2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xs ZXJzL0RPTVRyZWVNYW5hZ2VyLmpzCkBAIC0zMzYsOCArMzM2LDggQEAgV2ViSW5zcGVjdG9yLkRP TVRyZWVNYW5hZ2VyID0gY2xhc3MgRE9NVHJlZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAgICAgICAgICAgICAgICAgaWYgKCFyZW1vdGVPYmplY3QpCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICBsZXQgc3BlY2lhbExvZ1N0eWxlcyA9IHRy dWU7Ci0gICAgICAgICAgICAgICAgbGV0IHN5bnRoZXRpYyA9IHRydWU7Ci0gICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1lZGlhdGVF eGVjdXRpb25XaXRoUmVzdWx0KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VsZWN0ZWQgRWxlbWVu dCIpLCByZW1vdGVPYmplY3QsIHNwZWNpYWxMb2dTdHlsZXMsIHN5bnRoZXRpYyk7CisgICAgICAg ICAgICAgICAgbGV0IHNob3VsZFJldmVhbENvbnNvbGUgPSBmYWxzZTsKKyAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuY29uc29sZUxvZ1ZpZXdDb250cm9sbGVyLmFwcGVuZEltbWVkaWF0ZUV4 ZWN1dGlvbldpdGhSZXN1bHQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWxlY3RlZCBFbGVtZW50 IiksIHJlbW90ZU9iamVjdCwgc3BlY2lhbExvZ1N0eWxlcywgc2hvdWxkUmV2ZWFsQ29uc29sZSk7 CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRy b2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMKaW5kZXggZmFmMzAxMy4uYzNkNzBkMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxl ci5qcwpAQCAtMTE4LDcgKzExOCw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0Nv bnRyb2xsZXIgPSBjbGFzcyBKYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAgICAgICAg IGNvbnNvbGVTZXNzaW9uLmVsZW1lbnQuc2Nyb2xsSW50b1ZpZXcoKTsKICAgICB9CiAKLSAgICBh cHBlbmRJbW1lZGlhdGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlc3VsdCwgYWRkU3BlY2lh bFVzZXJMb2dDbGFzcywgc3ludGhldGljKQorICAgIGFwcGVuZEltbWVkaWF0ZUV4ZWN1dGlvbldp dGhSZXN1bHQodGV4dCwgcmVzdWx0LCBhZGRTcGVjaWFsVXNlckxvZ0NsYXNzLCBzaG91bGRSZXZl YWxDb25zb2xlKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQocmVzdWx0IGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdCk7CiAKQEAgLTEyNyw3ICsxMjcsNyBAQCBXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyID0gY2xhc3MgSmF2YVNjcmlwdExv Z1ZpZXdDb250cm9sbGVyIGV4dAogCiAgICAgICAgIGZ1bmN0aW9uIHNhdmVSZXN1bHRDYWxsYmFj ayhzYXZlZFJlc3VsdEluZGV4KQogICAgICAgICB7Ci0gICAgICAgICAgICBsZXQgY29tbWFuZFJl c3VsdE1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0TWVzc2Fn ZShyZXN1bHQsIGZhbHNlLCBzYXZlZFJlc3VsdEluZGV4LCBzeW50aGV0aWMpOworICAgICAgICAg ICAgbGV0IGNvbW1hbmRSZXN1bHRNZXNzYWdlID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29t bWFuZFJlc3VsdE1lc3NhZ2UocmVzdWx0LCBmYWxzZSwgc2F2ZWRSZXN1bHRJbmRleCwgc2hvdWxk UmV2ZWFsQ29uc29sZSk7CiAgICAgICAgICAgICBsZXQgY29tbWFuZFJlc3VsdE1lc3NhZ2VWaWV3 ID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZVZpZXcoY29tbWFuZFJlc3VsdE1lc3Nh Z2UpOwogICAgICAgICAgICAgdGhpcy5fYXBwZW5kQ29uc29sZU1lc3NhZ2VWaWV3KGNvbW1hbmRS ZXN1bHRNZXNzYWdlVmlldywgdHJ1ZSk7CiAgICAgICAgIH0KQEAgLTIyNSw4ICsyMjUsOCBAQCBX ZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyID0gY2xhc3MgSmF2YVNjcmlw dExvZ1ZpZXdDb250cm9sbGVyIGV4dAogICAgICAgICAgICAgaWYgKCFyZXN1bHQgfHwgdGhpcy5f Y2xlYXJlZCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIGxldCBzeW50 aGV0aWMgPSBmYWxzZTsKLSAgICAgICAgICAgIGxldCBjb21tYW5kUmVzdWx0TWVzc2FnZSA9IG5l dyBXZWJJbnNwZWN0b3IuQ29uc29sZUNvbW1hbmRSZXN1bHRNZXNzYWdlKHJlc3VsdCwgd2FzVGhy b3duLCBzYXZlZFJlc3VsdEluZGV4LCBzeW50aGV0aWMpOworICAgICAgICAgICAgbGV0IHNob3Vs ZFJldmVhbENvbnNvbGUgPSB0cnVlOworICAgICAgICAgICAgbGV0IGNvbW1hbmRSZXN1bHRNZXNz YWdlID0gbmV3IFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UocmVzdWx0 LCB3YXNUaHJvd24sIHNhdmVkUmVzdWx0SW5kZXgsIHNob3VsZFJldmVhbENvbnNvbGUpOwogICAg ICAgICAgICAgbGV0IGNvbW1hbmRSZXN1bHRNZXNzYWdlVmlldyA9IG5ldyBXZWJJbnNwZWN0b3Iu Q29uc29sZU1lc3NhZ2VWaWV3KGNvbW1hbmRSZXN1bHRNZXNzYWdlKTsKICAgICAgICAgICAgIHRo aXMuX2FwcGVuZENvbnNvbGVNZXNzYWdlVmlldyhjb21tYW5kUmVzdWx0TWVzc2FnZVZpZXcsIHRy dWUpOwogICAgICAgICB9CkBAIC0yNjksOSArMjY5LDcgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3Jp cHRMb2dWaWV3Q29udHJvbGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciBl eHQKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5jb25zb2xlQ29udGVudFZpZXcudmlzaWJsZSkK ICAgICAgICAgICAgIHRoaXMucmVuZGVyUGVuZGluZ01lc3NhZ2VzU29vbigpOwogCi0gICAgICAg IC8vIFdlIG9ubHkgYXV0byBzaG93IHRoZSBjb25zb2xlIGlmIHRoZSBtZXNzYWdlIGlzIGEgbm9u LXN5bnRoZXRpYyByZXN1bHQuCi0gICAgICAgIC8vIFRoaXMgaXMgd2hlbiB0aGUgdXNlciBldmFs dWF0ZWQgc29tZXRoaW5nIGRpcmVjdGx5IGluIHRoZSBwcm9tcHQuCi0gICAgICAgIGlmICghV2Vi SW5zcGVjdG9yLmlzU2hvd2luZ0NvbnNvbGVUYWIoKSAmJiBtZXNzYWdlVmlldy5tZXNzYWdlICYm IChtZXNzYWdlVmlldy5tZXNzYWdlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlVHlwZS5SZXN1bHQgfHwgbWVzc2FnZVZpZXcubWVzc2FnZS5zeW50aGV0aWMpKQor ICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5pc1Nob3dpbmdDb25zb2xlVGFiKCkgJiYgbWVzc2Fn ZVZpZXcubWVzc2FnZSAmJiBtZXNzYWdlVmlldy5tZXNzYWdlLnNob3VsZFJldmVhbENvbnNvbGUp CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2hvd1NwbGl0Q29uc29sZSgpOwogICAgIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0Nv bnNvbGVDb21tYW5kUmVzdWx0TWVzc2FnZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9Db25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UuanMKaW5kZXggZjcz NmRlNS4uNWMyMjk1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvTW9kZWxzL0NvbnNvbGVDb21tYW5kUmVzdWx0TWVzc2FnZS5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29uc29sZUNvbW1hbmRSZXN1bHRN ZXNzYWdlLmpzCkBAIC0yOSw3ICsyOSw3IEBACiAKIFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFu ZFJlc3VsdE1lc3NhZ2UgPSBjbGFzcyBDb25zb2xlQ29tbWFuZFJlc3VsdCBleHRlbmRzIFdlYklu c3BlY3Rvci5Db25zb2xlTWVzc2FnZQogewotICAgIGNvbnN0cnVjdG9yKHJlc3VsdCwgd2FzVGhy b3duLCBzYXZlZFJlc3VsdEluZGV4LCBzeW50aGV0aWMpCisgICAgY29uc3RydWN0b3IocmVzdWx0 LCB3YXNUaHJvd24sIHNhdmVkUmVzdWx0SW5kZXgsIHNob3VsZFJldmVhbENvbnNvbGUgPSB0cnVl KQogICAgIHsKICAgICAgICAgbGV0IHNvdXJjZSA9IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZS5NZXNzYWdlU291cmNlLkpTOwogICAgICAgICBsZXQgbGV2ZWwgPSAod2FzVGhyb3duID8gV2Vi SW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZlbC5FcnJvciA6IFdlYkluc3BlY3Rv ci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2ZWwuTG9nKTsKQEAgLTM4LDcgKzM4LDcgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kUmVzdWx0TWVzc2FnZSA9IGNsYXNzIENvbnNvbGVDb21t YW5kUmVzdWx0IGV4dGVuZHMgV2UKICAgICAgICAgc3VwZXIoc291cmNlLCBsZXZlbCwgIiIsIHR5 cGUsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIDAsIFtyZXN1bHRdLCB1bmRlZmlu ZWQsIHVuZGVmaW5lZCk7CiAKICAgICAgICAgdGhpcy5fc2F2ZWRSZXN1bHRJbmRleCA9IHNhdmVk UmVzdWx0SW5kZXg7Ci0gICAgICAgIHRoaXMuX3N5bnRoZXRpYyA9IHN5bnRoZXRpYyB8fCBmYWxz ZTsKKyAgICAgICAgdGhpcy5fc2hvdWxkUmV2ZWFsQ29uc29sZSA9IHNob3VsZFJldmVhbENvbnNv bGU7CiAKICAgICAgICAgaWYgKHRoaXMuX3NhdmVkUmVzdWx0SW5kZXggJiYgdGhpcy5fc2F2ZWRS ZXN1bHRJbmRleCA+IFdlYkluc3BlY3Rvci5Db25zb2xlQ29tbWFuZFJlc3VsdE1lc3NhZ2UubWF4 aW11bVNhdmVkUmVzdWx0SW5kZXgpCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuQ29uc29sZUNv bW1hbmRSZXN1bHRNZXNzYWdlLm1heGltdW1TYXZlZFJlc3VsdEluZGV4ID0gdGhpcy5fc2F2ZWRS ZXN1bHRJbmRleDsKQEAgLTU4LDkgKzU4LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5k UmVzdWx0TWVzc2FnZSA9IGNsYXNzIENvbnNvbGVDb21tYW5kUmVzdWx0IGV4dGVuZHMgV2UKICAg ICAgICAgcmV0dXJuIHRoaXMuX3NhdmVkUmVzdWx0SW5kZXg7CiAgICAgfQogCi0gICAgZ2V0IHN5 bnRoZXRpYygpCisgICAgZ2V0IHNob3VsZFJldmVhbENvbnNvbGUoKQogICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMuX3N5bnRoZXRpYzsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Nob3VsZFJldmVh bENvbnNvbGU7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvSGVhcFNuYXBzaG90SW5zdGFuY2VEYXRhR3JpZE5vZGUuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwU25hcHNob3RJ bnN0YW5jZURhdGFHcmlkTm9kZS5qcwppbmRleCA3M2VmODkyLi45YjZjODlhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9IZWFwU25hcHNob3RJ bnN0YW5jZURhdGFHcmlkTm9kZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9IZWFwU25hcHNob3RJbnN0YW5jZURhdGFHcmlkTm9kZS5qcwpAQCAtNTMs NyArNTMsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90SW5zdGFuY2VEYXRhR3JpZE5vZGUg PSBjbGFzcyBIZWFwU25hcHNob3RJbnN0YW5jZURhdGFHcgogICAgIHN0YXRpYyBsb2dIZWFwU25h cHNob3ROb2RlKG5vZGUpCiAgICAgewogICAgICAgICBsZXQgaGVhcE9iamVjdElkZW50aWZpZXIg PSBub2RlLmlkOwotICAgICAgICBsZXQgc3ludGhldGljID0gdHJ1ZTsKKyAgICAgICAgbGV0IHNo b3VsZFJldmVhbENvbnNvbGUgPSB0cnVlOwogICAgICAgICBsZXQgdGV4dCA9IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiSGVhcCBTbmFwc2hvdCBPYmplY3QgKEAlZCkiKS5mb3JtYXQoaGVhcE9iamVj dElkZW50aWZpZXIpOwogCiAgICAgICAgIG5vZGUuc2hvcnRlc3RHQ1Jvb3RQYXRoKChnY1Jvb3RQ YXRoKSA9PiB7CkBAIC03MywyMSArNzMsMTkgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdElu c3RhbmNlRGF0YUdyaWROb2RlID0gY2xhc3MgSGVhcFNuYXBzaG90SW5zdGFuY2VEYXRhR3IKICAg ICAgICAgICAgICAgICAgICAgICAgIGhlYXBTbmFwc2hvdFJvb3RQYXRoID0gaGVhcFNuYXBzaG90 Um9vdFBhdGguYXBwZW5kRWRnZShjb21wb25lbnQpOwogICAgICAgICAgICAgICAgIH0KIAotICAg ICAgICAgICAgICAgIGlmICghaGVhcFNuYXBzaG90Um9vdFBhdGguaXNGdWxsUGF0aEltcG9zc2li bGUoKSkgewotICAgICAgICAgICAgICAgICAgICBzeW50aGV0aWMgPSBmYWxzZTsKKyAgICAgICAg ICAgICAgICBpZiAoIWhlYXBTbmFwc2hvdFJvb3RQYXRoLmlzRnVsbFBhdGhJbXBvc3NpYmxlKCkp CiAgICAgICAgICAgICAgICAgICAgIHRleHQgPSBoZWFwU25hcHNob3RSb290UGF0aC5mdWxsUGF0 aDsKLSAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChu b2RlLmNsYXNzTmFtZSA9PT0gInN0cmluZyIpIHsKICAgICAgICAgICAgICAgICBIZWFwQWdlbnQu Z2V0UHJldmlldyhoZWFwT2JqZWN0SWRlbnRpZmllciwgZnVuY3Rpb24oZXJyb3IsIHN0cmluZywg ZnVuY3Rpb25EZXRhaWxzLCBvYmplY3RQcmV2aWV3UGF5bG9hZCkgewogICAgICAgICAgICAgICAg ICAgICBsZXQgcmVtb3RlT2JqZWN0ID0gZXJyb3IgPyBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0 LmZyb21QcmltaXRpdmVWYWx1ZSh1bmRlZmluZWQpIDogV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVj dC5mcm9tUHJpbWl0aXZlVmFsdWUoc3RyaW5nKTsKLSAgICAgICAgICAgICAgICAgICAgV2ViSW5z cGVjdG9yLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1lZGlhdGVFeGVjdXRpb25X aXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgc3ludGhldGljKTsKKyAgICAgICAgICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGVMb2dWaWV3Q29udHJvbGxlci5hcHBlbmRJbW1lZGlh dGVFeGVjdXRpb25XaXRoUmVzdWx0KHRleHQsIHJlbW90ZU9iamVjdCwgc2hvdWxkUmV2ZWFsQ29u c29sZSk7CiAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAg ICAgICAgICAgIEhlYXBBZ2VudC5nZXRSZW1vdGVPYmplY3QoaGVhcE9iamVjdElkZW50aWZpZXIs IFdlYkluc3BlY3Rvci5SdW50aW1lTWFuYWdlci5Db25zb2xlT2JqZWN0R3JvdXAsIGZ1bmN0aW9u KGVycm9yLCByZW1vdGVPYmplY3RQYXlsb2FkKSB7CiAgICAgICAgICAgICAgICAgICAgIGxldCBy ZW1vdGVPYmplY3QgPSBlcnJvciA/IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVByaW1p dGl2ZVZhbHVlKHVuZGVmaW5lZCkgOiBXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXls b2FkKHJlbW90ZU9iamVjdFBheWxvYWQpOwotICAgICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuY29uc29sZUxvZ1ZpZXdDb250cm9sbGVyLmFwcGVuZEltbWVkaWF0ZUV4ZWN1dGlvbldpdGhS ZXN1bHQodGV4dCwgcmVtb3RlT2JqZWN0LCBzeW50aGV0aWMpOworICAgICAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuY29uc29sZUxvZ1ZpZXdDb250cm9sbGVyLmFwcGVuZEltbWVkaWF0ZUV4 ZWN1dGlvbldpdGhSZXN1bHQodGV4dCwgcmVtb3RlT2JqZWN0LCBzaG91bGRSZXZlYWxDb25zb2xl KTsKICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSk7Cg==