207438 2020-02-08 21:15:54 -0800 Optimize Style::determineChange() 2020-02-09 20:12:13 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr sabouhallawa simon.fraser webkit-bug-importer zalan oldest_to_newest 1616653 0 simon.fraser 2020-02-08 21:15:54 -0800 Optimize Style::determineChange() 1616654 1 390194 simon.fraser 2020-02-08 21:19:52 -0800 Created attachment 390194 Patch 1616664 2 390194 koivisto 2020-02-09 05:50:31 -0800 Comment on attachment 390194 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390194&action=review > Source/WebCore/rendering/style/RenderStyle.cpp:451 > +bool RenderStyle::alignItemsEqual(const RenderStyle& other) const > +{ > + return m_rareNonInheritedData.ptr() == other.m_rareNonInheritedData.ptr() > + || m_rareNonInheritedData->alignItems == other.m_rareNonInheritedData->alignItems; > +} > + > +bool RenderStyle::justifyItemsEqual(const RenderStyle& other) const > +{ > + return m_rareNonInheritedData.ptr() == other.m_rareNonInheritedData.ptr() > + || m_rareNonInheritedData->justifyItems == other.m_rareNonInheritedData->justifyItems; > +} Combining these ("alignAndJustifyItemsEqual") would eliminate one m_rareNonInheritedData comparison. 1616669 3 simon.fraser 2020-02-09 07:51:52 -0800 (In reply to Antti Koivisto from comment #2) > Comment on attachment 390194 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=390194&action=review > > > Source/WebCore/rendering/style/RenderStyle.cpp:451 > > +bool RenderStyle::alignItemsEqual(const RenderStyle& other) const > > +{ > > + return m_rareNonInheritedData.ptr() == other.m_rareNonInheritedData.ptr() > > + || m_rareNonInheritedData->alignItems == other.m_rareNonInheritedData->alignItems; > > +} > > + > > +bool RenderStyle::justifyItemsEqual(const RenderStyle& other) const > > +{ > > + return m_rareNonInheritedData.ptr() == other.m_rareNonInheritedData.ptr() > > + || m_rareNonInheritedData->justifyItems == other.m_rareNonInheritedData->justifyItems; > > +} > > Combining these ("alignAndJustifyItemsEqual") would eliminate one > m_rareNonInheritedData comparison. I thought about that. Wasn't sure what to name the function. 1616670 4 390204 simon.fraser 2020-02-09 08:19:29 -0800 Created attachment 390204 Patch 1616675 5 390204 koivisto 2020-02-09 09:24:23 -0800 Comment on attachment 390204 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390204&action=review > Source/WebCore/style/StyleChange.cpp:56 > + if (!s1.childAffectingFlexPropertiesEqual(s2)) > + return Inherit; Seems like this also affects grid. Could also be something more generic like descendantStyleAffectingNonInheritedPropertiesEqual 1616748 6 simon.fraser 2020-02-09 20:11:10 -0800 https://trac.webkit.org/changeset/256102/webkit 1616750 7 webkit-bug-importer 2020-02-09 20:12:13 -0800 <rdar://problem/59300384> 390194 2020-02-08 21:19:52 -0800 2020-02-09 05:50:31 -0800 Patch bug-207438-20200208211951.patch text/plain 4227 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGEwYzRkYTViMTMxZGJj OTJlNzc4MDQ0OTNiOThiMjJhZmM2NmIyOC4uNWQ4NDM4YTU1YTU5OTZkYTIzOTk1NmY2MzdmMGM1 MWI3YTNlNDQ3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAyLTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE9wdGltaXplIFN0 eWxlOjpkZXRlcm1pbmVDaGFuZ2UoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjA3NDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3R5bGU6OmRldGVybWluZUNoYW5nZSgpIGNhbGxlZCBSZW5kZXJTdHls ZTo6b3BlcmF0b3IhPSgpIGJlZm9yZSB0aGUgdGVzdGluZyBzb21lIG90aGVyCisgICAgICAgIHNl dHMgb2YgcHJvcGVydGllcyBmb3IgaW5lcXVhbGl0eS4KKyAgICAgICAgCisgICAgICAgIEl0J3Mg ZmFzdGVyIHRvIGNhbGwgaW5oZXJpdGVkRXF1YWwoKSBldGMgYmVmb3JlIHRoZSBmdWxsIHN0eWxl IGNvbXBhcmUuIEFsc28gb3B0aW1pemUKKyAgICAgICAgY29tcGFyaW5nIGFsaWduSXRlbXMoKSBh bmQganVzdGlmeUl0ZW1zKCkgYnkgYWRkaW5nIGhlbHBlciBmdW5jdGlvbnMgdGhhdCBmaXJzdCB0 ZXN0CisgICAgICAgIGZvciBlcXVhbGl0eSBvZiB0aGUgbV9yYXJlTm9uSW5oZXJpdGVkRGF0YSBw b2ludGVyLgorICAgICAgICAKKyAgICAgICAgVGhpcyBpcyBhIH40JSBwcm9ncmVzc2lvbiBvbiBz b21lIE1vdGlvbk1hcmsgc3VidGVzdHMuIFRpbWUgdW5kZXIgVHJlZVJlc29sdmVyOjpjcmVhdGVB bmltYXRlZEVsZW1lbnRVcGRhdGUoKQorICAgICAgICBkcm9wcyBmcm9tIDIuNCUgdG8gMC45JS4K KworICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJTdHlsZTo6YWxpZ25JdGVtc0VxdWFsIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclN0eWxlOjpqdXN0aWZ5SXRlbXNFcXVhbCBjb25zdCk6CisgICAgICAgICog cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgICogc3R5bGUvU3R5bGVDaGFu Z2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmRldGVybWluZUNoYW5nZSk6CisKIDIw MjAtMDItMDcgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UkVHUkVTU0lPTiAocjI1NTk1Myk6IFsgaU9TIE1hYyBdIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvd2ViLWFuaW1hdGlvbnMvdGltaW5nLW1vZGVsL3RpbWVsaW5lcy91cGRhdGUtYW5k LXNlbmQtZXZlbnRzLmh0bWwgaXMgY3Jhc2hpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDlmYTY1ZmI2OGZkODJmZTA1MmE3ZGI0NDgx NzM3OWIwNDllMGU2MzkuLjEzMzYxNmY3OTQ0MmFjMTdlNTE1M2NjODE4Y2QyNGZmM2RkNDRkYWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApA QCAtNDM4LDYgKzQzOCwxOCBAQCBib29sIFJlbmRlclN0eWxlOjppbmhlcml0ZWRFcXVhbChjb25z dCBSZW5kZXJTdHlsZSYgb3RoZXIpIGNvbnN0CiAgICAgICAgICYmIG1fcmFyZUluaGVyaXRlZERh dGEgPT0gb3RoZXIubV9yYXJlSW5oZXJpdGVkRGF0YTsKIH0KIAorYm9vbCBSZW5kZXJTdHlsZTo6 YWxpZ25JdGVtc0VxdWFsKGNvbnN0IFJlbmRlclN0eWxlJiBvdGhlcikgY29uc3QKK3sKKyAgICBy ZXR1cm4gbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS5wdHIoKSA9PSBvdGhlci5tX3JhcmVOb25Jbmhl cml0ZWREYXRhLnB0cigpCisgICAgICAgIHx8IG1fcmFyZU5vbkluaGVyaXRlZERhdGEtPmFsaWdu SXRlbXMgPT0gb3RoZXIubV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+YWxpZ25JdGVtczsKK30KKwor Ym9vbCBSZW5kZXJTdHlsZTo6anVzdGlmeUl0ZW1zRXF1YWwoY29uc3QgUmVuZGVyU3R5bGUmIG90 aGVyKSBjb25zdAoreworICAgIHJldHVybiBtX3JhcmVOb25Jbmhlcml0ZWREYXRhLnB0cigpID09 IG90aGVyLm1fcmFyZU5vbkluaGVyaXRlZERhdGEucHRyKCkKKyAgICAgICAgfHwgbV9yYXJlTm9u SW5oZXJpdGVkRGF0YS0+anVzdGlmeUl0ZW1zID09IG90aGVyLm1fcmFyZU5vbkluaGVyaXRlZERh dGEtPmp1c3RpZnlJdGVtczsKK30KKwogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAKIHN0 YXRpYyBpbmxpbmUgdW5zaWduZWQgY29tcHV0ZUZvbnRIYXNoKGNvbnN0IEZvbnRDYXNjYWRlJiBm b250KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRl eCAzMWQyOTRjMjQ4YzFjOWZjODQ1YzIxZWMxNmE2Y2U5ZGM1OTNiMzEwLi4yMzIzMzY1ZDZiZTlm MGY4MmQzM2IxMGFiZmVmYWYxMDAyMWY2NjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMTQxOCw2ICsxNDE4LDggQEAgcHVibGljOgogICAg IGNvbnN0IEF0b21TdHJpbmcmIGh5cGhlblN0cmluZygpIGNvbnN0OwogCiAgICAgYm9vbCBpbmhl cml0ZWRFcXVhbChjb25zdCBSZW5kZXJTdHlsZSYpIGNvbnN0OworICAgIGJvb2wgYWxpZ25JdGVt c0VxdWFsKGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3Q7CisgICAgYm9vbCBqdXN0aWZ5SXRlbXNF cXVhbChjb25zdCBSZW5kZXJTdHlsZSYpIGNvbnN0OwogCiAjaWYgRU5BQkxFKFRFWFRfQVVUT1NJ WklORykKICAgICB1aW50MzJfdCBoYXNoRm9yVGV4dEF1dG9zaXppbmcoKSBjb25zdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlQ2hhbmdlLmNwcAppbmRleCAyMmFkYWU3MDg0ZTRiMmU3OTI5MmQxNGFk NTg3NjUxOGRjNWE0OGQwLi45M2M5OTJhNGViODc2NWI5OTQzMDVkMmVjNDg4YjI0NWY0YzgxOTI1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVDaGFuZ2UuY3BwCkBAIC00OSwxNSArNDksMTcgQEAg Q2hhbmdlIGRldGVybWluZUNoYW5nZShjb25zdCBSZW5kZXJTdHlsZSYgczEsIGNvbnN0IFJlbmRl clN0eWxlJiBzMikKICAgICBpZiAoczEuaGFzVGV4dENvbWJpbmUoKSAhPSBzMi5oYXNUZXh0Q29t YmluZSgpKQogICAgICAgICByZXR1cm4gRGV0YWNoOwogCi0gICAgaWYgKHMxICE9IHMyKSB7Ci0g ICAgICAgIGlmICghczEuaW5oZXJpdGVkRXF1YWwoczIpKQotICAgICAgICAgICAgcmV0dXJuIElu aGVyaXQ7CisgICAgaWYgKCFzMS5pbmhlcml0ZWRFcXVhbChzMikpCisgICAgICAgIHJldHVybiBJ bmhlcml0OwogCi0gICAgICAgIGlmIChzMS5hbGlnbkl0ZW1zKCkgIT0gczIuYWxpZ25JdGVtcygp IHx8IHMxLmp1c3RpZnlJdGVtcygpICE9IHMyLmp1c3RpZnlJdGVtcygpKQotICAgICAgICAgICAg cmV0dXJuIEluaGVyaXQ7CisgICAgaWYgKCFzMS5hbGlnbkl0ZW1zRXF1YWwoczIpKQorICAgICAg ICByZXR1cm4gSW5oZXJpdDsKIAorICAgIGlmICghczEuanVzdGlmeUl0ZW1zRXF1YWwoczIpKQor ICAgICAgICByZXR1cm4gSW5oZXJpdDsKKworICAgIGlmIChzMSAhPSBzMikKICAgICAgICAgcmV0 dXJuIE5vSW5oZXJpdDsKLSAgICB9CiAKICAgICAvLyBJZiB0aGUgcHNldWRvU3R5bGVzIGhhdmUg Y2hhbmdlZCwgd2Ugd2FudCBhbnkgU3R5bGVDaGFuZ2UgdGhhdCBpcyBub3QgTm9DaGFuZ2UKICAg ICAvLyBiZWNhdXNlIHNldFN0eWxlIHdpbGwgZG8gdGhlIHJpZ2h0IHRoaW5nIHdpdGggYW55dGhp bmcgZWxzZS4K 390204 2020-02-09 08:19:29 -0800 2020-02-09 09:46:20 -0800 Patch bug-207438-20200209081929.patch text/plain 4102 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGEwYzRkYTViMTMxZGJj OTJlNzc4MDQ0OTNiOThiMjJhZmM2NmIyOC4uY2M3NzU4NjEwNGU3MGVlYjg5YTY4NDIzZWIwNDUy MzMyZjU2MzNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAyLTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE9wdGltaXplIFN0 eWxlOjpkZXRlcm1pbmVDaGFuZ2UoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjA3NDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlz dG8uCisKKyAgICAgICAgU3R5bGU6OmRldGVybWluZUNoYW5nZSgpIGNhbGxlZCBSZW5kZXJTdHls ZTo6b3BlcmF0b3IhPSgpIGJlZm9yZSB0aGUgdGVzdGluZyBzb21lIG90aGVyCisgICAgICAgIHNl dHMgb2YgcHJvcGVydGllcyBmb3IgaW5lcXVhbGl0eS4KKyAgICAgICAgCisgICAgICAgIEl0J3Mg ZmFzdGVyIHRvIGNhbGwgaW5oZXJpdGVkRXF1YWwoKSBldGMgYmVmb3JlIHRoZSBmdWxsIHN0eWxl IGNvbXBhcmUuIEFsc28gb3B0aW1pemUKKyAgICAgICAgY29tcGFyaW5nIGFsaWduSXRlbXMoKSBh bmQganVzdGlmeUl0ZW1zKCkgYnkgYWRkaW5nIGEgaGVscGVyIGZ1bmN0aW9uIHRoYXQgZmlyc3Qg dGVzdHMKKyAgICAgICAgZm9yIGVxdWFsaXR5IG9mIHRoZSBtX3JhcmVOb25Jbmhlcml0ZWREYXRh IHBvaW50ZXIuIFRoZXNlIChhZGRlZCBpbiByMjEzNDgwKSByZXR1cm4gSW5oZXJpdAorICAgICAg ICBiZWNhdXNlIGFsaWduLWl0ZW1zIGFuZCBqdXN0aWZ5LWl0ZW1zIGFmZmVjdCBjaGlsZCBsYXlv dXQuCisgICAgICAgIAorICAgICAgICBUaGlzIGlzIGEgfjQlIHByb2dyZXNzaW9uIG9uIHNvbWUg TW90aW9uTWFyayBzdWJ0ZXN0cy4gVGltZSB1bmRlciBUcmVlUmVzb2x2ZXI6OmNyZWF0ZUFuaW1h dGVkRWxlbWVudFVwZGF0ZSgpCisgICAgICAgIGRyb3BzIGZyb20gMi40JSB0byAwLjklLgorCisg ICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclN0eWxlOjpjaGlsZEFmZmVjdGluZ0ZsZXhQcm9wZXJ0aWVzRXF1YWwgY29uc3Qp OgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAqIHN0 eWxlL1N0eWxlQ2hhbmdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpkZXRlcm1pbmVD aGFuZ2UpOgorCiAyMDIwLTAyLTA3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNTU5NTMpOiBbIGlPUyBNYWMgXSBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYi1hbmltYXRpb25zL3RpbWluZy1tb2RlbC90aW1lbGlu ZXMvdXBkYXRlLWFuZC1zZW5kLWV2ZW50cy5odG1sIGlzIGNyYXNoaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCA5ZmE2NWZiNjhmZDgy ZmUwNTJhN2RiNDQ4MTczNzliMDQ5ZTBlNjM5Li5iYzE2MjAyNmRmNDMxZWU4YzA4N2Y1NDNiZTUw MjM1MDM0NDU5ZjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5jcHAKQEAgLTQzOCw2ICs0MzgsMTUgQEAgYm9vbCBSZW5kZXJTdHlsZTo6aW5oZXJp dGVkRXF1YWwoY29uc3QgUmVuZGVyU3R5bGUmIG90aGVyKSBjb25zdAogICAgICAgICAmJiBtX3Jh cmVJbmhlcml0ZWREYXRhID09IG90aGVyLm1fcmFyZUluaGVyaXRlZERhdGE7CiB9CiAKK2Jvb2wg UmVuZGVyU3R5bGU6OmNoaWxkQWZmZWN0aW5nRmxleFByb3BlcnRpZXNFcXVhbChjb25zdCBSZW5k ZXJTdHlsZSYgb3RoZXIpIGNvbnN0Cit7CisgICAgaWYgKG1fcmFyZU5vbkluaGVyaXRlZERhdGEu cHRyKCkgPT0gb3RoZXIubV9yYXJlTm9uSW5oZXJpdGVkRGF0YS5wdHIoKSkKKyAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgCisgICAgcmV0dXJuIG1fcmFyZU5vbkluaGVyaXRlZERhdGEtPmFsaWdu SXRlbXMgPT0gb3RoZXIubV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+YWxpZ25JdGVtcworICAgICAg ICAmJiBtX3JhcmVOb25Jbmhlcml0ZWREYXRhLT5qdXN0aWZ5SXRlbXMgPT0gb3RoZXIubV9yYXJl Tm9uSW5oZXJpdGVkRGF0YS0+anVzdGlmeUl0ZW1zOworfQorCiAjaWYgRU5BQkxFKFRFWFRfQVVU T1NJWklORykKIAogc3RhdGljIGlubGluZSB1bnNpZ25lZCBjb21wdXRlRm9udEhhc2goY29uc3Qg Rm9udENhc2NhZGUmIGZvbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCmluZGV4IDMxZDI5NGMyNDhjMWM5ZmM4NDVjMjFlYzE2YTZjZTlkYzU5M2IzMTAu LjM4MjM0YjMzZTAxZWEwMzk2YTMyYTA3MjljMjQ3MWY2ZmFlMmY3NjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC0xNDE4LDYgKzE0MTgsNyBA QCBwdWJsaWM6CiAgICAgY29uc3QgQXRvbVN0cmluZyYgaHlwaGVuU3RyaW5nKCkgY29uc3Q7CiAK ICAgICBib29sIGluaGVyaXRlZEVxdWFsKGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3Q7CisgICAg Ym9vbCBjaGlsZEFmZmVjdGluZ0ZsZXhQcm9wZXJ0aWVzRXF1YWwoY29uc3QgUmVuZGVyU3R5bGUm KSBjb25zdDsKIAogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCiAgICAgdWludDMyX3QgaGFz aEZvclRleHRBdXRvc2l6aW5nKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZUNoYW5nZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZUNoYW5nZS5j cHAKaW5kZXggMjJhZGFlNzA4NGU0YjJlNzkyOTJkMTRhZDU4NzY1MThkYzVhNDhkMC4uODI4YmVm Zjc5ZGQ2Y2QzZWM4YTA2ZTgyY2IyZDk1MDZkM2I5MjY1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVDaGFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlQ2hhbmdlLmNwcApAQCAtNDksMTUgKzQ5LDE0IEBAIENoYW5nZSBkZXRlcm1pbmVDaGFuZ2Uo Y29uc3QgUmVuZGVyU3R5bGUmIHMxLCBjb25zdCBSZW5kZXJTdHlsZSYgczIpCiAgICAgaWYgKHMx Lmhhc1RleHRDb21iaW5lKCkgIT0gczIuaGFzVGV4dENvbWJpbmUoKSkKICAgICAgICAgcmV0dXJu IERldGFjaDsKIAotICAgIGlmIChzMSAhPSBzMikgewotICAgICAgICBpZiAoIXMxLmluaGVyaXRl ZEVxdWFsKHMyKSkKLSAgICAgICAgICAgIHJldHVybiBJbmhlcml0OworICAgIGlmICghczEuaW5o ZXJpdGVkRXF1YWwoczIpKQorICAgICAgICByZXR1cm4gSW5oZXJpdDsKIAotICAgICAgICBpZiAo czEuYWxpZ25JdGVtcygpICE9IHMyLmFsaWduSXRlbXMoKSB8fCBzMS5qdXN0aWZ5SXRlbXMoKSAh PSBzMi5qdXN0aWZ5SXRlbXMoKSkKLSAgICAgICAgICAgIHJldHVybiBJbmhlcml0OworICAgIGlm ICghczEuY2hpbGRBZmZlY3RpbmdGbGV4UHJvcGVydGllc0VxdWFsKHMyKSkKKyAgICAgICAgcmV0 dXJuIEluaGVyaXQ7CiAKKyAgICBpZiAoczEgIT0gczIpCiAgICAgICAgIHJldHVybiBOb0luaGVy aXQ7Ci0gICAgfQogCiAgICAgLy8gSWYgdGhlIHBzZXVkb1N0eWxlcyBoYXZlIGNoYW5nZWQsIHdl IHdhbnQgYW55IFN0eWxlQ2hhbmdlIHRoYXQgaXMgbm90IE5vQ2hhbmdlCiAgICAgLy8gYmVjYXVz ZSBzZXRTdHlsZSB3aWxsIGRvIHRoZSByaWdodCB0aGluZyB3aXRoIGFueXRoaW5nIGVsc2UuCg==