139285 2014-12-04 20:15:53 -0800 Move 'text-emphasis-style' CSS property to the new StyleBuilder 2014-12-05 12:27:13 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue oldest_to_newest 1052661 0 cdumez 2014-12-04 20:15:53 -0800 Move 'text-emphasis-style' CSS property to the new StyleBuilder 1052663 1 242614 cdumez 2014-12-04 21:01:17 -0800 Created attachment 242614 Patch 1052800 2 242614 commit-queue 2014-12-05 12:27:08 -0800 Comment on attachment 242614 Patch Clearing flags on attachment: 242614 Committed r176861: <http://trac.webkit.org/changeset/176861> 1052801 3 commit-queue 2014-12-05 12:27:13 -0800 All reviewed patches have been landed. Closing bug. 242614 2014-12-04 21:01:17 -0800 2014-12-05 12:27:08 -0800 Patch bug-139285-20141204210150.patch text/plain 11078 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2ODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjdhMWFhOTY0OWU2N2Rk YmM2NzJlY2VhNThkNGQyYzQ5ZWVjM2Q0MS4uZjIxYzkwYzU5ZTgyODIwMWY4OTQ4ZmY3NmUwZWIw NTJmYjI4ZGU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTA0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAndGV4dC1lbXBoYXNp cy1zdHlsZScgQ1NTIHByb3BlcnR5IHRvIHRoZSBuZXcgU3R5bGVCdWlsZGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlICd0ZXh0LWVtcGhhc2lz LXN0eWxlJyBDU1MgcHJvcGVydHkgdG8gdGhlIG5ldyBTdHlsZUJ1aWxkZXIgYnkKKyAgICAgICAg dXNpbmcgY3VzdG9tIGNvZGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBj aGFuZ2UuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBj c3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNh dGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKToKKyAgICAgICAgKFdlYkNv cmU6OkFwcGx5UHJvcGVydHlUZXh0RW1waGFzaXNTdHlsZTo6YXBwbHlJbmhlcml0VmFsdWUpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVRleHRFbXBoYXNpc1N0eWxl OjphcHBseUluaXRpYWxWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVBy b3BlcnR5VGV4dEVtcGhhc2lzU3R5bGU6OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVRleHRFbXBoYXNpc1N0eWxlOjpjcmVhdGVIYW5kbGVyKTog RGVsZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5pdGlhbFdlYmtpdFRleHRFbXBoYXNp c1N0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhl cml0V2Via2l0VGV4dEVtcGhhc2lzU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWls ZGVyQ3VzdG9tOjphcHBseVZhbHVlV2Via2l0VGV4dEVtcGhhc2lzU3R5bGUpOgorCiAyMDE0LTEy LTAyICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiB0aW1lbGluZSBwcm9iZSByZWNvcmRzIGhhdmUgaW5hY2N1cmF0ZSBwZXIt cHJvYmUgaGl0IGNvdW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3Bl cnR5TmFtZXMuaW4gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRl eCBhYWY5ZGNlZWVlZGIyYjVmZGM3OGUxZDM1ODA5NzcwNGNhNDljNWM2Li5kZmM3Y2IzMjAwMzgy NjVkYzk2MGFjODU4Zjk5NzRmYzYxNzhhNDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUHJvcGVydHlOYW1lcy5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVy dHlOYW1lcy5pbgpAQCAtNTA1LDcgKzUwNSw3IEBAIHRleHQtZW1waGFzaXMgPSAtd2Via2l0LXRl eHQtZW1waGFzaXMKIHRleHQtZW1waGFzaXMtY29sb3IgPSAtd2Via2l0LXRleHQtZW1waGFzaXMt Y29sb3IKIC13ZWJraXQtdGV4dC1lbXBoYXNpcy1wb3NpdGlvbiBbSW5oZXJpdGVkLCBDb252ZXJ0 ZXI9VGV4dEVtcGhhc2lzUG9zaXRpb25dCiB0ZXh0LWVtcGhhc2lzLXBvc2l0aW9uID0gLXdlYmtp dC10ZXh0LWVtcGhhc2lzLXBvc2l0aW9uCi0td2Via2l0LXRleHQtZW1waGFzaXMtc3R5bGUgW0lu aGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQorLXdlYmtpdC10ZXh0LWVtcGhhc2lzLXN0eWxl IFtJbmhlcml0ZWQsIEN1c3RvbT1BbGxdCiAtZXB1Yi10ZXh0LWVtcGhhc2lzLXN0eWxlID0gLXdl YmtpdC10ZXh0LWVtcGhhc2lzLXN0eWxlCiB0ZXh0LWVtcGhhc2lzLXN0eWxlID0gLXdlYmtpdC10 ZXh0LWVtcGhhc2lzLXN0eWxlCiAtd2Via2l0LXRleHQtZmlsbC1jb2xvciBbSW5oZXJpdGVkLCBM ZWdhY3lTdHlsZUJ1aWxkZXJdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVj YXRlZFN0eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxl QnVpbGRlci5jcHAKaW5kZXggNGU0NmFhMTgwYjg4ODMwYzZmMTEyZDA0MDBiMzJiZmEzY2M0OTYw Ni4uOThhNTI1ZmIzOWM2MmFmMmE1ZWFlYzFiZDJkMjYwYWRjN2M4OTExMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcApAQCAtNzgwLDY5ICs3ODAs NiBAQCBwdWJsaWM6CiAgICAgfQogfTsKIAotY2xhc3MgQXBwbHlQcm9wZXJ0eVRleHRFbXBoYXNp c1N0eWxlIHsKLXB1YmxpYzoKLSAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRWYWx1ZShDU1NQ cm9wZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyKQotICAgIHsKLSAgICAgICAg c3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzRmlsbChzdHlsZVJlc29sdmVy LT5wYXJlbnRTdHlsZSgpLT50ZXh0RW1waGFzaXNGaWxsKCkpOwotICAgICAgICBzdHlsZVJlc29s dmVyLT5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNNYXJrKHN0eWxlUmVzb2x2ZXItPnBhcmVudFN0 eWxlKCktPnRleHRFbXBoYXNpc01hcmsoKSk7Ci0gICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxl KCktPnNldFRleHRFbXBoYXNpc0N1c3RvbU1hcmsoc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUo KS0+dGV4dEVtcGhhc2lzQ3VzdG9tTWFyaygpKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBh cHBseUluaXRpYWxWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29s dmVyKQotICAgIHsKLSAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhh c2lzRmlsbChSZW5kZXJTdHlsZTo6aW5pdGlhbFRleHRFbXBoYXNpc0ZpbGwoKSk7Ci0gICAgICAg IHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNldFRleHRFbXBoYXNpc01hcmsoUmVuZGVyU3R5bGU6 OmluaXRpYWxUZXh0RW1waGFzaXNNYXJrKCkpOwotICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHls ZSgpLT5zZXRUZXh0RW1waGFzaXNDdXN0b21NYXJrKFJlbmRlclN0eWxlOjppbml0aWFsVGV4dEVt cGhhc2lzQ3VzdG9tTWFyaygpKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVl KENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2 YWx1ZSkKLSAgICB7Ci0gICAgICAgIGlmIChpczxDU1NWYWx1ZUxpc3Q+KCp2YWx1ZSkpIHsKLSAg ICAgICAgICAgIENTU1ZhbHVlTGlzdCYgbGlzdCA9IGRvd25jYXN0PENTU1ZhbHVlTGlzdD4oKnZh bHVlKTsKLSAgICAgICAgICAgIEFTU0VSVChsaXN0Lmxlbmd0aCgpID09IDIpOwotICAgICAgICAg ICAgaWYgKGxpc3QubGVuZ3RoKCkgIT0gMikKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgMjsgKytpKSB7Ci0gICAgICAgICAgICAg ICAgQ1NTVmFsdWUqIGl0ZW0gPSBsaXN0Lml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaSk7Ci0gICAg ICAgICAgICAgICAgaWYgKCFpczxDU1NQcmltaXRpdmVWYWx1ZT4oKml0ZW0pKQotICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVl JiB2YWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqaXRlbSk7Ci0gICAgICAgICAg ICAgICAgaWYgKHZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUZpbGxlZCB8fCB2YWx1ZS5n ZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVPcGVuKQotICAgICAgICAgICAgICAgICAgICBzdHlsZVJl c29sdmVyLT5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNGaWxsKHZhbHVlKTsKLSAgICAgICAgICAg ICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNl dFRleHRFbXBoYXNpc01hcmsodmFsdWUpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgc3R5 bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzQ3VzdG9tTWFyayhudWxsQXRvbSk7 Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoIWlzPENTU1By aW1pdGl2ZVZhbHVlPigqdmFsdWUpKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBDU1NQ cmltaXRpdmVWYWx1ZSYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1 ZT4oKnZhbHVlKTsKLQotICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNTdHJpbmcoKSkgewot ICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzRmlsbChU ZXh0RW1waGFzaXNGaWxsRmlsbGVkKTsKLSAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxl KCktPnNldFRleHRFbXBoYXNpc01hcmsoVGV4dEVtcGhhc2lzTWFya0N1c3RvbSk7Ci0gICAgICAg ICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNDdXN0b21NYXJrKHBy aW1pdGl2ZVZhbHVlLmdldFN0cmluZ1ZhbHVlKCkpOwotICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICB9Ci0KLSAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lz Q3VzdG9tTWFyayhudWxsQXRvbSk7Ci0KLSAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZh bHVlSUQoKSA9PSBDU1NWYWx1ZUZpbGxlZCB8fCBwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkg PT0gQ1NTVmFsdWVPcGVuKSB7Ci0gICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5z ZXRUZXh0RW1waGFzaXNGaWxsKHByaW1pdGl2ZVZhbHVlKTsKLSAgICAgICAgICAgIHN0eWxlUmVz b2x2ZXItPnN0eWxlKCktPnNldFRleHRFbXBoYXNpc01hcmsoVGV4dEVtcGhhc2lzTWFya0F1dG8p OwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+c3R5bGUoKS0+ c2V0VGV4dEVtcGhhc2lzRmlsbChUZXh0RW1waGFzaXNGaWxsRmlsbGVkKTsKLSAgICAgICAgICAg IHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPnNldFRleHRFbXBoYXNpc01hcmsocHJpbWl0aXZlVmFs dWUpOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVh dGVIYW5kbGVyKCkgeyByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwg JmFwcGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7IH0KLX07Ci0KIHRlbXBsYXRlIDx0eXBl bmFtZSBULAogICAgICAgICAgIFQgKEFuaW1hdGlvbjo6KmdldHRlckZ1bmN0aW9uKSgpIGNvbnN0 LAogICAgICAgICAgIHZvaWQgKEFuaW1hdGlvbjo6KnNldHRlckZ1bmN0aW9uKShUKSwKQEAgLTEw MDEsNyArOTM4LDYgQEAgRGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRlZFN0eWxlQnVp bGRlcigpCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFza1NvdXJj ZVR5cGUsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8RU1hc2tTb3VyY2VUeXBlLCBDU1NQcm9wZXJ0 eVdlYmtpdE1hc2tTb3VyY2VUeXBlLCBNYXNrRmlsbExheWVyLCAmUmVuZGVyU3R5bGU6OmFjY2Vz c01hc2tMYXllcnMsICZSZW5kZXJTdHlsZTo6bWFza0xheWVycywgJkZpbGxMYXllcjo6aXNNYXNr U291cmNlVHlwZVNldCwgJkZpbGxMYXllcjo6bWFza1NvdXJjZVR5cGUsICZGaWxsTGF5ZXI6OnNl dE1hc2tTb3VyY2VUeXBlLCAmRmlsbExheWVyOjpjbGVhck1hc2tTb3VyY2VUeXBlLCAmRmlsbExh eWVyOjppbml0aWFsTWFza1NvdXJjZVR5cGUsICZDU1NUb1N0eWxlTWFwOjptYXBGaWxsTWFza1Nv dXJjZVR5cGU+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlT3JpZ2luLCBBcHBseVByb3BlcnR5RXhwYW5kaW5nPFN1 cHByZXNzVmFsdWUsIENTU1Byb3BlcnR5V2Via2l0UGVyc3BlY3RpdmVPcmlnaW5YLCBDU1NQcm9w ZXJ0eVdlYmtpdFBlcnNwZWN0aXZlT3JpZ2luWT46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VGV4dEVtcGhhc2lzQ29sb3IsIEFwcGx5 UHJvcGVydHlDb2xvcjxOb0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5bGU6OnRleHRFbXBo YXNpc0NvbG9yLCAmUmVuZGVyU3R5bGU6OnNldFRleHRFbXBoYXNpc0NvbG9yLCAmUmVuZGVyU3R5 bGU6OnNldFZpc2l0ZWRMaW5rVGV4dEVtcGhhc2lzQ29sb3IsICZSZW5kZXJTdHlsZTo6Y29sb3I+ OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdl YmtpdFRleHRFbXBoYXNpc1N0eWxlLCBBcHBseVByb3BlcnR5VGV4dEVtcGhhc2lzU3R5bGU6OmNy ZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0 VGV4dEZpbGxDb2xvciwgQXBwbHlQcm9wZXJ0eUNvbG9yPE5vSW5oZXJpdEZyb21QYXJlbnQsICZS ZW5kZXJTdHlsZTo6dGV4dEZpbGxDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRUZXh0RmlsbENvbG9y LCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5rVGV4dEZpbGxDb2xvciwgJlJlbmRlclN0eWxl Ojpjb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1By b3BlcnR5V2Via2l0VGV4dFN0cm9rZUNvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9Jbmhlcml0 RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjp0ZXh0U3Ryb2tlQ29sb3IsICZSZW5kZXJTdHlsZTo6 c2V0VGV4dFN0cm9rZUNvbG9yLCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5rVGV4dFN0cm9r ZUNvbG9yLCAmUmVuZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQ cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUcmFuc2l0aW9uRGVsYXksIEFwcGx5UHJv cGVydHlBbmltYXRpb248ZG91YmxlLCAmQW5pbWF0aW9uOjpkZWxheSwgJkFuaW1hdGlvbjo6c2V0 RGVsYXksICZBbmltYXRpb246OmlzRGVsYXlTZXQsICZBbmltYXRpb246OmNsZWFyRGVsYXksICZB bmltYXRpb246OmluaXRpYWxBbmltYXRpb25EZWxheSwgJkNTU1RvU3R5bGVNYXA6Om1hcEFuaW1h dGlvbkRlbGF5LCAmUmVuZGVyU3R5bGU6OmFjY2Vzc1RyYW5zaXRpb25zLCAmUmVuZGVyU3R5bGU6 OnRyYW5zaXRpb25zPjo6Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1 aWxkZXJDdXN0b20uaAppbmRleCA1NzAxZTc5NmY1ZGVjNWUzZjkyMDc3N2RhMzg1ZWEyYzc0MzE0 YTAwLi5lY2M1NzQ0MTkxM2ZkYzM3NTRmZTVhYjk1MzRmMDM1ZjA5NDA2NzkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0xMzAsNiArMTMwLDEwIEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRXZWJraXRBc3BlY3RSYXRpbyhTdHlsZVJl c29sdmVyJik7CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZVdlYmtpdEFzcGVjdFJhdGlvKFN0 eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogCisgICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFs V2Via2l0VGV4dEVtcGhhc2lzU3R5bGUoU3R5bGVSZXNvbHZlciYpOworICAgIHN0YXRpYyB2b2lk IGFwcGx5SW5oZXJpdFdlYmtpdFRleHRFbXBoYXNpc1N0eWxlKFN0eWxlUmVzb2x2ZXImKTsKKyAg ICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlV2Via2l0VGV4dEVtcGhhc2lzU3R5bGUoU3R5bGVSZXNv bHZlciYsIENTU1ZhbHVlJik7CisKIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZl Y3RpdmVab29tKFN0eWxlUmVzb2x2ZXImKTsKICAgICBzdGF0aWMgQ1NTVG9MZW5ndGhDb252ZXJz aW9uRGF0YSBjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKFN0eWxl UmVzb2x2ZXImKTsKQEAgLTEwNDYsNiArMTA1MCw1NiBAQCBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxk ZXJDdXN0b206OmFwcGx5VmFsdWVXZWJraXRBc3BlY3RSYXRpbyhTdHlsZVJlc29sdmVyJiBzdHls ZQogICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0QXNwZWN0UmF0aW9OdW1lcmF0b3IoYXNw ZWN0UmF0aW9WYWx1ZS5udW1lcmF0b3JWYWx1ZSgpKTsKIH0KIAoraW5saW5lIHZvaWQgU3R5bGVC dWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxXZWJraXRUZXh0RW1waGFzaXNTdHlsZShTdHlsZVJl c29sdmVyJiBzdHlsZVJlc29sdmVyKQoreworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0 VGV4dEVtcGhhc2lzRmlsbChSZW5kZXJTdHlsZTo6aW5pdGlhbFRleHRFbXBoYXNpc0ZpbGwoKSk7 CisgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNNYXJrKFJlbmRlclN0 eWxlOjppbml0aWFsVGV4dEVtcGhhc2lzTWFyaygpKTsKKyAgICBzdHlsZVJlc29sdmVyLnN0eWxl KCktPnNldFRleHRFbXBoYXNpc0N1c3RvbU1hcmsoUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0RW1w aGFzaXNDdXN0b21NYXJrKCkpOworfQorCitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206 OmFwcGx5SW5oZXJpdFdlYmtpdFRleHRFbXBoYXNpc1N0eWxlKFN0eWxlUmVzb2x2ZXImIHN0eWxl UmVzb2x2ZXIpCit7CisgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNG aWxsKHN0eWxlUmVzb2x2ZXIucGFyZW50U3R5bGUoKS0+dGV4dEVtcGhhc2lzRmlsbCgpKTsKKyAg ICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldFRleHRFbXBoYXNpc01hcmsoc3R5bGVSZXNvbHZl ci5wYXJlbnRTdHlsZSgpLT50ZXh0RW1waGFzaXNNYXJrKCkpOworICAgIHN0eWxlUmVzb2x2ZXIu c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzQ3VzdG9tTWFyayhzdHlsZVJlc29sdmVyLnBhcmVudFN0 eWxlKCktPnRleHRFbXBoYXNpc0N1c3RvbU1hcmsoKSk7Cit9CisKK2lubGluZSB2b2lkIFN0eWxl QnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZVdlYmtpdFRleHRFbXBoYXNpc1N0eWxlKFN0eWxlUmVz b2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSkKK3sKKyAgICBpZiAoaXM8Q1NT VmFsdWVMaXN0Pih2YWx1ZSkpIHsKKyAgICAgICAgYXV0byYgbGlzdCA9IGRvd25jYXN0PENTU1Zh bHVlTGlzdD4odmFsdWUpOworICAgICAgICBBU1NFUlQobGlzdC5sZW5ndGgoKSA9PSAyKTsKKwor ICAgICAgICBmb3IgKGF1dG8mIGl0ZW0gOiBsaXN0KSB7CisgICAgICAgICAgICBDU1NQcmltaXRp dmVWYWx1ZSYgdmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oaXRlbS5nZXQoKSk7 CisgICAgICAgICAgICBpZiAodmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlRmlsbGVkIHx8 IHZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZU9wZW4pCisgICAgICAgICAgICAgICAgc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNGaWxsKHZhbHVlKTsKKyAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldFRleHRF bXBoYXNpc01hcmsodmFsdWUpOworICAgICAgICB9CisgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5 bGUoKS0+c2V0VGV4dEVtcGhhc2lzQ3VzdG9tTWFyayhudWxsQXRvbSk7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisKKyAgICBhdXRvJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1p dGl2ZVZhbHVlPih2YWx1ZSk7CisgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmlzU3RyaW5nKCkpIHsK KyAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNGaWxsKFRleHRF bXBoYXNpc0ZpbGxGaWxsZWQpOworICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldFRl eHRFbXBoYXNpc01hcmsoVGV4dEVtcGhhc2lzTWFya0N1c3RvbSk7CisgICAgICAgIHN0eWxlUmVz b2x2ZXIuc3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzQ3VzdG9tTWFyayhwcmltaXRpdmVWYWx1ZS5n ZXRTdHJpbmdWYWx1ZSgpKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHN0eWxlUmVz b2x2ZXIuc3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzQ3VzdG9tTWFyayhudWxsQXRvbSk7CisKKyAg ICBpZiAocHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlRmlsbGVkIHx8IHBy aW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZU9wZW4pIHsKKyAgICAgICAgc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNGaWxsKHByaW1pdGl2ZVZhbHVlKTsK KyAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNNYXJrKFRleHRF bXBoYXNpc01hcmtBdXRvKTsKKyAgICB9IGVsc2UgeworICAgICAgICBzdHlsZVJlc29sdmVyLnN0 eWxlKCktPnNldFRleHRFbXBoYXNpc0ZpbGwoVGV4dEVtcGhhc2lzRmlsbEZpbGxlZCk7CisgICAg ICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzTWFyayhwcmltaXRpdmVW YWx1ZSk7CisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBT dHlsZUJ1aWxkZXJDdXN0b21faAo=