227425 2021-06-26 20:48:54 -0700 [LFC][TFC] Rename GridSpace::preferredSpace to preferredSize 2021-06-27 10:21:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227417 227426 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1772908 0 zalan 2021-06-26 20:48:54 -0700 ssia 1772909 1 432342 zalan 2021-06-26 20:54:01 -0700 Created attachment 432342 [fast-cq] Patch 1772940 2 ews-feeder 2021-06-27 10:20:15 -0700 Committed r279316 (239192@main): <https://commits.webkit.org/239192@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432342. 1772941 3 webkit-bug-importer 2021-06-27 10:21:17 -0700 <rdar://problem/79839506> 432342 2021-06-26 20:54:01 -0700 2021-06-27 10:20:15 -0700 [fast-cq] Patch bug-227425-20210626205400.patch text/plain 8335 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2IxNzExM2VmOWJlYmQ1 NmRkZjE1Yjk5YzQxODZjOTNiY2Y1OTc3Mi4uMDQ0ZDI3Y2RmNDBiN2E2ZTVkNzg2YTJlMGVhZjhj NTI0ZjZkMTk3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA2LTI2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdIFJlbmFtZSBH cmlkU3BhY2U6OnByZWZlcnJlZFNwYWNlIHRvIHByZWZlcnJlZFNpemUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzQyNQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIGEgbW9yZSBkZXNjcmlwdGl2 ZSBuYW1lLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJs ZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkdyaWRTcGFjZTo6aXNFbXB0 eSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om9wZXJhdG9yLSk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6Om9wZXJhdG9yKz0pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpvcGVyYXRvci8pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpkaXN0cmlidXRlQXZhaWxh YmxlU3BhY2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZvcm1hdHRpbmdDb250 ZXh0OjpUYWJsZUxheW91dDo6ZGlzdHJpYnV0ZWRIb3Jpem9udGFsU3BhY2UpOiBwcmVmZXJyZWRX aWR0aCBpcyB0aGUgc2FtZSBpbiBib3RoIGNhc2VzLgorCiAyMDIxLTA2LTI1ICBBbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdIEludHJvZHVjZSBhIHBy aW9yaXR5IG9yZGVyIGZvciB0aGUgZ3JpZCB0eXBlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy90YWJsZS9UYWJsZUxheW91dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlTGF5b3V0LmNw cAppbmRleCAxMDE2MmFmMTYxNmU3YzU0YWJjN2I0ODBkOWEyZDg0ZDZjZWNkMjA4Li42YzJjODA0 YmI3MzgwNjgyZTAwZjc2YWMzODU1YzkyNTkzZWRjZWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlTGF5b3V0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL3RhYmxlL1RhYmxlTGF5 b3V0LmNwcApAQCAtNzEsNyArNzEsNyBAQCBzdHJ1Y3QgUm93U3BhbiB7CiB9OwogCiBzdHJ1Y3Qg R3JpZFNwYWNlIHsKLSAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiAhcHJlZmVycmVk U3BhY2U7IH0KKyAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiAhcHJlZmVycmVkU2l6 ZTsgfQogCiAgICAgZW51bSBjbGFzcyBUeXBlIHsKICAgICAgICAgUGVyY2VudCwKQEAgLTgxLDcg KzgxLDcgQEAgc3RydWN0IEdyaWRTcGFjZSB7CiAgICAgfTsKICAgICBUeXBlIHR5cGUgeyBUeXBl OjpBdXRvIH07CiAgICAgLy8gUHJlZmVycmVkIHdpZHRoL2hlaWdodCBmb3IgY29sdW1uL3JvdyB3 ZSBzdGFydCB0aGUgZGlzdHJpYnV0aW9uIHdpdGggKHVzdWFsbHkgdGhlIG1pbmltdW0gY29udGVu dCB3aWR0aCkuCi0gICAgZmxvYXQgcHJlZmVycmVkU3BhY2UgeyAwIH07CisgICAgZmxvYXQgcHJl ZmVycmVkU2l6ZSB7IDAgfTsKICAgICAvLyBUaGUgYmFzZSBzcGFjZSB2YWx1ZSBmb3IgdGhlIGRp c3RyaWJ1dGlvbiBjb21wdXRhdGlvbiBlLmcgWyA5IF0gWyAxIF0gdmFsdWVzIGZvciAyIGNvbHVt bnMgaW4gdGhlIHRhYmxlIG1lYW5zIHRoYXQgaWYKICAgICAvLyB3ZSd2ZSBnbyAxMDBweCBmbGV4 aWJsZSBzcGFjZSB0byBkaXN0cmlidXRlLCA5MHB4IGFuZCAxMHB4IGdvIHRvIHRoZSBjb2x1bW5z IHJlc3BlY3RpdmVseS4KICAgICBmbG9hdCBmbGV4QmFzZSB7IDAgfTsKQEAgLTg5LDE0ICs4OSwx NCBAQCBzdHJ1Y3QgR3JpZFNwYWNlIHsKIAogaW5saW5lIHN0YXRpYyBHcmlkU3BhY2UmIG9wZXJh dG9yLShHcmlkU3BhY2UmIGEsIGNvbnN0IEdyaWRTcGFjZSYgYikKIHsKLSAgICBhLnByZWZlcnJl ZFNwYWNlID0gc3RkOjptYXgoMC4wZiwgYS5wcmVmZXJyZWRTcGFjZSAtIGIucHJlZmVycmVkU3Bh Y2UpOworICAgIGEucHJlZmVycmVkU2l6ZSA9IHN0ZDo6bWF4KDAuMGYsIGEucHJlZmVycmVkU2l6 ZSAtIGIucHJlZmVycmVkU2l6ZSk7CiAgICAgYS5mbGV4QmFzZSA9IHN0ZDo6bWF4KDAuMGYsIGEu ZmxleEJhc2UgLSBiLmZsZXhCYXNlKTsKICAgICByZXR1cm4gYTsKIH0KIAogaW5saW5lIHN0YXRp YyBHcmlkU3BhY2UmIG9wZXJhdG9yKz0oR3JpZFNwYWNlJiBhLCBjb25zdCBHcmlkU3BhY2UmIGIp CiB7Ci0gICAgYS5wcmVmZXJyZWRTcGFjZSArPSBiLnByZWZlcnJlZFNwYWNlOworICAgIGEucHJl ZmVycmVkU2l6ZSArPSBiLnByZWZlcnJlZFNpemU7CiAgICAgYS5mbGV4QmFzZSArPSBiLmZsZXhC YXNlOwogICAgIHJldHVybiBhOwogfQpAQCAtMTA4LDcgKzEwOCw3IEBAIGlubGluZSBzdGF0aWMg R3JpZFNwYWNlJiBvcGVyYXRvci09KEdyaWRTcGFjZSYgYSwgY29uc3QgR3JpZFNwYWNlJiBiKQog CiBpbmxpbmUgc3RhdGljIEdyaWRTcGFjZSYgb3BlcmF0b3IvKEdyaWRTcGFjZSYgYSwgdW5zaWdu ZWQgdmFsdWUpCiB7Ci0gICAgYS5wcmVmZXJyZWRTcGFjZSAvPSB2YWx1ZTsKKyAgICBhLnByZWZl cnJlZFNpemUgLz0gdmFsdWU7CiAgICAgYS5mbGV4QmFzZSAvPSB2YWx1ZTsKICAgICByZXR1cm4g YTsKIH0KQEAgLTEzNCw3ICsxMzQsNyBAQCBzdGF0aWMgVmVjdG9yPExheW91dFVuaXQ+IGRpc3Ry aWJ1dGVBdmFpbGFibGVTcGFjZShjb25zdCBUYWJsZUdyaWQmIGdyaWQsIExheW91dAogICAgICAg ICAgICAgYXV0byYgcmVzb2x2ZWRJdGVtID0gcmVzb2x2ZWRJdGVtc1tpbmRleF07CiAgICAgICAg ICAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIG1peGVkIGNvbHVtbi9yb3cgdHlwZXMgZS5n LiBmaXJzdCByb3cgZmlyc3QgY29sdW1uIGlzIGZpeGVkLCB3aGlsZSBzZWNvbmQgcm93IGZpcnN0 IGNvbHVtbiBpcyBwZXJjZW50LgogICAgICAgICAgICAgQVNTRVJUKHJlc29sdmVkSXRlbS0+dHlw ZSA9PSBjdXJyZW50U3BhY2UudHlwZSk7Ci0gICAgICAgICAgICByZXNvbHZlZEl0ZW0tPnByZWZl cnJlZFNwYWNlID0gc3RkOjptYXgocmVzb2x2ZWRJdGVtLT5wcmVmZXJyZWRTcGFjZSwgY3VycmVu dFNwYWNlLnByZWZlcnJlZFNwYWNlKTsKKyAgICAgICAgICAgIHJlc29sdmVkSXRlbS0+cHJlZmVy cmVkU2l6ZSA9IHN0ZDo6bWF4KHJlc29sdmVkSXRlbS0+cHJlZmVycmVkU2l6ZSwgY3VycmVudFNw YWNlLnByZWZlcnJlZFNpemUpOwogICAgICAgICAgICAgcmVzb2x2ZWRJdGVtLT5mbGV4QmFzZSA9 IHN0ZDo6bWF4KHJlc29sdmVkSXRlbS0+ZmxleEJhc2UsIGN1cnJlbnRTcGFjZS5mbGV4QmFzZSk7 CiAgICAgICAgIH0KICAgICB9CkBAIC0xOTcsNyArMTk3LDcgQEAgc3RhdGljIFZlY3RvcjxMYXlv dXRVbml0PiBkaXN0cmlidXRlQXZhaWxhYmxlU3BhY2UoY29uc3QgVGFibGVHcmlkJiBncmlkLCBM YXlvdXQKICAgICAgICAgICAgIGF1dG8gcmVzb2x2ZWRTcGFubmluZ1NwYWNlID0gR3JpZFNwYWNl IHsgfTsKICAgICAgICAgICAgIGZvciAoYXV0byBzcGFuSW5kZXggPSBTcGFuVHlwZTo6c3RhcnRT cGFuKGNlbGwpOyBzcGFuSW5kZXggPCBTcGFuVHlwZTo6ZW5kU3BhbihjZWxsKTsgKytzcGFuSW5k ZXgpCiAgICAgICAgICAgICAgICAgcmVzb2x2ZWRTcGFubmluZ1NwYWNlICs9ICpyZXNvbHZlZEl0 ZW1zW3NwYW5JbmRleF07Ci0gICAgICAgICAgICBpZiAocmVzb2x2ZWRTcGFubmluZ1NwYWNlLnBy ZWZlcnJlZFNwYWNlID49IHVucmVzb2x2ZWRTcGFubmluZ1NwYWNlLnByZWZlcnJlZFNwYWNlKSB7 CisgICAgICAgICAgICBpZiAocmVzb2x2ZWRTcGFubmluZ1NwYWNlLnByZWZlcnJlZFNpemUgPj0g dW5yZXNvbHZlZFNwYW5uaW5nU3BhY2UucHJlZmVycmVkU2l6ZSkgewogICAgICAgICAgICAgICAg IC8vIFRoZSBzcGFubmluZyBjZWxsIGZpdHMgdGhlIHNwYW5uZWQgY29sdW1ucy9yb3dzIGp1c3Qg ZmluZS4gTm90aGluZyB0byBkaXN0cmlidXRlLgogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwog ICAgICAgICAgICAgfQpAQCAtMjA2LDcgKzIwNiw3IEBAIHN0YXRpYyBWZWN0b3I8TGF5b3V0VW5p dD4gZGlzdHJpYnV0ZUF2YWlsYWJsZVNwYWNlKGNvbnN0IFRhYmxlR3JpZCYgZ3JpZCwgTGF5b3V0 CiAgICAgICAgICAgICBpZiAoIXNwYWNlVG9EaXN0cmlidXRlLmlzRW1wdHkoKSkgewogICAgICAg ICAgICAgICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gc3BhY2VUb0Rpc3RyaWJ1dGUuZmxleEJh c2UgLyByZXNvbHZlZFNwYW5uaW5nU3BhY2UuZmxleEJhc2U7CiAgICAgICAgICAgICAgICAgZm9y IChhdXRvIHNwYW5JbmRleCA9IFNwYW5UeXBlOjpzdGFydFNwYW4oY2VsbCk7IHNwYW5JbmRleCA8 IFNwYW5UeXBlOjplbmRTcGFuKGNlbGwpOyArK3NwYW5JbmRleCkKLSAgICAgICAgICAgICAgICAg ICAgKnJlc29sdmVkSXRlbXNbc3BhbkluZGV4XSArPSBHcmlkU3BhY2UgeyByZXNvbHZlZEl0ZW1z W3NwYW5JbmRleF0tPnR5cGUsIHJlc29sdmVkSXRlbXNbc3BhbkluZGV4XS0+cHJlZmVycmVkU3Bh Y2UgKiBjb2x1bW5zRmxleEJhc2UsIHJlc29sdmVkSXRlbXNbc3BhbkluZGV4XS0+ZmxleEJhc2Ug KiBjb2x1bW5zRmxleEJhc2UgfTsKKyAgICAgICAgICAgICAgICAgICAgKnJlc29sdmVkSXRlbXNb c3BhbkluZGV4XSArPSBHcmlkU3BhY2UgeyByZXNvbHZlZEl0ZW1zW3NwYW5JbmRleF0tPnR5cGUs IHJlc29sdmVkSXRlbXNbc3BhbkluZGV4XS0+cHJlZmVycmVkU2l6ZSAqIGNvbHVtbnNGbGV4QmFz ZSwgcmVzb2x2ZWRJdGVtc1tzcGFuSW5kZXhdLT5mbGV4QmFzZSAqIGNvbHVtbnNGbGV4QmFzZSB9 OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtMjQ5LDE0ICsyNDksMTQgQEAg c3RhdGljIFZlY3RvcjxMYXlvdXRVbml0PiBkaXN0cmlidXRlQXZhaWxhYmxlU3BhY2UoY29uc3Qg VGFibGVHcmlkJiBncmlkLCBMYXlvdXQKICAgICBmbG9hdCBzcGFjZVRvRGlzdHJpYnV0ZSA9IGF2 YWlsYWJsZVNwYWNlOwogICAgIC8vIFRvcCBhbmQgYm90dG9tIHNwYWNpbmcgYXJlIGZpeGVkLgog ICAgIHNwYWNlVG9EaXN0cmlidXRlIC09IDIgKiBTcGFuVHlwZTo6c3BhY2luZyhncmlkKTsKLSAg ICBzcGFjZVRvRGlzdHJpYnV0ZSAtPSBhZGp1c3RhYmxlZFNwYWNlLnByZWZlcnJlZFNwYWNlICsg KChyZXNvbHZlZEl0ZW1zLnNpemUoKSAtIDEpICogU3BhblR5cGU6OnNwYWNpbmcoZ3JpZCkpOwor ICAgIHNwYWNlVG9EaXN0cmlidXRlIC09IGFkanVzdGFibGVkU3BhY2UucHJlZmVycmVkU2l6ZSAr ICgocmVzb2x2ZWRJdGVtcy5zaXplKCkgLSAxKSAqIFNwYW5UeXBlOjpzcGFjaW5nKGdyaWQpKTsK ICAgICAvLyBEaXN0cmlidXRlIHRoZSBleHRyYSBzcGFjZSBiYXNlZCBvbiB0aGUgcmVzb2x2ZWQg c3BhY2VzLiBOb3RlIHRoYXQgdGhlIGV4dHJhIHNwYWNlIGNvdWxkIGJlIGEgbmVnYXRpdmUgdmFs dWUgaW4gd2hpY2ggY2FzZQogICAgIC8vIHdlIG1heSBhc3NpZ24gbGVzcyBzcGFjZSB0byBjb2x1 bW5zLgogICAgIGF1dG8gY29sdW1uc0ZsZXhCYXNlID0gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFz ZSA/IHNwYWNlVG9EaXN0cmlidXRlIC8gYWRqdXN0YWJsZWRTcGFjZS5mbGV4QmFzZSA6IDAuZjsK ICAgICBhdXRvIGRpc3RyaWJ1dGVTcGFjZUZvclR5cGUgPSBbJl0oY29uc3QgYXV0byYgY29sdW1u SW5kZXhlcykgewogICAgICAgICBmb3IgKGF1dG8mIGNvbHVtbkluZGV4IDogY29sdW1uSW5kZXhl cykgewogICAgICAgICAgICAgYXV0byBjb2x1bW5FeHRyYVNwYWNlID0gY29sdW1uc0ZsZXhCYXNl ICogcmVzb2x2ZWRJdGVtc1tjb2x1bW5JbmRleF0tPmZsZXhCYXNlOwotICAgICAgICAgICAgZGlz dHJpYnV0ZWRTcGFjZXNbY29sdW1uSW5kZXhdID0gTGF5b3V0VW5pdCB7IHJlc29sdmVkSXRlbXNb Y29sdW1uSW5kZXhdLT5wcmVmZXJyZWRTcGFjZSArIGNvbHVtbkV4dHJhU3BhY2UgfTsKKyAgICAg ICAgICAgIGRpc3RyaWJ1dGVkU3BhY2VzW2NvbHVtbkluZGV4XSA9IExheW91dFVuaXQgeyByZXNv bHZlZEl0ZW1zW2NvbHVtbkluZGV4XS0+cHJlZmVycmVkU2l6ZSArIGNvbHVtbkV4dHJhU3BhY2Ug fTsKICAgICAgICAgfQogICAgIH07CiAgICAgLy8gRGlzdHJpYnV0ZSB0aGUgYXZhaWxhYmxlIHNw YWNlIHN0YXJ0aW5nIHdpdGggcGVyY2VudCBjb2x1bW5zIGFuZCBlbmRpbmcgd2l0aCBhdXRvcy4K QEAgLTI4NCw2ICsyODQsNyBAQCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpUYWJsZUxheW91dDo6 RGlzdHJpYnV0ZWRTcGFjZXMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6VAogCiAgICAgICAgIGZs b2F0IG1pbmltdW1Db250ZW50V2lkdGggPSBzbG90LndpZHRoQ29uc3RyYWludHMoKS5taW5pbXVt OwogICAgICAgICBmbG9hdCBtYXhpbXVtQ29udGVudFdpZHRoID0gc2xvdC53aWR0aENvbnN0cmFp bnRzKCkubWF4aW11bTsKKyAgICAgICAgYXV0byBwcmVmZXJyZWRXaWR0aCA9IHN0ZDo6bWF4KG1p bmltdW1Db250ZW50V2lkdGgsIGNvbHVtbldpZHRoLnZhbHVlX29yKG1heGltdW1Db250ZW50V2lk dGgpKTsKICAgICAgICAgaWYgKCFoYXNFbm91Z2hBdmFpbGFibGVTcGFjZUZvck1heGltdW1XaWR0 aCkgewogICAgICAgICAgICAgLy8gbWF4aW11bSB3aWR0aCA+IGF2YWlsYWJsZSBob3Jpem9udGFs IHNwYWNlCiAgICAgICAgICAgICAvLyBwcmVmZXJyZWQgd2lkdGg6IGl0J3MgYWx3YXlzIGF0IGxl YXN0IGFzIHdpZGUgYXMgdGhlIG1pbmltdW0gY29udGVudCB3aWR0aCBhbmQgaWYgY29sdW1uIGZp eGVkIHdpZHRoIGlzIHNldCB0aGVuIHRoZSBncmVhdGVyIG9mIHRoZSB0d28uCkBAIC0zMDMsNyAr MzA0LDYgQEAgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6VGFibGVMYXlvdXQ6OkRpc3RyaWJ1dGVk U3BhY2VzIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6OlQKICAgICAgICAgICAgIC8vIHRvdGFsIGFk anVzdGFibGUgc3BhY2U6IDEyMHB4IC0gODBweCAtIDUwcHggPSAtMTBweCA8LSBOb3RlIHRoZSBu ZWdhdGl2ZSBhdmFpbGFibGUgc3BhY2Ugd2l0aCBvdmVyLWNvbnN0cmFpbmVkIHZhbHVlcy4KICAg ICAgICAgICAgIC8vIGNvbHVtbnMgZXh0cmEgd2lkdGhzOiAtMTBweCAvICgzMHB4ICsgMHB4KSAq IDMwcHggPSAtMTBweCBhbmQgLTEwcHggLyAoMzBweCArIDBweCkgKiAwcHggPSAwcHgKICAgICAg ICAgICAgIC8vIGNvbHVtbnMgZmluYWwgd2lkdGhzOiA3MHB4IGFuZCA1MHB4IChmaXJzdCBjb2x1 bW4gaXMgbmFycm93ZXIgdGhhbiBpdHMgcHJlZmVycmVkIHdpZHRoIGFuZCB0aGUgc2Vjb25kIGlz IGFzIHdpZGUgYXMgdGhlIG1pbmltdW0gY29udGVudCB3aWR0aCkKLSAgICAgICAgICAgIGF1dG8g cHJlZmVycmVkV2lkdGggPSBzdGQ6Om1heChtaW5pbXVtQ29udGVudFdpZHRoLCBjb2x1bW5XaWR0 aC52YWx1ZV9vcihtYXhpbXVtQ29udGVudFdpZHRoKSk7CiAgICAgICAgICAgICByZXR1cm4gR3Jp ZFNwYWNlIHsgdHlwZSwgcHJlZmVycmVkV2lkdGgsIHByZWZlcnJlZFdpZHRoIC0gbWluaW11bUNv bnRlbnRXaWR0aCB9OwogICAgICAgICB9CiAKQEAgLTMyNCw3ICszMjQsNiBAQCBUYWJsZUZvcm1h dHRpbmdDb250ZXh0OjpUYWJsZUxheW91dDo6RGlzdHJpYnV0ZWRTcGFjZXMgVGFibGVGb3JtYXR0 aW5nQ29udGV4dDo6VAogICAgICAgICAvLyB0b3RhbCBhZGp1c3RhYmxlIHNwYWNlOiAyNjAwcHgg LSA1MDBweCA9IDIxMDBweAogICAgICAgICAvLyBjb2x1bW5zIGV4dHJhIHdpZHRoczogMjEwMHB4 IC8gNTAwcHggKiAyMDBweCA9IDg0MHB4IGFuZCAyMTAwcHggLyA1MDBweCAqIDMwMHB4ID0gMTI2 MHB4CiAgICAgICAgIC8vIGNvbHVtbnMgZmluYWwgd2lkdGhzOiAxMDQwcHggYW5kIDE1NjBweAot ICAgICAgICBhdXRvIHByZWZlcnJlZFdpZHRoID0gc3RkOjptYXgobWluaW11bUNvbnRlbnRXaWR0 aCwgY29sdW1uV2lkdGgudmFsdWVfb3IobWF4aW11bUNvbnRlbnRXaWR0aCkpOwogICAgICAgICBy ZXR1cm4gR3JpZFNwYWNlIHsgdHlwZSwgcHJlZmVycmVkV2lkdGgsIHByZWZlcnJlZFdpZHRoIH07 CiAgICAgfSk7CiB9Cg==