149199 2015-09-15 17:53:20 -0700 Web Inspector: Fix common typo "supress" => "suppress" 2015-09-16 16:25:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck bburg commit-queue esprehn+autocc gyuyoung.kim mkwst simon.fraser oldest_to_newest 1126222 0 joepeck 2015-09-15 17:53:20 -0700 Fix common typo "supress" => "suppress". 1126224 1 261273 joepeck 2015-09-15 17:57:00 -0700 Created attachment 261273 [PATCH] Proposed Fix I didn't check LayoutTests, of which I know there are some. 1126225 2 commit-queue 2015-09-15 17:59:22 -0700 Attachment 261273 did not pass style-queue: ERROR: Source/WebCore/platform/NotImplemented.h:32: preprocessor directives (e.g., #ifdef, #define, #import) should never be indented. [whitespace/indent] [4] ERROR: Source/WebCore/platform/NotImplemented.h:34: preprocessor directives (e.g., #ifdef, #define, #import) should never be indented. [whitespace/indent] [4] ERROR: Source/WebCore/platform/NotImplemented.h:47: Multi line control clauses should use braces. [whitespace/braces] [4] Total errors found: 3 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 1126510 3 261273 commit-queue 2015-09-16 16:25:37 -0700 Comment on attachment 261273 [PATCH] Proposed Fix Clearing flags on attachment: 261273 Committed r189883: <http://trac.webkit.org/changeset/189883> 1126511 4 commit-queue 2015-09-16 16:25:41 -0700 All reviewed patches have been landed. Closing bug. 261273 2015-09-15 17:57:00 -0700 2015-09-16 16:25:37 -0700 [PATCH] Proposed Fix suppress-1.patch text/plain 10973 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMWFhOGUyLi4zZTExOGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTUtMDktMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBGaXggY29tbW9uIHR5cG8gInN1cHJlc3MiID0+ICJzdXBw cmVzcyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 OTE5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aHRtbC9zaGFkb3cvQ29udGVudERpc3RyaWJ1dG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpDb250 ZW50RGlzdHJpYnV0b3I6Om5lZWRzRGlzdHJpYnV0aW9uKToKKyAgICAgICAgKiBwYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQ b2xpY3k6OnJlcG9ydFZpb2xhdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vTm90SW1wbGVtZW50 ZWQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS93aW4vTGF5ZXJDaGFuZ2VzRmx1 c2hlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllckNoYW5nZXNGbHVzaGVyOjpob29rQ2Fs bGJhY2spOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9ISURHYW1lcGFkUHJvdmlkZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SElER2FtZXBhZFByb3ZpZGVyOjpkZXZpY2VSZW1vdmVkKToKKyAg ICAgICAgKiBwbGF0Zm9ybS93aW4vbWFrZXNhZmVzZWguYXNtOgorCisyMDE1LTA5LTE1ICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3Rv cjogUGF1c2VkIERlYnVnZ2VyIHByZXZlbnRzIHBhZ2UgcmVsb2FkCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgxNzQKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVudERpc3RyaWJ1dG9yLmggYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0b3IuaAppbmRleCBmMGVkOGFmLi45OTY3 MjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJp YnV0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50RGlzdHJpYnV0 b3IuaApAQCAtODcsNyArODcsNyBAQCBwcml2YXRlOgogCiBpbmxpbmUgYm9vbCBDb250ZW50RGlz dHJpYnV0b3I6Om5lZWRzRGlzdHJpYnV0aW9uKCkgY29uc3QKIHsKLSAgICAvLyBEdXJpbmcgdGhl IGludmFsaWRhdGlvbiwgcmUtZGlzdHJpYnV0aW9uIHNob3VsZCBiZSBzdXByZXNzZWQuCisgICAg Ly8gRHVyaW5nIHRoZSBpbnZhbGlkYXRpb24sIHJlLWRpc3RyaWJ1dGlvbiBzaG91bGQgYmUgc3Vw cHJlc3NlZC4KICAgICByZXR1cm4gbV92YWxpZGl0eSAhPSBWYWxpZCAmJiBtX3ZhbGlkaXR5ICE9 IEludmFsaWRhdGluZzsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJp dHlQb2xpY3kuY3BwCmluZGV4IDAxYTMzZGQuLmZhYjQ5ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKQEAgLTE2MzgsNyArMTYzOCw3IEBAIHZv aWQgQ29udGVudFNlY3VyaXR5UG9saWN5OjpyZXBvcnRWaW9sYXRpb24oY29uc3QgU3RyaW5nJiBk aXJlY3RpdmVUZXh0LCBjb25zdCBTCiAgICAgLy8gZGlyZWN0aXZlIHRoYXQgd2FzIHZpb2xhdGVk LiBUaGUgZG9jdW1lbnQncyBVUkwgaXMgc2FmZSB0byBzZW5kIGJlY2F1c2UKICAgICAvLyBpdCdz IHRoZSBkb2N1bWVudCBpdHNlbGYgdGhhdCdzIHJlcXVlc3RpbmcgdGhhdCBpdCBiZSBzZW50LiBZ b3UgY291bGQKICAgICAvLyBtYWtlIGFuIGFyZ3VtZW50IHRoYXQgd2Ugc2hvdWxkbid0IHNlbmQg SFRUUFMgZG9jdW1lbnQgVVJMcyB0byBIVFRQCi0gICAgLy8gcmVwb3J0LXVyaXMgKGZvciB0aGUg c2FtZSByZWFzb25zIHRoYXQgd2Ugc3VwcmVzcyB0aGUgUmVmZXJlciBpbiB0aGF0CisgICAgLy8g cmVwb3J0LXVyaXMgKGZvciB0aGUgc2FtZSByZWFzb25zIHRoYXQgd2Ugc3VwcHJlc3MgdGhlIFJl ZmVyZXIgaW4gdGhhdAogICAgIC8vIGNhc2UpLCBidXQgdGhlIFJlZmVyZXIgaXMgc2VudCBpbXBs aWNpdGx5IHdoZXJlYXMgdGhpcyByZXF1ZXN0IGlzIG9ubHkKICAgICAvLyBzZW50IGV4cGxpY2l0 bHkuIEFzIGZvciB3aGljaCBkaXJlY3RpdmUgd2FzIHZpb2xhdGVkLCB0aGF0J3MgcHJldHR5CiAg ICAgLy8gaGFybWxlc3MgaW5mb3JtYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9Ob3RJbXBsZW1lbnRlZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTm90SW1w bGVtZW50ZWQuaAppbmRleCA5ZTY5MDEyLi41MTJiZWY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Ob3RJbXBsZW1lbnRlZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL05vdEltcGxlbWVudGVkLmgKQEAgLTI5LDkgKzI5LDkgQEAKICNpbmNsdWRlIDx3dGYvQXNz ZXJ0aW9ucy5oPgogCiAjaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShFRkwpCi0gICAgI2Rl ZmluZSBzdXByZXNzTm90SW1wbGVtZW50ZWRXYXJuaW5nKCkgZ2V0ZW52KCJESVNBQkxFX05JX1dB Uk5JTkciKQorICAgICNkZWZpbmUgc3VwcHJlc3NOb3RJbXBsZW1lbnRlZFdhcm5pbmcoKSBnZXRl bnYoIkRJU0FCTEVfTklfV0FSTklORyIpCiAjZWxzZQotICAgICNkZWZpbmUgc3VwcmVzc05vdElt cGxlbWVudGVkV2FybmluZygpIGZhbHNlCisgICAgI2RlZmluZSBzdXBwcmVzc05vdEltcGxlbWVu dGVkV2FybmluZygpIGZhbHNlCiAjZW5kaWYKIAogI2lmIExPR19ESVNBQkxFRApAQCAtNDQsNyAr NDQsNyBAQCBXRUJDT1JFX0VYUE9SVCBXVEZMb2dDaGFubmVsKiBub3RJbXBsZW1lbnRlZExvZ2dp bmdDaGFubmVsKCk7CiAKICNkZWZpbmUgbm90SW1wbGVtZW50ZWQoKSBkbyB7IFwKICAgICAgICAg c3RhdGljIGJvb2wgaGF2ZVByaW50ZWQgPSBmYWxzZTsgXAotICAgICAgICBpZiAoIWhhdmVQcmlu dGVkICYmICFzdXByZXNzTm90SW1wbGVtZW50ZWRXYXJuaW5nKCkpIHsgXAorICAgICAgICBpZiAo IWhhdmVQcmludGVkICYmICFzdXBwcmVzc05vdEltcGxlbWVudGVkV2FybmluZygpKSB7IFwKICAg ICAgICAgICAgIFdURkxvZ1ZlcmJvc2UoX19GSUxFX18sIF9fTElORV9fLCBXVEZfUFJFVFRZX0ZV TkNUSU9OLCBXZWJDb3JlOjpub3RJbXBsZW1lbnRlZExvZ2dpbmdDaGFubmVsKCksICJVTklNUExF TUVOVEVEOiAiKTsgXAogICAgICAgICAgICAgaGF2ZVByaW50ZWQgPSB0cnVlOyBcCiAgICAgICAg IH0gXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Evd2lu L0xheWVyQ2hhbmdlc0ZsdXNoZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Evd2luL0xheWVyQ2hhbmdlc0ZsdXNoZXIuY3BwCmluZGV4IDM5MTg3NTUuLjk0N2IzZjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL3dpbi9MYXll ckNoYW5nZXNGbHVzaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS93aW4vTGF5ZXJDaGFuZ2VzRmx1c2hlci5jcHAKQEAgLTcwLDEwICs3MCwxMCBAQCB2b2lk IExheWVyQ2hhbmdlc0ZsdXNoZXI6OmNhbmNlbFBlbmRpbmdGbHVzaChBYnN0cmFjdENBQ0ZMYXll clRyZWVIb3N0KiBob3N0KQogCiBMUkVTVUxUIExheWVyQ2hhbmdlc0ZsdXNoZXI6Omhvb2tDYWxs YmFjayhpbnQgY29kZSwgV1BBUkFNIHdQYXJhbSwgTFBBUkFNIGxQYXJhbSkKIHsKLSAgICAvLyBT dXByZXNzIHRoZSBleGNlcHRpb24gaGFuZGxlciBXaW5kb3dzIHB1dHMgYXJvdW5kIGFsbCBob29r IGNhbGxzIHNvIHdlIGNhbiAKKyAgICAvLyBTdXBwcmVzcyB0aGUgZXhjZXB0aW9uIGhhbmRsZXIg V2luZG93cyBwdXRzIGFyb3VuZCBhbGwgaG9vayBjYWxscyBzbyB3ZSBjYW4gCiAgICAgLy8gY3Jh c2ggZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyBpZiBhbiBleGNlcHRpb24gaXMgaGl0LiAKICAgICBF eGNlcHRpb25SZWdpc3RyYXRpb24gcmVnaXN0cmF0aW9uU3RydWN0OyAvLyBOb3RlOiBtdXN0IGJl IHN0YWNrIGFsbG9jYXRlZC4KLSAgICBTdHJ1Y3R1cmVkRXhjZXB0aW9uSGFuZGxlclN1cHByZXNz b3Igc3VwcmVzc29yKHJlZ2lzdHJhdGlvblN0cnVjdCk7CisgICAgU3RydWN0dXJlZEV4Y2VwdGlv bkhhbmRsZXJTdXBwcmVzc29yIHN1cHByZXNzb3IocmVnaXN0cmF0aW9uU3RydWN0KTsKICAgICBy ZXR1cm4gc2luZ2xldG9uKCkuaG9va0ZpcmVkKGNvZGUsIHdQYXJhbSwgbFBhcmFtKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0hJREdhbWVwYWRQcm92aWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvSElER2FtZXBhZFByb3ZpZGVyLmNw cAppbmRleCA2OTdhNDljLi5hNWUwYmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvSElER2FtZXBhZFByb3ZpZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvSElER2FtZXBhZFByb3ZpZGVyLmNwcApAQCAtMjAzLDcgKzIwMyw3IEBAIHZvaWQg SElER2FtZXBhZFByb3ZpZGVyOjpkZXZpY2VSZW1vdmVkKElPSElERGV2aWNlUmVmIGRldmljZSkK ICAgICBBU1NFUlQocmVtb3ZlZEdhbWVwYWQpOwogCiAgICAgLy8gQW55IHRpbWUgd2UgZ2V0IGEg ZGV2aWNlIHJlbW92ZWQgY2FsbGJhY2sgd2Uga25vdyBpdCdzIGEgcmVhbCBldmVudCBhbmQgbm90 IGFuICdhbHJlYWR5IGNvbm5lY3RlZCcgZXZlbnQuCi0gICAgLy8gV2Ugc2hvdWxkIGFsd2F5cyBz dG9wIHN1cHJlc3NpbmcgY2FsbGJhY2tzIHdoZW4gd2UgcmVjZWl2ZSBzdWNoIGFuIGV2ZW50Lgor ICAgIC8vIFdlIHNob3VsZCBhbHdheXMgc3RvcCBzdXBwcmVzc2luZyBjYWxsYmFja3Mgd2hlbiB3 ZSByZWNlaXZlIHN1Y2ggYW4gZXZlbnQuCiAgICAgbV9zaG91bGREaXNwYXRjaENhbGxiYWNrcyA9 IHRydWU7CiAKICAgICBmb3IgKGF1dG8mIGNsaWVudCA6IG1fY2xpZW50cykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9tYWtlc2FmZXNlaC5hc20gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vbWFrZXNhZmVzZWguYXNtCmluZGV4IDE5ZGNhMTkuLjMyZmNmYWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9tYWtlc2FmZXNlaC5hc20K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL21ha2VzYWZlc2VoLmFzbQpAQCAtMzIs NyArMzIsNyBAQAogLjM4NgogLm1vZGVsIEZMQVQsIFNURENBTEwKIAotRVhURVJOIGV4Y2VwdGlv bkhhbmRsZXJAMTYgOiBuZWFyICAgOyBEZWZpbmVkIGluIFN0cnVjdHVyZWRFeGNlcHRpb25IYW5k bGVyU3VwcmVzc29yLmNwcAorRVhURVJOIGV4Y2VwdGlvbkhhbmRsZXJAMTYgOiBuZWFyICAgOyBE ZWZpbmVkIGluIFN0cnVjdHVyZWRFeGNlcHRpb25IYW5kbGVyU3VwcHJlc3Nvci5jcHAKIAogZXhj ZXB0aW9uSGFuZGxlclRodW5rIHByb3RvCiAuc2FmZXNlaCBleGNlcHRpb25IYW5kbGVyVGh1bmsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0NjAzZDguLmYzNGZiNzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE1LTA5LTE1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGNv bW1vbiB0eXBvICJzdXByZXNzIiA9PiAic3VwcHJlc3MiCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDkxOTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLnByb3RvdHlwZS5zZWxlY3Qp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZS5wcm90b3R5cGUuZGVzZWxlY3Qp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoQmFyLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNlYXJjaEJhcik6CisKKzIwMTUtMDktMTUgIEpvc2VwaCBQZWNvcmFybyAg PHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtlIEZpbmQg LyBTYXZlIGtleWJvYXJkIHNob3J0Y3V0cyB3b3JrIGJldHRlciBnbG9iYWxseQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5MTk4CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMK aW5kZXggNjUxZWJjMi4uNGNjNGU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuanMKQEAgLTE3MjIsNyArMTcyMiw3IEBA IFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUgPSBjbGFzcyBEYXRhR3JpZE5vZGUgZXh0ZW5kcyBX ZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KCJyZXZlYWxlZCIpOwogICAgIH0KIAotICAgIHNlbGVjdChzdXByZXNzU2VsZWN0ZWRFdmVudCkK KyAgICBzZWxlY3Qoc3VwcHJlc3NTZWxlY3RlZEV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKCF0 aGlzLmRhdGFHcmlkIHx8ICF0aGlzLnNlbGVjdGFibGUgfHwgdGhpcy5zZWxlY3RlZCkKICAgICAg ICAgICAgIHJldHVybjsKQEAgLTE3MzYsNyArMTczNiw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3Jp ZE5vZGUgPSBjbGFzcyBEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAg ICAgICAgIGlmICh0aGlzLl9lbGVtZW50KQogICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFz c0xpc3QuYWRkKCJzZWxlY3RlZCIpOwogCi0gICAgICAgIGlmICghc3VwcmVzc1NlbGVjdGVkRXZl bnQpCisgICAgICAgIGlmICghc3VwcHJlc3NTZWxlY3RlZEV2ZW50KQogICAgICAgICAgICAgdGhp cy5kYXRhR3JpZC5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRhdGFHcmlk LkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQpOwogICAgIH0KIApAQCAtMTc0Niw3ICsxNzQ2LDcg QEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZSA9IGNsYXNzIERhdGFHcmlkTm9kZSBleHRlbmRz IFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5zZWxlY3QoKTsKICAgICB9CiAKLSAg ICBkZXNlbGVjdChzdXByZXNzRGVzZWxlY3RlZEV2ZW50KQorICAgIGRlc2VsZWN0KHN1cHByZXNz RGVzZWxlY3RlZEV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLmRhdGFHcmlkIHx8IHRo aXMuZGF0YUdyaWQuc2VsZWN0ZWROb2RlICE9PSB0aGlzIHx8ICF0aGlzLnNlbGVjdGVkKQogICAg ICAgICAgICAgcmV0dXJuOwpAQCAtMTc1Nyw3ICsxNzU3LDcgQEAgV2ViSW5zcGVjdG9yLkRhdGFH cmlkTm9kZSA9IGNsYXNzIERhdGFHcmlkTm9kZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QK ICAgICAgICAgaWYgKHRoaXMuX2VsZW1lbnQpCiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNs YXNzTGlzdC5yZW1vdmUoInNlbGVjdGVkIik7CiAKLSAgICAgICAgaWYgKCFzdXByZXNzRGVzZWxl Y3RlZEV2ZW50KQorICAgICAgICBpZiAoIXN1cHByZXNzRGVzZWxlY3RlZEV2ZW50KQogICAgICAg ICAgICAgdGhpcy5kYXRhR3JpZC5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9y LkRhdGFHcmlkLkV2ZW50LlNlbGVjdGVkTm9kZUNoYW5nZWQpOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoQmFyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoQmFyLmpz CmluZGV4IDNmMmJkN2EuLmIyZGRjNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaEJhci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hCYXIuanMKQEAgLTI1LDcgKzI1LDcgQEAK IAogV2ViSW5zcGVjdG9yLlNlYXJjaEJhciA9IGNsYXNzIFNlYXJjaEJhciBleHRlbmRzIFdlYklu c3BlY3Rvci5OYXZpZ2F0aW9uSXRlbQogewotICAgIGNvbnN0cnVjdG9yKGlkZW50aWZpZXIsIHBs YWNlaG9sZGVyLCBkZWxlZ2F0ZSwgc3VwcmVzc0luY3JlbWVudGFsKQorICAgIGNvbnN0cnVjdG9y KGlkZW50aWZpZXIsIHBsYWNlaG9sZGVyLCBkZWxlZ2F0ZSwgc3VwcHJlc3NJbmNyZW1lbnRhbCkK ICAgICB7CiAgICAgICAgIHN1cGVyKGlkZW50aWZpZXIpOwogCkBAIC0zOSw3ICszOSw3IEBAIFdl Ykluc3BlY3Rvci5TZWFyY2hCYXIgPSBjbGFzcyBTZWFyY2hCYXIgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuTmF2aWdhdGlvbkl0ZW0KICAgICAgICAgdGhpcy5fc2VhcmNoSW5wdXQgPSB0aGlzLl9lbGVt ZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImlucHV0IikpOwogICAgICAg ICB0aGlzLl9zZWFyY2hJbnB1dC50eXBlID0gInNlYXJjaCI7CiAgICAgICAgIHRoaXMuX3NlYXJj aElucHV0LnNwZWxsY2hlY2sgPSBmYWxzZTsKLSAgICAgICAgdGhpcy5fc2VhcmNoSW5wdXQuaW5j cmVtZW50YWwgPSAhc3VwcmVzc0luY3JlbWVudGFsOworICAgICAgICB0aGlzLl9zZWFyY2hJbnB1 dC5pbmNyZW1lbnRhbCA9ICFzdXBwcmVzc0luY3JlbWVudGFsOwogICAgICAgICB0aGlzLl9zZWFy Y2hJbnB1dC5zZXRBdHRyaWJ1dGUoInJlc3VsdHMiLCA1KTsKICAgICAgICAgdGhpcy5fc2VhcmNo SW5wdXQuc2V0QXR0cmlidXRlKCJhdXRvc2F2ZSIsIGlkZW50aWZpZXIgKyAiLWF1dG9zYXZlIik7 CiAgICAgICAgIHRoaXMuX3NlYXJjaElucHV0LnNldEF0dHJpYnV0ZSgicGxhY2Vob2xkZXIiLCBw bGFjZWhvbGRlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDc5Y2NlZi4uZmZhNjNjNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDE1LTA5LTE1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGNvbW1vbiB0eXBvICJzdXBy ZXNzIiA9PiAic3VwcHJlc3MiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDkxOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFBsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVByb2Nlc3MpOgor CiAyMDE1LTA5LTE1ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAg ICBNb3ZlIG1vc3QgSURCIG9iamVjdCBlbmNvZGluZy9kZWNvZGluZyBmcm9tIFdlYktpdDIgdG8g V2ViQ29yZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1Bs dWdpblByb2Nlc3NNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVn aW5Qcm9jZXNzTWFjLm1tCmluZGV4IDA0MmQ0MTcuLjEwYTQzZmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpblByb2Nlc3NNYWMubW0KKysrIGIvU291 cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9tYWMvUGx1Z2luUHJvY2Vzc01hYy5tbQpAQCAtNDQw LDcgKzQ0MCw3IEBAIHZvaWQgUGx1Z2luUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplUHJvY2Vz cyhjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBhCiAKICAgICBtX3BsdWdpbkJ1bmRs ZUlkZW50aWZpZXIgPSBDRkJ1bmRsZUdldElkZW50aWZpZXIocGx1Z2luQnVuZGxlLmdldCgpKTsK IAotICAgIC8vIEZJWE1FOiBXb3JrYXJvdW5kIGZvciBKYXZhIG5vdCBsaWtpbmcgaXRzIHBsdWdp biBwcm9jZXNzIHRvIGJlIHN1cHJlc3NlZCAtIDxyZGFyOi8vcHJvYmxlbS8xNDI2Nzg0Mz4KKyAg ICAvLyBGSVhNRTogV29ya2Fyb3VuZCBmb3IgSmF2YSBub3QgbGlraW5nIGl0cyBwbHVnaW4gcHJv Y2VzcyB0byBiZSBzdXBwcmVzc2VkIC0gPHJkYXI6Ly9wcm9ibGVtLzE0MjY3ODQzPgogICAgIGlm IChtX3BsdWdpbkJ1bmRsZUlkZW50aWZpZXIgPT0gImNvbS5vcmFjbGUuamF2YS5KYXZhQXBwbGV0 UGx1Z2luIikKICAgICAgICAgKG5ldyBVc2VyQWN0aXZpdHkoImNvbS5vcmFjbGUuamF2YS5KYXZh QXBwbGV0UGx1Z2luIikpLT5zdGFydCgpOwogfQo=