55759 2011-03-04 02:58:12 -0800 Web Inspector: implement getCompletions via evaluate. 2011-06-18 02:30:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik yurys oldest_to_newest 362386 0 pfeldman 2011-03-04 02:58:12 -0800 There is no need for this protocol method otherwise. 362390 1 84716 pfeldman 2011-03-04 03:02:40 -0800 Created attachment 84716 [PATCH] Proposed change. 423070 2 84716 loislo 2011-06-18 00:31:09 -0700 Comment on attachment 84716 [PATCH] Proposed change. was landed r80342 84716 2011-03-04 03:02:40 -0800 2011-06-18 00:31:08 -0700 [PATCH] Proposed change. completions text/plain 18370 pfeldman ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMTZmODAzLi44NDc2Njc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTEtMDMtMDQgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogaW1wbGVtZW50IGdldENvbXBsZXRpb25zIHZpYSBldmFsdWF0ZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1NzU5CisKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuY3BwOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qczoK KyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmlkbDoKKyAgICAgICAgKiBpbnNwZWN0b3Iv SW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckRlYnVnZ2VyQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFn ZW50LmNwcDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50Lmg6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuY29tcGxldGlvbnMuZXZhbHVhdGVkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUuY29tcGxldGlvbnMu ZXZhbHVhdGVkUHJvcGVydGllcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcu cHJvdG90eXBlLmNvbXBsZXRpb25zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlVmll dy5wcm90b3R5cGUuX3JlcG9ydENvbXBsZXRpb25zKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlLmV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZS51cGRhdGluZ0NhbGxiYWNr V3JhcHBlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5l dmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlLl9zaG93UG9wdXApOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZS5fZXZhbFNlbGVjdGlvbkluQ2FsbEZyYW1lKToKKwogMjAxMS0wMy0wMyAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZ dXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlw dC5jcHAKaW5kZXggOTE3MmJhMy4uZjA3NThmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHQuY3BwCkBAIC03NCwyMyArNzQsNiBAQCB2b2lkIEluamVjdGVkU2Ny aXB0OjpldmFsdWF0ZU9uQ2FsbEZyYW1lKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBjYWxs RnJhbWVJZAogICAgIG1ha2VDYWxsKGZ1bmN0aW9uLCByZXN1bHQpOwogfQogCi12b2lkIEluamVj dGVkU2NyaXB0OjpnZXRDb21wbGV0aW9ucyhjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGJvb2wg aW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQpCi17 Ci0gICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1faW5qZWN0ZWRTY3JpcHRPYmplY3Qs ICJnZXRDb21wbGV0aW9ucyIpOwotICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGV4cHJlc3Np b24pOwotICAgIGZ1bmN0aW9uLmFwcGVuZEFyZ3VtZW50KGluY2x1ZGVDb21tYW5kTGluZUFQSSk7 Ci0gICAgbWFrZUNhbGwoZnVuY3Rpb24sIHJlc3VsdCk7Ci19Ci0KLXZvaWQgSW5qZWN0ZWRTY3Jp cHQ6OmdldENvbXBsZXRpb25zT25DYWxsRnJhbWUoUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+ IGNhbGxGcmFtZUlkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGJvb2wgaW5jbHVkZUNvbW1h bmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQpCi17Ci0gICAgU2NyaXB0 RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1faW5qZWN0ZWRTY3JpcHRPYmplY3QsICJnZXRDb21wbGV0 aW9uc09uQ2FsbEZyYW1lIik7Ci0gICAgZnVuY3Rpb24uYXBwZW5kQXJndW1lbnQoY2FsbEZyYW1l SWQtPnRvSlNPTlN0cmluZygpKTsKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudChleHByZXNz aW9uKTsKLSAgICBmdW5jdGlvbi5hcHBlbmRBcmd1bWVudChpbmNsdWRlQ29tbWFuZExpbmVBUEkp OwotICAgIG1ha2VDYWxsKGZ1bmN0aW9uLCByZXN1bHQpOwotfQotCiB2b2lkIEluamVjdGVkU2Ny aXB0OjpnZXRQcm9wZXJ0aWVzKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCwg Ym9vbCBpZ25vcmVIYXNPd25Qcm9wZXJ0eSwgYm9vbCBhYmJyZXZpYXRlLCBSZWZQdHI8SW5zcGVj dG9yVmFsdWU+KiByZXN1bHQpCiB7CiAgICAgU2NyaXB0RnVuY3Rpb25DYWxsIGZ1bmN0aW9uKG1f aW5qZWN0ZWRTY3JpcHRPYmplY3QsICJnZXRQcm9wZXJ0aWVzIik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHQuaCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCmluZGV4IGRlYzM4YTcuLmFkMTQ4MTQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5oCkBAIC01NCw4ICs1NCw2IEBAIHB1 YmxpYzoKICAgICB2b2lkIGV2YWx1YXRlKGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3Qg U3RyaW5nJiBvYmplY3RHcm91cCwgYm9vbCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIFJlZlB0cjxJ bnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CiAgICAgdm9pZCBldmFsdWF0ZU9uKFBhc3NSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCwgY29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBSZWZQ dHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQpOwogICAgIHZvaWQgZXZhbHVhdGVPbkNhbGxGcmFt ZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gY2FsbEZyYW1lSWQsIGNvbnN0IFN0cmluZyYg ZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCwgYm9vbCBpbmNsdWRlQ29tbWFu ZExpbmVBUEksIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7Ci0gICAgdm9pZCBnZXRD b21wbGV0aW9ucyhjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGJvb2wgaW5jbHVkZUNvbW1hbmRM aW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQpOwotICAgIHZvaWQgZ2V0Q29t cGxldGlvbnNPbkNhbGxGcmFtZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gY2FsbEZyYW1l SWQsIGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgYm9vbCBpbmNsdWRlQ29tbWFuZExpbmVBUEks IFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CiAgICAgdm9pZCBnZXRQcm9wZXJ0aWVz KFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCwgYm9vbCBpZ25vcmVIYXNPd25Q cm9wZXJ0eSwgYm9vbCBhYmJyZXZpYXRlLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1bHQp OwogICAgIE5vZGUqIG5vZGVGb3JPYmplY3RJZChQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4g b2JqZWN0SWQpOwogICAgIHZvaWQgcmVzb2x2ZU5vZGUobG9uZyBub2RlSWQsIFJlZlB0cjxJbnNw ZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHRTb3VyY2UuanMKaW5kZXggZDkxZDk1MS4uYTFmZWFjOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5qcwpAQCAtMjM1LDU0 ICsyMzUsNiBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBP YmplY3Qua2V5cyhwcm9wZXJ0eU5hbWVTZXQpOwogICAgIH0sCiAKLSAgICBnZXRDb21wbGV0aW9u czogZnVuY3Rpb24oZXhwcmVzc2lvbiwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJKQotICAgIHsKLSAg ICAgICAgdmFyIHByb3BzID0ge307Ci0gICAgICAgIHRyeSB7Ci0gICAgICAgICAgICBpZiAoIWV4 cHJlc3Npb24pCi0gICAgICAgICAgICAgICAgZXhwcmVzc2lvbiA9ICJ0aGlzIjsKLSAgICAgICAg ICAgIHZhciBleHByZXNzaW9uUmVzdWx0ID0gdGhpcy5fZXZhbHVhdGVPbihpbnNwZWN0ZWRXaW5k b3cuZXZhbCwgaW5zcGVjdGVkV2luZG93LCBleHByZXNzaW9uLCBmYWxzZSwgZmFsc2UpOwotCi0g ICAgICAgICAgICBpZiAodHlwZW9mIGV4cHJlc3Npb25SZXN1bHQgPT09ICJvYmplY3QiKQotICAg ICAgICAgICAgICAgIHRoaXMuX3BvcHVsYXRlUHJvcGVydHlOYW1lcyhleHByZXNzaW9uUmVzdWx0 LCBwcm9wcyk7Ci0KLSAgICAgICAgICAgIGlmIChpbmNsdWRlQ29tbWFuZExpbmVBUEkpIHsKLSAg ICAgICAgICAgICAgICBmb3IgKHZhciBwcm9wIGluIENvbW1hbmRMaW5lQVBJLm1lbWJlcnNfKQot ICAgICAgICAgICAgICAgICAgICBwcm9wc1tDb21tYW5kTGluZUFQSS5tZW1iZXJzX1twcm9wXV0g PSB0cnVlOwotICAgICAgICAgICAgfQotICAgICAgICB9IGNhdGNoKGUpIHsKLSAgICAgICAgfQot ICAgICAgICByZXR1cm4gcHJvcHM7Ci0gICAgfSwKLQotICAgIGdldENvbXBsZXRpb25zT25DYWxs RnJhbWU6IGZ1bmN0aW9uKGNhbGxGcmFtZUlkLCBleHByZXNzaW9uLCBpbmNsdWRlQ29tbWFuZExp bmVBUEkpCi0gICAgewotICAgICAgICB2YXIgcHJvcHMgPSB7fTsKLSAgICAgICAgdHJ5IHsKLSAg ICAgICAgICAgIHZhciBjYWxsRnJhbWUgPSB0aGlzLl9jYWxsRnJhbWVGb3JJZChjYWxsRnJhbWVJ ZCk7Ci0gICAgICAgICAgICBpZiAoIWNhbGxGcmFtZSkKLSAgICAgICAgICAgICAgICByZXR1cm4g cHJvcHM7Ci0KLSAgICAgICAgICAgIGlmIChleHByZXNzaW9uKSB7Ci0gICAgICAgICAgICAgICAg dmFyIGV4cHJlc3Npb25SZXN1bHQgPSB0aGlzLl9ldmFsdWF0ZU9uKGNhbGxGcmFtZS5ldmFsdWF0 ZSwgY2FsbEZyYW1lLCBleHByZXNzaW9uLCB0cnVlLCBmYWxzZSk7Ci0gICAgICAgICAgICAgICAg aWYgKHR5cGVvZiBleHByZXNzaW9uUmVzdWx0ID09PSAib2JqZWN0IikKLSAgICAgICAgICAgICAg ICAgICAgdGhpcy5fcG9wdWxhdGVQcm9wZXJ0eU5hbWVzKGV4cHJlc3Npb25SZXN1bHQsIHByb3Bz KTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgLy8gRXZhbHVhdGUgaW50 byBwcm9wZXJ0aWVzIGluIHNjb3BlIG9mIHRoZSBzZWxlY3RlZCBjYWxsIGZyYW1lLgotICAgICAg ICAgICAgICAgIHZhciBzY29wZUNoYWluID0gY2FsbEZyYW1lLnNjb3BlQ2hhaW47Ci0gICAgICAg ICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzY29wZUNoYWluLmxlbmd0aDsgKytpKQotICAg ICAgICAgICAgICAgICAgICB0aGlzLl9wb3B1bGF0ZVByb3BlcnR5TmFtZXMoc2NvcGVDaGFpbltp XSwgcHJvcHMpOwotICAgICAgICAgICAgfQotICAgIAotICAgICAgICAgICAgaWYgKGluY2x1ZGVD b21tYW5kTGluZUFQSSkgewotICAgICAgICAgICAgICAgIGZvciAodmFyIHByb3AgaW4gQ29tbWFu ZExpbmVBUEkubWVtYmVyc18pCi0gICAgICAgICAgICAgICAgICAgIHByb3BzW0NvbW1hbmRMaW5l QVBJLm1lbWJlcnNfW3Byb3BdXSA9IHRydWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gY2F0 Y2goZSkgewotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBwcm9wczsKLSAgICB9LAotCiAgICAg ZXZhbHVhdGU6IGZ1bmN0aW9uKGV4cHJlc3Npb24sIG9iamVjdEdyb3VwLCBpbmplY3RDb21tYW5k TGluZUFQSSkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9ldmFsdWF0ZUFuZFdyYXAoaW5z cGVjdGVkV2luZG93LmV2YWwsIGluc3BlY3RlZFdpbmRvdywgZXhwcmVzc2lvbiwgb2JqZWN0R3Jv dXAsIGZhbHNlLCBpbmplY3RDb21tYW5kTGluZUFQSSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3IuaWRsCmluZGV4IGM0N2NiZTAuLjY1NTNkNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3IuaWRsCkBAIC03NCw3ICs3NCw2IEBAIG1vZHVsZSBjb3JlIHsKICAgICBp bnRlcmZhY2UgW0NvbmRpdGlvbmFsPUlOU1BFQ1RPUl0gUnVudGltZSB7CiAgICAgICAgIHZvaWQg ZXZhbHVhdGUoaW4gU3RyaW5nIGV4cHJlc3Npb24sIGluIFN0cmluZyBvYmplY3RHcm91cCwgaW4g Ym9vbGVhbiBpbmNsdWRlQ29tbWFuZExpbmVBUEksIG91dCBWYWx1ZSByZXN1bHQpOwogICAgICAg ICB2b2lkIGV2YWx1YXRlT24oaW4gT2JqZWN0IG9iamVjdElkLCBpbiBTdHJpbmcgZXhwcmVzc2lv biwgb3V0IFZhbHVlIHJlc3VsdCk7Ci0gICAgICAgIHZvaWQgZ2V0Q29tcGxldGlvbnMoaW4gU3Ry aW5nIGV4cHJlc3Npb24sIGluIGJvb2xlYW4gaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBvdXQgVmFs dWUgcmVzdWx0KTsKICAgICAgICAgdm9pZCBnZXRQcm9wZXJ0aWVzKGluIE9iamVjdCBvYmplY3RJ ZCwgaW4gYm9vbGVhbiBpZ25vcmVIYXNPd25Qcm9wZXJ0eSwgaW4gYm9vbGVhbiBhYmJyZXZpYXRl LCBvdXQgVmFsdWUgcmVzdWx0KTsKICAgICAgICAgdm9pZCBzZXRQcm9wZXJ0eVZhbHVlKGluIE9i amVjdCBvYmplY3RJZCwgaW4gU3RyaW5nIHByb3BlcnR5TmFtZSwgaW4gU3RyaW5nIGV4cHJlc3Np b24sIG91dCBWYWx1ZSByZXN1bHQpOwogICAgICAgICB2b2lkIHJlbGVhc2VPYmplY3QoaW4gT2Jq ZWN0IG9iamVjdElkKTsKQEAgLTIzMSw3ICsyMzAsNiBAQCBtb2R1bGUgY29yZSB7CiAgICAgICAg IHZvaWQgc2V0UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZShpbiBsb25nIHBhdXNlT25FeGNlcHRpb25z U3RhdGUsIG91dCBsb25nIG5ld1N0YXRlKTsKIAogICAgICAgICB2b2lkIGV2YWx1YXRlT25DYWxs RnJhbWUoaW4gT2JqZWN0IGNhbGxGcmFtZUlkLCBpbiBTdHJpbmcgZXhwcmVzc2lvbiwgaW4gU3Ry aW5nIG9iamVjdEdyb3VwLCBpbiBib29sZWFuIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgb3V0IFZh bHVlIHJlc3VsdCk7Ci0gICAgICAgIHZvaWQgZ2V0Q29tcGxldGlvbnNPbkNhbGxGcmFtZShpbiBP YmplY3QgY2FsbEZyYW1lSWQsIGluIFN0cmluZyBleHByZXNzaW9uLCBpbiBib29sZWFuIGluY2x1 ZGVDb21tYW5kTGluZUFQSSwgb3V0IFZhbHVlIHJlc3VsdCk7CiAKICNpZiBkZWZpbmVkKEVOQUJM RV9XT1JLRVJTKSAmJiBFTkFCTEVfV09SS0VSUwogICAgICAgICBbZXZlbnRdIHZvaWQgZGlkQ3Jl YXRlV29ya2VyKG91dCBsb25nIGlkLCBvdXQgU3RyaW5nIHVybCwgb3V0IGJvb2xlYW4gaXNTaGFy ZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVn Z2VyQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuY3BwCmluZGV4IDJjNWMwYTcuLjBjZGMyYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5jcHAKQEAgLTMzNCwxMyArMzM0 LDYgQEAgdm9pZCBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50OjpldmFsdWF0ZU9uQ2FsbEZyYW1lKEVy cm9yU3RyaW5nKiwgUGFzc1JlZlB0cjxJbnNwZWMKICAgICAgICAgaW5qZWN0ZWRTY3JpcHQuZXZh bHVhdGVPbkNhbGxGcmFtZShjYWxsRnJhbWVJZCwgZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGlu Y2x1ZGVDb21tYW5kTGluZUFQSSwgcmVzdWx0KTsKIH0KIAotdm9pZCBJbnNwZWN0b3JEZWJ1Z2dl ckFnZW50OjpnZXRDb21wbGV0aW9uc09uQ2FsbEZyYW1lKEVycm9yU3RyaW5nKiwgUGFzc1JlZlB0 cjxJbnNwZWN0b3JPYmplY3Q+IGNhbGxGcmFtZUlkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24s IGJvb2wgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiByZXN1 bHQpCi17Ci0gICAgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRTY3JpcHQgPSBtX2luamVjdGVkU2Ny aXB0SG9zdC0+aW5qZWN0ZWRTY3JpcHRGb3JPYmplY3RJZChjYWxsRnJhbWVJZC5nZXQoKSk7Ci0g ICAgaWYgKCFpbmplY3RlZFNjcmlwdC5oYXNOb1ZhbHVlKCkpCi0gICAgICAgIGluamVjdGVkU2Ny aXB0LmdldENvbXBsZXRpb25zT25DYWxsRnJhbWUoY2FsbEZyYW1lSWQsIGV4cHJlc3Npb24sIGlu Y2x1ZGVDb21tYW5kTGluZUFQSSwgcmVzdWx0KTsKLX0KLQogUGFzc1JlZlB0cjxJbnNwZWN0b3JW YWx1ZT4gSW5zcGVjdG9yRGVidWdnZXJBZ2VudDo6Y3VycmVudENhbGxGcmFtZXMoKQogewogICAg IGlmICghbV9wYXVzZWRTY3JpcHRTdGF0ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRGVidWdnZXJBZ2VudC5oCmluZGV4IGIzNzNjYzUuLjM5NDAzNGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRlYnVnZ2VyQWdlbnQuaApA QCAtOTksNyArOTksNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdGVwT3V0KEVycm9yU3RyaW5nKiBl cnJvcik7CiAgICAgdm9pZCBzZXRQYXVzZU9uRXhjZXB0aW9uc1N0YXRlKEVycm9yU3RyaW5nKiBl cnJvciwgbG9uZyBwYXVzZVN0YXRlLCBsb25nKiBuZXdTdGF0ZSk7CiAgICAgdm9pZCBldmFsdWF0 ZU9uQ2FsbEZyYW1lKEVycm9yU3RyaW5nKiBlcnJvciwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+IGNhbGxGcmFtZUlkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIGNvbnN0IFN0cmluZyYg b2JqZWN0R3JvdXAsIGJvb2wgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9y VmFsdWU+KiByZXN1bHQpOwotICAgIHZvaWQgZ2V0Q29tcGxldGlvbnNPbkNhbGxGcmFtZShFcnJv clN0cmluZyogZXJyb3IsIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBjYWxsRnJhbWVJZCwg Y29uc3QgU3RyaW5nJiBleHByZXNzaW9uLCBib29sIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgUmVm UHRyPEluc3BlY3RvclZhbHVlPiogcmVzdWx0KTsKIAogICAgIGNsYXNzIExpc3RlbmVyIHsKICAg ICBwdWJsaWM6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UnVudGltZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50 aW1lQWdlbnQuY3BwCmluZGV4IGIyMTcyYzQuLmFiN2Y1NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSdW50aW1lQWdlbnQuY3BwCkBAIC01OSwxMyArNTks NiBAQCB2b2lkIEluc3BlY3RvclJ1bnRpbWVBZ2VudDo6ZXZhbHVhdGVPbihFcnJvclN0cmluZyos IFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PgogICAgICAgICBpbmplY3RlZFNjcmlwdC5ldmFs dWF0ZU9uKG9iamVjdElkLCBleHByZXNzaW9uLCByZXN1bHQpOwogfQogCi12b2lkIEluc3BlY3Rv clJ1bnRpbWVBZ2VudDo6Z2V0Q29tcGxldGlvbnMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcm IGV4cHJlc3Npb24sIGJvb2wgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBSZWZQdHI8SW5zcGVjdG9y VmFsdWU+KiByZXN1bHQpCi17Ci0gICAgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRTY3JpcHQgPSBt X2luamVjdGVkU2NyaXB0SG9zdC0+aW5qZWN0ZWRTY3JpcHRGb3JNYWluRnJhbWUoKTsKLSAgICBp ZiAoIWluamVjdGVkU2NyaXB0Lmhhc05vVmFsdWUoKSkKLSAgICAgICAgaW5qZWN0ZWRTY3JpcHQu Z2V0Q29tcGxldGlvbnMoZXhwcmVzc2lvbiwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCByZXN1bHQp OwotfQotCiB2b2lkIEluc3BlY3RvclJ1bnRpbWVBZ2VudDo6Z2V0UHJvcGVydGllcyhFcnJvclN0 cmluZyosIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBvYmplY3RJZCwgYm9vbCBpZ25vcmVI YXNPd25Qcm9wZXJ0eSwgYm9vbCBhYmJyZXZpYXRlLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KiBy ZXN1bHQpCiB7CiAgICAgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0ZWRTY3JpcHQgPSBtX2luamVjdGVk U2NyaXB0SG9zdC0+aW5qZWN0ZWRTY3JpcHRGb3JPYmplY3RJZChvYmplY3RJZC5nZXQoKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50 LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUnVudGltZUFnZW50LmgKaW5k ZXggNzk0NTBkNC4uMjhmMzU2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJ1bnRpbWVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JSdW50aW1lQWdlbnQuaApAQCAtNjEsNyArNjEsNiBAQCBwdWJsaWM6CiAgICAgLy8g UGFydCBvZiB0aGUgcHJvdG9jb2wuCiAgICAgdm9pZCBldmFsdWF0ZShFcnJvclN0cmluZyosIGNv bnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgY29uc3QgU3RyaW5nJiBvYmplY3RHcm91cCwgYm9vbCBp bmNsdWRlQ29tbWFuZExpbmVBUEksIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CiAg ICAgdm9pZCBldmFsdWF0ZU9uKEVycm9yU3RyaW5nKiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+IG9iamVjdElkLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIFJlZlB0cjxJbnNwZWN0b3JW YWx1ZT4qIHJlc3VsdCk7Ci0gICAgdm9pZCBnZXRDb21wbGV0aW9ucyhFcnJvclN0cmluZyosIGNv bnN0IFN0cmluZyYgZXhwcmVzc2lvbiwgYm9vbCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIFJlZlB0 cjxJbnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CiAgICAgdm9pZCByZWxlYXNlT2JqZWN0KEVycm9y U3RyaW5nKiwgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IG9iamVjdElkKTsKICAgICB2b2lk IGdldFByb3BlcnRpZXMoRXJyb3JTdHJpbmcqLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4g b2JqZWN0SWQsIGJvb2wgaWdub3JlSGFzT3duUHJvcGVydHksIGJvb2wgYWJicmV2aWF0ZSwgUmVm UHRyPEluc3BlY3RvclZhbHVlPiogcmVzdWx0KTsKICAgICB2b2lkIHNldFByb3BlcnR5VmFsdWUo RXJyb3JTdHJpbmcqLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gb2JqZWN0SWQsIGNvbnN0 IFN0cmluZyYgcHJvcGVydHlOYW1lLCBjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24sIFJlZlB0cjxJ bnNwZWN0b3JWYWx1ZT4qIHJlc3VsdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCA2OTQyMjQ3Li44MTUzNDg0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAg LTM1MywyMCArMzUzLDMwIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIGlmICghZXhwcmVzc2lvblN0cmluZyAmJiAhcHJlZml4KQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIHZhciByZXBvcnRDb21wbGV0aW9ucyA9IHRoaXMuX3JlcG9ydENv bXBsZXRpb25zLmJpbmQodGhpcywgYmVzdE1hdGNoT25seSwgY29tcGxldGlvbnNSZWFkeUNhbGxi YWNrLCBkb3ROb3RhdGlvbiwgYnJhY2tldE5vdGF0aW9uLCBwcmVmaXgpOwotICAgICAgICAvLyBD b2xsZWN0IGNvbW1hIHNlcGFyYXRlZCBvYmplY3QgcHJvcGVydGllcyBmb3IgdGhlIGNvbXBsZXRp b24uCi0KLSAgICAgICAgdmFyIGluY2x1ZGVDb21tYW5kTGluZUFQSSA9ICghZG90Tm90YXRpb24g JiYgIWJyYWNrZXROb3RhdGlvbik7Ci0gICAgICAgIGlmIChXZWJJbnNwZWN0b3IucGFuZWxzLnNj cmlwdHMucGF1c2VkKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmdl dENvbXBsZXRpb25zT25DYWxsRnJhbWUoZXhwcmVzc2lvblN0cmluZywgaW5jbHVkZUNvbW1hbmRM aW5lQVBJLCByZXBvcnRDb21wbGV0aW9ucyk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIFJ1 bnRpbWVBZ2VudC5nZXRDb21wbGV0aW9ucyhleHByZXNzaW9uU3RyaW5nLCBpbmNsdWRlQ29tbWFu ZExpbmVBUEksIHJlcG9ydENvbXBsZXRpb25zKTsKLSAgICB9LAorICAgICAgICB0aGlzLmV2YWxJ bkluc3BlY3RlZFdpbmRvdyhleHByZXNzaW9uU3RyaW5nLCAiY29tcGxldGlvbiIsIHRydWUsIGV2 YWx1YXRlZC5iaW5kKHRoaXMpKTsKIAotICAgIF9yZXBvcnRDb21wbGV0aW9uczogZnVuY3Rpb24o YmVzdE1hdGNoT25seSwgY29tcGxldGlvbnNSZWFkeUNhbGxiYWNrLCBkb3ROb3RhdGlvbiwgYnJh Y2tldE5vdGF0aW9uLCBwcmVmaXgsIHJlc3VsdCwgaXNFeGNlcHRpb24pIHsKLSAgICAgICAgaWYg KGlzRXhjZXB0aW9uKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmdW5jdGlvbiBldmFs dWF0ZWQocmVzdWx0KQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXJlc3VsdCkKKyAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXN1bHQuZ2V0UHJvcGVydGllcyh0cnVl LCBmYWxzZSwgZXZhbHVhdGVkUHJvcGVydGllcy5iaW5kKHRoaXMpKTsKKyAgICAgICAgfQorCisg ICAgICAgIGZ1bmN0aW9uIGV2YWx1YXRlZFByb3BlcnRpZXMocHJvcGVydGllcykKKyAgICAgICAg eworICAgICAgICAgICAgUnVudGltZUFnZW50LnJlbGVhc2VXcmFwcGVyT2JqZWN0R3JvdXAoImNv bXBsZXRpb24iKTsKKyAgICAgICAgICAgIHZhciBwcm9wZXJ0eU5hbWVzID0gW107CisgICAgICAg ICAgICBmb3IgKHZhciBpID0gMDsgcHJvcGVydGllcyAmJiBpIDwgcHJvcGVydGllcy5sZW5ndGg7 ICsraSkKKyAgICAgICAgICAgICAgICBwcm9wZXJ0eU5hbWVzLnB1c2gocHJvcGVydGllc1tpXS5u YW1lKTsKKworICAgICAgICAgICAgdmFyIGluY2x1ZGVDb21tYW5kTGluZUFQSSA9ICghZG90Tm90 YXRpb24gJiYgIWJyYWNrZXROb3RhdGlvbik7CisgICAgICAgICAgICBpZiAoaW5jbHVkZUNvbW1h bmRMaW5lQVBJKQorICAgICAgICAgICAgICAgIHByb3BlcnR5TmFtZXMuc3BsaWNlKDAsIDAsICJk aXIiLCAiZGlyeG1sIiwgImtleXMiLCAidmFsdWVzIiwgInByb2ZpbGUiLCAicHJvZmlsZUVuZCIs ICJtb25pdG9yRXZlbnRzIiwgInVubW9uaXRvckV2ZW50cyIsICJpbnNwZWN0IiwgImNvcHkiLCAi Y2xlYXIiKTsKKyAgICAgICAgICAgIHRoaXMuX3JlcG9ydENvbXBsZXRpb25zKGJlc3RNYXRjaE9u bHksIGNvbXBsZXRpb25zUmVhZHlDYWxsYmFjaywgZG90Tm90YXRpb24sIGJyYWNrZXROb3RhdGlv biwgcHJlZml4LCBwcm9wZXJ0eU5hbWVzKTsKKyAgICAgICAgfQorICAgIH0sCiAKKyAgICBfcmVw b3J0Q29tcGxldGlvbnM6IGZ1bmN0aW9uKGJlc3RNYXRjaE9ubHksIGNvbXBsZXRpb25zUmVhZHlD YWxsYmFjaywgZG90Tm90YXRpb24sIGJyYWNrZXROb3RhdGlvbiwgcHJlZml4LCBwcm9wZXJ0aWVz KSB7CiAgICAgICAgIGlmIChicmFja2V0Tm90YXRpb24pIHsKICAgICAgICAgICAgIGlmIChwcmVm aXgubGVuZ3RoICYmIHByZWZpeFswXSA9PT0gIiciKQogICAgICAgICAgICAgICAgIHZhciBxdW90 ZVVzZWQgPSAiJyI7CkBAIC0zNzUsNyArMzg1LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHZhciByZXN1bHRzID0gW107Ci0g ICAgICAgIHZhciBwcm9wZXJ0aWVzID0gT2JqZWN0LmtleXMocmVzdWx0KS5zb3J0KCk7CisgICAg ICAgIHByb3BlcnRpZXMuc29ydCgpOwogCiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcHJv cGVydGllcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgdmFyIHByb3BlcnR5ID0gcHJvcGVy dGllc1tpXTsKQEAgLTUxMiw3ICs1MjIsNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJv dG90eXBlID0gewogICAgIGV2YWxJbkluc3BlY3RlZFdpbmRvdzogZnVuY3Rpb24oZXhwcmVzc2lv biwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgY2FsbGJhY2spCiAgICAgewog ICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzICYmIFdlYkluc3BlY3Rvci5w YW5lbHMuc2NyaXB0cy5wYXVzZWQpIHsKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu c2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUoZXhwcmVzc2lvbiwgZmFsc2UsIG9i amVjdEdyb3VwLCBpbmNsdWRlQ29tbWFuZExpbmVBUEksIGNhbGxiYWNrKTsKKyAgICAgICAgICAg IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUo ZXhwcmVzc2lvbiwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgY2FsbGJhY2sp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggOThmMjM2Ny4uODY5 YWQ4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3Jp cHRzUGFuZWwuanMKQEAgLTQwMywzMSArNDAzLDE2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgc291cmNlRnJhbWUucmVtb3ZlQnJlYWtwb2lu dChicmVha3BvaW50LmxpbmVOdW1iZXIpOwogICAgIH0sCiAKLSAgICBnZXRDb21wbGV0aW9uc09u Q2FsbEZyYW1lOiBmdW5jdGlvbihleHByZXNzaW9uU3RyaW5nLCBpbmNsdWRlQ29tbWFuZExpbmVB UEksIGNhbGxiYWNrKQorICAgIGV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZTogZnVuY3Rpb24o Y29kZSwgb2JqZWN0R3JvdXAsIGluY2x1ZGVDb21tYW5kTGluZUFQSSwgY2FsbGJhY2spCiAgICAg ewogICAgICAgICB2YXIgc2VsZWN0ZWRDYWxsRnJhbWUgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2Rl bC5zZWxlY3RlZENhbGxGcmFtZTsKICAgICAgICAgaWYgKCF0aGlzLl9wYXVzZWQgfHwgIXNlbGVj dGVkQ2FsbEZyYW1lKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIERlYnVnZ2VyQWdl bnQuZ2V0Q29tcGxldGlvbnNPbkNhbGxGcmFtZShzZWxlY3RlZENhbGxGcmFtZS5pZCwgZXhwcmVz c2lvblN0cmluZywgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBjYWxsYmFjayk7Ci0gICAgfSwKLQot ICAgIGV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZTogZnVuY3Rpb24oY29kZSwgdXBkYXRlSW50 ZXJmYWNlLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCBjYWxsYmFjaykKLSAg ICB7Ci0gICAgICAgIHZhciBzZWxlY3RlZENhbGxGcmFtZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1v ZGVsLnNlbGVjdGVkQ2FsbEZyYW1lOwotICAgICAgICBpZiAoIXRoaXMuX3BhdXNlZCB8fCAhc2Vs ZWN0ZWRDYWxsRnJhbWUpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKHR5cGVv ZiB1cGRhdGVJbnRlcmZhY2UgPT09ICJ1bmRlZmluZWQiKQotICAgICAgICAgICAgdXBkYXRlSW50 ZXJmYWNlID0gdHJ1ZTsKLQogICAgICAgICBmdW5jdGlvbiB1cGRhdGluZ0NhbGxiYWNrV3JhcHBl cihyZXN1bHQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGlmIChyZXN1bHQpIHsKKyAgICAgICAg ICAgIGlmIChyZXN1bHQpCiAgICAgICAgICAgICAgICAgY2FsbGJhY2soV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5mcm9tUGF5bG9hZChyZXN1bHQpKTsKLSAgICAgICAgICAgICAgICBpZiAodXBk YXRlSW50ZXJmYWNlKQotICAgICAgICAgICAgICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5zY29w ZWNoYWluLnVwZGF0ZShzZWxlY3RlZENhbGxGcmFtZSk7Ci0gICAgICAgICAgICB9CiAgICAgICAg IH0KICAgICAgICAgRGVidWdnZXJBZ2VudC5ldmFsdWF0ZU9uQ2FsbEZyYW1lKHNlbGVjdGVkQ2Fs bEZyYW1lLmlkLCBjb2RlLCBvYmplY3RHcm91cCwgaW5jbHVkZUNvbW1hbmRMaW5lQVBJLCB1cGRh dGluZ0NhbGxiYWNrV3JhcHBlci5iaW5kKHRoaXMpKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggMzZjZWIwMC4u MGY4OTY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T b3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nv dXJjZUZyYW1lLmpzCkBAIC03MTgsNyArNzE4LDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBzaG93 T2JqZWN0UG9wdXAuY2FsbCh0aGlzLCByZXN1bHQpOwogICAgICAgICB9Ci0gICAgICAgIFdlYklu c3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUoZWxlbWVu dC50ZXh0Q29udGVudCwgZmFsc2UsIHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCwgZmFsc2UsIGV2 YWx1YXRlQ2FsbGJhY2suYmluZCh0aGlzKSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu c2NyaXB0cy5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUoZWxlbWVudC50ZXh0Q29udGVudCwg dGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwLCBmYWxzZSwgZXZhbHVhdGVDYWxsYmFjay5iaW5kKHRo aXMpKTsKICAgICB9LAogCiAgICAgX2VkaXRCcmVha3BvaW50Q29uZGl0aW9uOiBmdW5jdGlvbihs aW5lTnVtYmVyLCBjb25kaXRpb24sIGNhbGxiYWNrKQpAQCAtNzc0LDcgKzc3NCw3IEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAK ICAgICAgICAgdmFyIGV4cHJlc3Npb24gPSBzZWxlY3Rpb24uZ2V0UmFuZ2VBdCgwKS50b1N0cmlu ZygpLnRyaW0oKTsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmV2YWx1YXRl SW5TZWxlY3RlZENhbGxGcmFtZShleHByZXNzaW9uLCBmYWxzZSwgImNvbnNvbGUiLCBmdW5jdGlv bihyZXN1bHQpIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmV2YWx1YXRl SW5TZWxlY3RlZENhbGxGcmFtZShleHByZXNzaW9uLCAiY29uc29sZSIsIGZ1bmN0aW9uKHJlc3Vs dCkgewogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dDb25zb2xlKCk7CiAgICAgICAgICAg ICB2YXIgY29tbWFuZE1lc3NhZ2UgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnNvbGVDb21tYW5kKGV4 cHJlc3Npb24pOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuYWRkTWVzc2FnZShj b21tYW5kTWVzc2FnZSk7Cg==