183410 2018-03-07 10:40:27 -0800 Don't invalidate descendants for sibling combinators unless needed 2018-03-07 12:29:23 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue webkit-bug-importer zalan oldest_to_newest 1404400 0 koivisto 2018-03-07 10:40:27 -0800 Separate "a ~ b" and "a ~ b c" cases. 1404402 1 webkit-bug-importer 2018-03-07 10:47:11 -0800 <rdar://problem/38227297> 1404417 2 335200 koivisto 2018-03-07 11:12:46 -0800 Created attachment 335200 patch 1404436 3 335200 commit-queue 2018-03-07 12:29:22 -0800 Comment on attachment 335200 patch Clearing flags on attachment: 335200 Committed r229372: <https://trac.webkit.org/changeset/229372> 1404437 4 commit-queue 2018-03-07 12:29:23 -0800 All reviewed patches have been landed. Closing bug. 335200 2018-03-07 11:12:46 -0800 2018-03-07 12:29:22 -0800 patch affectnextsibling-descendant-2.patch text/plain 13295 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyOTM2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ2IEBACisyMDE4LTAzLTA3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBpbnZhbGlkYXRlIGRl c2NlbmRhbnRzIGZvciBzaWJsaW5nIGNvbWJpbmF0b3JzIHVubGVzcyBuZWVkZWQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzQxMAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzgyMjcyOTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSWYgd2Uga25vdyB0aGUgbWF0Y2hlZCBzaWJsaW5nIGNvbWJpbmF0 b3IgZG9lc24ndCBhZmZlY3QgZGVzY2VuZGFudHMgd2Ugc2hvdWxkbid0IGludmFsaWRhdGUgdGhl bS4KKworICAgICAgICAqIGNzcy9TZWxlY3RvckNoZWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2VsZWN0b3JDaGVja2VyOjptYXRjaFJlY3Vyc2l2ZWx5IGNvbnN0KToKKworICAgICAgICAg ICAgVXNlIGRpZmZlcmVudCBiaXQgZm9yIHRoZSBkZXNjZW5kYW50IGNhc2UuCisKKyAgICAgICAg KiBjc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rv ckNvbXBpbGVyOjpmcmFnbWVudE1hdGNoZXNUaGVSaWdodG1vc3RFbGVtZW50KToKKworICAgICAg ICAgICAgUmVtb3ZlIHVubmVlZGVkIGNvbnRleHQgYXNzZXJ0LgorCisgICAgICAgIChXZWJDb3Jl OjpTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlU2VsZWN0 b3JDaGVja2VyKToKKworICAgICAgICAgICAgVXNlIGRpZmZlcmVudCBiaXQgZm9yIHRoZSBkZXNj ZW5kYW50IGNhc2UuCisKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGlsZXI6OlNlbGVj dG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVTZWxlY3RvckNoZWNrZXJFeGNsdWRpbmdQc2V1ZG9F bGVtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNv ZGVHZW5lcmF0b3I6OmdlbmVyYXRlRWxlbWVudEhhc1BzZXVkb0VsZW1lbnQpOgorICAgICAgICAo V2ViQ29yZTo6U2VsZWN0b3JDb21waWxlcjo6U2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0 ZVJlcXVlc3RlZFBzZXVkb0VsZW1lbnRFcXVhbHNUb1NlbGVjdG9yUHNldWRvRWxlbWVudCk6Cisg ICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW52YWxpZGF0ZUZv clNpYmxpbmdDb21iaW5hdG9ycyk6CisKKyAgICAgICAgICAgIEludmFsaWRhdGUgdGhlIHRhcmdl dCBzaWJsaW5nIG9yIGFsbCBkZXNjZW5kYW50cyBiYXNlZCBvbiB0aGUgYml0cy4KKworICAgICAg ICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpkZXNjZW5kYW50 c0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RWxl bWVudDo6c2V0RGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nIGNvbnN0KToKKyAg ICAgICAgKiBkb20vTm9kZS5oOgorICAgICAgICAqIHN0eWxlL1N0eWxlUmVsYXRpb25zLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpjb21taXRSZWxhdGlvbnNUb1JlbmRlclN0eWxlKToK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpjb21taXRSZWxhdGlvbnMpOgorICAgICAgICAqIHN0 eWxlL1N0eWxlUmVsYXRpb25zLmg6CisKKyAgICAgICAgICAgIEFkZCBEZXNjZW5kYW50c0FmZmVj dGVkQnlQcmV2aW91c1NpYmxpbmcgYml0LiBBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nIGlzIG5v dyBqdXN0IGFib3V0IHRoZSB0YXJnZXQgZWxlbWVudC4KKwogMjAxOC0wMy0wNyAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgY2hlY2tGb3JTaWJsaW5nU3R5bGVD aGFuZ2VzIHNob3VsZCB1c2UgaW50ZXJuYWwgdmVyc2lvbnMgb2YgdGhlIGludmFsaWRhdGlvbiBm dW5jdGlvbnMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCShyZXZp c2lvbiAyMjkzNjgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzYyLDcgKzM2Miw4IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hS ZXN1bHQgU2VsZWN0b3JDaGUKIAogICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkRpcmVjdEFkamFjZW50 OgogICAgICAgICB7Ci0gICAgICAgICAgICBhZGRTdHlsZVJlbGF0aW9uKGNoZWNraW5nQ29udGV4 dCwgKmNvbnRleHQuZWxlbWVudCwgU3R5bGU6OlJlbGF0aW9uOjpBZmZlY3RlZEJ5UHJldmlvdXNT aWJsaW5nKTsKKyAgICAgICAgICAgIGF1dG8gcmVsYXRpb24gPSBjb250ZXh0LmlzTWF0Y2hFbGVt ZW50ID8gU3R5bGU6OlJlbGF0aW9uOjpBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nIDogU3R5bGU6 OlJlbGF0aW9uOjpEZXNjZW5kYW50c0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmc7CisgICAgICAg ICAgICBhZGRTdHlsZVJlbGF0aW9uKGNoZWNraW5nQ29udGV4dCwgKmNvbnRleHQuZWxlbWVudCwg cmVsYXRpb24pOwogCiAgICAgICAgICAgICBFbGVtZW50KiBwcmV2aW91c0VsZW1lbnQgPSBjb250 ZXh0LmVsZW1lbnQtPnByZXZpb3VzRWxlbWVudFNpYmxpbmcoKTsKICAgICAgICAgICAgIGlmICgh cHJldmlvdXNFbGVtZW50KQpAQCAtMzgyLDggKzM4Myw5IEBAIFNlbGVjdG9yQ2hlY2tlcjo6TWF0 Y2hSZXN1bHQgU2VsZWN0b3JDaGUKIAogICAgICAgICAgICAgcmV0dXJuIE1hdGNoUmVzdWx0Ojp1 cGRhdGVXaXRoTWF0Y2hUeXBlKHJlc3VsdCwgbWF0Y2hUeXBlKTsKICAgICAgICAgfQotICAgIGNh c2UgQ1NTU2VsZWN0b3I6OkluZGlyZWN0QWRqYWNlbnQ6Ci0gICAgICAgIGFkZFN0eWxlUmVsYXRp b24oY2hlY2tpbmdDb250ZXh0LCAqY29udGV4dC5lbGVtZW50LCBTdHlsZTo6UmVsYXRpb246OkFm ZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcpOworICAgIGNhc2UgQ1NTU2VsZWN0b3I6OkluZGlyZWN0 QWRqYWNlbnQ6IHsKKyAgICAgICAgYXV0byByZWxhdGlvbiA9IGNvbnRleHQuaXNNYXRjaEVsZW1l bnQgPyBTdHlsZTo6UmVsYXRpb246OkFmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcgOiBTdHlsZTo6 UmVsYXRpb246OkRlc2NlbmRhbnRzQWZmZWN0ZWRCeVByZXZpb3VzU2libGluZzsKKyAgICAgICAg YWRkU3R5bGVSZWxhdGlvbihjaGVja2luZ0NvbnRleHQsICpjb250ZXh0LmVsZW1lbnQsIHJlbGF0 aW9uKTsKIAogICAgICAgICBuZXh0Q29udGV4dC5lbGVtZW50ID0gY29udGV4dC5lbGVtZW50LT5w cmV2aW91c0VsZW1lbnRTaWJsaW5nKCk7CiAgICAgICAgIG5leHRDb250ZXh0LmZpcnN0U2VsZWN0 b3JPZlRoZUZyYWdtZW50ID0gbmV4dENvbnRleHQuc2VsZWN0b3I7CkBAIC00MDIsNyArNDA0LDcg QEAgU2VsZWN0b3JDaGVja2VyOjpNYXRjaFJlc3VsdCBTZWxlY3RvckNoZQogICAgICAgICAgICAg ICAgIHJldHVybiBNYXRjaFJlc3VsdDo6dXBkYXRlV2l0aE1hdGNoVHlwZShyZXN1bHQsIG1hdGNo VHlwZSk7CiAgICAgICAgIH07CiAgICAgICAgIHJldHVybiBNYXRjaFJlc3VsdDo6ZmFpbHMoTWF0 Y2g6OlNlbGVjdG9yRmFpbHNBbGxTaWJsaW5ncyk7Ci0KKyAgICB9CiAgICAgY2FzZSBDU1NTZWxl Y3Rvcjo6U3Vic2VsZWN0b3I6CiAgICAgICAgIHsKICAgICAgICAgICAgIC8vIGEgc2VsZWN0b3Ig aXMgaW52YWxpZCBpZiBzb21ldGhpbmcgZm9sbG93cyBhIHBzZXVkby1lbGVtZW50CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9jc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIuY3BwCShyZXZpc2lvbiAyMjkz NjgpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3NqaXQvU2VsZWN0b3JDb21waWxlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQyMiwxMSArNDIyLDggQEAgc3RhdGljIGlubGluZSBGdW5jdGlvblR5cGUg bW9zdFJlc3RyaWN0aQogICAgIHJldHVybiBzdGQ6Om1heChhLCBiKTsKIH0KIAotc3RhdGljIGlu bGluZSBib29sIGZyYWdtZW50TWF0Y2hlc1RoZVJpZ2h0bW9zdEVsZW1lbnQoU2VsZWN0b3JDb250 ZXh0IHNlbGVjdG9yQ29udGV4dCwgY29uc3QgU2VsZWN0b3JGcmFnbWVudCYgZnJhZ21lbnQpCitz dGF0aWMgaW5saW5lIGJvb2wgZnJhZ21lbnRNYXRjaGVzVGhlUmlnaHRtb3N0RWxlbWVudChjb25z dCBTZWxlY3RvckZyYWdtZW50JiBmcmFnbWVudCkKIHsKLSAgICAvLyBSZXR1cm4gdHJ1ZSBpZiB0 aGUgcG9zaXRpb24gb2YgdGhpcyBmcmFnbWVudCBpcyBSaWdodG1vc3QgaW4gdGhlIHJvb3QgZnJh Z21lbnRzLgotICAgIC8vIEluIHRoaXMgY2FzZSwgd2Ugc2hvdWxkIHVzZSB0aGUgUmVuZGVyU3R5 bGUgc3RvcmVkIGluIHRoZSBDaGVja2luZ0NvbnRleHQuCi0gICAgQVNTRVJUX1VOVVNFRChzZWxl Y3RvckNvbnRleHQsIHNlbGVjdG9yQ29udGV4dCAhPSBTZWxlY3RvckNvbnRleHQ6OlF1ZXJ5U2Vs ZWN0b3IpOwogICAgIHJldHVybiBmcmFnbWVudC5yZWxhdGlvblRvUmlnaHRGcmFnbWVudCA9PSBG cmFnbWVudFJlbGF0aW9uOjpSaWdodG1vc3QgJiYgZnJhZ21lbnQucG9zaXRpb25JblJvb3RGcmFn bWVudHMgPT0gRnJhZ21lbnRQb3NpdGlvbkluUm9vdEZyYWdtZW50czo6UmlnaHRtb3N0OwogfQog CkBAIC0xNzM0LDcgKzE3MzEsNyBAQCB2b2lkIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJh dGVTZWxlCiAgICAgQXNzZW1ibGVyOjpKdW1wTGlzdCBmYWlsdXJlT25GdW5jdGlvbkVudHJ5Owog ICAgIC8vIFRlc3Qgc2VsZWN0b3IncyBwc2V1ZG8gZWxlbWVudCBlcXVhbHMgdG8gcmVxdWVzdGVk IFBzZXVkb0lkLgogICAgIGlmIChtX3NlbGVjdG9yQ29udGV4dCAhPSBTZWxlY3RvckNvbnRleHQ6 OlF1ZXJ5U2VsZWN0b3IgJiYgbV9mdW5jdGlvblR5cGUgPT0gRnVuY3Rpb25UeXBlOjpTZWxlY3Rv ckNoZWNrZXJXaXRoQ2hlY2tpbmdDb250ZXh0KSB7Ci0gICAgICAgIEFTU0VSVF9XSVRIX01FU1NB R0UoZnJhZ21lbnRNYXRjaGVzVGhlUmlnaHRtb3N0RWxlbWVudChtX3NlbGVjdG9yQ29udGV4dCwg bV9zZWxlY3RvckZyYWdtZW50cy5maXJzdCgpKSwgIk1hdGNoaW5nIHBzZXVkbyBlbGVtZW50cyBv bmx5IG1ha2Ugc2Vuc2UgZm9yIHRoZSByaWdodG1vc3QgZnJhZ21lbnQuIik7CisgICAgICAgIEFT U0VSVF9XSVRIX01FU1NBR0UoZnJhZ21lbnRNYXRjaGVzVGhlUmlnaHRtb3N0RWxlbWVudChtX3Nl bGVjdG9yRnJhZ21lbnRzLmZpcnN0KCkpLCAiTWF0Y2hpbmcgcHNldWRvIGVsZW1lbnRzIG9ubHkg bWFrZSBzZW5zZSBmb3IgdGhlIHJpZ2h0bW9zdCBmcmFnbWVudC4iKTsKICAgICAgICAgZ2VuZXJh dGVSZXF1ZXN0ZWRQc2V1ZG9FbGVtZW50RXF1YWxzVG9TZWxlY3RvclBzZXVkb0VsZW1lbnQoZmFp bHVyZU9uRnVuY3Rpb25FbnRyeSwgbV9zZWxlY3RvckZyYWdtZW50cy5maXJzdCgpLCBjaGVja2lu Z0NvbnRleHRSZWdpc3Rlcik7CiAgICAgfQogCkBAIC0xODk1LDggKzE4OTIsMTIgQEAgdm9pZCBT ZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlU2VsZQogICAgICAgICAgICAgZ2VuZXJhdGVJ bmRpcmVjdEFkamFjZW50VHJlZVdhbGtlcihmYWlsdXJlQ2FzZXMsIGZyYWdtZW50KTsKICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIGlmIChzaG91bGRNYXJrU3R5bGVJc0Fm ZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcoZnJhZ21lbnQpKQotICAgICAgICAgICAgZ2VuZXJhdGVB ZGRTdHlsZVJlbGF0aW9uSWZSZXNvbHZpbmdTdHlsZShlbGVtZW50QWRkcmVzc1JlZ2lzdGVyLCBT dHlsZTo6UmVsYXRpb246OkFmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcpOworICAgICAgICBpZiAo c2hvdWxkTWFya1N0eWxlSXNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nKGZyYWdtZW50KSkgewor ICAgICAgICAgICAgaWYgKGZyYWdtZW50TWF0Y2hlc1RoZVJpZ2h0bW9zdEVsZW1lbnQoZnJhZ21l bnQpKQorICAgICAgICAgICAgICAgIGdlbmVyYXRlQWRkU3R5bGVSZWxhdGlvbklmUmVzb2x2aW5n U3R5bGUoZWxlbWVudEFkZHJlc3NSZWdpc3RlciwgU3R5bGU6OlJlbGF0aW9uOjpBZmZlY3RlZEJ5 UHJldmlvdXNTaWJsaW5nKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBnZW5l cmF0ZUFkZFN0eWxlUmVsYXRpb25JZlJlc29sdmluZ1N0eWxlKGVsZW1lbnRBZGRyZXNzUmVnaXN0 ZXIsIFN0eWxlOjpSZWxhdGlvbjo6RGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5n KTsKKyAgICAgICAgfQogICAgICAgICBnZW5lcmF0ZUJhY2t0cmFja2luZ1RhaWxzSWZOZWVkZWQo ZmFpbHVyZUNhc2VzLCBmcmFnbWVudCk7CiAgICAgfQogCkBAIC0zNzMxLDcgKzM3MzIsNyBAQCB2 b2lkIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVFbGVtCiB7CiAgICAgQVNTRVJUX1VO VVNFRChmcmFnbWVudCwgZnJhZ21lbnQucHNldWRvRWxlbWVudFNlbGVjdG9yKTsKICAgICBBU1NF UlRfV0lUSF9NRVNTQUdFKG1fc2VsZWN0b3JDb250ZXh0ICE9IFNlbGVjdG9yQ29udGV4dDo6UXVl cnlTZWxlY3RvciwgIldoZW4gdGhlIGZyYWdtZW50IGhhcyBwc2V1ZG8gZWxlbWVudCwgdGhlIHNl bGVjdG9yIGJlY29tZXMgQ2Fubm90TWF0Y2hBbnl0aGluZyBmb3IgUXVlcnlTZWxlY3RvciBhbmQg dGhpcyB0ZXN0IGZ1bmN0aW9uIGlzIG5vdCBjYWxsZWQuIik7Ci0gICAgQVNTRVJUX1dJVEhfTUVT U0FHRV9VTlVTRUQoZnJhZ21lbnQsIGZyYWdtZW50TWF0Y2hlc1RoZVJpZ2h0bW9zdEVsZW1lbnQo bV9zZWxlY3RvckNvbnRleHQsIGZyYWdtZW50KSwgIlZpcnR1YWwgcHNldWRvIGVsZW1lbnRzIGhh bmRsaW5nIGlzIG9ubHkgZWZmZWN0aXZlIGluIHRoZSByaWdodG1vc3QgZnJhZ21lbnQuIElmIHRo ZSBjdXJyZW50IGZyYWdtZW50IGlzIG5vdCByaWdodG1vc3QgZnJhZ21lbnQsIENTUyBKSVQgY29t cGlsZXIgbWFrZXMgaXQgQ2Fubm90TWF0Y2hBbnl0aGluZyBpbiBmcmFnbWVudCBjb25zdHJ1Y3Rp b24gcGhhc2UsIHNvIG5ldmVyIHJlYWNoIGhlcmUuIik7CisgICAgQVNTRVJUX1dJVEhfTUVTU0FH RV9VTlVTRUQoZnJhZ21lbnQsIGZyYWdtZW50TWF0Y2hlc1RoZVJpZ2h0bW9zdEVsZW1lbnQoZnJh Z21lbnQpLCAiVmlydHVhbCBwc2V1ZG8gZWxlbWVudHMgaGFuZGxpbmcgaXMgb25seSBlZmZlY3Rp dmUgaW4gdGhlIHJpZ2h0bW9zdCBmcmFnbWVudC4gSWYgdGhlIGN1cnJlbnQgZnJhZ21lbnQgaXMg bm90IHJpZ2h0bW9zdCBmcmFnbWVudCwgQ1NTIEpJVCBjb21waWxlciBtYWtlcyBpdCBDYW5ub3RN YXRjaEFueXRoaW5nIGluIGZyYWdtZW50IGNvbnN0cnVjdGlvbiBwaGFzZSwgc28gbmV2ZXIgcmVh Y2ggaGVyZS4iKTsKIH0KIAogdm9pZCBTZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlUmVx dWVzdGVkUHNldWRvRWxlbWVudEVxdWFsc1RvU2VsZWN0b3JQc2V1ZG9FbGVtZW50KEFzc2VtYmxl cjo6SnVtcExpc3QmIGZhaWx1cmVDYXNlcywgY29uc3QgU2VsZWN0b3JGcmFnbWVudCYgZnJhZ21l bnQsIEFzc2VtYmxlcjo6UmVnaXN0ZXJJRCBjaGVja2luZ0NvbnRleHQpCkBAIC0zNzQxLDcgKzM3 NDIsNyBAQCB2b2lkIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVSZXF1CiAgICAgLy8g TWFrZSBzdXJlIHRoYXQgdGhlIHJlcXVlc3RlZCBwc2V1ZG9JZCBlcXVhbHMgdG8gdGhlIHBzZXVk byBlbGVtZW50IG9mIHRoZSByaWdodG1vc3QgZnJhZ21lbnQuCiAgICAgLy8gSWYgdGhlIHJpZ2h0 bW9zdCBmcmFnbWVudCBkb2Vzbid0IGhhdmUgYSBwc2V1ZG8gZWxlbWVudCwgdGhlIHJlcXVlc3Rl ZCBwc2V1ZG9JZCBuZWVkIHRvIGJlIE5PUFNFVURPIHRvIHN1Y2NlZWQgdGhlIG1hdGNoaW5nLgog ICAgIC8vIE90aGVyd2lzZSwgaWYgdGhlIHJlcXVlc3RlZCBwc2V1ZG9JZCBpcyBub3QgTk9QU0VV RE8sIHRoZSByZXF1ZXN0ZWQgcHNldWRvSWQgbmVlZCB0byBlcXVhbCB0byB0aGUgcHNldWRvIGVs ZW1lbnQgb2YgdGhlIHJpZ2h0bW9zdCBmcmFnbWVudC4KLSAgICBpZiAoZnJhZ21lbnRNYXRjaGVz VGhlUmlnaHRtb3N0RWxlbWVudChtX3NlbGVjdG9yQ29udGV4dCwgZnJhZ21lbnQpKSB7CisgICAg aWYgKGZyYWdtZW50TWF0Y2hlc1RoZVJpZ2h0bW9zdEVsZW1lbnQoZnJhZ21lbnQpKSB7CiAgICAg ICAgIGlmICghZnJhZ21lbnQucHNldWRvRWxlbWVudFNlbGVjdG9yKQogICAgICAgICAgICAgZmFp bHVyZUNhc2VzLmFwcGVuZChtX2Fzc2VtYmxlci5icmFuY2g4KEFzc2VtYmxlcjo6Tm90RXF1YWws IEFzc2VtYmxlcjo6QWRkcmVzcyhjaGVja2luZ0NvbnRleHQsIE9CSkVDVF9PRkZTRVRPRihTZWxl Y3RvckNoZWNrZXI6OkNoZWNraW5nQ29udGV4dCwgcHNldWRvSWQpKSwgQXNzZW1ibGVyOjpUcnVz dGVkSW1tMzIoTk9QU0VVRE8pKSk7CiAgICAgICAgIGVsc2UgewpJbmRleDogU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcAkocmV2aXNpb24gMjI5MzY4KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDg0LDcgKzE0ODQsMTEgQEAgc3RhdGljIHZvaWQgaW52 YWxpZGF0ZUZvclNpYmxpbmdDb21iaW5hdAogewogICAgIGZvciAoOyBzaWJsaW5nOyBzaWJsaW5n ID0gc2libGluZy0+bmV4dEVsZW1lbnRTaWJsaW5nKCkpIHsKICAgICAgICAgaWYgKHNpYmxpbmct PnN0eWxlSXNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nKCkpCi0gICAgICAgICAgICBzaWJsaW5n LT5pbnZhbGlkYXRlU3R5bGVGb3JTdWJ0cmVlSW50ZXJuYWwoKTsKKyAgICAgICAgICAgIHNpYmxp bmctPmludmFsaWRhdGVTdHlsZUludGVybmFsKCk7CisgICAgICAgIGlmIChzaWJsaW5nLT5kZXNj ZW5kYW50c0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcoKSkgeworICAgICAgICAgICAgZm9yIChh dXRvKiBzaWJsaW5nQ2hpbGQgPSBzaWJsaW5nLT5maXJzdEVsZW1lbnRDaGlsZCgpOyBzaWJsaW5n Q2hpbGQ7IHNpYmxpbmdDaGlsZCA9IHNpYmxpbmdDaGlsZC0+bmV4dEVsZW1lbnRTaWJsaW5nKCkp CisgICAgICAgICAgICAgICAgc2libGluZ0NoaWxkLT5pbnZhbGlkYXRlU3R5bGVGb3JTdWJ0cmVl SW50ZXJuYWwoKTsKKyAgICAgICAgfQogICAgICAgICBpZiAoIXNpYmxpbmctPmFmZmVjdHNOZXh0 U2libGluZ0VsZW1lbnRTdHlsZSgpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnQuaAkocmV2aXNpb24gMjI5MzY4KQorKysgU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzI3LDYgKzMyNyw3IEBAIHB1YmxpYzoKICAg ICBib29sIHN0eWxlQWZmZWN0ZWRCeUFjdGl2ZSgpIGNvbnN0IHsgcmV0dXJuIGhhc1JhcmVEYXRh KCkgJiYgcmFyZURhdGFTdHlsZUFmZmVjdGVkQnlBY3RpdmUoKTsgfQogICAgIGJvb2wgc3R5bGVB ZmZlY3RlZEJ5RW1wdHkoKSBjb25zdCB7IHJldHVybiBoYXNSYXJlRGF0YSgpICYmIHJhcmVEYXRh U3R5bGVBZmZlY3RlZEJ5RW1wdHkoKTsgfQogICAgIGJvb2wgc3R5bGVBZmZlY3RlZEJ5Rm9jdXNX aXRoaW4oKSBjb25zdCB7IHJldHVybiBoYXNSYXJlRGF0YSgpICYmIHJhcmVEYXRhU3R5bGVBZmZl Y3RlZEJ5Rm9jdXNXaXRoaW4oKTsgfQorICAgIGJvb2wgZGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJl dmlvdXNTaWJsaW5nKCkgY29uc3QgeyByZXR1cm4gZ2V0RmxhZyhEZXNjZW5kYW50c0FmZmVjdGVk QnlQcmV2aW91c1NpYmxpbmdGbGFnKTsgfQogICAgIGJvb2wgY2hpbGRyZW5BZmZlY3RlZEJ5SG92 ZXIoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKENoaWxkcmVuQWZmZWN0ZWRCeUhvdmVyUnVsZXNG bGFnKTsgfQogICAgIGJvb2wgY2hpbGRyZW5BZmZlY3RlZEJ5RHJhZygpIGNvbnN0IHsgcmV0dXJu IGhhc1JhcmVEYXRhKCkgJiYgcmFyZURhdGFDaGlsZHJlbkFmZmVjdGVkQnlEcmFnKCk7IH0KICAg ICBib29sIGNoaWxkcmVuQWZmZWN0ZWRCeUZpcnN0Q2hpbGRSdWxlcygpIGNvbnN0IHsgcmV0dXJu IGdldEZsYWcoQ2hpbGRyZW5BZmZlY3RlZEJ5Rmlyc3RDaGlsZFJ1bGVzRmxhZyk7IH0KQEAgLTM0 MSw2ICszNDIsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFN0eWxlQWZmZWN0ZWRCeUVtcHR5 KCk7CiAgICAgdm9pZCBzZXRTdHlsZUFmZmVjdGVkQnlGb2N1c1dpdGhpbigpOworICAgIHZvaWQg c2V0RGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nKCkgY29uc3QgeyByZXR1cm4g c2V0RmxhZyhEZXNjZW5kYW50c0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmdGbGFnKTsgfQogICAg IHZvaWQgc2V0Q2hpbGRyZW5BZmZlY3RlZEJ5SG92ZXIoKSB7IHNldEZsYWcoQ2hpbGRyZW5BZmZl Y3RlZEJ5SG92ZXJSdWxlc0ZsYWcpOyB9CiAgICAgdm9pZCBzZXRTdHlsZUFmZmVjdGVkQnlBY3Rp dmUoKTsKICAgICB2b2lkIHNldENoaWxkcmVuQWZmZWN0ZWRCeURyYWcoKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuaAkocmV2aXNpb24gMjI5MzY4KQorKysgU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaAkod29y a2luZyBjb3B5KQpAQCAtNTY5LDcgKzU2OSw3IEBAIHByb3RlY3RlZDoKICAgICAgICAgSXNTdHls ZWRFbGVtZW50RmxhZyA9IDEgPDwgMywKICAgICAgICAgSXNIVE1MRmxhZyA9IDEgPDwgNCwKICAg ICAgICAgSXNTVkdGbGFnID0gMSA8PCA1LAotICAgICAgICAvLyBPbmUgZnJlZSBiaXQgbGVmdC4K KyAgICAgICAgRGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nRmxhZyA9IDEgPDwg NiwKICAgICAgICAgQ2hpbGROZWVkc1N0eWxlUmVjYWxjRmxhZyA9IDEgPDwgNywKICAgICAgICAg SXNDb25uZWN0ZWRGbGFnID0gMSA8PCA4LAogICAgICAgICBJc0xpbmtGbGFnID0gMSA8PCA5LApJ bmRleDogU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZWxhdGlvbnMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVsYXRpb25zLmNwcAkocmV2aXNpb24gMjI5 MzY4KQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZWxhdGlvbnMuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03NSw2ICs3NSw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxSZWxhdGlvbnM+IGNvbW1p dFJlbGF0aW8KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFJlbGF0aW9uOjpBZmZl Y3RlZEJ5Rm9jdXNXaXRoaW46CiAgICAgICAgIGNhc2UgUmVsYXRpb246OkFmZmVjdGVkQnlQcmV2 aW91c1NpYmxpbmc6CisgICAgICAgIGNhc2UgUmVsYXRpb246OkRlc2NlbmRhbnRzQWZmZWN0ZWRC eVByZXZpb3VzU2libGluZzoKICAgICAgICAgY2FzZSBSZWxhdGlvbjo6QWZmZWN0c05leHRTaWJs aW5nOgogICAgICAgICBjYXNlIFJlbGF0aW9uOjpDaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9z aXRpb25hbFJ1bGVzOgogICAgICAgICBjYXNlIFJlbGF0aW9uOjpDaGlsZHJlbkFmZmVjdGVkQnlC YWNrd2FyZFBvc2l0aW9uYWxSdWxlczoKQEAgLTExNCw2ICsxMTUsOSBAQCB2b2lkIGNvbW1pdFJl bGF0aW9ucyhzdGQ6OnVuaXF1ZV9wdHI8UmVsCiAgICAgICAgIGNhc2UgUmVsYXRpb246OkFmZmVj dGVkQnlQcmV2aW91c1NpYmxpbmc6CiAgICAgICAgICAgICBlbGVtZW50LnNldFN0eWxlSXNBZmZl Y3RlZEJ5UHJldmlvdXNTaWJsaW5nKCk7CiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2Fz ZSBSZWxhdGlvbjo6RGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nOgorICAgICAg ICAgICAgZWxlbWVudC5zZXREZXNjZW5kYW50c0FmZmVjdGVkQnlQcmV2aW91c1NpYmxpbmcoKTsK KyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFJlbGF0aW9uOjpBZmZlY3RzTmV4dFNp Ymxpbmc6IHsKICAgICAgICAgICAgIGF1dG8qIHNpYmxpbmcgPSAmZWxlbWVudDsKICAgICAgICAg ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCByZWxhdGlvbi52YWx1ZSAmJiBzaWJsaW5nOyAr K2ksIHNpYmxpbmcgPSBzaWJsaW5nLT5uZXh0RWxlbWVudFNpYmxpbmcoKSkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVsYXRpb25zLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVSZWxhdGlvbnMuaAkocmV2aXNpb24gMjI5MzY4KQorKysgU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVSZWxhdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiAr NDQsNyBAQCBzdHJ1Y3QgUmVsYXRpb24gewogICAgICAgICBBZmZlY3RlZEJ5Rm9jdXNXaXRoaW4s CiAgICAgICAgIEFmZmVjdGVkQnlIb3ZlciwKICAgICAgICAgQWZmZWN0ZWRCeVByZXZpb3VzU2li bGluZywKKyAgICAgICAgRGVzY2VuZGFudHNBZmZlY3RlZEJ5UHJldmlvdXNTaWJsaW5nLAogICAg ICAgICAvLyBGb3IgQWZmZWN0c05leHRTaWJsaW5nICd2YWx1ZScgdGVsbHMgaG93IG1hbnkgZWxl bWVudCBzaWJsaW5ncyB0byBtYXJrIHN0YXJ0aW5nIHdpdGggJ2VsZW1lbnQnLgogICAgICAgICBB ZmZlY3RzTmV4dFNpYmxpbmcsCiAgICAgICAgIENoaWxkcmVuQWZmZWN0ZWRCeUZvcndhcmRQb3Np dGlvbmFsUnVsZXMsIAo=