179620 2017-11-13 10:59:26 -0800 Don't eliminate whitespace renderer if the previous sibling is a text renderer 2017-11-13 15:39:52 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 157477 1 koivisto webkit-unassigned bfulgham commit-queue rniwa simon.fraser webkit-bug-importer zalan oldest_to_newest 1370954 0 koivisto 2017-11-13 10:59:26 -0800 Currently whitespace elimination code doesn't consider runs of text renderers. We should always make whitespace renderer if the previous renderer is a text renderer. The behavior should be the same as if those were a single renderer with merged text. This situation can happen easily with display:contents. 1370976 1 326777 koivisto 2017-11-13 11:40:35 -0800 Created attachment 326777 patch 1370979 2 326778 koivisto 2017-11-13 11:42:29 -0800 Created attachment 326778 patch 1371024 3 326778 commit-queue 2017-11-13 13:14:50 -0800 Comment on attachment 326778 patch Clearing flags on attachment: 326778 Committed r224773: <https://trac.webkit.org/changeset/224773> 1371025 4 commit-queue 2017-11-13 13:14:52 -0800 All reviewed patches have been landed. Closing bug. 1371134 5 webkit-bug-importer 2017-11-13 15:39:52 -0800 <rdar://problem/35517807> 326777 2017-11-13 11:40:35 -0800 2017-11-13 11:42:29 -0800 patch whitespace-previous.patch text/plain 5168 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDc2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTExLTEzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBlbGltaW5hdGUgd2hp dGVzcGFjZSByZW5kZXJlciBpZiB0aGUgcHJldmlvdXMgc2libGluZyBpcyBhIHRleHQgcmVuZGVy ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTYy MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJl bnRseSB3aGl0ZXNwYWNlIGVsaW1pbmF0aW9uIGNvZGUgZG9lc24ndCBjb25zaWRlciBydW5zIG9m IHRleHQgcmVuZGVyZXJzLiBXZSBzaG91bGQgYWx3YXlzIG1ha2Ugd2hpdGVzcGFjZQorICAgICAg ICByZW5kZXJlciBpZiB0aGUgcHJldmlvdXMgcmVuZGVyZXIgaXMgYSB0ZXh0IHJlbmRlcmVyLiBU aGUgYmVoYXZpb3Igc2hvdWxkIGJlIHRoZSBzYW1lIGFzIGlmIHRob3NlIHdlcmUgYSBzaW5nbGUK KyAgICAgICAgcmVuZGVyZXIgd2l0aCBtZXJnZWQgdGV4dC4gVGhpcyBzaXR1YXRpb24gY2FuIGhh cHBlbiBlYXNpbHkgd2l0aCBkaXNwbGF5OmNvbnRlbnRzLgorCisgICAgICAgICogc3R5bGUvUmVu ZGVyVHJlZVVwZGF0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6 OnRleHRSZW5kZXJlcklzTmVlZGVkKToKKworICAgICAgICBXZSBuZWVkIGEgcmVuZGVyZXIgaWYg dGhlIHByZXZpb3VzIHJlbmRlcmUgaXMgUmVuZGVyVGV4dC4KKwogMjAxNy0xMS0xMyAgQ29saW4g QmVuZGVsbCAgPGNvbGluQGJlbmRlbGwuY2E+CiAKICAgICAgICAgQWRkZWQgbWltZSB0eXBlIGNo ZWNrIHRvIHRoZSBwaWN0dXJlIHNvdXJjZSBwcmVsb2FkZXIgdG8gYXZvaWQgZG93bmxvYWRpbmcg aW5jb21wYXRpYmxlIHJlc291cmNlcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRl clRyZWVVcGRhdGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5k ZXJUcmVlVXBkYXRlci5jcHAJKHJldmlzaW9uIDIyNDY0MSkKKysrIFNvdXJjZS9XZWJDb3JlL3N0 eWxlL1JlbmRlclRyZWVVcGRhdGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzk4LDcgKzM5OCw4 IEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6OmNyZWF0ZVJlbmRlcmVyKEUKIAogYm9vbCBSZW5k ZXJUcmVlVXBkYXRlcjo6dGV4dFJlbmRlcmVySXNOZWVkZWQoY29uc3QgVGV4dCYgdGV4dE5vZGUp CiB7Ci0gICAgY29uc3QgUmVuZGVyRWxlbWVudCYgcGFyZW50UmVuZGVyZXIgPSByZW5kZXJUcmVl UG9zaXRpb24oKS5wYXJlbnQoKTsKKyAgICBhdXRvJiByZW5kZXJpbmdQYXJlbnQgPSB0aGlzLT5y ZW5kZXJpbmdQYXJlbnQoKTsKKyAgICBhdXRvJiBwYXJlbnRSZW5kZXJlciA9IHJlbmRlcmluZ1Bh cmVudC5yZW5kZXJUcmVlUG9zaXRpb24tPnBhcmVudCgpOwogICAgIGlmICghcGFyZW50UmVuZGVy ZXIuY2FuSGF2ZUNoaWxkcmVuKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAocGFy ZW50UmVuZGVyZXIuZWxlbWVudCgpICYmICFwYXJlbnRSZW5kZXJlci5lbGVtZW50KCktPmNoaWxk U2hvdWxkQ3JlYXRlUmVuZGVyZXIodGV4dE5vZGUpKQpAQCAtNDA5LDEzICs0MTAsMTcgQEAgYm9v bCBSZW5kZXJUcmVlVXBkYXRlcjo6dGV4dFJlbmRlcmVySXNOZQogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgaWYgKCF0ZXh0Tm9kZS5jb250YWluc09ubHlXaGl0ZXNwYWNlKCkpCiAgICAgICAg IHJldHVybiB0cnVlOworICAgIGlmIChpczxSZW5kZXJUZXh0PihyZW5kZXJpbmdQYXJlbnQucHJl dmlvdXNDaGlsZFJlbmRlcmVyKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgLy8gVGhpcyB0 ZXh0IG5vZGUgaGFzIG5vdGhpbmcgYnV0IHdoaXRlIHNwYWNlLiBXZSBtYXkgc3RpbGwgbmVlZCBh IHJlbmRlcmVyIGluIHNvbWUgY2FzZXMuCi0gICAgaWYgKHBhcmVudFJlbmRlcmVyLmlzVGFibGUo KSB8fCBwYXJlbnRSZW5kZXJlci5pc1RhYmxlUm93KCkgfHwgcGFyZW50UmVuZGVyZXIuaXNUYWJs ZVNlY3Rpb24oKSB8fCBwYXJlbnRSZW5kZXJlci5pc1JlbmRlclRhYmxlQ29sKCkgfHwgcGFyZW50 UmVuZGVyZXIuaXNGcmFtZVNldCgpIHx8IChwYXJlbnRSZW5kZXJlci5pc0ZsZXhpYmxlQm94KCkg JiYgIXBhcmVudFJlbmRlcmVyLmlzUmVuZGVyQnV0dG9uKCkpKQorICAgIGlmIChwYXJlbnRSZW5k ZXJlci5pc1RhYmxlKCkgfHwgcGFyZW50UmVuZGVyZXIuaXNUYWJsZVJvdygpIHx8IHBhcmVudFJl bmRlcmVyLmlzVGFibGVTZWN0aW9uKCkgfHwgcGFyZW50UmVuZGVyZXIuaXNSZW5kZXJUYWJsZUNv bCgpIHx8IHBhcmVudFJlbmRlcmVyLmlzRnJhbWVTZXQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIGlmIChwYXJlbnRSZW5kZXJlci5pc0ZsZXhpYmxlQm94KCkgJiYgIXBhcmVudFJlbmRl cmVyLmlzUmVuZGVyQnV0dG9uKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAocGFy ZW50UmVuZGVyZXIuc3R5bGUoKS5wcmVzZXJ2ZU5ld2xpbmUoKSkgLy8gcHJlL3ByZS13cmFwL3By ZS1saW5lIGFsd2F5cyBtYWtlIHJlbmRlcmVycy4KICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAg ICBhdXRvKiBwcmV2aW91c1JlbmRlcmVyID0gcmVuZGVyaW5nUGFyZW50KCkucHJldmlvdXNDaGls ZFJlbmRlcmVyOworICAgIGF1dG8qIHByZXZpb3VzUmVuZGVyZXIgPSByZW5kZXJpbmdQYXJlbnQu cHJldmlvdXNDaGlsZFJlbmRlcmVyOwogICAgIGlmIChwcmV2aW91c1JlbmRlcmVyICYmIHByZXZp b3VzUmVuZGVyZXItPmlzQlIoKSkgLy8gPHNwYW4+PGJyLz4gPGJyLz48L3NwYW4+CiAgICAgICAg IHJldHVybiBmYWxzZTsKIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjI0NjQxKQorKysgTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTctMTEtMTMg IEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IGVsaW1p bmF0ZSB3aGl0ZXNwYWNlIHJlbmRlcmVyIGlmIHRoZSBwcmV2aW91cyBzaWJsaW5nIGlzIGEgdGV4 dCByZW5kZXJlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc5NjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDE3LTExLTA5ICBNYWNpZWogU3RhY2hvd2lhayAg PG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHN1cHBvcnQgZm9yIGlPUy1vbmx5IHNv ZnRiYW5rLXNqaXMgZW5jb2RpbmcgaWYgcG9zc2libGUKSW5kZXg6IExheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwko cmV2aXNpb24gMjI0NjQxKQorKysgTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwkod29ya2lu ZyBjb3B5KQpAQCAtMTM1OSwxNCArMTM1OSw4IEBAIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvaHRtbC9zZW0KICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMK ICMjIyBTVEFSVCBPRiBkaXNwbGF5OiBjb250ZW50cyBmYWlsdXJlcwogCi13ZWJraXQub3JnL2Iv MTU3NDc3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1kaXNwbGF5LTMv ZGlzcGxheS1jb250ZW50cy1mbGV4LTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMTU3NDc3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1k aXNwbGF5LTMvZGlzcGxheS1jb250ZW50cy1keW5hbWljLXRhYmxlLTAwMS1pbmxpbmUuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZGlzcGxheS0zL2Rpc3BsYXktY29udGVudHMtZHluYW1p Yy1mbGV4LTAwMi1ub25lLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8x NTc0NzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWRpc3BsYXktMy9k aXNwbGF5LWNvbnRlbnRzLWZsZXgtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp dC5vcmcvYi8xNTc0NzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWRp c3BsYXktMy9kaXNwbGF5LWZsb3ctcm9vdC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3MtZGlzcGxheS0zL2Rpc3BsYXktY29udGVudHMtZHluYW1pYy1mbGV4LTAwMy1ub25lLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8xNTc0NzcgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWRpc3BsYXktMy9kaXNwbGF5LWNvbnRlbnRzLWR5bmFt aWMtZmxleC0wMDItaW5saW5lLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8xNTc0NzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWRpc3BsYXkt My9kaXNwbGF5LWNvbnRlbnRzLWR5bmFtaWMtZmxleC0wMDMtaW5saW5lLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIAogIyMjIEVORCBPRiBkaXNwbGF5OiBjb250ZW50cyBmYWlsdXJlcwogIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwo= 326778 2017-11-13 11:42:29 -0800 2017-11-13 13:14:50 -0800 patch whitespace-previous-2.patch text/plain 5248 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDc2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTEzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBlbGltaW5hdGUgd2hp dGVzcGFjZSByZW5kZXJlciBpZiB0aGUgcHJldmlvdXMgc2libGluZyBpcyBhIHRleHQgcmVuZGVy ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTYy MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJl bnRseSB3aGl0ZXNwYWNlIGVsaW1pbmF0aW9uIGNvZGUgZG9lc24ndCBjb25zaWRlciBydW5zIG9m IHRleHQgcmVuZGVyZXJzLiBXZSBzaG91bGQgYWx3YXlzIG1ha2Ugd2hpdGVzcGFjZQorICAgICAg ICByZW5kZXJlciBpZiB0aGUgcHJldmlvdXMgcmVuZGVyZXIgaXMgYSB0ZXh0IHJlbmRlcmVyLiBU aGUgYmVoYXZpb3Igc2hvdWxkIGJlIHRoZSBzYW1lIGFzIGlmIHRob3NlIHdlcmUgYSBzaW5nbGUK KyAgICAgICAgcmVuZGVyZXIgd2l0aCBtZXJnZWQgdGV4dC4gVGhpcyBzaXR1YXRpb24gY2FuIGhh cHBlbiBlYXNpbHkgd2l0aCBkaXNwbGF5OmNvbnRlbnRzLgorCisgICAgICAgIFRoaXMgZml4ZXMg dGhlIHJlbWFpbmluZyBmbGV4Ym94IGZhaWx1cmVzIGluIGRpc3BsYXk6Y29udGVudHMgdGVzdHMu CisKKyAgICAgICAgKiBzdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUcmVlVXBkYXRlcjo6dGV4dFJlbmRlcmVySXNOZWVkZWQpOgorCisgICAgICAg IFdlIG5lZWQgYSByZW5kZXJlciBpZiB0aGUgcHJldmlvdXMgcmVuZGVyZSBpcyBSZW5kZXJUZXh0 LgorCiAyMDE3LTExLTEzICBDb2xpbiBCZW5kZWxsICA8Y29saW5AYmVuZGVsbC5jYT4KIAogICAg ICAgICBBZGRlZCBtaW1lIHR5cGUgY2hlY2sgdG8gdGhlIHBpY3R1cmUgc291cmNlIHByZWxvYWRl ciB0byBhdm9pZCBkb3dubG9hZGluZyBpbmNvbXBhdGlibGUgcmVzb3VyY2VzLgpJbmRleDogU291 cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRhdGVyLmNwcAkocmV2aXNpb24gMjI0NjQx KQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zOTgsNyArMzk4LDggQEAgdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6Y3JlYXRl UmVuZGVyZXIoRQogCiBib29sIFJlbmRlclRyZWVVcGRhdGVyOjp0ZXh0UmVuZGVyZXJJc05lZWRl ZChjb25zdCBUZXh0JiB0ZXh0Tm9kZSkKIHsKLSAgICBjb25zdCBSZW5kZXJFbGVtZW50JiBwYXJl bnRSZW5kZXJlciA9IHJlbmRlclRyZWVQb3NpdGlvbigpLnBhcmVudCgpOworICAgIGF1dG8mIHJl bmRlcmluZ1BhcmVudCA9IHRoaXMtPnJlbmRlcmluZ1BhcmVudCgpOworICAgIGF1dG8mIHBhcmVu dFJlbmRlcmVyID0gcmVuZGVyaW5nUGFyZW50LnJlbmRlclRyZWVQb3NpdGlvbi0+cGFyZW50KCk7 CiAgICAgaWYgKCFwYXJlbnRSZW5kZXJlci5jYW5IYXZlQ2hpbGRyZW4oKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIGlmIChwYXJlbnRSZW5kZXJlci5lbGVtZW50KCkgJiYgIXBhcmVudFJl bmRlcmVyLmVsZW1lbnQoKS0+Y2hpbGRTaG91bGRDcmVhdGVSZW5kZXJlcih0ZXh0Tm9kZSkpCkBA IC00MDksMTMgKzQxMCwxNyBAQCBib29sIFJlbmRlclRyZWVVcGRhdGVyOjp0ZXh0UmVuZGVyZXJJ c05lCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIXRleHROb2RlLmNvbnRhaW5zT25s eVdoaXRlc3BhY2UoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKGlzPFJlbmRlclRl eHQ+KHJlbmRlcmluZ1BhcmVudC5wcmV2aW91c0NoaWxkUmVuZGVyZXIpKQorICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAvLyBUaGlzIHRleHQgbm9kZSBoYXMgbm90aGluZyBidXQgd2hpdGUgc3Bh Y2UuIFdlIG1heSBzdGlsbCBuZWVkIGEgcmVuZGVyZXIgaW4gc29tZSBjYXNlcy4KLSAgICBpZiAo cGFyZW50UmVuZGVyZXIuaXNUYWJsZSgpIHx8IHBhcmVudFJlbmRlcmVyLmlzVGFibGVSb3coKSB8 fCBwYXJlbnRSZW5kZXJlci5pc1RhYmxlU2VjdGlvbigpIHx8IHBhcmVudFJlbmRlcmVyLmlzUmVu ZGVyVGFibGVDb2woKSB8fCBwYXJlbnRSZW5kZXJlci5pc0ZyYW1lU2V0KCkgfHwgKHBhcmVudFJl bmRlcmVyLmlzRmxleGlibGVCb3goKSAmJiAhcGFyZW50UmVuZGVyZXIuaXNSZW5kZXJCdXR0b24o KSkpCisgICAgaWYgKHBhcmVudFJlbmRlcmVyLmlzVGFibGUoKSB8fCBwYXJlbnRSZW5kZXJlci5p c1RhYmxlUm93KCkgfHwgcGFyZW50UmVuZGVyZXIuaXNUYWJsZVNlY3Rpb24oKSB8fCBwYXJlbnRS ZW5kZXJlci5pc1JlbmRlclRhYmxlQ29sKCkgfHwgcGFyZW50UmVuZGVyZXIuaXNGcmFtZVNldCgp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKHBhcmVudFJlbmRlcmVyLmlzRmxleGli bGVCb3goKSAmJiAhcGFyZW50UmVuZGVyZXIuaXNSZW5kZXJCdXR0b24oKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIGlmIChwYXJlbnRSZW5kZXJlci5zdHlsZSgpLnByZXNlcnZlTmV3bGlu ZSgpKSAvLyBwcmUvcHJlLXdyYXAvcHJlLWxpbmUgYWx3YXlzIG1ha2UgcmVuZGVyZXJzLgogICAg ICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGF1dG8qIHByZXZpb3VzUmVuZGVyZXIgPSByZW5kZXJp bmdQYXJlbnQoKS5wcmV2aW91c0NoaWxkUmVuZGVyZXI7CisgICAgYXV0byogcHJldmlvdXNSZW5k ZXJlciA9IHJlbmRlcmluZ1BhcmVudC5wcmV2aW91c0NoaWxkUmVuZGVyZXI7CiAgICAgaWYgKHBy ZXZpb3VzUmVuZGVyZXIgJiYgcHJldmlvdXNSZW5kZXJlci0+aXNCUigpKSAvLyA8c3Bhbj48YnIv PiA8YnIvPjwvc3Bhbj4KICAgICAgICAgcmV0dXJuIGZhbHNlOwogCkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biAyMjQ2NDEpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxMiBAQAorMjAxNy0xMS0xMyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgRG9uJ3QgZWxpbWluYXRlIHdoaXRlc3BhY2UgcmVuZGVyZXIgaWYgdGhlIHBy ZXZpb3VzIHNpYmxpbmcgaXMgYSB0ZXh0IHJlbmRlcmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk2MjAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTctMTEt MDkgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUg c3VwcG9ydCBmb3IgaU9TLW9ubHkgc29mdGJhbmstc2ppcyBlbmNvZGluZyBpZiBwb3NzaWJsZQpJ bmRleDogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zCShyZXZpc2lvbiAyMjQ2NDEpCisrKyBMYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkpCkBAIC0xMzU5LDE0ICsxMzU5LDggQEAgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbQogIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogIyMjIFNUQVJUIE9GIGRpc3BsYXk6IGNvbnRlbnRzIGZh aWx1cmVzCiAKLXdlYmtpdC5vcmcvYi8xNTc0NzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWRpc3BsYXktMy9kaXNwbGF5LWNvbnRlbnRzLWZsZXgtMDAzLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xNTc0NzcgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWRpc3BsYXktMy9kaXNwbGF5LWNvbnRlbnRzLWR5bmFtaWMt dGFibGUtMDAxLWlubGluZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MTU3NDc3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1kaXNwbGF5LTMv ZGlzcGxheS1jb250ZW50cy1keW5hbWljLWZsZXgtMDAyLW5vbmUuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3MtZGlzcGxheS0zL2Rpc3BsYXktY29udGVudHMtZmxleC0wMDIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZGlzcGxheS0zL2Rpc3BsYXktZmxvdy1yb290LTAwMS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMTU3NDc3IGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1kaXNwbGF5LTMvZGlzcGxheS1jb250ZW50cy1keW5h bWljLWZsZXgtMDAzLW5vbmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i LzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZGlzcGxheS0z L2Rpc3BsYXktY29udGVudHMtZHluYW1pYy1mbGV4LTAwMi1pbmxpbmUuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtZGlzcGxheS0zL2Rpc3BsYXktY29udGVudHMtZHluYW1pYy1mbGV4LTAw My1pbmxpbmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiAjIyMgRU5EIE9GIGRpc3BsYXk6 IGNvbnRlbnRzIGZhaWx1cmVzCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjCg==