134058 2014-06-19 03:28:42 -0700 [CSS Grid Layout] Add GridSpan::iterator 2014-06-20 01:29:38 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rego rego andersca bjonesbe commit-queue darin esprehn+autocc glenn jfernandez kondapallykalyan simon.fraser svillar oldest_to_newest 1016657 0 rego 2014-06-19 03:28:42 -0700 Once GridResolvedPosition patch has landed (bug #131732) it'd be nice to refactor current loops to make them simpler. This has been already implemented in Blink and should be ported into WebKit (see https://codereview.chromium.org/235663004/). 1016777 1 233386 rego 2014-06-19 14:45:03 -0700 Created attachment 233386 Patch Small refactoring of GridResolvedPosition loops. 1016781 2 233386 bjonesbe 2014-06-19 15:22:16 -0700 Comment on attachment 233386 Patch Why can't you use a range based for loop? 1016788 3 rego 2014-06-19 16:10:50 -0700 (In reply to comment #2) > (From update of attachment 233386 [details]) > Why can't you use a range based for loop? Good idea, I'm changing the patch to use them. Thanks for the suggestion. 1016794 4 233392 rego 2014-06-19 16:22:06 -0700 Created attachment 233392 Patch New version using range-based for loops. 1016835 5 233392 bjonesbe 2014-06-19 21:44:30 -0700 Comment on attachment 233392 Patch iterators are awesome. r=me. 1016882 6 233392 rego 2014-06-20 01:29:30 -0700 Comment on attachment 233392 Patch Clearing flags on attachment: 233392 Committed r170182: <http://trac.webkit.org/changeset/170182> 1016883 7 rego 2014-06-20 01:29:38 -0700 All reviewed patches have been landed. Closing bug. 233386 2014-06-19 14:45:03 -0700 2014-06-19 16:21:59 -0700 Patch bug-134058-20140619234440.patch text/plain 5322 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjlhZGE5NDFhYWJmMjE0 YjJiM2JiMWFlY2Y5NWYyMTE0NWFjYjdiNC4uMzY0MDEwNWMxODdjYzkwNWNjMGRhOWU4NGM0ZDVk Mjc3Y2EwZDdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTA2LTE5ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEFkZCBHcmlkU3Bhbjo6aXRlcmF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDA1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE9uY2UgdGhhdCBHcmlkUmVzb2x2ZWRQb3NpdGlvbiBo YXMgYmVlbiBpbnRyb2R1Y2VkIGluIHIxNjk5MzQsIHRoaXMKKyAgICAgICAgcGF0Y2ggYWRkcyBh IEdyaWRTcGFuOjppdGVyYXRvciB3aGljaCBhbGxvd3MgdG8gc2ltcGxpZnkgdGhlIGxvb3BzIG92 ZXIKKyAgICAgICAgR3JpZFJlc29sdmVkUG9zaXRpb25zLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyBhcyBpdCBpcyBhbHJlYWR5IGNvdmVyZWQgYnkgY3VycmVudCB0ZXN0cworICAgICAgICAoZmFz dC9jc3MtZ3JpZC1sYXlvdXQvKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmNvbXB1dGVOb3JtYWxpemVkRnJhY3Rp b25CcmVhZHRoKTogQWRhcHQgbG9vcCB0bworICAgICAgICB1c2UgR3JpZFNwYW46Oml0ZXJhdG9y LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aW5zZXJ0SXRlbUludG9HcmlkKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpncmlkQXJlYUJyZWFkdGhGb3JDaGls ZCk6IERpdHRvLgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9HcmlkQ29vcmRpbmF0ZS5oOiBE ZWZpbmUgR3JpZFNwYW46Oml0ZXJhdG9yLgorICAgICAgICAoV2ViQ29yZTo6R3JpZFNwYW46OmJl Z2luKTogUmV0dXJuIHJlc29sdmVkIGluaXRpYWwgcG9zaXRpb24uCisgICAgICAgIChXZWJDb3Jl OjpHcmlkU3Bhbjo6ZW5kKTogUmV0dXJuIG5leHQgdG8gcmVzb2x2ZWQgZmluYWwgcG9zaXRpb24u CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0dyaWRSZXNvbHZlZFBvc2l0aW9uLmg6CisgICAg ICAgIChXZWJDb3JlOjpHcmlkUmVzb2x2ZWRQb3NpdGlvbjo6b3BlcmF0b3IhPSk6IEFkZCBub3Qg ZXF1YWwgb3BlcmF0b3IuCisKIDIwMTQtMDYtMTggIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0Bp Z2FsaWEuY29tPgogCiAgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2ssIEZpbGVU aHJlYWQ6OlRhc2sgcGFyYW1ldGVycyBzaG91bGQgYmUgdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggNjFjZDI2Y2U2ZDcxNWE0MjQyMjUyYWQzNDQzMWM1 OGNmMTBhZmQzYi4uZjA2NjhiYjU5NDk0OTUwYzUwMGQ2YTAwZTI5NGVlN2U5ZTViYmI5NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtNDAxLDcgKzQwMSw3IEBA IGRvdWJsZSBSZW5kZXJHcmlkOjpjb21wdXRlTm9ybWFsaXplZEZyYWN0aW9uQnJlYWR0aChWZWN0 b3I8R3JpZFRyYWNrPiYgdHJhY2tzLCBjCiAgICAgLy8gfGF2YWlsYWJsZUxvZ2ljYWxTcGFjZXwg YWxyZWFkeSBhY2NvdW50cyBmb3IgdGhlIHVzZWQgYnJlYWR0aHMgc28gbm8gbmVlZCB0byByZW1v dmUgaXQgaGVyZS4KIAogICAgIFZlY3RvcjxHcmlkVHJhY2tGb3JOb3JtYWxpemF0aW9uPiB0cmFj a3NGb3JOb3JtYWxpemF0aW9uOwotICAgIGZvciAoR3JpZFJlc29sdmVkUG9zaXRpb24gcG9zaXRp b24gPSB0cmFja3NTcGFuLnJlc29sdmVkSW5pdGlhbFBvc2l0aW9uOyBwb3NpdGlvbiA8PSB0cmFj a3NTcGFuLnJlc29sdmVkRmluYWxQb3NpdGlvbjsgKytwb3NpdGlvbikgeworICAgIGZvciAoYXV0 byBwb3NpdGlvbiA9IHRyYWNrc1NwYW4uYmVnaW4oKTsgcG9zaXRpb24gIT0gdHJhY2tzU3Bhbi5l bmQoKTsgKytwb3NpdGlvbikgewogICAgICAgICBjb25zdCBHcmlkVHJhY2tTaXplJiB0cmFja1Np emUgPSBncmlkVHJhY2tTaXplKGRpcmVjdGlvbiwgcG9zaXRpb24udG9JbnQoKSk7CiAgICAgICAg IGlmICghdHJhY2tTaXplLm1heFRyYWNrQnJlYWR0aCgpLmlzRmxleCgpKQogICAgICAgICAgICAg Y29udGludWU7CkBAIC02MjMsOCArNjIzLDggQEAgdm9pZCBSZW5kZXJHcmlkOjpncm93R3JpZChH cmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKQogCiB2b2lkIFJlbmRlckdyaWQ6Omlu c2VydEl0ZW1JbnRvR3JpZChSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBHcmlkQ29vcmRpbmF0ZSYg Y29vcmRpbmF0ZSkKIHsKLSAgICBmb3IgKEdyaWRSZXNvbHZlZFBvc2l0aW9uIHJvdyA9IGNvb3Jk aW5hdGUucm93cy5yZXNvbHZlZEluaXRpYWxQb3NpdGlvbjsgcm93IDw9IGNvb3JkaW5hdGUucm93 cy5yZXNvbHZlZEZpbmFsUG9zaXRpb247ICsrcm93KSB7Ci0gICAgICAgIGZvciAoR3JpZFJlc29s dmVkUG9zaXRpb24gY29sdW1uID0gY29vcmRpbmF0ZS5jb2x1bW5zLnJlc29sdmVkSW5pdGlhbFBv c2l0aW9uOyBjb2x1bW4gPD0gY29vcmRpbmF0ZS5jb2x1bW5zLnJlc29sdmVkRmluYWxQb3NpdGlv bjsgKytjb2x1bW4pCisgICAgZm9yIChhdXRvIHJvdyA9IGNvb3JkaW5hdGUucm93cy5iZWdpbigp OyByb3cgIT0gY29vcmRpbmF0ZS5yb3dzLmVuZCgpOyArK3JvdykgeworICAgICAgICBmb3IgKGF1 dG8gY29sdW1uID0gY29vcmRpbmF0ZS5jb2x1bW5zLmJlZ2luKCk7IGNvbHVtbiAhPSBjb29yZGlu YXRlLmNvbHVtbnMuZW5kKCk7ICsrY29sdW1uKQogICAgICAgICAgICAgbV9ncmlkW3Jvdy50b0lu dCgpXVtjb2x1bW4udG9JbnQoKV0uYXBwZW5kKGNoaWxkKTsKICAgICB9CiAgICAgbV9ncmlkSXRl bUNvb3JkaW5hdGUuc2V0KGNoaWxkLCBjb29yZGluYXRlKTsKQEAgLTgzNyw3ICs4MzcsNyBAQCBM YXlvdXRVbml0IFJlbmRlckdyaWQ6OmdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNvbnN0IFJlbmRl ckJveCogY2hpbGQsIEdyaWRUcmFjawogICAgIGNvbnN0IEdyaWRDb29yZGluYXRlJiBjb29yZGlu YXRlID0gY2FjaGVkR3JpZENvb3JkaW5hdGUoY2hpbGQpOwogICAgIGNvbnN0IEdyaWRTcGFuJiBz cGFuID0gKGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5zKSA/IGNvb3JkaW5hdGUuY29sdW1ucyA6IGNv b3JkaW5hdGUucm93czsKICAgICBMYXlvdXRVbml0IGdyaWRBcmVhQnJlYWR0aCA9IDA7Ci0gICAg Zm9yIChHcmlkUmVzb2x2ZWRQb3NpdGlvbiB0cmFja1Bvc2l0aW9uID0gc3Bhbi5yZXNvbHZlZElu aXRpYWxQb3NpdGlvbjsgdHJhY2tQb3NpdGlvbiA8PSBzcGFuLnJlc29sdmVkRmluYWxQb3NpdGlv bjsgKyt0cmFja1Bvc2l0aW9uKQorICAgIGZvciAoYXV0byB0cmFja1Bvc2l0aW9uID0gc3Bhbi5i ZWdpbigpOyB0cmFja1Bvc2l0aW9uICE9IHNwYW4uZW5kKCk7ICsrdHJhY2tQb3NpdGlvbikKICAg ICAgICAgZ3JpZEFyZWFCcmVhZHRoICs9IHRyYWNrc1t0cmFja1Bvc2l0aW9uLnRvSW50KCldLm1f dXNlZEJyZWFkdGg7CiAgICAgcmV0dXJuIGdyaWRBcmVhQnJlYWR0aDsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkQ29vcmRpbmF0ZS5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRDb29yZGluYXRlLmgKaW5kZXggOTA4ZjM2NzJi Njk1MzQ2NjU1YWQ5ZjlkZGMyZjNjOWYyODRiZTY3My4uMzljNGEzYmZiNDZhMDg1NjY0M2ZlMTZm MmIyMzczZmRkNTI2ZDQ5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL0dyaWRDb29yZGluYXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L0dyaWRDb29yZGluYXRlLmgKQEAgLTU5LDYgKzU5LDE4IEBAIHB1YmxpYzoKIAogICAgIEdyaWRS ZXNvbHZlZFBvc2l0aW9uIHJlc29sdmVkSW5pdGlhbFBvc2l0aW9uOwogICAgIEdyaWRSZXNvbHZl ZFBvc2l0aW9uIHJlc29sdmVkRmluYWxQb3NpdGlvbjsKKworICAgIHR5cGVkZWYgR3JpZFJlc29s dmVkUG9zaXRpb24gaXRlcmF0b3I7CisKKyAgICBpdGVyYXRvciBiZWdpbigpIGNvbnN0CisgICAg eworICAgICAgICByZXR1cm4gcmVzb2x2ZWRJbml0aWFsUG9zaXRpb247CisgICAgfQorCisgICAg aXRlcmF0b3IgZW5kKCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiByZXNvbHZlZEZpbmFs UG9zaXRpb24ubmV4dCgpOworICAgIH0KIH07CiAKIC8vIFRoaXMgcmVwcmVzZW50cyBhIGdyaWQg YXJlYSB0aGF0IHNwYW5zIGluIGJvdGggcm93cycgYW5kIGNvbHVtbnMnIGRpcmVjdGlvbi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUmVzb2x2ZWRQb3Np dGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRSZXNvbHZlZFBvc2l0 aW9uLmgKaW5kZXggOTAxNjc0MTZkZTEwYjA5ZDNjY2FlZjE2ZDE5NDNhMjRjMGQ5YWRhYS4uN2Q1 ZTcyMDhmYjBhYzE4MGZjNzIyZmFjOWRkZmUxZTI0NWY3YjQyMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRSZXNvbHZlZFBvc2l0aW9uLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRSZXNvbHZlZFBvc2l0aW9uLmgKQEAgLTEw Niw2ICsxMDYsMTEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV9pbnRlZ2VyUG9zaXRpb24g PT0gb3RoZXIubV9pbnRlZ2VyUG9zaXRpb247CiAgICAgfQogCisgICAgYm9vbCBvcGVyYXRvciE9 KGNvbnN0IEdyaWRSZXNvbHZlZFBvc2l0aW9uJiBvdGhlcikgY29uc3QKKyAgICB7CisgICAgICAg IHJldHVybiBtX2ludGVnZXJQb3NpdGlvbiAhPSBvdGhlci5tX2ludGVnZXJQb3NpdGlvbjsKKyAg ICB9CisKICAgICBib29sIG9wZXJhdG9yPChjb25zdCBHcmlkUmVzb2x2ZWRQb3NpdGlvbiYgb3Ro ZXIpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9pbnRlZ2VyUG9zaXRpb24gPCBvdGhl ci5tX2ludGVnZXJQb3NpdGlvbjsK 233392 2014-06-19 16:22:06 -0700 2014-06-20 01:29:30 -0700 Patch bug-134058-20140620012143.patch text/plain 5569 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjlhZGE5NDFhYWJmMjE0 YjJiM2JiMWFlY2Y5NWYyMTE0NWFjYjdiNC4uYzYyZjlkZjFlODc3MmY5NDZmZDY5NTI4YjMxMDlk OTVlOThiOWRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTA2LTE5ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEFkZCBHcmlkU3Bhbjo6aXRlcmF0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDA1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE9uY2UgdGhhdCBHcmlkUmVzb2x2ZWRQb3NpdGlvbiBo YXMgYmVlbiBpbnRyb2R1Y2VkIGluIHIxNjk5MzQsIHRoaXMKKyAgICAgICAgcGF0Y2ggYWRkcyBh IEdyaWRTcGFuOjppdGVyYXRvciB3aGljaCBhbGxvd3MgdG8gc2ltcGxpZnkgdGhlIGxvb3BzIG92 ZXIKKyAgICAgICAgR3JpZFJlc29sdmVkUG9zaXRpb25zLgorICAgICAgICBGcm9tIG5vdyBvbiB3 ZSBjb3VsZCB1c2UgcmFuZ2UtYmFzZWQgZm9yIGxvb3BzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyBhcyBpdCBpcyBhbHJlYWR5IGNvdmVyZWQgYnkgY3VycmVudCB0ZXN0cworICAgICAgICAoZmFz dC9jc3MtZ3JpZC1sYXlvdXQvKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmNvbXB1dGVOb3JtYWxpemVkRnJhY3Rp b25CcmVhZHRoKTogQ2hhbmdlIGxvb3AgdG8KKyAgICAgICAgcmFuZ2VkLWJhc2VkIGZvci4KKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Omluc2VydEl0ZW1JbnRvR3JpZCk6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Z3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQpOiBE aXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvR3JpZENvb3JkaW5hdGUuaDogRGVmaW5l IEdyaWRTcGFuOjppdGVyYXRvci4KKyAgICAgICAgKFdlYkNvcmU6OkdyaWRTcGFuOjpiZWdpbik6 IFJldHVybiByZXNvbHZlZCBpbml0aWFsIHBvc2l0aW9uLgorICAgICAgICAoV2ViQ29yZTo6R3Jp ZFNwYW46OmVuZCk6IFJldHVybiBuZXh0IHRvIHJlc29sdmVkIGZpbmFsIHBvc2l0aW9uLgorICAg ICAgICAqIHJlbmRlcmluZy9zdHlsZS9HcmlkUmVzb2x2ZWRQb3NpdGlvbi5oOgorICAgICAgICAo V2ViQ29yZTo6R3JpZFJlc29sdmVkUG9zaXRpb246Om9wZXJhdG9yKik6IEFkZCBvcGVyYXRvciBy ZXF1aXJlZCBieQorICAgICAgICByYW5nZS1iYXNlZCBmb3IgbG9vcHMuCisgICAgICAgIChXZWJD b3JlOjpHcmlkUmVzb2x2ZWRQb3NpdGlvbjo6b3BlcmF0b3IhPSk6IEFkZCBub3QgZXF1YWwgb3Bl cmF0b3IuCisKIDIwMTQtMDYtMTggIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29t PgogCiAgICAgICAgIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ6OlRhc2ssIEZpbGVUaHJlYWQ6OlRh c2sgcGFyYW1ldGVycyBzaG91bGQgYmUgdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5jcHAKaW5kZXggNjFjZDI2Y2U2ZDcxNWE0MjQyMjUyYWQzNDQzMWM1OGNmMTBhZmQz Yi4uZTZjZDk1MjhmNWJjYzgwMTQ4ZmIwMGQ1YTQ4NWZlM2JmYzY2NjY5MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtNDAxLDcgKzQwMSw3IEBAIGRvdWJsZSBS ZW5kZXJHcmlkOjpjb21wdXRlTm9ybWFsaXplZEZyYWN0aW9uQnJlYWR0aChWZWN0b3I8R3JpZFRy YWNrPiYgdHJhY2tzLCBjCiAgICAgLy8gfGF2YWlsYWJsZUxvZ2ljYWxTcGFjZXwgYWxyZWFkeSBh Y2NvdW50cyBmb3IgdGhlIHVzZWQgYnJlYWR0aHMgc28gbm8gbmVlZCB0byByZW1vdmUgaXQgaGVy ZS4KIAogICAgIFZlY3RvcjxHcmlkVHJhY2tGb3JOb3JtYWxpemF0aW9uPiB0cmFja3NGb3JOb3Jt YWxpemF0aW9uOwotICAgIGZvciAoR3JpZFJlc29sdmVkUG9zaXRpb24gcG9zaXRpb24gPSB0cmFj a3NTcGFuLnJlc29sdmVkSW5pdGlhbFBvc2l0aW9uOyBwb3NpdGlvbiA8PSB0cmFja3NTcGFuLnJl c29sdmVkRmluYWxQb3NpdGlvbjsgKytwb3NpdGlvbikgeworICAgIGZvciAoYXV0byBwb3NpdGlv biA6IHRyYWNrc1NwYW4pIHsKICAgICAgICAgY29uc3QgR3JpZFRyYWNrU2l6ZSYgdHJhY2tTaXpl ID0gZ3JpZFRyYWNrU2l6ZShkaXJlY3Rpb24sIHBvc2l0aW9uLnRvSW50KCkpOwogICAgICAgICBp ZiAoIXRyYWNrU2l6ZS5tYXhUcmFja0JyZWFkdGgoKS5pc0ZsZXgoKSkKICAgICAgICAgICAgIGNv bnRpbnVlOwpAQCAtNjIzLDggKzYyMyw4IEBAIHZvaWQgUmVuZGVyR3JpZDo6Z3Jvd0dyaWQoR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbikKIAogdm9pZCBSZW5kZXJHcmlkOjppbnNl cnRJdGVtSW50b0dyaWQoUmVuZGVyQm94KiBjaGlsZCwgY29uc3QgR3JpZENvb3JkaW5hdGUmIGNv b3JkaW5hdGUpCiB7Ci0gICAgZm9yIChHcmlkUmVzb2x2ZWRQb3NpdGlvbiByb3cgPSBjb29yZGlu YXRlLnJvd3MucmVzb2x2ZWRJbml0aWFsUG9zaXRpb247IHJvdyA8PSBjb29yZGluYXRlLnJvd3Mu cmVzb2x2ZWRGaW5hbFBvc2l0aW9uOyArK3JvdykgewotICAgICAgICBmb3IgKEdyaWRSZXNvbHZl ZFBvc2l0aW9uIGNvbHVtbiA9IGNvb3JkaW5hdGUuY29sdW1ucy5yZXNvbHZlZEluaXRpYWxQb3Np dGlvbjsgY29sdW1uIDw9IGNvb3JkaW5hdGUuY29sdW1ucy5yZXNvbHZlZEZpbmFsUG9zaXRpb247 ICsrY29sdW1uKQorICAgIGZvciAoYXV0byByb3cgOiBjb29yZGluYXRlLnJvd3MpIHsKKyAgICAg ICAgZm9yIChhdXRvIGNvbHVtbiA6IGNvb3JkaW5hdGUuY29sdW1ucykKICAgICAgICAgICAgIG1f Z3JpZFtyb3cudG9JbnQoKV1bY29sdW1uLnRvSW50KCldLmFwcGVuZChjaGlsZCk7CiAgICAgfQog ICAgIG1fZ3JpZEl0ZW1Db29yZGluYXRlLnNldChjaGlsZCwgY29vcmRpbmF0ZSk7CkBAIC04Mzcs NyArODM3LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpncmlkQXJlYUJyZWFkdGhGb3JDaGls ZChjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBHcmlkVHJhY2sKICAgICBjb25zdCBHcmlkQ29vcmRp bmF0ZSYgY29vcmRpbmF0ZSA9IGNhY2hlZEdyaWRDb29yZGluYXRlKGNoaWxkKTsKICAgICBjb25z dCBHcmlkU3BhbiYgc3BhbiA9IChkaXJlY3Rpb24gPT0gRm9yQ29sdW1ucykgPyBjb29yZGluYXRl LmNvbHVtbnMgOiBjb29yZGluYXRlLnJvd3M7CiAgICAgTGF5b3V0VW5pdCBncmlkQXJlYUJyZWFk dGggPSAwOwotICAgIGZvciAoR3JpZFJlc29sdmVkUG9zaXRpb24gdHJhY2tQb3NpdGlvbiA9IHNw YW4ucmVzb2x2ZWRJbml0aWFsUG9zaXRpb247IHRyYWNrUG9zaXRpb24gPD0gc3Bhbi5yZXNvbHZl ZEZpbmFsUG9zaXRpb247ICsrdHJhY2tQb3NpdGlvbikKKyAgICBmb3IgKGF1dG8gdHJhY2tQb3Np dGlvbiA6IHNwYW4pCiAgICAgICAgIGdyaWRBcmVhQnJlYWR0aCArPSB0cmFja3NbdHJhY2tQb3Np dGlvbi50b0ludCgpXS5tX3VzZWRCcmVhZHRoOwogICAgIHJldHVybiBncmlkQXJlYUJyZWFkdGg7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZENvb3Jk aW5hdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkQ29vcmRpbmF0ZS5o CmluZGV4IDkwOGYzNjcyYjY5NTM0NjY1NWFkOWY5ZGRjMmYzYzlmMjg0YmU2NzMuLjM5YzRhM2Jm YjQ2YTA4NTY2NDNmZTE2ZjJiMjM3M2ZkZDUyNmQ0OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkQ29vcmRpbmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9HcmlkQ29vcmRpbmF0ZS5oCkBAIC01OSw2ICs1OSwxOCBAQCBwdWJs aWM6CiAKICAgICBHcmlkUmVzb2x2ZWRQb3NpdGlvbiByZXNvbHZlZEluaXRpYWxQb3NpdGlvbjsK ICAgICBHcmlkUmVzb2x2ZWRQb3NpdGlvbiByZXNvbHZlZEZpbmFsUG9zaXRpb247CisKKyAgICB0 eXBlZGVmIEdyaWRSZXNvbHZlZFBvc2l0aW9uIGl0ZXJhdG9yOworCisgICAgaXRlcmF0b3IgYmVn aW4oKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIHJlc29sdmVkSW5pdGlhbFBvc2l0aW9u OworICAgIH0KKworICAgIGl0ZXJhdG9yIGVuZCgpIGNvbnN0CisgICAgeworICAgICAgICByZXR1 cm4gcmVzb2x2ZWRGaW5hbFBvc2l0aW9uLm5leHQoKTsKKyAgICB9CiB9OwogCiAvLyBUaGlzIHJl cHJlc2VudHMgYSBncmlkIGFyZWEgdGhhdCBzcGFucyBpbiBib3RoIHJvd3MnIGFuZCBjb2x1bW5z JyBkaXJlY3Rpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv R3JpZFJlc29sdmVkUG9zaXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9H cmlkUmVzb2x2ZWRQb3NpdGlvbi5oCmluZGV4IDkwMTY3NDE2ZGUxMGIwOWQzY2NhZWYxNmQxOTQz YTI0YzBkOWFkYWEuLmRiM2QyMWEzZGUwMDZmZmMzOThjODAwNWZhMjkyYjVlN2I0MGQ3ZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUmVzb2x2ZWRQb3Np dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUmVzb2x2ZWRQ b3NpdGlvbi5oCkBAIC05NSw2ICs5NSwxMSBAQCBwdWJsaWM6CiAgICAgICAgIG1faW50ZWdlclBv c2l0aW9uID0gYWRqdXN0R3JpZFBvc2l0aW9uRm9yU2lkZShpbnRlZ2VyUG9zaXRpb24sIHNpZGUp Lm1faW50ZWdlclBvc2l0aW9uOwogICAgIH0KIAorICAgIEdyaWRSZXNvbHZlZFBvc2l0aW9uJiBv cGVyYXRvciooKQorICAgIHsKKyAgICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KKwogICAgIEdy aWRSZXNvbHZlZFBvc2l0aW9uJiBvcGVyYXRvcisrKCkKICAgICB7CiAgICAgICAgIG1faW50ZWdl clBvc2l0aW9uKys7CkBAIC0xMDYsNiArMTExLDExIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJu IG1faW50ZWdlclBvc2l0aW9uID09IG90aGVyLm1faW50ZWdlclBvc2l0aW9uOwogICAgIH0KIAor ICAgIGJvb2wgb3BlcmF0b3IhPShjb25zdCBHcmlkUmVzb2x2ZWRQb3NpdGlvbiYgb3RoZXIpIGNv bnN0CisgICAgeworICAgICAgICByZXR1cm4gbV9pbnRlZ2VyUG9zaXRpb24gIT0gb3RoZXIubV9p bnRlZ2VyUG9zaXRpb247CisgICAgfQorCiAgICAgYm9vbCBvcGVyYXRvcjwoY29uc3QgR3JpZFJl c29sdmVkUG9zaXRpb24mIG90aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIG1faW50 ZWdlclBvc2l0aW9uIDwgb3RoZXIubV9pbnRlZ2VyUG9zaXRpb247Cg==