141562 2015-02-13 07:19:50 -0800 [CSS Grid Layout] Remove the usage of Length(Undefined) in GridLength 2015-02-16 01:42:42 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 140763 1 svillar svillar cdumez darin kling koivisto svillar oldest_to_newest 1068910 0 svillar 2015-02-13 07:19:50 -0800 From Blink's r164154 "Neither of createGridTrackSize() nor createGridTrackBreadth() should be able to fail, so these are changed to return objects directly instead of taking an out reference (note that in general failing in applying properties is incorrect and we should catch these in the parser)." 1068922 1 246527 svillar 2015-02-13 08:17:45 -0800 Created attachment 246527 Patch 1069005 2 246527 cdumez 2015-02-13 12:32:51 -0800 Comment on attachment 246527 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246527&action=review r=me > Source/WebCore/rendering/style/GridTrackSize.h:73 > + DEPRECATED_DEFINE_STATIC_LOCAL(GridLength, minContent, (Length(MinContent))); It is the opportunity to use a NeverDestroyed<>. > Source/WebCore/rendering/style/GridTrackSize.h:82 > + DEPRECATED_DEFINE_STATIC_LOCAL(GridLength, maxContent, (Length(MaxContent))); It is the opportunity to use a NeverDestroyed<>. 1069394 3 svillar 2015-02-16 01:42:42 -0800 Committed r180140: <http://trac.webkit.org/changeset/180140> 246527 2015-02-13 08:17:45 -0800 2015-02-13 12:32:51 -0800 Patch bug-141562-20150213171741.patch text/plain 15364 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU2NTIzZTQxYTY3YmYw ZGI0N2NhMTQzYTA0NzY2ZDMwYmEwNGY0Ni4uODY3NjZiY2ZmMjczZDNjYjBiODQzY2IyOWRmMzlh NzIwMjIyZjQzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDE1LTAyLTEzICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIFJlbW92ZSB0aGUgdXNhZ2Ugb2YgTGVuZ3RoKFVuZGVmaW5lZCkgaW4gR3JpZExl bmd0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQx NTYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJv bSBCbGluayByMTY0MTU0IGJ5IDx0aW1sb2hAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFRoZSBw YXRjaCBzaW1wbGlmaWVzIHNvbWUgb2YgdGhlIGxvZ2ljIGluIGNyZWF0aW5nIGFuZCBhcHBseWlu ZworICAgICAgICBHcmlkTGVuZ3RoIGFuZCBHcmlkVHJhY2tTaXplIHZhbHVlcyB0byBSZW5kZXJT dHlsZXMgYnkgdXNpbmcgdGhlCisgICAgICAgIGNvbnN0cnVjdG9ycyBmb3IgaW5pdGlhbGlzYXRp b24gaW5zdGVhZCBvZiBkZWZlcnJpbmcgdG8gc2V0dGVycy4KKworICAgICAgICBUaGUgcmF0aW9u YWxlIGJlaGluZCB0aGlzIGNoYW5nZSBpcyB0aGF0IG5laXRoZXIgb2YKKyAgICAgICAgY3JlYXRl R3JpZFRyYWNrU2l6ZSgpIG5vciBjcmVhdGVHcmlkVHJhY2tCcmVhZHRoKCkgc2hvdWxkIGJlIGFi bGUKKyAgICAgICAgdG8gZmFpbCwgc28gdGhlc2UgYXJlIGNoYW5nZWQgdG8gcmV0dXJuIG9iamVj dHMgZGlyZWN0bHkgaW5zdGVhZAorICAgICAgICBvZiB0YWtpbmcgYW4gb3V0IHJlZmVyZW5jZSAo bm90ZSB0aGF0IGluIGdlbmVyYWwgZmFpbGluZyBpbgorICAgICAgICBhcHBseWluZyBwcm9wZXJ0 aWVzIGlzIGluY29ycmVjdCBhbmQgd2Ugc2hvdWxkIGNhdGNoIHRoZXNlIGluIHRoZQorICAgICAg ICBwYXJzZXIpLgorCisgICAgICAgIFRoZSBxdWlyayB2YWx1ZSBhY3Jvc3MgdG8gdGhlIExlbmd0 aHMgd2FzIGFsc28gcmVtb3ZlZCBiZWNhdXNlIGl0CisgICAgICAgIGRvZXNuJ3QgYXBwbHkgdG8g R3JpZC4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNz cy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRl ckNvbnZlcnRlcjo6Y3JlYXRlR3JpZFRyYWNrQnJlYWR0aCk6IFJldHVybiBhCisgICAgICAgIEdy aWRMZW5ndGggaW5zdGVhZCBvZiBhIGJvb2wuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxk ZXJDb252ZXJ0ZXI6OmNyZWF0ZUdyaWRUcmFja1NpemUpOiBSZXR1cm4gYQorICAgICAgICBHcmlk VHJhY2tTaXplIGluc3RlYWQgb2YgYSBib29sLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWls ZGVyQ29udmVydGVyOjpjcmVhdGVHcmlkVHJhY2tMaXN0KTogRG8gbm90CisgICAgICAgIGNyZWF0 ZSB0ZW1wb3JhcnkgR3JpZFRyYWNrU2l6ZXMgd2l0aCB1bmRlZmluZWQgTGVuZ3Rocy4KKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydEdyaWRUcmFja1NpemUp OiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvR3JpZExlbmd0aC5oOgorICAgICAg ICAoV2ViQ29yZTo6R3JpZExlbmd0aDo6R3JpZExlbmd0aCk6IEl0IG5vdyByZXF1aXJlcyBhIG1h bmRhdG9yeQorICAgICAgICBMZW5ndGggYXJndW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpHcmlk TGVuZ3RoOjpsZW5ndGgpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JpZExlbmd0aDo6 c2V0RmxleCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0dyaWRUcmFja1Np emUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemU6OkdyaWRUcmFja1NpemUpOiBJ dCBub3cgcmVxdWlyZXMgYQorICAgICAgICBtYW5kYXRvcnkgR3JpZExlbmd0aCBhcmd1bWVudC4K KyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemU6Omxlbmd0aCk6IFJlbW92ZWQgbm8gbG9u Z2VyIHZhbGlkIEFTU0VSVHMuCisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXplOjptaW5U cmFja0JyZWFkdGgpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemU6Om1h eFRyYWNrQnJlYWR0aCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6R3JpZFRyYWNrU2l6ZTo6 c2V0TGVuZ3RoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemU6OnNl dE1pbk1heCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl Lmg6CisKIDIwMTUtMDItMTIgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OIChyMTc2MjYyKTogSW52YWxpZCBjYXN0IGluIFdlYkNvcmVgV2ViQ29y ZTo6Um9vdElubGluZUJveDo6c2VsZWN0aW9uVG9wCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0 eU5hbWVzLmluCmluZGV4IGI2MDNmYzc1YmU5ZmI2OTBhMGE4YjkzNDc0NTgwYWNiNWFiYWQ5Nzgu Ljk2ZmU0MWMwODdhYzA1MTgyOGI1YmYxOTk1ZmI5YTIzOWVlOGJkYWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCkBAIC00NzksOCArNDc5LDggQEAganVzdGlmeS1jb250 ZW50CiAjaWYgZGVmaW5lZChFTkFCTEVfQ1NTX0dSSURfTEFZT1VUKSAmJiBFTkFCTEVfQ1NTX0dS SURfTEFZT1VUCiAtd2Via2l0LWdyaWQgW0xvbmdoYW5kcz0td2Via2l0LWdyaWQtdGVtcGxhdGUt Y29sdW1uc3wtd2Via2l0LWdyaWQtdGVtcGxhdGUtcm93c3wtd2Via2l0LWdyaWQtdGVtcGxhdGUt YXJlYXN8LXdlYmtpdC1ncmlkLWF1dG8tZmxvd3wtd2Via2l0LWdyaWQtYXV0by1jb2x1bW5zfC13 ZWJraXQtZ3JpZC1hdXRvLXJvd3NdCiAtd2Via2l0LWdyaWQtYXJlYSBbTG9uZ2hhbmRzPS13ZWJr aXQtZ3JpZC1yb3ctc3RhcnR8LXdlYmtpdC1ncmlkLWNvbHVtbi1zdGFydHwtd2Via2l0LWdyaWQt cm93LWVuZHwtd2Via2l0LWdyaWQtcm93LXN0YXJ0XQotLXdlYmtpdC1ncmlkLWF1dG8tY29sdW1u cyBbQ29uZGl0aW9uYWxDb252ZXJ0ZXI9R3JpZFRyYWNrU2l6ZV0KLS13ZWJraXQtZ3JpZC1hdXRv LXJvd3MgW0NvbmRpdGlvbmFsQ29udmVydGVyPUdyaWRUcmFja1NpemVdCistd2Via2l0LWdyaWQt YXV0by1jb2x1bW5zIFtDb252ZXJ0ZXI9R3JpZFRyYWNrU2l6ZV0KKy13ZWJraXQtZ3JpZC1hdXRv LXJvd3MgW0NvbnZlcnRlcj1HcmlkVHJhY2tTaXplXQogLXdlYmtpdC1ncmlkLWNvbHVtbi1lbmQg W0NvbmRpdGlvbmFsQ29udmVydGVyPUdyaWRQb3NpdGlvbiwgTmFtZUZvck1ldGhvZHM9R3JpZEl0 ZW1Db2x1bW5FbmRdCiAtd2Via2l0LWdyaWQtY29sdW1uLXN0YXJ0IFtDb25kaXRpb25hbENvbnZl cnRlcj1HcmlkUG9zaXRpb24sIE5hbWVGb3JNZXRob2RzPUdyaWRJdGVtQ29sdW1uU3RhcnRdCiAt d2Via2l0LWdyaWQtdGVtcGxhdGUgW0xvbmdoYW5kcz0td2Via2l0LWdyaWQtdGVtcGxhdGUtY29s dW1uc3wtd2Via2l0LWdyaWQtdGVtcGxhdGUtcm93c3wtd2Via2l0LWdyaWQtdGVtcGxhdGUtYXJl YXNdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmgKaW5kZXggZDE0 ZmFkMDc3ODNkZTM5MmZhZjU1ZmMyZWY1N2JjNmJiMzNjNmI4NC4uODFhOWE2YWE5ODAwMTcwNmU3 NDIyZTk3ZDE2ZGEwYjg1MWQxNmY0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlckNvbnZlcnRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxk ZXJDb252ZXJ0ZXIuaApAQCAtOTUsNyArOTUsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFZlY3Rv cjxMZW5ndGhTaXplPiBjb252ZXJ0U2Nyb2xsU25hcENvb3JkaW5hdGVzKFN0eWxlUmVzb2x2ZXIm LCBDU1NWYWx1ZSYpOwogI2VuZGlmCiAjaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkKLSAgICBz dGF0aWMgT3B0aW9uYWw8R3JpZFRyYWNrU2l6ZT4gY29udmVydEdyaWRUcmFja1NpemUoU3R5bGVS ZXNvbHZlciYsIENTU1ZhbHVlJik7CisgICAgc3RhdGljIEdyaWRUcmFja1NpemUgY29udmVydEdy aWRUcmFja1NpemUoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CiAgICAgc3RhdGljIE9wdGlv bmFsPEdyaWRQb3NpdGlvbj4gY29udmVydEdyaWRQb3NpdGlvbihTdHlsZVJlc29sdmVyJiwgQ1NT VmFsdWUmKTsKICAgICBzdGF0aWMgR3JpZEF1dG9GbG93IGNvbnZlcnRHcmlkQXV0b0Zsb3coU3R5 bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CiAjZW5kaWYgLy8gRU5BQkxFKENTU19HUklEX0xBWU9V VCkKQEAgLTEzNSw4ICsxMzUsOCBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBMZW5ndGggcGFyc2VT bmFwQ29vcmRpbmF0ZShTdHlsZVJlc29sdmVyJiwgY29uc3QgQ1NTVmFsdWUmKTsKICNlbmRpZgog I2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCi0gICAgc3RhdGljIGJvb2wgY3JlYXRlR3JpZFRy YWNrQnJlYWR0aChDU1NQcmltaXRpdmVWYWx1ZSYsIFN0eWxlUmVzb2x2ZXImLCBHcmlkTGVuZ3Ro Jik7Ci0gICAgc3RhdGljIGJvb2wgY3JlYXRlR3JpZFRyYWNrU2l6ZShDU1NWYWx1ZSYsIEdyaWRU cmFja1NpemUmLCBTdHlsZVJlc29sdmVyJik7CisgICAgc3RhdGljIEdyaWRMZW5ndGggY3JlYXRl R3JpZFRyYWNrQnJlYWR0aChDU1NQcmltaXRpdmVWYWx1ZSYsIFN0eWxlUmVzb2x2ZXImKTsKKyAg ICBzdGF0aWMgR3JpZFRyYWNrU2l6ZSBjcmVhdGVHcmlkVHJhY2tTaXplKENTU1ZhbHVlJiwgU3R5 bGVSZXNvbHZlciYpOwogICAgIHN0YXRpYyBib29sIGNyZWF0ZUdyaWRUcmFja0xpc3QoQ1NTVmFs dWUmLCBWZWN0b3I8R3JpZFRyYWNrU2l6ZT4mIHRyYWNrU2l6ZXMsIE5hbWVkR3JpZExpbmVzTWFw JiwgT3JkZXJlZE5hbWVkR3JpZExpbmVzTWFwJiwgU3R5bGVSZXNvbHZlciYpOwogICAgIHN0YXRp YyBib29sIGNyZWF0ZUdyaWRQb3NpdGlvbihDU1NWYWx1ZSYsIEdyaWRQb3NpdGlvbiYpOwogICAg IHN0YXRpYyB2b2lkIGNyZWF0ZUltcGxpY2l0TmFtZWRHcmlkTGluZXNGcm9tR3JpZEFyZWEoY29u c3QgTmFtZWRHcmlkQXJlYU1hcCYsIE5hbWVkR3JpZExpbmVzTWFwJiwgR3JpZFRyYWNrU2l6aW5n RGlyZWN0aW9uKTsKQEAgLTc1NCw1NSArNzU0LDMyIEBAIGlubGluZSBWZWN0b3I8TGVuZ3RoU2l6 ZT4gU3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0U2Nyb2xsU25hcENvb3JkaW5hdGVzKFN0 CiAjZW5kaWYKIAogI2lmIEVOQUJMRShDU1NfR1JJRF9MQVlPVVQpCi1pbmxpbmUgYm9vbCBTdHls ZUJ1aWxkZXJDb252ZXJ0ZXI6OmNyZWF0ZUdyaWRUcmFja0JyZWFkdGgoQ1NTUHJpbWl0aXZlVmFs dWUmIHByaW1pdGl2ZVZhbHVlLCBTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBHcmlkTGVu Z3RoJiB3b3JraW5nTGVuZ3RoKQoraW5saW5lIEdyaWRMZW5ndGggU3R5bGVCdWlsZGVyQ29udmVy dGVyOjpjcmVhdGVHcmlkVHJhY2tCcmVhZHRoKENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVW YWx1ZSwgU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKIHsKLSAgICBpZiAocHJpbWl0aXZl VmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVlV2Via2l0TWluQ29udGVudCkgewotICAgICAg ICB3b3JraW5nTGVuZ3RoID0gTGVuZ3RoKE1pbkNvbnRlbnQpOwotICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICB9Ci0KLSAgICBpZiAocHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1Zh bHVlV2Via2l0TWF4Q29udGVudCkgewotICAgICAgICB3b3JraW5nTGVuZ3RoID0gTGVuZ3RoKE1h eENvbnRlbnQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KLSAgICBpZiAocHJpbWl0 aXZlVmFsdWUuaXNGbGV4KCkpIHsKLSAgICAgICAgLy8gRnJhY3Rpb25hbCB1bml0LgotICAgICAg ICB3b3JraW5nTGVuZ3RoLnNldEZsZXgocHJpbWl0aXZlVmFsdWUuZ2V0RG91YmxlVmFsdWUoKSk7 Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KKyAgICBpZiAocHJpbWl0aXZlVmFsdWUuZ2V0 VmFsdWVJRCgpID09IENTU1ZhbHVlV2Via2l0TWluQ29udGVudCkKKyAgICAgICAgcmV0dXJuIExl bmd0aChNaW5Db250ZW50KTsKIAotICAgIHdvcmtpbmdMZW5ndGggPSBwcmltaXRpdmVWYWx1ZS5j b252ZXJ0VG9MZW5ndGg8Rml4ZWRJbnRlZ2VyQ29udmVyc2lvbiB8IFBlcmNlbnRDb252ZXJzaW9u IHwgQ2FsY3VsYXRlZENvbnZlcnNpb24gfCBBdXRvQ29udmVyc2lvbj4oc3R5bGVSZXNvbHZlci5z dGF0ZSgpLmNzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKSk7Ci0gICAgaWYgKHdvcmtpbmdMZW5n dGgubGVuZ3RoKCkuaXNVbmRlZmluZWQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlm IChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVXZWJraXRNYXhDb250ZW50 KQorICAgICAgICByZXR1cm4gTGVuZ3RoKE1heENvbnRlbnQpOwogCi0gICAgaWYgKHByaW1pdGl2 ZVZhbHVlLmlzTGVuZ3RoKCkpCi0gICAgICAgIHdvcmtpbmdMZW5ndGgubGVuZ3RoKCkuc2V0SGFz UXVpcmsocHJpbWl0aXZlVmFsdWUuaXNRdWlya1ZhbHVlKCkpOworICAgIC8vIEZyYWN0aW9uYWwg dW5pdC4KKyAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNGbGV4KCkpCisgICAgICAgIHJldHVybiBH cmlkTGVuZ3RoKHByaW1pdGl2ZVZhbHVlLmdldERvdWJsZVZhbHVlKCkpOwogCi0gICAgcmV0dXJu IHRydWU7CisgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVlLmNvbnZlcnRUb0xlbmd0aDxGaXhlZElu dGVnZXJDb252ZXJzaW9uIHwgUGVyY2VudENvbnZlcnNpb24gfCBDYWxjdWxhdGVkQ29udmVyc2lv biB8IEF1dG9Db252ZXJzaW9uPihzdHlsZVJlc29sdmVyLnN0YXRlKCkuY3NzVG9MZW5ndGhDb252 ZXJzaW9uRGF0YSgpKTsKIH0KIAotaW5saW5lIGJvb2wgU3R5bGVCdWlsZGVyQ29udmVydGVyOjpj cmVhdGVHcmlkVHJhY2tTaXplKENTU1ZhbHVlJiB2YWx1ZSwgR3JpZFRyYWNrU2l6ZSYgdHJhY2tT aXplLCBTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQoraW5saW5lIEdyaWRUcmFja1NpemUg U3R5bGVCdWlsZGVyQ29udmVydGVyOjpjcmVhdGVHcmlkVHJhY2tTaXplKENTU1ZhbHVlJiB2YWx1 ZSwgU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKIHsKLSAgICBpZiAoaXM8Q1NTUHJpbWl0 aXZlVmFsdWU+KHZhbHVlKSkgewotICAgICAgICBHcmlkTGVuZ3RoIHdvcmtpbmdMZW5ndGg7Ci0g ICAgICAgIGlmICghY3JlYXRlR3JpZFRyYWNrQnJlYWR0aChkb3duY2FzdDxDU1NQcmltaXRpdmVW YWx1ZT4odmFsdWUpLCBzdHlsZVJlc29sdmVyLCB3b3JraW5nTGVuZ3RoKSkKLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLQotICAgICAgICB0cmFja1NpemUuc2V0TGVuZ3RoKHdvcmtpbmdMZW5n dGgpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9CisgICAgaWYgKGlzPENTU1ByaW1pdGl2 ZVZhbHVlPih2YWx1ZSkpCisgICAgICAgIHJldHVybiBHcmlkVHJhY2tTaXplKGNyZWF0ZUdyaWRU cmFja0JyZWFkdGgoZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KHZhbHVlKSwgc3R5bGVSZXNv bHZlcikpOwogCiAgICAgQ1NTVmFsdWVMaXN0JiBhcmd1bWVudHMgPSAqZG93bmNhc3Q8Q1NTRnVu Y3Rpb25WYWx1ZT4odmFsdWUpLmFyZ3VtZW50cygpOwogICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZ X0lNUExJQ0FUSU9OKGFyZ3VtZW50cy5sZW5ndGgoKSA9PSAyKTsKIAotICAgIEdyaWRMZW5ndGgg bWluVHJhY2tCcmVhZHRoOwotICAgIEdyaWRMZW5ndGggbWF4VHJhY2tCcmVhZHRoOwotICAgIGlm ICghY3JlYXRlR3JpZFRyYWNrQnJlYWR0aChkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKmFy Z3VtZW50cy5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDApKSwgc3R5bGVSZXNvbHZlciwgbWluVHJh Y2tCcmVhZHRoKSB8fCAhY3JlYXRlR3JpZFRyYWNrQnJlYWR0aChkb3duY2FzdDxDU1NQcmltaXRp dmVWYWx1ZT4oKmFyZ3VtZW50cy5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKDEpKSwgc3R5bGVSZXNv bHZlciwgbWF4VHJhY2tCcmVhZHRoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgdHJh Y2tTaXplLnNldE1pbk1heChtaW5UcmFja0JyZWFkdGgsIG1heFRyYWNrQnJlYWR0aCk7Ci0gICAg cmV0dXJuIHRydWU7CisgICAgR3JpZExlbmd0aCBtaW5UcmFja0JyZWFkdGgoY3JlYXRlR3JpZFRy YWNrQnJlYWR0aChkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKmFyZ3VtZW50cy5pdGVtV2l0 aG91dEJvdW5kc0NoZWNrKDApKSwgc3R5bGVSZXNvbHZlcikpOworICAgIEdyaWRMZW5ndGggbWF4 VHJhY2tCcmVhZHRoKGNyZWF0ZUdyaWRUcmFja0JyZWFkdGgoZG93bmNhc3Q8Q1NTUHJpbWl0aXZl VmFsdWU+KCphcmd1bWVudHMuaXRlbVdpdGhvdXRCb3VuZHNDaGVjaygxKSksIHN0eWxlUmVzb2x2 ZXIpKTsKKyAgICByZXR1cm4gR3JpZFRyYWNrU2l6ZShtaW5UcmFja0JyZWFkdGgsIG1heFRyYWNr QnJlYWR0aCk7CiB9CiAKIGlubGluZSBib29sIFN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y3JlYXRl R3JpZFRyYWNrTGlzdChDU1NWYWx1ZSYgdmFsdWUsIFZlY3RvcjxHcmlkVHJhY2tTaXplPiYgdHJh Y2tTaXplcywgTmFtZWRHcmlkTGluZXNNYXAmIG5hbWVkR3JpZExpbmVzLCBPcmRlcmVkTmFtZWRH cmlkTGluZXNNYXAmIG9yZGVyZWROYW1lZEdyaWRMaW5lcywgU3R5bGVSZXNvbHZlciYgc3R5bGVS ZXNvbHZlcikKQEAgLTgyOCwxMSArODA1LDcgQEAgaW5saW5lIGJvb2wgU3R5bGVCdWlsZGVyQ29u dmVydGVyOjpjcmVhdGVHcmlkVHJhY2tMaXN0KENTU1ZhbHVlJiB2YWx1ZSwgVmVjdG9yPEcKICAg ICAgICAgfQogCiAgICAgICAgICsrY3VycmVudE5hbWVkR3JpZExpbmU7Ci0gICAgICAgIEdyaWRU cmFja1NpemUgdHJhY2tTaXplOwotICAgICAgICBpZiAoIWNyZWF0ZUdyaWRUcmFja1NpemUoY3Vy cmVudFZhbHVlLCB0cmFja1NpemUsIHN0eWxlUmVzb2x2ZXIpKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgICAgIHRyYWNrU2l6ZXMuYXBwZW5kKHRyYWNrU2l6ZSk7CisgICAgICAg IHRyYWNrU2l6ZXMuYXBwZW5kKGNyZWF0ZUdyaWRUcmFja1NpemUoY3VycmVudFZhbHVlLCBzdHls ZVJlc29sdmVyKSk7CiAgICAgfQogCiAgICAgLy8gVGhlIHBhcnNlciBzaG91bGQgaGF2ZSByZWpl Y3RlZCBhbnkgPHRyYWNrLWxpc3Q+IHdpdGhvdXQgYW55IDx0cmFjay1zaXplPiBhcwpAQCAtOTA4 LDEyICs4ODEsOSBAQCBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNyZWF0ZUlt cGxpY2l0TmFtZWRHcmlkTGluZXNGcm9tR3JpZEFyZWEoY29ucwogICAgIH0KIH0KIAotaW5saW5l IE9wdGlvbmFsPEdyaWRUcmFja1NpemU+IFN0eWxlQnVpbGRlckNvbnZlcnRlcjo6Y29udmVydEdy aWRUcmFja1NpemUoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVl KQoraW5saW5lIEdyaWRUcmFja1NpemUgU3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0R3Jp ZFRyYWNrU2l6ZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUp CiB7Ci0gICAgR3JpZFRyYWNrU2l6ZSB0cmFja1NpemU7Ci0gICAgaWYgKGNyZWF0ZUdyaWRUcmFj a1NpemUodmFsdWUsIHRyYWNrU2l6ZSwgc3R5bGVSZXNvbHZlcikpCi0gICAgICAgIHJldHVybiB0 cmFja1NpemU7Ci0gICAgcmV0dXJuIE51bGxvcHQ7CisgICAgcmV0dXJuIGNyZWF0ZUdyaWRUcmFj a1NpemUodmFsdWUsIHN0eWxlUmVzb2x2ZXIpOwogfQogCiBpbmxpbmUgT3B0aW9uYWw8R3JpZFBv c2l0aW9uPiBTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRHcmlkUG9zaXRpb24oU3R5bGVS ZXNvbHZlciYsIENTU1ZhbHVlJiB2YWx1ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9HcmlkTGVuZ3RoLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvR3JpZExlbmd0aC5oCmluZGV4IGQ0MTQ0ZjQzYjg4NDgwZGJlYzgyMjUzMzY4MjQzZjE4Njk5 NWRjMzQuLmUyMzAwMTkyMTNhOTQ3YTJhYzI0MGM0Nzc0ZDk2ZTg1ZDQ4YTNiZGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkTGVuZ3RoLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRMZW5ndGguaApAQCAtNDMsMTcgKzQzLDE3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIC8vIGFuIG5ldyB1bml0IHRvIExlbmd0aC5oLgogY2xh c3MgR3JpZExlbmd0aCB7CiBwdWJsaWM6Ci0gICAgR3JpZExlbmd0aCgpCi0gICAgICAgIDogbV9s ZW5ndGgoVW5kZWZpbmVkKQorICAgIEdyaWRMZW5ndGgoY29uc3QgTGVuZ3RoJiBsZW5ndGgpCisg ICAgICAgIDogbV9sZW5ndGgobGVuZ3RoKQogICAgICAgICAsIG1fZmxleCgwKQogICAgICAgICAs IG1fdHlwZShMZW5ndGhUeXBlKQogICAgIHsKKyAgICAgICAgQVNTRVJUKCFsZW5ndGguaXNVbmRl ZmluZWQoKSk7CiAgICAgfQogCi0gICAgR3JpZExlbmd0aChjb25zdCBMZW5ndGgmIGxlbmd0aCkK LSAgICAgICAgOiBtX2xlbmd0aChsZW5ndGgpCi0gICAgICAgICwgbV9mbGV4KDApCi0gICAgICAg ICwgbV90eXBlKExlbmd0aFR5cGUpCisgICAgZXhwbGljaXQgR3JpZExlbmd0aChkb3VibGUgZmxl eCkKKyAgICAgICAgOiBtX2ZsZXgoZmxleCkKKyAgICAgICAgLCBtX3R5cGUoRmxleFR5cGUpCiAg ICAgewogICAgIH0KIApAQCAtNjEsMTQgKzYxLDggQEAgcHVibGljOgogICAgIGJvb2wgaXNGbGV4 KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IEZsZXhUeXBlOyB9CiAKICAgICBjb25zdCBMZW5n dGgmIGxlbmd0aCgpIGNvbnN0IHsgQVNTRVJUKGlzTGVuZ3RoKCkpOyByZXR1cm4gbV9sZW5ndGg7 IH0KLSAgICBMZW5ndGgmIGxlbmd0aCgpIHsgQVNTRVJUKGlzTGVuZ3RoKCkpOyByZXR1cm4gbV9s ZW5ndGg7IH0KIAogICAgIGRvdWJsZSBmbGV4KCkgY29uc3QgeyBBU1NFUlQoaXNGbGV4KCkpOyBy ZXR1cm4gbV9mbGV4OyB9Ci0gICAgdm9pZCBzZXRGbGV4KGRvdWJsZSBmbGV4KQotICAgIHsKLSAg ICAgICAgbV90eXBlID0gRmxleFR5cGU7Ci0gICAgICAgIG1fZmxleCA9IGZsZXg7Ci0gICAgfQog CiAgICAgYm9vbCBpc1BlcmNlbnRhZ2UoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gTGVuZ3Ro VHlwZSAmJiBtX2xlbmd0aC5pc1BlcmNlbnQoKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFRyYWNrU2l6ZS5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL0dyaWRUcmFja1NpemUuaAppbmRleCAzZTMzNTI0ODBjNTcyY2JhMjFiYWZk MmQ3OGFkMzQ0M2FjNTlhOGZkLi45YzcyNDRhY2EwNGNjZDE1OWY0N2Y1NDZhZmE1MjY0MTYyNmNh OWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFRyYWNr U2l6ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkVHJhY2tTaXpl LmgKQEAgLTQ1LDE2ICs0NSwxOCBAQCBlbnVtIEdyaWRUcmFja1NpemVUeXBlIHsKIAogY2xhc3Mg R3JpZFRyYWNrU2l6ZSB7CiBwdWJsaWM6Ci0gICAgR3JpZFRyYWNrU2l6ZShMZW5ndGhUeXBlIHR5 cGUgPSBVbmRlZmluZWQpCisgICAgR3JpZFRyYWNrU2l6ZShjb25zdCBHcmlkTGVuZ3RoJiBsZW5n dGgpCiAgICAgICAgIDogbV90eXBlKExlbmd0aFRyYWNrU2l6aW5nKQotICAgICAgICAsIG1fbWlu VHJhY2tCcmVhZHRoKHR5cGUpCi0gICAgICAgICwgbV9tYXhUcmFja0JyZWFkdGgodHlwZSkKKyAg ICAgICAgLCBtX21pblRyYWNrQnJlYWR0aChsZW5ndGgpCisgICAgICAgICwgbV9tYXhUcmFja0Jy ZWFkdGgobGVuZ3RoKQogICAgIHsKICAgICB9CiAKICAgICBHcmlkVHJhY2tTaXplKGNvbnN0IEdy aWRMZW5ndGgmIG1pblRyYWNrQnJlYWR0aCwgY29uc3QgR3JpZExlbmd0aCYgbWF4VHJhY2tCcmVh ZHRoKQorICAgICAgICA6IG1fdHlwZShNaW5NYXhUcmFja1NpemluZykKKyAgICAgICAgLCBtX21p blRyYWNrQnJlYWR0aChtaW5UcmFja0JyZWFkdGgpCisgICAgICAgICwgbV9tYXhUcmFja0JyZWFk dGgobWF4VHJhY2tCcmVhZHRoKQogICAgIHsKLSAgICAgICAgc2V0TWluTWF4KG1pblRyYWNrQnJl YWR0aCwgbWF4VHJhY2tCcmVhZHRoKTsKICAgICB9CiAKICAgICBjb25zdCBHcmlkTGVuZ3RoJiBs ZW5ndGgoKSBjb25zdApAQCAtNjIsMjIgKzY0LDEzIEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJU KG1fdHlwZSA9PSBMZW5ndGhUcmFja1NpemluZyk7CiAgICAgICAgIEFTU0VSVChtX21pblRyYWNr QnJlYWR0aCA9PSBtX21heFRyYWNrQnJlYWR0aCk7CiAgICAgICAgIGNvbnN0IEdyaWRMZW5ndGgm IG1pblRyYWNrQnJlYWR0aCA9IG1fbWluVHJhY2tCcmVhZHRoOwotICAgICAgICBBU1NFUlQoIW1p blRyYWNrQnJlYWR0aC5pc0xlbmd0aCgpIHx8ICFtaW5UcmFja0JyZWFkdGgubGVuZ3RoKCkuaXNV bmRlZmluZWQoKSk7CiAgICAgICAgIHJldHVybiBtaW5UcmFja0JyZWFkdGg7CiAgICAgfQogCi0g ICAgdm9pZCBzZXRMZW5ndGgoY29uc3QgR3JpZExlbmd0aCYgbGVuZ3RoKQotICAgIHsKLSAgICAg ICAgbV90eXBlID0gTGVuZ3RoVHJhY2tTaXppbmc7Ci0gICAgICAgIG1fbWluVHJhY2tCcmVhZHRo ID0gbGVuZ3RoOwotICAgICAgICBtX21heFRyYWNrQnJlYWR0aCA9IGxlbmd0aDsKLSAgICB9Ci0K ICAgICBjb25zdCBHcmlkTGVuZ3RoJiBtaW5UcmFja0JyZWFkdGgoKSBjb25zdAogICAgIHsKLSAg ICAgICAgQVNTRVJUKCFtX21pblRyYWNrQnJlYWR0aC5pc0xlbmd0aCgpIHx8ICFtX21pblRyYWNr QnJlYWR0aC5sZW5ndGgoKS5pc1VuZGVmaW5lZCgpKTsKICAgICAgICAgaWYgKG1fbWluVHJhY2tC cmVhZHRoLmlzTGVuZ3RoKCkgJiYgbV9taW5UcmFja0JyZWFkdGgubGVuZ3RoKCkuaXNBdXRvKCkp IHsKLSAgICAgICAgICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChHcmlkTGVuZ3Ro LCBtaW5Db250ZW50LCAoTWluQ29udGVudCkpOworICAgICAgICAgICAgREVQUkVDQVRFRF9ERUZJ TkVfU1RBVElDX0xPQ0FMKEdyaWRMZW5ndGgsIG1pbkNvbnRlbnQsIChMZW5ndGgoTWluQ29udGVu dCkpKTsKICAgICAgICAgICAgIHJldHVybiBtaW5Db250ZW50OwogICAgICAgICB9CiAgICAgICAg IHJldHVybiBtX21pblRyYWNrQnJlYWR0aDsKQEAgLTg1LDIxICs3OCwxMyBAQCBwdWJsaWM6CiAK ICAgICBjb25zdCBHcmlkTGVuZ3RoJiBtYXhUcmFja0JyZWFkdGgoKSBjb25zdAogICAgIHsKLSAg ICAgICAgQVNTRVJUKCFtX21heFRyYWNrQnJlYWR0aC5pc0xlbmd0aCgpIHx8ICFtX21heFRyYWNr QnJlYWR0aC5sZW5ndGgoKS5pc1VuZGVmaW5lZCgpKTsKICAgICAgICAgaWYgKG1fbWF4VHJhY2tC cmVhZHRoLmlzTGVuZ3RoKCkgJiYgbV9tYXhUcmFja0JyZWFkdGgubGVuZ3RoKCkuaXNBdXRvKCkp IHsKLSAgICAgICAgICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChHcmlkTGVuZ3Ro LCBtYXhDb250ZW50LCAoTWF4Q29udGVudCkpOworICAgICAgICAgICAgREVQUkVDQVRFRF9ERUZJ TkVfU1RBVElDX0xPQ0FMKEdyaWRMZW5ndGgsIG1heENvbnRlbnQsIChMZW5ndGgoTWF4Q29udGVu dCkpKTsKICAgICAgICAgICAgIHJldHVybiBtYXhDb250ZW50OwogICAgICAgICB9CiAgICAgICAg IHJldHVybiBtX21heFRyYWNrQnJlYWR0aDsKICAgICB9CiAKLSAgICB2b2lkIHNldE1pbk1heChj b25zdCBHcmlkTGVuZ3RoJiBtaW5UcmFja0JyZWFkdGgsIGNvbnN0IEdyaWRMZW5ndGgmIG1heFRy YWNrQnJlYWR0aCkKLSAgICB7Ci0gICAgICAgIG1fdHlwZSA9IE1pbk1heFRyYWNrU2l6aW5nOwot ICAgICAgICBtX21pblRyYWNrQnJlYWR0aCA9IG1pblRyYWNrQnJlYWR0aDsKLSAgICAgICAgbV9t YXhUcmFja0JyZWFkdGggPSBtYXhUcmFja0JyZWFkdGg7Ci0gICAgfQotCiAgICAgR3JpZFRyYWNr U2l6ZVR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQogCiAgICAgYm9vbCBpc0Nv bnRlbnRTaXplZCgpIGNvbnN0IHsgcmV0dXJuIG1fbWluVHJhY2tCcmVhZHRoLmlzQ29udGVudFNp emVkKCkgfHwgbV9tYXhUcmFja0JyZWFkdGguaXNDb250ZW50U2l6ZWQoKTsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCAyYmFiZDBiZGM3YmQ4 MTkzYmY0MTlmNDkzZjM5NTc4NzIxMjM3MGVhLi42YjUyODIwYjZkMmNiODUyNWNkZDlkZTI3YTA5 ZGU4YWRkNDhjMTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuaApAQCAtMTk3Miw4ICsxOTcyLDggQEAgcHVibGljOgogCiAgICAgc3RhdGljIEdyaWRB dXRvRmxvdyBpbml0aWFsR3JpZEF1dG9GbG93KCkgeyByZXR1cm4gQXV0b0Zsb3dSb3c7IH0KIAot ICAgIHN0YXRpYyBHcmlkVHJhY2tTaXplIGluaXRpYWxHcmlkQXV0b0NvbHVtbnMoKSB7IHJldHVy biBHcmlkVHJhY2tTaXplKEF1dG8pOyB9Ci0gICAgc3RhdGljIEdyaWRUcmFja1NpemUgaW5pdGlh bEdyaWRBdXRvUm93cygpIHsgcmV0dXJuIEdyaWRUcmFja1NpemUoQXV0byk7IH0KKyAgICBzdGF0 aWMgR3JpZFRyYWNrU2l6ZSBpbml0aWFsR3JpZEF1dG9Db2x1bW5zKCkgeyByZXR1cm4gR3JpZFRy YWNrU2l6ZShMZW5ndGgoQXV0bykpOyB9CisgICAgc3RhdGljIEdyaWRUcmFja1NpemUgaW5pdGlh bEdyaWRBdXRvUm93cygpIHsgcmV0dXJuIEdyaWRUcmFja1NpemUoTGVuZ3RoKEF1dG8pKTsgfQog CiAgICAgc3RhdGljIE5hbWVkR3JpZEFyZWFNYXAgaW5pdGlhbE5hbWVkR3JpZEFyZWEoKSB7IHJl dHVybiBOYW1lZEdyaWRBcmVhTWFwKCk7IH0KICAgICBzdGF0aWMgc2l6ZV90IGluaXRpYWxOYW1l ZEdyaWRBcmVhQ291bnQoKSB7IHJldHVybiAwOyB9Cg==