164819 2016-11-16 07:00:33 -0800 Remove getMutableCachedPseudoStyle 2016-11-16 10:08:39 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser zalan oldest_to_newest 1251855 0 koivisto 2016-11-16 07:00:33 -0800 We shouldn't mutate style during rendering. 1251856 1 294935 koivisto 2016-11-16 07:05:40 -0800 Created attachment 294935 patch 1251910 2 294935 commit-queue 2016-11-16 10:08:35 -0800 Comment on attachment 294935 patch Clearing flags on attachment: 294935 Committed r208797: <http://trac.webkit.org/changeset/208797> 1251911 3 commit-queue 2016-11-16 10:08:39 -0800 All reviewed patches have been landed. Closing bug. 294935 2016-11-16 07:05:40 -0800 2016-11-16 10:08:35 -0800 patch remove-getMutableCachedPseudoStyle.patch text/plain 11650 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODc5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE2LTExLTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgZ2V0TXV0YWJsZUNh Y2hlZFBzZXVkb1N0eWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjQ4MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJdCBpcyBvbmx5IHVzZWQgYnkgc3R5bGVGb3JGaXJzdExldHRlci4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzdHlsZUZv ckZpcnN0TGV0dGVyKToKKworICAgICAgICAgICAgQ2xvbmUgdGhlIG9yaWdpbmFsIHN0eWxlIGJl Zm9yZSBtdXRhdGlvbnMuCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjp1cGRhdGVG aXJzdExldHRlclN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjcmVhdGVG aXJzdExldHRlclJlbmRlcmVyKToKKworICAgICAgICAgICAgU2luY2Ugd2UgaGF2ZSBhIGNsb25l IGFscmVhZHkganVzdCBtb3ZlIGl0IGluIHBsYWNlLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6Z2V0TXV0 YWJsZUNhY2hlZFBzZXVkb1N0eWxlKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5oOgorCiAyMDE2LTExLTE2ICBSb21haW4gQmVsbGVzc29ydCAgPHJvbWFpbi5i ZWxsZXNzb3J0QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBbUmVhZGFibGUgU3RyZWFtcyBBUEld IEltcGxlbWVudCBSZWFkYWJsZUJ5dGVTdHJlYW1Db250cm9sbGVyIGNsb3NlKCkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gMjA4NjQ4KQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzA1MCw1MiArMzA1MCw1MiBAQCBSZW5kZXJCbG9jayogUmVuZGVyQmxvY2s6OmZpcnN0 TGluZUJsb2NrCiAgICAgcmV0dXJuIGZpcnN0TGluZUJsb2NrOwogfQogCi1zdGF0aWMgY29uc3Qg UmVuZGVyU3R5bGUmIHN0eWxlRm9yRmlyc3RMZXR0ZXIoUmVuZGVyRWxlbWVudCogZmlyc3RMZXR0 ZXJCbG9jaywgUmVuZGVyT2JqZWN0KiBmaXJzdExldHRlckNvbnRhaW5lcikKK3N0YXRpYyBSZW5k ZXJTdHlsZSBzdHlsZUZvckZpcnN0TGV0dGVyKGNvbnN0IFJlbmRlckVsZW1lbnQmIGZpcnN0TGV0 dGVyQmxvY2ssIGNvbnN0IFJlbmRlck9iamVjdCYgZmlyc3RMZXR0ZXJDb250YWluZXIpCiB7Ci0g ICAgYXV0byogcHNldWRvU3R5bGUgPSBmaXJzdExldHRlckJsb2NrLT5nZXRNdXRhYmxlQ2FjaGVk UHNldWRvU3R5bGUoRklSU1RfTEVUVEVSLCAmZmlyc3RMZXR0ZXJDb250YWluZXItPmZpcnN0TGlu ZVN0eWxlKCkpOwotICAgIAorICAgIGF1dG8gZmlyc3RMZXR0ZXJTdHlsZSA9IFJlbmRlclN0eWxl OjpjbG9uZSgqZmlyc3RMZXR0ZXJCbG9jay5nZXRDYWNoZWRQc2V1ZG9TdHlsZShGSVJTVF9MRVRU RVIsICZmaXJzdExldHRlckNvbnRhaW5lci5maXJzdExpbmVTdHlsZSgpKSk7CisKICAgICAvLyBJ ZiB3ZSBoYXZlIGFuIGluaXRpYWwgbGV0dGVyIGRyb3AgdGhhdCBpcyA+PSAxLCB0aGVuIHdlIG5l ZWQgdG8gZm9yY2UgZmxvYXRpbmcgdG8gYmUgb24uCi0gICAgaWYgKHBzZXVkb1N0eWxlLT5pbml0 aWFsTGV0dGVyRHJvcCgpID49IDEgJiYgIXBzZXVkb1N0eWxlLT5pc0Zsb2F0aW5nKCkpCi0gICAg ICAgIHBzZXVkb1N0eWxlLT5zZXRGbG9hdGluZyhwc2V1ZG9TdHlsZS0+aXNMZWZ0VG9SaWdodERp cmVjdGlvbigpID8gTGVmdEZsb2F0IDogUmlnaHRGbG9hdCk7CisgICAgaWYgKGZpcnN0TGV0dGVy U3R5bGUuaW5pdGlhbExldHRlckRyb3AoKSA+PSAxICYmICFmaXJzdExldHRlclN0eWxlLmlzRmxv YXRpbmcoKSkKKyAgICAgICAgZmlyc3RMZXR0ZXJTdHlsZS5zZXRGbG9hdGluZyhmaXJzdExldHRl clN0eWxlLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IExlZnRGbG9hdCA6IFJpZ2h0RmxvYXQp OwogCiAgICAgLy8gV2UgaGF2ZSB0byBjb21wdXRlIHRoZSBjb3JyZWN0IGZvbnQtc2l6ZSBmb3Ig dGhlIGZpcnN0LWxldHRlciBpZiBpdCBoYXMgYW4gaW5pdGlhbCBsZXR0ZXIgaGVpZ2h0IHNldC4K LSAgICBSZW5kZXJPYmplY3QqIHBhcmFncmFwaCA9IGZpcnN0TGV0dGVyQ29udGFpbmVyLT5pc1Jl bmRlckJsb2NrRmxvdygpID8gZmlyc3RMZXR0ZXJDb250YWluZXIgOiBmaXJzdExldHRlckNvbnRh aW5lci0+Y29udGFpbmluZ0Jsb2NrKCk7Ci0gICAgaWYgKHBzZXVkb1N0eWxlLT5pbml0aWFsTGV0 dGVySGVpZ2h0KCkgPj0gMSAmJiBwc2V1ZG9TdHlsZS0+Zm9udE1ldHJpY3MoKS5oYXNDYXBIZWln aHQoKSAmJiBwYXJhZ3JhcGgtPnN0eWxlKCkuZm9udE1ldHJpY3MoKS5oYXNDYXBIZWlnaHQoKSkg eworICAgIGF1dG8qIHBhcmFncmFwaCA9IGZpcnN0TGV0dGVyQ29udGFpbmVyLmlzUmVuZGVyQmxv Y2tGbG93KCkgPyAmZmlyc3RMZXR0ZXJDb250YWluZXIgOiBmaXJzdExldHRlckNvbnRhaW5lci5j b250YWluaW5nQmxvY2soKTsKKyAgICBpZiAoZmlyc3RMZXR0ZXJTdHlsZS5pbml0aWFsTGV0dGVy SGVpZ2h0KCkgPj0gMSAmJiBmaXJzdExldHRlclN0eWxlLmZvbnRNZXRyaWNzKCkuaGFzQ2FwSGVp Z2h0KCkgJiYgcGFyYWdyYXBoLT5zdHlsZSgpLmZvbnRNZXRyaWNzKCkuaGFzQ2FwSGVpZ2h0KCkp IHsKICAgICAgICAgLy8gRklYTUU6IEZvciBpZGVvZ3JhcGhpYyBiYXNlbGluZXMsIHdlIHdhbnQg dG8gZ28gZnJvbSBsaW5lIGVkZ2UgdG8gbGluZSBlZGdlLiBUaGlzIGlzIGVxdWl2YWxlbnQgdG8g KE4tMSkqbGluZS1oZWlnaHQgKyB0aGUgZm9udCBoZWlnaHQuCiAgICAgICAgIC8vIFdlIGRvbid0 IHlldCBzdXBwb3J0IGlkZW9ncmFwaGljIGJhc2VsaW5lcy4KICAgICAgICAgLy8gRm9yIGFuIE4t bGluZSBmaXJzdC1sZXR0ZXIgYW5kIGZvciBhbHBoYWJldGljIGJhc2VsaW5lcywgdGhlIGNhcC1o ZWlnaHQgb2YgdGhlIGZpcnN0IGxldHRlciBuZWVkcyB0byBlcXVhbCAoTi0xKSpsaW5lLWhlaWdo dCBvZiBwYXJhZ3JhcGggbGluZXMgKyBjYXAtaGVpZ2h0IG9mIHRoZSBwYXJhZ3JhcGgKICAgICAg ICAgLy8gTWF0aGVtYXRpY2FsbHkgd2UgY2FuJ3QgcmVseSBvbiBmb250LXNpemUsIHNpbmNlIGZv bnQoKS5oZWlnaHQoKSBkb2Vzbid0IG5lY2Vzc2FyaWx5IG1hdGNoLiBGb3IgcmVsaWFiaWxpdHks IHRoZSBiZXN0IGFwcHJvYWNoIGlzIHNpbXBseSB0bwogICAgICAgICAvLyBjb21wYXJlIHRoZSBm aW5hbCBtZWFzdXJlZCBjYXAtaGVpZ2h0cyBvZiB0aGUgdHdvIGZvbnRzIGluIG9yZGVyIHRvIGdl dCB0byB0aGUgY2xvc2VzdCBwb3NzaWJsZSB2YWx1ZS4KLSAgICAgICAgcHNldWRvU3R5bGUtPnNl dExpbmVCb3hDb250YWluKExpbmVCb3hDb250YWluSW5pdGlhbExldHRlcik7CisgICAgICAgIGZp cnN0TGV0dGVyU3R5bGUuc2V0TGluZUJveENvbnRhaW4oTGluZUJveENvbnRhaW5Jbml0aWFsTGV0 dGVyKTsKICAgICAgICAgaW50IGxpbmVIZWlnaHQgPSBwYXJhZ3JhcGgtPnN0eWxlKCkuY29tcHV0 ZWRMaW5lSGVpZ2h0KCk7CiAgICAgICAgIAogICAgICAgICAvLyBTZXQgdGhlIGZvbnQgdG8gYmUg b25lIGxpbmUgdG9vIGJpZyBhbmQgdGhlbiByYXRjaGV0IGJhY2sgdG8gZ2V0IHRvIGEgcHJlY2lz ZSBmaXQuIFdlIGNhbid0IGp1c3Qgc2V0IHRoZSBkZXNpcmVkIGZvbnQgc2l6ZSBiYXNlZCBvZmYg Zm9udCBoZWlnaHQgbWV0cmljcwogICAgICAgICAvLyBiZWNhdXNlIG1hbnkgZm9udHMgYmFrZSBh c2NlbnQgaW50byB0aGUgZm9udCBtZXRyaWNzLiBUaGVyZWZvcmUgd2UgaGF2ZSB0byBsb29rIGF0 IGFjdHVhbCBtZWFzdXJlZCBjYXAgaGVpZ2h0IHZhbHVlcyBpbiBvcmRlciB0byBrbm93IHdoZW4g d2UgaGF2ZSBhIGdvb2QgZml0LgotICAgICAgICBhdXRvIG5ld0ZvbnREZXNjcmlwdGlvbiA9IHBz ZXVkb1N0eWxlLT5mb250RGVzY3JpcHRpb24oKTsKLSAgICAgICAgZmxvYXQgY2FwUmF0aW8gPSBw c2V1ZG9TdHlsZS0+Zm9udE1ldHJpY3MoKS5mbG9hdENhcEhlaWdodCgpIC8gcHNldWRvU3R5bGUt PmZvbnRTaXplKCk7Ci0gICAgICAgIGZsb2F0IHN0YXJ0aW5nRm9udFNpemUgPSAoKHBzZXVkb1N0 eWxlLT5pbml0aWFsTGV0dGVySGVpZ2h0KCkgLSAxKSAqIGxpbmVIZWlnaHQgKyBwYXJhZ3JhcGgt PnN0eWxlKCkuZm9udE1ldHJpY3MoKS5jYXBIZWlnaHQoKSkgLyBjYXBSYXRpbzsKKyAgICAgICAg YXV0byBuZXdGb250RGVzY3JpcHRpb24gPSBmaXJzdExldHRlclN0eWxlLmZvbnREZXNjcmlwdGlv bigpOworICAgICAgICBmbG9hdCBjYXBSYXRpbyA9IGZpcnN0TGV0dGVyU3R5bGUuZm9udE1ldHJp Y3MoKS5mbG9hdENhcEhlaWdodCgpIC8gZmlyc3RMZXR0ZXJTdHlsZS5mb250U2l6ZSgpOworICAg ICAgICBmbG9hdCBzdGFydGluZ0ZvbnRTaXplID0gKChmaXJzdExldHRlclN0eWxlLmluaXRpYWxM ZXR0ZXJIZWlnaHQoKSAtIDEpICogbGluZUhlaWdodCArIHBhcmFncmFwaC0+c3R5bGUoKS5mb250 TWV0cmljcygpLmNhcEhlaWdodCgpKSAvIGNhcFJhdGlvOwogICAgICAgICBuZXdGb250RGVzY3Jp cHRpb24uc2V0U3BlY2lmaWVkU2l6ZShzdGFydGluZ0ZvbnRTaXplKTsKICAgICAgICAgbmV3Rm9u dERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShzdGFydGluZ0ZvbnRTaXplKTsKLSAgICAgICAg cHNldWRvU3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihuZXdGb250RGVzY3JpcHRpb24pOwotICAg ICAgICBwc2V1ZG9TdHlsZS0+Zm9udENhc2NhZGUoKS51cGRhdGUocHNldWRvU3R5bGUtPmZvbnRD YXNjYWRlKCkuZm9udFNlbGVjdG9yKCkpOworICAgICAgICBmaXJzdExldHRlclN0eWxlLnNldEZv bnREZXNjcmlwdGlvbihuZXdGb250RGVzY3JpcHRpb24pOworICAgICAgICBmaXJzdExldHRlclN0 eWxlLmZvbnRDYXNjYWRlKCkudXBkYXRlKGZpcnN0TGV0dGVyU3R5bGUuZm9udENhc2NhZGUoKS5m b250U2VsZWN0b3IoKSk7CiAgICAgICAgIAotICAgICAgICBpbnQgZGVzaXJlZENhcEhlaWdodCA9 IChwc2V1ZG9TdHlsZS0+aW5pdGlhbExldHRlckhlaWdodCgpIC0gMSkgKiBsaW5lSGVpZ2h0ICsg cGFyYWdyYXBoLT5zdHlsZSgpLmZvbnRNZXRyaWNzKCkuY2FwSGVpZ2h0KCk7Ci0gICAgICAgIGlu dCBhY3R1YWxDYXBIZWlnaHQgPSBwc2V1ZG9TdHlsZS0+Zm9udE1ldHJpY3MoKS5jYXBIZWlnaHQo KTsKKyAgICAgICAgaW50IGRlc2lyZWRDYXBIZWlnaHQgPSAoZmlyc3RMZXR0ZXJTdHlsZS5pbml0 aWFsTGV0dGVySGVpZ2h0KCkgLSAxKSAqIGxpbmVIZWlnaHQgKyBwYXJhZ3JhcGgtPnN0eWxlKCku Zm9udE1ldHJpY3MoKS5jYXBIZWlnaHQoKTsKKyAgICAgICAgaW50IGFjdHVhbENhcEhlaWdodCA9 IGZpcnN0TGV0dGVyU3R5bGUuZm9udE1ldHJpY3MoKS5jYXBIZWlnaHQoKTsKICAgICAgICAgd2hp bGUgKGFjdHVhbENhcEhlaWdodCA+IGRlc2lyZWRDYXBIZWlnaHQpIHsKLSAgICAgICAgICAgIGF1 dG8gbmV3Rm9udERlc2NyaXB0aW9uID0gcHNldWRvU3R5bGUtPmZvbnREZXNjcmlwdGlvbigpOwor ICAgICAgICAgICAgYXV0byBuZXdGb250RGVzY3JpcHRpb24gPSBmaXJzdExldHRlclN0eWxlLmZv bnREZXNjcmlwdGlvbigpOwogICAgICAgICAgICAgbmV3Rm9udERlc2NyaXB0aW9uLnNldFNwZWNp ZmllZFNpemUobmV3Rm9udERlc2NyaXB0aW9uLnNwZWNpZmllZFNpemUoKSAtIDEpOwogICAgICAg ICAgICAgbmV3Rm9udERlc2NyaXB0aW9uLnNldENvbXB1dGVkU2l6ZShuZXdGb250RGVzY3JpcHRp b24uY29tcHV0ZWRTaXplKCkgLTEpOwotICAgICAgICAgICAgcHNldWRvU3R5bGUtPnNldEZvbnRE ZXNjcmlwdGlvbihuZXdGb250RGVzY3JpcHRpb24pOwotICAgICAgICAgICAgcHNldWRvU3R5bGUt PmZvbnRDYXNjYWRlKCkudXBkYXRlKHBzZXVkb1N0eWxlLT5mb250Q2FzY2FkZSgpLmZvbnRTZWxl Y3RvcigpKTsKLSAgICAgICAgICAgIGFjdHVhbENhcEhlaWdodCA9IHBzZXVkb1N0eWxlLT5mb250 TWV0cmljcygpLmNhcEhlaWdodCgpOworICAgICAgICAgICAgZmlyc3RMZXR0ZXJTdHlsZS5zZXRG b250RGVzY3JpcHRpb24obmV3Rm9udERlc2NyaXB0aW9uKTsKKyAgICAgICAgICAgIGZpcnN0TGV0 dGVyU3R5bGUuZm9udENhc2NhZGUoKS51cGRhdGUoZmlyc3RMZXR0ZXJTdHlsZS5mb250Q2FzY2Fk ZSgpLmZvbnRTZWxlY3RvcigpKTsKKyAgICAgICAgICAgIGFjdHVhbENhcEhlaWdodCA9IGZpcnN0 TGV0dGVyU3R5bGUuZm9udE1ldHJpY3MoKS5jYXBIZWlnaHQoKTsKICAgICAgICAgfQogICAgIH0K ICAgICAKICAgICAvLyBGb3JjZSBpbmxpbmUgZGlzcGxheSAoZXhjZXB0IGZvciBmbG9hdGluZyBm aXJzdC1sZXR0ZXJzKS4KLSAgICBwc2V1ZG9TdHlsZS0+c2V0RGlzcGxheShwc2V1ZG9TdHlsZS0+ aXNGbG9hdGluZygpID8gQkxPQ0sgOiBJTkxJTkUpOworICAgIGZpcnN0TGV0dGVyU3R5bGUuc2V0 RGlzcGxheShmaXJzdExldHRlclN0eWxlLmlzRmxvYXRpbmcoKSA/IEJMT0NLIDogSU5MSU5FKTsK ICAgICAvLyBDU1MyIHNheXMgZmlyc3QtbGV0dGVyIGNhbid0IGJlIHBvc2l0aW9uZWQuCi0gICAg cHNldWRvU3R5bGUtPnNldFBvc2l0aW9uKFN0YXRpY1Bvc2l0aW9uKTsKLSAgICByZXR1cm4gKnBz ZXVkb1N0eWxlOworICAgIGZpcnN0TGV0dGVyU3R5bGUuc2V0UG9zaXRpb24oU3RhdGljUG9zaXRp b24pOworICAgIHJldHVybiBmaXJzdExldHRlclN0eWxlOwogfQogCiAvLyBDU1MgMi4xIGh0dHA6 Ly93d3cudzMub3JnL1RSL0NTUzIxL3NlbGVjdG9yLmh0bWwjZmlyc3QtbGV0dGVyCkBAIC0zMTM1 LDE2ICszMTM1LDE2IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZUZpcnN0TGV0dGVyU3R5bGUK IHsKICAgICBSZW5kZXJFbGVtZW50KiBmaXJzdExldHRlciA9IGN1cnJlbnRDaGlsZC0+cGFyZW50 KCk7CiAgICAgUmVuZGVyRWxlbWVudCogZmlyc3RMZXR0ZXJDb250YWluZXIgPSBmaXJzdExldHRl ci0+cGFyZW50KCk7Ci0gICAgYXV0byYgcHNldWRvU3R5bGUgPSBzdHlsZUZvckZpcnN0TGV0dGVy KGZpcnN0TGV0dGVyQmxvY2ssIGZpcnN0TGV0dGVyQ29udGFpbmVyKTsKKyAgICBhdXRvIHBzZXVk b1N0eWxlID0gc3R5bGVGb3JGaXJzdExldHRlcigqZmlyc3RMZXR0ZXJCbG9jaywgKmZpcnN0TGV0 dGVyQ29udGFpbmVyKTsKICAgICBBU1NFUlQoZmlyc3RMZXR0ZXItPmlzRmxvYXRpbmcoKSB8fCBm aXJzdExldHRlci0+aXNJbmxpbmUoKSk7CiAKICAgICBpZiAoU3R5bGU6OmRldGVybWluZUNoYW5n ZShmaXJzdExldHRlci0+c3R5bGUoKSwgcHNldWRvU3R5bGUpID09IFN0eWxlOjpEZXRhY2gpIHsK ICAgICAgICAgLy8gVGhlIGZpcnN0LWxldHRlciByZW5kZXJlciBuZWVkcyB0byBiZSByZXBsYWNl ZC4gQ3JlYXRlIGEgbmV3IHJlbmRlcmVyIG9mIHRoZSByaWdodCB0eXBlLgogICAgICAgICBSZW5k ZXJCb3hNb2RlbE9iamVjdCogbmV3Rmlyc3RMZXR0ZXI7CiAgICAgICAgIGlmIChwc2V1ZG9TdHls ZS5kaXNwbGF5KCkgPT0gSU5MSU5FKQotICAgICAgICAgICAgbmV3Rmlyc3RMZXR0ZXIgPSBuZXcg UmVuZGVySW5saW5lKGRvY3VtZW50KCksIFJlbmRlclN0eWxlOjpjbG9uZShwc2V1ZG9TdHlsZSkp OworICAgICAgICAgICAgbmV3Rmlyc3RMZXR0ZXIgPSBuZXcgUmVuZGVySW5saW5lKGRvY3VtZW50 KCksIFdURk1vdmUocHNldWRvU3R5bGUpKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgbmV3 Rmlyc3RMZXR0ZXIgPSBuZXcgUmVuZGVyQmxvY2tGbG93KGRvY3VtZW50KCksIFJlbmRlclN0eWxl OjpjbG9uZShwc2V1ZG9TdHlsZSkpOworICAgICAgICAgICAgbmV3Rmlyc3RMZXR0ZXIgPSBuZXcg UmVuZGVyQmxvY2tGbG93KGRvY3VtZW50KCksIFdURk1vdmUocHNldWRvU3R5bGUpKTsKICAgICAg ICAgbmV3Rmlyc3RMZXR0ZXItPmluaXRpYWxpemVTdHlsZSgpOwogCiAgICAgICAgIC8vIE1vdmUg dGhlIGZpcnN0IGxldHRlciBpbnRvIHRoZSBuZXcgcmVuZGVyZXIuCkBAIC0zMTcwLDE4ICszMTcw LDE4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZUZpcnN0TGV0dGVyU3R5bGUKICAgICAgICAg Zmlyc3RMZXR0ZXIgPSBuZXdGaXJzdExldHRlcjsKICAgICAgICAgZmlyc3RMZXR0ZXJDb250YWlu ZXItPmFkZENoaWxkKGZpcnN0TGV0dGVyLCBuZXh0U2libGluZyk7CiAgICAgfSBlbHNlCi0gICAg ICAgIGZpcnN0TGV0dGVyLT5zZXRTdHlsZShSZW5kZXJTdHlsZTo6Y2xvbmUocHNldWRvU3R5bGUp KTsKKyAgICAgICAgZmlyc3RMZXR0ZXItPnNldFN0eWxlKFdURk1vdmUocHNldWRvU3R5bGUpKTsK IH0KIAogdm9pZCBSZW5kZXJCbG9jazo6Y3JlYXRlRmlyc3RMZXR0ZXJSZW5kZXJlcihSZW5kZXJF bGVtZW50KiBmaXJzdExldHRlckJsb2NrLCBSZW5kZXJUZXh0KiBjdXJyZW50VGV4dENoaWxkKQog ewogICAgIFJlbmRlckVsZW1lbnQqIGZpcnN0TGV0dGVyQ29udGFpbmVyID0gY3VycmVudFRleHRD aGlsZC0+cGFyZW50KCk7Ci0gICAgYXV0byYgcHNldWRvU3R5bGUgPSBzdHlsZUZvckZpcnN0TGV0 dGVyKGZpcnN0TGV0dGVyQmxvY2ssIGZpcnN0TGV0dGVyQ29udGFpbmVyKTsKKyAgICBhdXRvIHBz ZXVkb1N0eWxlID0gc3R5bGVGb3JGaXJzdExldHRlcigqZmlyc3RMZXR0ZXJCbG9jaywgKmZpcnN0 TGV0dGVyQ29udGFpbmVyKTsKICAgICBSZW5kZXJCb3hNb2RlbE9iamVjdCogZmlyc3RMZXR0ZXIg PSBudWxscHRyOwogICAgIGlmIChwc2V1ZG9TdHlsZS5kaXNwbGF5KCkgPT0gSU5MSU5FKQotICAg ICAgICBmaXJzdExldHRlciA9IG5ldyBSZW5kZXJJbmxpbmUoZG9jdW1lbnQoKSwgUmVuZGVyU3R5 bGU6OmNsb25lKHBzZXVkb1N0eWxlKSk7CisgICAgICAgIGZpcnN0TGV0dGVyID0gbmV3IFJlbmRl cklubGluZShkb2N1bWVudCgpLCBXVEZNb3ZlKHBzZXVkb1N0eWxlKSk7CiAgICAgZWxzZQotICAg ICAgICBmaXJzdExldHRlciA9IG5ldyBSZW5kZXJCbG9ja0Zsb3coZG9jdW1lbnQoKSwgUmVuZGVy U3R5bGU6OmNsb25lKHBzZXVkb1N0eWxlKSk7CisgICAgICAgIGZpcnN0TGV0dGVyID0gbmV3IFJl bmRlckJsb2NrRmxvdyhkb2N1bWVudCgpLCBXVEZNb3ZlKHBzZXVkb1N0eWxlKSk7CiAgICAgZmly c3RMZXR0ZXItPmluaXRpYWxpemVTdHlsZSgpOwogICAgIGZpcnN0TGV0dGVyQ29udGFpbmVyLT5h ZGRDaGlsZChmaXJzdExldHRlciwgY3VycmVudFRleHRDaGlsZCk7CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAJKHJldmlzaW9uIDIwODY0OCkKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTUyOSwyMSArMTUyOSw2IEBAIGNvbnN0IFJlbmRlclN0eWxlKiBSZW5kZXJFbGVtZW50 OjpnZXRDYWMKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotUmVuZGVyU3R5bGUqIFJlbmRlckVs ZW1lbnQ6OmdldE11dGFibGVDYWNoZWRQc2V1ZG9TdHlsZShQc2V1ZG9JZCBwc2V1ZG8sIGNvbnN0 IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSkKLXsKLSAgICBpZiAocHNldWRvIDwgRklSU1RfSU5U RVJOQUxfUFNFVURPSUQgJiYgIXN0eWxlKCkuaGFzUHNldWRvU3R5bGUocHNldWRvKSkKLSAgICAg ICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICBSZW5kZXJTdHlsZSogY2FjaGVkU3R5bGUgPSBzdHls ZSgpLmdldENhY2hlZFBzZXVkb1N0eWxlKHBzZXVkbyk7Ci0gICAgaWYgKGNhY2hlZFN0eWxlKQot ICAgICAgICByZXR1cm4gY2FjaGVkU3R5bGU7Ci0KLSAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVy U3R5bGU+IHJlc3VsdCA9IGdldFVuY2FjaGVkUHNldWRvU3R5bGUoUHNldWRvU3R5bGVSZXF1ZXN0 KHBzZXVkbyksIHBhcmVudFN0eWxlKTsKLSAgICBpZiAocmVzdWx0KQotICAgICAgICByZXR1cm4g bV9zdHlsZS5hZGRDYWNoZWRQc2V1ZG9TdHlsZShXVEZNb3ZlKHJlc3VsdCkpOwotICAgIHJldHVy biBudWxscHRyOwotfQotCiBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IFJlbmRlckVsZW1l bnQ6OmdldFVuY2FjaGVkUHNldWRvU3R5bGUoY29uc3QgUHNldWRvU3R5bGVSZXF1ZXN0JiBwc2V1 ZG9TdHlsZVJlcXVlc3QsIGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSwgY29uc3QgUmVu ZGVyU3R5bGUqIG93blN0eWxlKSBjb25zdAogewogICAgIGlmIChwc2V1ZG9TdHlsZVJlcXVlc3Qu cHNldWRvSWQgPCBGSVJTVF9JTlRFUk5BTF9QU0VVRE9JRCAmJiAhb3duU3R5bGUgJiYgIXN0eWxl KCkuaGFzUHNldWRvU3R5bGUocHNldWRvU3R5bGVSZXF1ZXN0LnBzZXVkb0lkKSkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAkocmV2aXNpb24gMjA4NjQ4KQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAkod29ya2luZyBjb3B5 KQpAQCAtNTcsNyArNTcsNiBAQCBwdWJsaWM6CiAgICAgLy8gVGhlIHBzZXVkbyBlbGVtZW50IHN0 eWxlIGNhbiBiZSBjYWNoZWQgb3IgdW5jYWNoZWQuICBVc2UgdGhlIGNhY2hlZCBtZXRob2QgaWYg dGhlIHBzZXVkbyBlbGVtZW50IGRvZXNuJ3QgcmVzcGVjdAogICAgIC8vIGFueSBwc2V1ZG8gY2xh c3NlcyAoYW5kIHRoZXJlZm9yZSBoYXMgbm8gY29uY2VwdCBvZiBjaGFuZ2luZyBzdGF0ZSkuCiAg ICAgY29uc3QgUmVuZGVyU3R5bGUqIGdldENhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb0lkLCBjb25z dCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUgPSBudWxscHRyKSBjb25zdDsKLSAgICBSZW5kZXJT dHlsZSogZ2V0TXV0YWJsZUNhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb0lkLCBjb25zdCBSZW5kZXJT dHlsZSogcGFyZW50U3R5bGUgPSBudWxscHRyKTsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVy U3R5bGU+IGdldFVuY2FjaGVkUHNldWRvU3R5bGUoY29uc3QgUHNldWRvU3R5bGVSZXF1ZXN0Jiwg Y29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlID0gbnVsbHB0ciwgY29uc3QgUmVuZGVyU3R5 bGUqIG93blN0eWxlID0gbnVsbHB0cikgY29uc3Q7CiAKICAgICAvLyBUaGlzIGlzIG51bGwgZm9y IGFub255bW91cyByZW5kZXJlcnMuCg==