123994 2013-11-07 07:58:50 -0800 [CSS Grid Layout] Fix the preferred logical widths code to work with spanning grid items 2013-12-16 04:05:29 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 123995 124345 125145 1 svillar svillar commit-queue darin dino esprehn+autocc glenn hyatt jchaffraix kling koivisto kondapallykalyan svillar oldest_to_newest 948259 0 svillar 2013-11-07 07:58:50 -0800 We should merge: Fix the preferred logical widths code to work with spanning grid items We implemented a simple algorithm to get the easy cases. The algorithm was completely wrong for more complex cases though, which was fine as the specification was completely silent on how to compute these logical widths. This has been raised to the working group in http://lists.w3.org/Archives/Public/www-style/2013Oct/0054.html No one objected after a week so we should be good to go. BUG=234197 Review URL: https://codereview.chromium.org/26557002 954490 1 217934 svillar 2013-11-27 03:09:08 -0800 Created attachment 217934 Patch 954676 2 svillar 2013-11-28 00:25:13 -0800 *** Bug 112388 has been marked as a duplicate of this bug. *** 960031 3 svillar 2013-12-16 04:05:29 -0800 Committed r160633: <http://trac.webkit.org/changeset/160633> 217934 2013-11-27 03:09:08 -0800 2013-12-12 02:09:51 -0800 Patch bug-123994-20131127120906.patch text/plain 11567 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5ODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDhhMjZlYjY1ODkxZmZh MGNhMTZkMzdkMWM2MjBkNjA2MThhZjZhNC4uOWEzYTUzODAxNDhmN2FkOTc5ZWYwMWI5Y2ZjNzZi MWRjOGVhMmZkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTExLTI3ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEZpeCB0aGUgcHJlZmVycmVkIGxvZ2ljYWwgd2lkdGhzIGNvZGUgdG8gd29yayB3 aXRoIHNwYW5uaW5nIGdyaWQgaXRlbXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyMzk5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZyb20gQmxpbmsgcjE1OTE4OSBieSA8amNoYWZmcmFpeEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgVGhlcmUgd2FzIG5vIGRlZmluaXRpb24gaW4gdGhlIHNwZWNzIGZv ciB0aGUgaW50cmluc2ljIC8gcHJlZmVycmVkCisgICAgICAgIGxvZ2ljYWwgd2lkdGhzIG9uIHRo ZSBncmlkIGVsZW1lbnQuIFRoZSBmb2xsb3dpbmcgd2FzIHByb3Bvc2VkIHRvCisgICAgICAgIHRo ZSBXRyBhbmQgbGF0ZXIgYWNjZXB0ZWQ6CisgICAgICAgIC0gVGhlIHN1bSBvZiB0aGUgZ3JpZCB0 cmFja3MnIFVzZWRCcmVhZHRoIGlzIHRoZSBtaW5pbXVtIGxvZ2ljYWwgd2lkdGgKKyAgICAgICAg LSBUaGUgc3VtIG9mIHRoZSBncmlkIHRyYWNrcycgTWF4QnJlYWR0aCBpcyB0aGUgbWF4aW11bSBs b2dpY2FsIHdpZHRoCisKKyAgICAgICAgaHR0cDovL2xpc3RzLnczLm9yZy9BcmNoaXZlcy9QdWJs aWMvd3d3LXN0eWxlLzIwMTNPY3QvMDA1NC5odG1sCisgICAgICAgIGZvciBtb3JlIGluZm9ybWF0 aW9uLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0ZWRVc2VkQnJlYWR0aE9mR3JpZFRyYWNrcyk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjptaW5Db250ZW50Rm9yQ2hpbGQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bWF4Q29udGVudEZvckNoaWxkKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyR3JpZC5oOgorCiAyMDEzLTExLTE0ICBTZXJnaW8gVmlsbGFyIFNl bmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIEZp eCBwb3NpdGlvbmluZyBvZiBncmlkIGl0ZW1zIHdpdGggbWFyZ2lucwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGY0MGZkYWMxYjI5NjY5MjZlMDYwY2I3ZjFjMGY3 M2MxMmQxYjczOWMuLjhmMmZmNDI0MTAzNmZkZTNjZGMwZThjZGRjMWQ0ZDNkMjA3NDM2NjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTIyMCwxMyArMjIwLDEz IEBAIHZvaWQgUmVuZGVyR3JpZDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0 VW5pdCYgbWluTG9naWNhbFdpZHRoLCBMYXlvCiB7CiAgICAgY29uc3RfY2FzdDxSZW5kZXJHcmlk Kj4odGhpcyktPnBsYWNlSXRlbXNPbkdyaWQoKTsKIAotICAgIC8vIEZJWE1FOiBUaGlzIGlzIGFu IGluZWZmaWNpZW50IHdheSB0byBmaWxsIG91ciBzaXplcyBhcyBpdCB3aWxsIHRyeSBldmVyeSBn cmlkIGFyZWFzLCB3aGVuIHdlIHdvdWxkCi0gICAgLy8gb25seSB3YW50IHRvIGFjY291bnQgZm9y IGZpeGVkIGdyaWQgdHJhY2tzIGFuZCBncmlkIGl0ZW1zLiBBbHNvIHRoaXMgd2lsbCBiZSBpbmNv cnJlY3QgaWYgd2UgaGF2ZSBzcGFubmluZwotICAgIC8vIGdyaWQgaXRlbXMuCi0gICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBncmlkQ29sdW1uQ291bnQoKTsgKytpKSB7Ci0gICAgICAgIGNvbnN0 IEdyaWRUcmFja1NpemUmIHRyYWNrU2l6ZSA9IGdyaWRUcmFja1NpemUoRm9yQ29sdW1ucywgaSk7 Ci0gICAgICAgIExheW91dFVuaXQgbWluVHJhY2tCcmVhZHRoID0gY29tcHV0ZVByZWZlcnJlZFRy YWNrV2lkdGgodHJhY2tTaXplLm1pblRyYWNrQnJlYWR0aCgpLCBpKTsKLSAgICAgICAgTGF5b3V0 VW5pdCBtYXhUcmFja0JyZWFkdGggPSBjb21wdXRlUHJlZmVycmVkVHJhY2tXaWR0aCh0cmFja1Np emUubWF4VHJhY2tCcmVhZHRoKCksIGkpOworICAgIEdyaWRTaXppbmdEYXRhIHNpemluZ0RhdGEo Z3JpZENvbHVtbkNvdW50KCksIGdyaWRSb3dDb3VudCgpKTsKKyAgICBMYXlvdXRVbml0IGF2YWls YWJsZUxvZ2ljYWxTcGFjZSA9IDA7CisgICAgY29uc3RfY2FzdDxSZW5kZXJHcmlkKj4odGhpcykt PmNvbXB1dGVkVXNlZEJyZWFkdGhPZkdyaWRUcmFja3MoRm9yQ29sdW1ucywgc2l6aW5nRGF0YSwg YXZhaWxhYmxlTG9naWNhbFNwYWNlKTsKKworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2l6 aW5nRGF0YS5jb2x1bW5UcmFja3Muc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBt aW5UcmFja0JyZWFkdGggPSBzaXppbmdEYXRhLmNvbHVtblRyYWNrc1tpXS5tX3VzZWRCcmVhZHRo OworICAgICAgICBMYXlvdXRVbml0IG1heFRyYWNrQnJlYWR0aCA9IHNpemluZ0RhdGEuY29sdW1u VHJhY2tzW2ldLm1fbWF4QnJlYWR0aDsKICAgICAgICAgbWF4VHJhY2tCcmVhZHRoID0gc3RkOjpt YXgobWF4VHJhY2tCcmVhZHRoLCBtaW5UcmFja0JyZWFkdGgpOwogCiAgICAgICAgIG1pbkxvZ2lj YWxXaWR0aCArPSBtaW5UcmFja0JyZWFkdGg7CkBAIC0yNTcsNDQgKzI1NywxNCBAQCB2b2lkIFJl bmRlckdyaWQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKICAgICBzZXRQcmVmZXJy ZWRMb2dpY2FsV2lkdGhzRGlydHkoZmFsc2UpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckdyaWQ6 OmNvbXB1dGVQcmVmZXJyZWRUcmFja1dpZHRoKGNvbnN0IEdyaWRMZW5ndGgmIGdyaWRMZW5ndGgs IHNpemVfdCB0cmFja0luZGV4KSBjb25zdAordm9pZCBSZW5kZXJHcmlkOjpjb21wdXRlZFVzZWRC cmVhZHRoT2ZHcmlkVHJhY2tzKFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNp emluZ0RhdGEmIHNpemluZ0RhdGEpCiB7Ci0gICAgaWYgKGdyaWRMZW5ndGguaXNGbGV4KCkpCi0g ICAgICAgIHJldHVybiAwOwotCi0gICAgY29uc3QgTGVuZ3RoJiBsZW5ndGggPSBncmlkTGVuZ3Ro Lmxlbmd0aCgpOwotCi0gICAgaWYgKGxlbmd0aC5pc0ZpeGVkKCkpIHsKLSAgICAgICAgLy8gR3Jp ZCBhcmVhcyBkb24ndCBoYXZlIGJvcmRlcnMsIG1hcmdpbnMgb3IgcGFkZGluZ3Mgc28gd2UgZG9u J3QgbmVlZCB0byBhY2NvdW50IGZvciB0aGVtLgotICAgICAgICByZXR1cm4gbGVuZ3RoLmludFZh bHVlKCk7Ci0gICAgfQotCi0gICAgaWYgKGxlbmd0aC5pc01pbkNvbnRlbnQoKSkgewotICAgICAg ICBMYXlvdXRVbml0IG1pbkNvbnRlbnRTaXplID0gMDsKLSAgICAgICAgR3JpZEl0ZXJhdG9yIGl0 ZXJhdG9yKG1fZ3JpZCwgRm9yQ29sdW1ucywgdHJhY2tJbmRleCk7Ci0gICAgICAgIHdoaWxlIChS ZW5kZXJCb3gqIGdyaWRJdGVtID0gaXRlcmF0b3IubmV4dEdyaWRJdGVtKCkpCi0gICAgICAgICAg ICBtaW5Db250ZW50U2l6ZSA9IHN0ZDo6bWF4KG1pbkNvbnRlbnRTaXplLCBncmlkSXRlbS0+bWlu UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhGb3JD aGlsZCgqZ3JpZEl0ZW0pKTsKLQotICAgICAgICByZXR1cm4gbWluQ29udGVudFNpemU7Ci0gICAg fQotCi0gICAgaWYgKGxlbmd0aC5pc01heENvbnRlbnQoKSkgewotICAgICAgICBMYXlvdXRVbml0 IG1heENvbnRlbnRTaXplID0gMDsKLSAgICAgICAgR3JpZEl0ZXJhdG9yIGl0ZXJhdG9yKG1fZ3Jp ZCwgRm9yQ29sdW1ucywgdHJhY2tJbmRleCk7Ci0gICAgICAgIHdoaWxlIChSZW5kZXJCb3gqIGdy aWRJdGVtID0gaXRlcmF0b3IubmV4dEdyaWRJdGVtKCkpCi0gICAgICAgICAgICBtYXhDb250ZW50 U2l6ZSA9IHN0ZDo6bWF4KG1heENvbnRlbnRTaXplLCBncmlkSXRlbS0+bWF4UHJlZmVycmVkTG9n aWNhbFdpZHRoKCkgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhGb3JDaGlsZCgqZ3JpZEl0 ZW0pKTsKLQotICAgICAgICByZXR1cm4gbWF4Q29udGVudFNpemU7Ci0gICAgfQotCi0gICAgLy8g RklYTUU6IGNzczMtc2l6aW5nIG1lbnRpb25zIHRoYXQgd2Ugc2hvdWxkIHJlc29sdmUgImRlZmlu aXRlIHNpemVzIgotICAgIC8vIChpbmNsdWRpbmcgPHBlcmNlbnRhZ2U+IGFuZCBjYWxjKCkpIGJ1 dCB3ZSBkb24ndCBkbyBpdCBlbHNld2hlcmUuCi0gICAgcmV0dXJuIDA7CisgICAgTGF5b3V0VW5p dCBhdmFpbGFibGVMb2dpY2FsU3BhY2UgPSAoZGlyZWN0aW9uID09IEZvckNvbHVtbnMpID8gYXZh aWxhYmxlTG9naWNhbFdpZHRoKCkgOiBhdmFpbGFibGVMb2dpY2FsSGVpZ2h0KEluY2x1ZGVNYXJn aW5Cb3JkZXJQYWRkaW5nKTsKKyAgICBjb21wdXRlZFVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tzKGRp cmVjdGlvbiwgc2l6aW5nRGF0YSwgYXZhaWxhYmxlTG9naWNhbFNwYWNlKTsKIH0KIAotdm9pZCBS ZW5kZXJHcmlkOjpjb21wdXRlZFVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tzKFRyYWNrU2l6aW5nRGly ZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCit2b2lkIFJlbmRl ckdyaWQ6OmNvbXB1dGVkVXNlZEJyZWFkdGhPZkdyaWRUcmFja3MoVHJhY2tTaXppbmdEaXJlY3Rp b24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSwgTGF5b3V0VW5pdCYgYXZh aWxhYmxlTG9naWNhbFNwYWNlKQogewotICAgIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFNw YWNlID0gKGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5zKSA/IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCgp IDogYXZhaWxhYmxlTG9naWNhbEhlaWdodChJbmNsdWRlTWFyZ2luQm9yZGVyUGFkZGluZyk7CiAg ICAgVmVjdG9yPEdyaWRUcmFjaz4mIHRyYWNrcyA9IChkaXJlY3Rpb24gPT0gRm9yQ29sdW1ucykg PyBzaXppbmdEYXRhLmNvbHVtblRyYWNrcyA6IHNpemluZ0RhdGEucm93VHJhY2tzOwogICAgIHNp emluZ0RhdGEuY29udGVudFNpemVkVHJhY2tzSW5kZXguc2hyaW5rKDApOwogICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgdHJhY2tzLnNpemUoKTsgKytpKSB7CkBAIC00NzYsNyArNDQ2LDcgQEAg TGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptaW5Db250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGls ZCwgVHJhY2tTaXppbmdEaXJlY3Rpb24KICAgICBpZiAoZGlyZWN0aW9uID09IEZvckNvbHVtbnMp IHsKICAgICAgICAgLy8gRklYTUU6IEl0J3MgdW5jbGVhciBpZiB3ZSBzaG91bGQgcmV0dXJuIHRo ZSBpbnRyaW5zaWMgd2lkdGggb3IgdGhlIHByZWZlcnJlZCB3aWR0aC4KICAgICAgICAgLy8gU2Vl IGh0dHA6Ly9saXN0cy53My5vcmcvQXJjaGl2ZXMvUHVibGljL3d3dy1zdHlsZS8yMDEzSmFuLzAy NDUuaHRtbAotICAgICAgICByZXR1cm4gY2hpbGQtPm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgp OworICAgICAgICByZXR1cm4gY2hpbGQtPm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICsgbWFy Z2luSW50cmluc2ljTG9naWNhbFdpZHRoRm9yQ2hpbGQoKmNoaWxkKTsKICAgICB9CiAKICAgICBy ZXR1cm4gbG9naWNhbENvbnRlbnRIZWlnaHRGb3JDaGlsZChjaGlsZCwgY29sdW1uVHJhY2tzKTsK QEAgLTQ5Miw3ICs0NjIsNyBAQCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1heENvbnRlbnRGb3JD aGlsZChSZW5kZXJCb3gqIGNoaWxkLCBUcmFja1NpemluZ0RpcmVjdGlvbgogICAgIGlmIChkaXJl Y3Rpb24gPT0gRm9yQ29sdW1ucykgewogICAgICAgICAvLyBGSVhNRTogSXQncyB1bmNsZWFyIGlm IHdlIHNob3VsZCByZXR1cm4gdGhlIGludHJpbnNpYyB3aWR0aCBvciB0aGUgcHJlZmVycmVkIHdp ZHRoLgogICAgICAgICAvLyBTZWUgaHR0cDovL2xpc3RzLnczLm9yZy9BcmNoaXZlcy9QdWJsaWMv d3d3LXN0eWxlLzIwMTNKYW4vMDI0NS5odG1sCi0gICAgICAgIHJldHVybiBjaGlsZC0+bWF4UHJl ZmVycmVkTG9naWNhbFdpZHRoKCk7CisgICAgICAgIHJldHVybiBjaGlsZC0+bWF4UHJlZmVycmVk TG9naWNhbFdpZHRoKCkgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhGb3JDaGlsZCgqY2hp bGQpOwogICAgIH0KIAogICAgIHJldHVybiBsb2dpY2FsQ29udGVudEhlaWdodEZvckNoaWxkKGNo aWxkLCBjb2x1bW5UcmFja3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKaW5k ZXggNmRjM2E1NDQzNTVlZTU2OWQ0M2FiNDRhYzQzNjJhMDk1ZDAwYjQwNC4uMDk0NmYxN2Y1N2Vj ZTUyMTBkZTFhM2Q0MTcwNTMyYmRlZTcxZjY5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5oCkBAIC02MSwxMiArNjEsMTEgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQg Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbFdpZHRo LCBMYXlvdXRVbml0JiBtYXhMb2dpY2FsV2lkdGgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1 YWwgdm9pZCBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpIE9WRVJSSURFOwogCi0gICAg TGF5b3V0VW5pdCBjb21wdXRlUHJlZmVycmVkVHJhY2tXaWR0aChjb25zdCBHcmlkTGVuZ3RoJiwg c2l6ZV90KSBjb25zdDsKLQogICAgIGNsYXNzIEdyaWRJdGVyYXRvcjsKICAgICBjbGFzcyBHcmlk U2l6aW5nRGF0YTsKICAgICBlbnVtIFRyYWNrU2l6aW5nRGlyZWN0aW9uIHsgRm9yQ29sdW1ucywg Rm9yUm93cyB9OwogICAgIHZvaWQgY29tcHV0ZWRVc2VkQnJlYWR0aE9mR3JpZFRyYWNrcyhUcmFj a1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKTsKKyAgICB2b2lkIGNvbXB1dGVkVXNl ZEJyZWFkdGhPZkdyaWRUcmFja3MoVHJhY2tTaXppbmdEaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRh JiwgTGF5b3V0VW5pdCYgYXZhaWxhYmxlTG9naWNhbFNwYWNlKTsKICAgICBMYXlvdXRVbml0IGNv bXB1dGVVc2VkQnJlYWR0aE9mTWluTGVuZ3RoKFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBjb25zdCBH cmlkTGVuZ3RoJikgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlVXNlZEJyZWFkdGhPZk1h eExlbmd0aChUcmFja1NpemluZ0RpcmVjdGlvbiwgY29uc3QgR3JpZExlbmd0aCYsIExheW91dFVu aXQgdXNlZEJyZWFkdGgpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29tcHV0ZVVzZWRCcmVhZHRo T2ZTcGVjaWZpZWRMZW5ndGgoVHJhY2tTaXppbmdEaXJlY3Rpb24sIGNvbnN0IExlbmd0aCYpIGNv bnN0OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IGY4Yjg3YWEyMWYzN2YyODZmMGJkNjMzOWNmYzY4NWM3MDAwNjYyNWEuLmQ0 YjZlZGY5YjMwNDNkNzBkNGYxMGNjNzNjOGJmNTc3ZDljNWNhMjYgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxMy0xMS0yNyAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNv bT4KKworICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBGaXggdGhlIHByZWZlcnJlZCBsb2dpY2Fs IHdpZHRocyBjb2RlIHRvIHdvcmsgd2l0aCBzcGFubmluZyBncmlkIGl0ZW1zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM5OTQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGcm9tIEJsaW5rIHIxNTkxODkg YnkgPGpjaGFmZnJhaXhAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEV4dGVuZGVkIHRoZSB0ZXN0 IGNhc2UgdG8gaW5jbHVkZSBzcGFubmluZyBncmlkIGl0ZW1zLgorCisgICAgICAgICogZmFzdC9j c3MtZ3JpZC1sYXlvdXQvZ3JpZC1wcmVmZXJyZWQtbG9naWNhbC13aWR0aHMtZXhwZWN0ZWQudHh0 OgorICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtcHJlZmVycmVkLWxvZ2ljYWwt d2lkdGhzLmh0bWw6CisKIDIwMTMtMTEtMTQgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFy QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NTUyBHcmlkIExheW91dF0gRml4IHBvc2l0aW9uaW5n IG9mIGdyaWQgaXRlbXMgd2l0aCBtYXJnaW5zCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy1ncmlkLWxheW91dC9ncmlkLXByZWZlcnJlZC1sb2dpY2FsLXdpZHRocy1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLXByZWZlcnJlZC1sb2dp Y2FsLXdpZHRocy1leHBlY3RlZC50eHQKaW5kZXggNjYzMGVjMjRiZDc4Mjk4MGNiMzgxOWE3Yjhj NmU0ZDM4Yzc3NGYwZS4uNmM5ZDcxYjNkZTc2Y2I2ZDZjODZhYzhhNmQzZDA1YmEwNWRjZDY5NyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1wcmVmZXJy ZWQtbG9naWNhbC13aWR0aHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3Nz LWdyaWQtbGF5b3V0L2dyaWQtcHJlZmVycmVkLWxvZ2ljYWwtd2lkdGhzLWV4cGVjdGVkLnR4dApA QCAtMjYsNiArMjYsOCBAQCBQQVNTCiBYWCBYWCBYWAogWFggWFggWFgKIFBBU1MKK1BBU1MKK1BB U1MKIFhYIFhYIFhYCiBYWCBYWCBYWAogUEFTUwpAQCAtNDQsMyArNDYsMTcgQEAgUEFTUwogWFgg WFggWFgKIFhYIFhYIFhYCiBQQVNTCitYWCBYWCBYWAorUEFTUworWFhYWFggWFhYWFgKK1hYWFhY IFhYWFhYCitQQVNTCitYWCBYWCBYWAorWFggWFggWFgKK1BBU1MKK1hYIFhYIFhYCitYWCBYWCBY WAorUEFTUworWFggWFggWFgKK1hYIFhYIFhYCitQQVNTCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLXByZWZlcnJlZC1sb2dpY2FsLXdpZHRocy5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1wcmVmZXJyZWQtbG9naWNh bC13aWR0aHMuaHRtbAppbmRleCAxNDRlOGU3OWFjNzQzZmYwZmQ2NGJjNWNhZTAyN2JmOTdlN2U0 NjExLi45Y2NiZTgyMmZmNGVhNjMzNGJlYWM1NzcyOGQ4YzQ0NDhhYjQ2YTk0IDEwMDc1NQotLS0g YS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLXByZWZlcnJlZC1sb2dpY2Fs LXdpZHRocy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQt cHJlZmVycmVkLWxvZ2ljYWwtd2lkdGhzLmh0bWwKQEAgLTM3LDYgKzM3LDExIEBACiAgICAgZm9u dDogMTBweC8xIEFoZW07CiB9CiAKKy5ncmlkRml4ZWRGcmFjdGlvbiB7CisgICAgLXdlYmtpdC1n cmlkLWRlZmluaXRpb24tY29sdW1uczogbWlubWF4KDEwcHgsIDFmcikgbWlubWF4KDJmciwgMjBw eCk7CisgICAgLXdlYmtpdC1ncmlkLWRlZmluaXRpb24tcm93czogMTBweDsKK30KKwogLm1hcmdp bnMgewogICAgIG1hcmdpbjogMTBweCAyMHB4IDMwcHggNDBweDsKIH0KQEAgLTgxLDYgKzg2LDkg QEAKICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd1NlY29uZENvbHVtbiI+WFggWFggWFg8L2Rpdj4K IDwvZGl2PgogCis8ZGl2IGNsYXNzPSJncmlkIGdyaWRGaXhlZEZyYWN0aW9uIG1pbi1jb250ZW50 IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwIj48L2Rp dj4KKzxkaXYgY2xhc3M9ImdyaWQgZ3JpZEZpeGVkRnJhY3Rpb24gbWF4LWNvbnRlbnQiIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PSIxMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMzAiPjwvZGl2PgorCiA8 IS0tIE5vdyB3aXRoIG1hcmdpbiBvbiBvbmUgb2YgdGhlIGdyaWQgaXRlbXMuIC0tPgogPGRpdiBj bGFzcz0iZ3JpZCBncmlkTWluQ29udGVudEZpeGVkIG1pbi1jb250ZW50IiBkYXRhLWV4cGVjdGVk LWhlaWdodD0iMTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCI+CiAgICAgPGRpdiBjbGFzcz0i Zmlyc3RSb3dGaXJzdENvbHVtbiI+WFggWFggWFg8L2Rpdj4KQEAgLTEwNyw1ICsxMTUsMjYgQEAK ICAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd1NlY29uZENvbHVtbiI+WFggWFggWFg8L2Rpdj4KIDwv ZGl2PgogCis8IS0tIFNwYW5uaW5nIGNlbGxzIC0tPgorPGRpdiBjbGFzcz0iZ3JpZCBncmlkTWlu Q29udGVudEZpeGVkIG1pbi1jb250ZW50IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAiIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjIwIj4KKyAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4i PlhYIFhYIFhYPC9kaXY+Cis8L2Rpdj4KKzxkaXYgY2xhc3M9ImdyaWQgZ3JpZEZpeGVkTWluQ29u dGVudCBtYXgtY29udGVudCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEwIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSI4MCI+CisgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dCb3RoQ29sdW1uIj5YWFhYWCBY WFhYWDwvZGl2PgorICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93U2Vjb25kQ29sdW1uIj5YWFhYWCBY WFhYWDwvZGl2PgorPC9kaXY+Cis8ZGl2IGNsYXNzPSJncmlkIGdyaWRGaXhlZE1heENvbnRlbnQg bWF4LWNvbnRlbnQiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxMCIgZGF0YS1leHBlY3RlZC13aWR0 aD0iODAiPgorICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Qm90aENvbHVtbiI+WFggWFggWFg8L2Rp dj4KKyAgICA8ZGl2IGNsYXNzPSJmaXJzdFJvd0JvdGhDb2x1bW4iPlhYIFhYIFhYPC9kaXY+Cis8 L2Rpdj4KKzxkaXYgY2xhc3M9ImdyaWQgZ3JpZEF1dG9Db250ZW50IG1pbi1jb250ZW50IiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iMTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIj4KKyAgICA8ZGl2 IGNsYXNzPSJmaXJzdFJvd0ZpcnN0Q29sdW1uIj5YWCBYWCBYWDwvZGl2PgorICAgIDxkaXYgY2xh c3M9ImZpcnN0Um93Qm90aENvbHVtbiI+WFggWFggWFg8L2Rpdj4KKzwvZGl2PgorPGRpdiBjbGFz cz0iZ3JpZCBncmlkQXV0b0NvbnRlbnQgbWF4LWNvbnRlbnQiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0 PSIxMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTIwIj4KKyAgICA8ZGl2IGNsYXNzPSJmaXJzdFJv d0JvdGhDb2x1bW4iPlhYIFhYIFhYPC9kaXY+CisgICAgPGRpdiBjbGFzcz0iZmlyc3RSb3dTZWNv bmRDb2x1bW4iPlhYIFhYIFhYPC9kaXY+Cis8L2Rpdj4KKwogPC9ib2R5PgogPC9odG1sPgo=