73500 2011-11-30 16:50:29 -0800 Implement CSS display property in CSSStyleApplyProperty. 2011-12-11 18:24:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson jchaffraix kling koivisto macpherson webkit.review.bot oldest_to_newest 512241 0 macpherson 2011-11-30 16:50:29 -0800 Implement css display property in CSSStyleApplyProperty. 512243 1 117297 macpherson 2011-11-30 16:53:23 -0800 Created attachment 117297 Patch 514641 2 117297 kling 2011-12-03 22:12:04 -0800 Comment on attachment 117297 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117297&action=review > Source/WebCore/ChangeLog:3 > + Implement css display property in CSSStyleApplyProperty. css -> CSS > Source/WebCore/css/CSSStyleApplyProperty.cpp:1183 > + static inline bool isSVGElement(CSSStyleSelector* selector) I'm not a fan of this name, since the function answers more than just "is it an SVG element". > Source/WebCore/css/CSSStyleApplyProperty.cpp:1203 > + static void applyInitialValue(CSSStyleSelector* selector) > + { > + selector->style()->setDisplay(RenderStyle::initialDisplay()); > + } Shouldn't we have the if (isSVGElement.....) early return before setting the value in here, too? 516431 3 118157 macpherson 2011-12-06 18:33:11 -0800 Created attachment 118157 Patch 518959 4 118157 webkit.review.bot 2011-12-11 18:24:46 -0800 Comment on attachment 118157 Patch Clearing flags on attachment: 118157 Committed r102552: <http://trac.webkit.org/changeset/102552> 518960 5 webkit.review.bot 2011-12-11 18:24:51 -0800 All reviewed patches have been landed. Closing bug. 117297 2011-11-30 16:53:23 -0800 2011-12-06 18:33:03 -0800 Patch bug-73500-20111201115320.patch text/plain 6908 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTU2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTMwICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IGNzcyBkaXNwbGF5IHByb3BlcnR5IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNTAwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Jpbmcgb25seSAv IG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5 UHJvcGVydHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eURpc3BsYXk6Omlz QWNjZXB0YWJsZUZvclNWR0VsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0 eURpc3BsYXk6OmlzU1ZHRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5 RGlzcGxheTo6YXBwbHlJbmhlcml0VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9w ZXJ0eURpc3BsYXk6OmFwcGx5SW5pdGlhbFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5 UHJvcGVydHlEaXNwbGF5OjphcHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlEaXNwbGF5OjpjcmVhdGVIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxl QXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvQ1NT U3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjph cHBseVByb3BlcnR5KToKKwogMjAxMS0xMS0zMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBDYW5ub3Qgc2VsZWN0IFJUTCB0ZXh0IGluc2lkZSBMVFIgdGV4dCBm cm9tIHJpZ2h0IHRvIGxlZnQgYnkgYSBtb3VzZSBkcmFnCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkocmV2aXNpb24gMTAxNTUyKQorKysgU291 cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTExNzQsNiArMTE3NCw1MyBAQCBwdWJsaWM6CiAgICAgfQogfTsKIAorY2xhc3MgQXBwbHlQ cm9wZXJ0eURpc3BsYXkgeworcHJpdmF0ZToKKyAgICBzdGF0aWMgaW5saW5lIGJvb2wgaXNBY2Nl cHRhYmxlRm9yU1ZHRWxlbWVudChFRGlzcGxheSBkaXNwbGF5UHJvcGVydHlWYWx1ZSkKKyAgICB7 CisgICAgICAgIHJldHVybiBkaXNwbGF5UHJvcGVydHlWYWx1ZSA9PSBJTkxJTkUgfHwgZGlzcGxh eVByb3BlcnR5VmFsdWUgPT0gQkxPQ0sgfHwgZGlzcGxheVByb3BlcnR5VmFsdWUgPT0gTk9ORTsK KyAgICB9CisgICAgc3RhdGljIGlubGluZSBib29sIGlzU1ZHRWxlbWVudChDU1NTdHlsZVNlbGVj dG9yKiBzZWxlY3RvcikKKyAgICB7CisjaWYgRU5BQkxFKFNWRykKKyAgICAgICAgcmV0dXJuIHNl bGVjdG9yLT5lbGVtZW50KCkgJiYgc2VsZWN0b3ItPmVsZW1lbnQoKS0+aXNTVkdFbGVtZW50KCkg JiYgc2VsZWN0b3ItPnN0eWxlKCktPnN0eWxlVHlwZSgpID09IE5PUFNFVURPOworI2Vsc2UKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCisgICAgfQorcHVibGljOgorICAgIHN0YXRpYyB2 b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yKQorICAgIHsK KyAgICAgICAgRURpc3BsYXkgZGlzcGxheSA9IHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpLT5kaXNw bGF5KCk7CisgICAgICAgIGlmIChpc1NWR0VsZW1lbnQoc2VsZWN0b3IpICYmICFpc0FjY2VwdGFi bGVGb3JTVkdFbGVtZW50KGRpc3BsYXkpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBz ZWxlY3Rvci0+c3R5bGUoKS0+c2V0RGlzcGxheShkaXNwbGF5KTsKKyAgICB9CisKKyAgICBzdGF0 aWMgdm9pZCBhcHBseUluaXRpYWxWYWx1ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvcikKKyAg ICB7CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXREaXNwbGF5KFJlbmRlclN0eWxlOjpp bml0aWFsRGlzcGxheSgpKTsKKyAgICB9CisKKyAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENT U1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yLCBDU1NWYWx1ZSogdmFsdWUpCisgICAgeworICAgICAg ICBpZiAoIXZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgRURpc3BsYXkgZGlzcGxheSA9ICpzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1 ZSo+KHZhbHVlKTsKKworICAgICAgICBpZiAoaXNTVkdFbGVtZW50KHNlbGVjdG9yKSAmJiAhaXNB Y2NlcHRhYmxlRm9yU1ZHRWxlbWVudChkaXNwbGF5KSkKKyAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0RGlzcGxheShkaXNwbGF5KTsKKyAgICB9CisK KyAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBwbHlJbmhlcml0VmFsdWUsICZhcHBseUluaXRp YWxWYWx1ZSwgJmFwcGx5VmFsdWUpOworICAgIH0KK307CisKIGNvbnN0IENTU1N0eWxlQXBwbHlQ cm9wZXJ0eSYgQ1NTU3R5bGVBcHBseVByb3BlcnR5OjpzaGFyZWRDU1NTdHlsZUFwcGx5UHJvcGVy dHkoKQogewogICAgIERFRklORV9TVEFUSUNfTE9DQUwoQ1NTU3R5bGVBcHBseVByb3BlcnR5LCBj c3NTdHlsZUFwcGx5UHJvcGVydHlJbnN0YW5jZSwgKCkpOwpAQCAtMTE5OCw2ICsxMjQ1LDggQEAg Q1NTU3R5bGVBcHBseVByb3BlcnR5OjpDU1NTdHlsZUFwcGx5UHJvcAogICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEJhY2tncm91bmRDb21wb3NpdGUsIEFwcGx5UHJvcGVy dHlGaWxsTGF5ZXI8Q29tcG9zaXRlT3BlcmF0b3IsIENTU1Byb3BlcnR5V2Via2l0QmFja2dyb3Vu ZENvbXBvc2l0ZSwgQmFja2dyb3VuZEZpbGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nlc3NCYWNr Z3JvdW5kTGF5ZXJzLCAmUmVuZGVyU3R5bGU6OmJhY2tncm91bmRMYXllcnMsCiAgICAgICAgICAg ICAgICAgICAgICAgICZGaWxsTGF5ZXI6OmlzQ29tcG9zaXRlU2V0LCAmRmlsbExheWVyOjpjb21w b3NpdGUsICZGaWxsTGF5ZXI6OnNldENvbXBvc2l0ZSwgJkZpbGxMYXllcjo6Y2xlYXJDb21wb3Np dGUsICZGaWxsTGF5ZXI6OmluaXRpYWxGaWxsQ29tcG9zaXRlLCAmQ1NTU3R5bGVTZWxlY3Rvcjo6 bWFwRmlsbENvbXBvc2l0ZT46OmNyZWF0ZUhhbmRsZXIoKSk7CiAKKyAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlEaXNwbGF5LCBBcHBseVByb3BlcnR5RGlzcGxheTo6Y3JlYXRlSGFu ZGxlcigpKTsKKwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJhY2tncm91bmRJ bWFnZSwgQXBwbHlQcm9wZXJ0eUZpbGxMYXllcjxTdHlsZUltYWdlKiwgQ1NTUHJvcGVydHlCYWNr Z3JvdW5kSW1hZ2UsIEJhY2tncm91bmRGaWxsTGF5ZXIsICZSZW5kZXJTdHlsZTo6YWNjZXNzQmFj a2dyb3VuZExheWVycywgJlJlbmRlclN0eWxlOjpiYWNrZ3JvdW5kTGF5ZXJzLAogICAgICAgICAg ICAgICAgICAgICAgICAmRmlsbExheWVyOjppc0ltYWdlU2V0LCAmRmlsbExheWVyOjppbWFnZSwg JkZpbGxMYXllcjo6c2V0SW1hZ2UsICZGaWxsTGF5ZXI6OmNsZWFySW1hZ2UsICZGaWxsTGF5ZXI6 OmluaXRpYWxGaWxsSW1hZ2UsICZDU1NTdHlsZVNlbGVjdG9yOjptYXBGaWxsSW1hZ2U+OjpjcmVh dGVIYW5kbGVyKCkpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3Iu Y3BwCShyZXZpc2lvbiAxMDE1NTIpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0NTAsNTMgKzI0NTAsNiBAQCBpbmxpbmUgYm9v bCBpc1ZhbGlkVmlzaXRlZExpbmtQcm9wZXJ0eShpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1j bGFzcyBTVkdEaXNwbGF5UHJvcGVydHlHdWFyZCB7Ci0gICAgV1RGX01BS0VfTk9OQ09QWUFCTEUo U1ZHRGlzcGxheVByb3BlcnR5R3VhcmQpOwotcHVibGljOgotICAgIFNWR0Rpc3BsYXlQcm9wZXJ0 eUd1YXJkKEVsZW1lbnQqLCBSZW5kZXJTdHlsZSopOwotICAgIH5TVkdEaXNwbGF5UHJvcGVydHlH dWFyZCgpOwotcHJpdmF0ZToKLSNpZiBFTkFCTEUoU1ZHKQotICAgIFJlbmRlclN0eWxlKiBtX3N0 eWxlOwotICAgIEVEaXNwbGF5IG1fb3JpZ2luYWxEaXNwbGF5UHJvcGVydHlWYWx1ZTsKLSNlbmRp ZgotfTsKLQotI2lmICFFTkFCTEUoU1ZHKQotaW5saW5lIFNWR0Rpc3BsYXlQcm9wZXJ0eUd1YXJk OjpTVkdEaXNwbGF5UHJvcGVydHlHdWFyZChFbGVtZW50KiwgUmVuZGVyU3R5bGUqKQotewotfQot Ci1pbmxpbmUgU1ZHRGlzcGxheVByb3BlcnR5R3VhcmQ6On5TVkdEaXNwbGF5UHJvcGVydHlHdWFy ZCgpCi17Ci19Ci0jZWxzZQotc3RhdGljIGlubGluZSBib29sIGlzQWNjZXB0YWJsZUZvclNWR0Vs ZW1lbnQoRURpc3BsYXkgZGlzcGxheVByb3BlcnR5VmFsdWUpCi17Ci0gICAgcmV0dXJuIGRpc3Bs YXlQcm9wZXJ0eVZhbHVlID09IElOTElORSB8fCBkaXNwbGF5UHJvcGVydHlWYWx1ZSA9PSBCTE9D SyB8fCBkaXNwbGF5UHJvcGVydHlWYWx1ZSA9PSBOT05FOwotfQotCi1pbmxpbmUgU1ZHRGlzcGxh eVByb3BlcnR5R3VhcmQ6OlNWR0Rpc3BsYXlQcm9wZXJ0eUd1YXJkKEVsZW1lbnQqIGVsZW1lbnQs IFJlbmRlclN0eWxlKiBzdHlsZSkKLXsKLSAgICBpZiAoIShlbGVtZW50ICYmIGVsZW1lbnQtPmlz U1ZHRWxlbWVudCgpICYmIHN0eWxlLT5zdHlsZVR5cGUoKSA9PSBOT1BTRVVETykpIHsKLSAgICAg ICAgbV9vcmlnaW5hbERpc3BsYXlQcm9wZXJ0eVZhbHVlID0gTk9ORTsKLSAgICAgICAgbV9zdHls ZSA9IDA7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgbV9zdHlsZSA9IHN0eWxlOwotICAg IG1fb3JpZ2luYWxEaXNwbGF5UHJvcGVydHlWYWx1ZSA9IHN0eWxlLT5kaXNwbGF5KCk7Ci0gICAg QVNTRVJUKGlzQWNjZXB0YWJsZUZvclNWR0VsZW1lbnQobV9vcmlnaW5hbERpc3BsYXlQcm9wZXJ0 eVZhbHVlKSk7Ci19Ci0KLWlubGluZSBTVkdEaXNwbGF5UHJvcGVydHlHdWFyZDo6flNWR0Rpc3Bs YXlQcm9wZXJ0eUd1YXJkKCkKLXsKLSAgICBpZiAoIW1fc3R5bGUgfHwgaXNBY2NlcHRhYmxlRm9y U1ZHRWxlbWVudChtX3N0eWxlLT5kaXNwbGF5KCkpKQotICAgICAgICByZXR1cm47Ci0gICAgbV9z dHlsZS0+c2V0RGlzcGxheShtX29yaWdpbmFsRGlzcGxheVByb3BlcnR5VmFsdWUpOwotfQotI2Vu ZGlmCi0KLQogLy8gU1ZHIGhhbmRsZXMgem9vbWluZyBpbiBhIGRpZmZlcmVudCB3YXkgY29tcGFy ZWQgdG8gQ1NTLiBUaGUgd2hvbGUgZG9jdW1lbnQgaXMgc2NhbGVkIGluc3RlYWQKIC8vIG9mIGVh Y2ggaW5kaXZpZHVhbCBsZW5ndGggdmFsdWUgaW4gdGhlIHJlbmRlciBzdHlsZSAvIHRyZWUuIENT U1ByaW1pdGl2ZVZhbHVlOjpjb21wdXRlTGVuZ3RoKigpCiAvLyBtdWx0aXBsaWVzIGVhY2ggcmVz b2x2ZWQgbGVuZ3RoIHdpdGggdGhlIHpvb20gbXVsdGlwbGllciAtIHNvIGZvciBTVkcgd2UgbmVl ZCB0byBkaXNhYmxlIHRoYXQuCkBAIC0yNTU3LDExICsyNTEwLDYgQEAgdm9pZCBDU1NTdHlsZVNl bGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlDbGVhcjoKICAg ICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShjbGVhciwgQ2xl YXIpCiAgICAgICAgIHJldHVybjsKLSAgICBjYXNlIENTU1Byb3BlcnR5RGlzcGxheTogewotICAg ICAgICBTVkdEaXNwbGF5UHJvcGVydHlHdWFyZCBndWFyZChtX2VsZW1lbnQsIG1fc3R5bGUuZ2V0 KCkpOwotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKGRp c3BsYXksIERpc3BsYXkpCi0gICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eUVtcHR5Q2VsbHM6CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9Q UklNSVRJVkUoZW1wdHlDZWxscywgRW1wdHlDZWxscykKICAgICAgICAgcmV0dXJuOwpAQCAtMzc2 OSw2ICszNzE3LDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAog ICAgIC8vIFRoZXNlIHByb3BlcnRpZXMgYXJlIGltcGxlbWVudGVkIGluIHRoZSBDU1NTdHlsZUFw cGx5UHJvcGVydHkgbG9va3VwIHRhYmxlLgogICAgIGNhc2UgQ1NTUHJvcGVydHlDb2xvcjoKICAg ICBjYXNlIENTU1Byb3BlcnR5RGlyZWN0aW9uOgorICAgIGNhc2UgQ1NTUHJvcGVydHlEaXNwbGF5 OgogICAgIGNhc2UgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQXR0YWNobWVudDoKICAgICBjYXNlIENT U1Byb3BlcnR5QmFja2dyb3VuZENsaXA6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJhY2tn cm91bmRDbGlwOgo= 118157 2011-12-06 18:33:11 -0800 2011-12-11 18:24:46 -0800 Patch bug-73500-20111207133308.patch text/plain 6753 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjE5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDExLTEyLTA2ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IENTUyBkaXNwbGF5IHByb3BlcnR5IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNTAwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3Jpbmcgb25seSAv IG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5 UHJvcGVydHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eURpc3BsYXk6Omlz VmFsaWREaXNwbGF5VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eURpc3Bs YXk6OmFwcGx5SW5oZXJpdFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlE aXNwbGF5OjphcHBseUluaXRpYWxWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3Bl cnR5RGlzcGxheTo6YXBwbHlWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5 RGlzcGxheTo6Y3JlYXRlSGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZUFwcGx5 UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6CisgICAgICAgICogY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQ cm9wZXJ0eSk6CisKIDIwMTEtMTItMDYgIEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gdW5rbm93biBjaGFyYWN0ZXJzIHN5bWJvbCBv biBcbiBpbiBjb21wbGV4IHNjcmlwdCB0ZXh0IChSVEwgYW5kIExUUikKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCShyZXZpc2lvbiAxMDIxOTUp CisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTI0OCw2ICsxMjQ4LDQ5IEBAIHB1YmxpYzoKICAgICB9CiB9OwogCitjbGFz cyBBcHBseVByb3BlcnR5RGlzcGxheSB7Citwcml2YXRlOgorICAgIHN0YXRpYyBpbmxpbmUgYm9v bCBpc1ZhbGlkRGlzcGxheVZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yLCBFRGlzcGxh eSBkaXNwbGF5UHJvcGVydHlWYWx1ZSkKKyAgICB7CisjaWYgRU5BQkxFKFNWRykKKyAgICAgICAg aWYgKHNlbGVjdG9yLT5lbGVtZW50KCkgJiYgc2VsZWN0b3ItPmVsZW1lbnQoKS0+aXNTVkdFbGVt ZW50KCkgJiYgc2VsZWN0b3ItPnN0eWxlKCktPnN0eWxlVHlwZSgpID09IE5PUFNFVURPKQorICAg ICAgICAgICAgcmV0dXJuIChkaXNwbGF5UHJvcGVydHlWYWx1ZSA9PSBJTkxJTkUgfHwgZGlzcGxh eVByb3BlcnR5VmFsdWUgPT0gQkxPQ0sgfHwgZGlzcGxheVByb3BlcnR5VmFsdWUgPT0gTk9ORSk7 CisjZW5kaWYKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorcHVibGljOgorICAgIHN0YXRp YyB2b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yKQorICAg IHsKKyAgICAgICAgRURpc3BsYXkgZGlzcGxheSA9IHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpLT5k aXNwbGF5KCk7CisgICAgICAgIGlmICghaXNWYWxpZERpc3BsYXlWYWx1ZShzZWxlY3RvciwgZGlz cGxheSkpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5z ZXREaXNwbGF5KGRpc3BsYXkpOworICAgIH0KKworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlh bFZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yKQorICAgIHsKKyAgICAgICAgc2VsZWN0 b3ItPnN0eWxlKCktPnNldERpc3BsYXkoUmVuZGVyU3R5bGU6OmluaXRpYWxEaXNwbGF5KCkpOwor ICAgIH0KKworICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWUoQ1NTU3R5bGVTZWxlY3Rvciogc2Vs ZWN0b3IsIENTU1ZhbHVlKiB2YWx1ZSkKKyAgICB7CisgICAgICAgIGlmICghdmFsdWUtPmlzUHJp bWl0aXZlVmFsdWUoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICBFRGlzcGxheSBk aXNwbGF5ID0gKnN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUpOworCisgICAg ICAgIGlmICghaXNWYWxpZERpc3BsYXlWYWx1ZShzZWxlY3RvciwgZGlzcGxheSkpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldERpc3BsYXkoZGlz cGxheSk7CisgICAgfQorCisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVy KCkKKyAgICB7CisgICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5SW5oZXJpdFZh bHVlLCAmYXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsKKyAgICB9Cit9OworCiBjb25z dCBDU1NTdHlsZUFwcGx5UHJvcGVydHkmIENTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6c2hhcmVkQ1NT U3R5bGVBcHBseVByb3BlcnR5KCkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKENTU1N0eWxl QXBwbHlQcm9wZXJ0eSwgY3NzU3R5bGVBcHBseVByb3BlcnR5SW5zdGFuY2UsICgpKTsKQEAgLTEy NzIsNiArMTMxNSw4IEBAIENTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3AK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kQ29tcG9z aXRlLCBBcHBseVByb3BlcnR5RmlsbExheWVyPENvbXBvc2l0ZU9wZXJhdG9yLCBDU1NQcm9wZXJ0 eVdlYmtpdEJhY2tncm91bmRDb21wb3NpdGUsIEJhY2tncm91bmRGaWxsTGF5ZXIsICZSZW5kZXJT dHlsZTo6YWNjZXNzQmFja2dyb3VuZExheWVycywgJlJlbmRlclN0eWxlOjpiYWNrZ3JvdW5kTGF5 ZXJzLAogICAgICAgICAgICAgICAgICAgICAgICAmRmlsbExheWVyOjppc0NvbXBvc2l0ZVNldCwg JkZpbGxMYXllcjo6Y29tcG9zaXRlLCAmRmlsbExheWVyOjpzZXRDb21wb3NpdGUsICZGaWxsTGF5 ZXI6OmNsZWFyQ29tcG9zaXRlLCAmRmlsbExheWVyOjppbml0aWFsRmlsbENvbXBvc2l0ZSwgJkNT U1N0eWxlU2VsZWN0b3I6Om1hcEZpbGxDb21wb3NpdGU+OjpjcmVhdGVIYW5kbGVyKCkpOwogCisg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5RGlzcGxheSwgQXBwbHlQcm9wZXJ0eURp c3BsYXk6OmNyZWF0ZUhhbmRsZXIoKSk7CisKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlCYWNrZ3JvdW5kSW1hZ2UsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8U3R5bGVJbWFnZSos IENTU1Byb3BlcnR5QmFja2dyb3VuZEltYWdlLCBCYWNrZ3JvdW5kRmlsbExheWVyLCAmUmVuZGVy U3R5bGU6OmFjY2Vzc0JhY2tncm91bmRMYXllcnMsICZSZW5kZXJTdHlsZTo6YmFja2dyb3VuZExh eWVycywKICAgICAgICAgICAgICAgICAgICAgICAgJkZpbGxMYXllcjo6aXNJbWFnZVNldCwgJkZp bGxMYXllcjo6aW1hZ2UsICZGaWxsTGF5ZXI6OnNldEltYWdlLCAmRmlsbExheWVyOjpjbGVhcklt YWdlLCAmRmlsbExheWVyOjppbml0aWFsRmlsbEltYWdlLCAmQ1NTU3R5bGVTZWxlY3Rvcjo6bWFw RmlsbEltYWdlPjo6Y3JlYXRlSGFuZGxlcigpKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gMTAyMTk1KQorKysgU291cmNlL1dlYkNvcmUv Y3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDQ2LDUzICsyNDQ2 LDYgQEAgaW5saW5lIGJvb2wgaXNWYWxpZFZpc2l0ZWRMaW5rUHJvcGVydHkoaQogICAgIHJldHVy biBmYWxzZTsKIH0KIAotY2xhc3MgU1ZHRGlzcGxheVByb3BlcnR5R3VhcmQgewotICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKFNWR0Rpc3BsYXlQcm9wZXJ0eUd1YXJkKTsKLXB1YmxpYzoKLSAgICBT VkdEaXNwbGF5UHJvcGVydHlHdWFyZChFbGVtZW50KiwgUmVuZGVyU3R5bGUqKTsKLSAgICB+U1ZH RGlzcGxheVByb3BlcnR5R3VhcmQoKTsKLXByaXZhdGU6Ci0jaWYgRU5BQkxFKFNWRykKLSAgICBS ZW5kZXJTdHlsZSogbV9zdHlsZTsKLSAgICBFRGlzcGxheSBtX29yaWdpbmFsRGlzcGxheVByb3Bl cnR5VmFsdWU7Ci0jZW5kaWYKLX07Ci0KLSNpZiAhRU5BQkxFKFNWRykKLWlubGluZSBTVkdEaXNw bGF5UHJvcGVydHlHdWFyZDo6U1ZHRGlzcGxheVByb3BlcnR5R3VhcmQoRWxlbWVudCosIFJlbmRl clN0eWxlKikKLXsKLX0KLQotaW5saW5lIFNWR0Rpc3BsYXlQcm9wZXJ0eUd1YXJkOjp+U1ZHRGlz cGxheVByb3BlcnR5R3VhcmQoKQotewotfQotI2Vsc2UKLXN0YXRpYyBpbmxpbmUgYm9vbCBpc0Fj Y2VwdGFibGVGb3JTVkdFbGVtZW50KEVEaXNwbGF5IGRpc3BsYXlQcm9wZXJ0eVZhbHVlKQotewot ICAgIHJldHVybiBkaXNwbGF5UHJvcGVydHlWYWx1ZSA9PSBJTkxJTkUgfHwgZGlzcGxheVByb3Bl cnR5VmFsdWUgPT0gQkxPQ0sgfHwgZGlzcGxheVByb3BlcnR5VmFsdWUgPT0gTk9ORTsKLX0KLQot aW5saW5lIFNWR0Rpc3BsYXlQcm9wZXJ0eUd1YXJkOjpTVkdEaXNwbGF5UHJvcGVydHlHdWFyZChF bGVtZW50KiBlbGVtZW50LCBSZW5kZXJTdHlsZSogc3R5bGUpCi17Ci0gICAgaWYgKCEoZWxlbWVu dCAmJiBlbGVtZW50LT5pc1NWR0VsZW1lbnQoKSAmJiBzdHlsZS0+c3R5bGVUeXBlKCkgPT0gTk9Q U0VVRE8pKSB7Ci0gICAgICAgIG1fb3JpZ2luYWxEaXNwbGF5UHJvcGVydHlWYWx1ZSA9IE5PTkU7 Ci0gICAgICAgIG1fc3R5bGUgPSAwOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIG1fc3R5 bGUgPSBzdHlsZTsKLSAgICBtX29yaWdpbmFsRGlzcGxheVByb3BlcnR5VmFsdWUgPSBzdHlsZS0+ ZGlzcGxheSgpOwotICAgIEFTU0VSVChpc0FjY2VwdGFibGVGb3JTVkdFbGVtZW50KG1fb3JpZ2lu YWxEaXNwbGF5UHJvcGVydHlWYWx1ZSkpOwotfQotCi1pbmxpbmUgU1ZHRGlzcGxheVByb3BlcnR5 R3VhcmQ6On5TVkdEaXNwbGF5UHJvcGVydHlHdWFyZCgpCi17Ci0gICAgaWYgKCFtX3N0eWxlIHx8 IGlzQWNjZXB0YWJsZUZvclNWR0VsZW1lbnQobV9zdHlsZS0+ZGlzcGxheSgpKSkKLSAgICAgICAg cmV0dXJuOwotICAgIG1fc3R5bGUtPnNldERpc3BsYXkobV9vcmlnaW5hbERpc3BsYXlQcm9wZXJ0 eVZhbHVlKTsKLX0KLSNlbmRpZgotCi0KIC8vIFNWRyBoYW5kbGVzIHpvb21pbmcgaW4gYSBkaWZm ZXJlbnQgd2F5IGNvbXBhcmVkIHRvIENTUy4gVGhlIHdob2xlIGRvY3VtZW50IGlzIHNjYWxlZCBp bnN0ZWFkCiAvLyBvZiBlYWNoIGluZGl2aWR1YWwgbGVuZ3RoIHZhbHVlIGluIHRoZSByZW5kZXIg c3R5bGUgLyB0cmVlLiBDU1NQcmltaXRpdmVWYWx1ZTo6Y29tcHV0ZUxlbmd0aCooKQogLy8gbXVs dGlwbGllcyBlYWNoIHJlc29sdmVkIGxlbmd0aCB3aXRoIHRoZSB6b29tIG11bHRpcGxpZXIgLSBz byBmb3IgU1ZHIHdlIG5lZWQgdG8gZGlzYWJsZSB0aGF0LgpAQCAtMjYwOCwxMSArMjU2MSw2IEBA IHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1By b3BlcnR5Q2xlYXI6CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklN SVRJVkUoY2xlYXIsIENsZWFyKQogICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0 eURpc3BsYXk6IHsKLSAgICAgICAgU1ZHRGlzcGxheVByb3BlcnR5R3VhcmQgZ3VhcmQobV9lbGVt ZW50LCBtX3N0eWxlLmdldCgpKTsKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxf QU5EX1BSSU1JVElWRShkaXNwbGF5LCBEaXNwbGF5KQotICAgICAgICByZXR1cm47Ci0gICAgfQog ICAgIGNhc2UgQ1NTUHJvcGVydHlFbXB0eUNlbGxzOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9B TkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKGVtcHR5Q2VsbHMsIEVtcHR5Q2VsbHMpCiAgICAgICAg IHJldHVybjsKQEAgLTM3NjQsNiArMzcxMiw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBw bHlQcm9wZXJ0eShpbnQKICAgICAvLyBUaGVzZSBwcm9wZXJ0aWVzIGFyZSBpbXBsZW1lbnRlZCBp biB0aGUgQ1NTU3R5bGVBcHBseVByb3BlcnR5IGxvb2t1cCB0YWJsZS4KICAgICBjYXNlIENTU1By b3BlcnR5Q29sb3I6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eURpcmVjdGlvbjoKKyAgICBjYXNlIENT U1Byb3BlcnR5RGlzcGxheToKICAgICBjYXNlIENTU1Byb3BlcnR5QmFja2dyb3VuZEF0dGFjaG1l bnQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUJhY2tncm91bmRDbGlwOgogICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRCYWNrZ3JvdW5kQ2xpcDoK