150891 2015-11-04 04:31:39 -0800 [css-grid] Grid placement conflict handling 2015-11-09 04:24:53 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60731 1 svillar svillar benjamin commit-queue darin esprehn+autocc glenn jfernandez kling kondapallykalyan rego svillar oldest_to_newest 1139325 0 svillar 2015-11-04 04:31:39 -0800 The specs have recently changed. If the placement for a grid item contains two lines, and the start line is further end-ward than the end line, swap the two lines. 1139623 1 264865 svillar 2015-11-05 08:11:49 -0800 Created attachment 264865 Patch 1139978 2 264865 darin 2015-11-06 09:02:55 -0800 Comment on attachment 264865 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=264865&action=review > Source/WebCore/rendering/style/GridResolvedPosition.cpp:300 > + m_integerPosition = isStartSide(side) ? integerPosition : std::max<int>(0, integerPosition - 1); This conversion to int and back to unsigned is not a clean way to clamp at zero? I suggest instead we write: if (!isStartSide(side) && integerPosition) --integerPosition; m_integerPosition = integerPosition; > Source/WebCore/rendering/style/GridResolvedPosition.h:138 > + return std::max<int>(m_integerPosition - 1, 0); Same issue here with converting to and from int. I would instead write: return m_integerPosition ? m_integerPosition - 1 : 0; 1140331 3 svillar 2015-11-09 04:24:53 -0800 Committed r192153: <http://trac.webkit.org/changeset/192153> 264865 2015-11-05 08:11:49 -0800 2015-11-06 09:02:55 -0800 Patch bug-150891-20151105171049.patch text/plain 15290 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxOTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjllMDljYTg0NWRlZGZk ZTRiOGViZTAxMzAyOTA3MjAzNmUyOWRlZC4uOTFhOGIyOTBkNGQ3ZGUzMTMzMDYwZmUyZDk2NzM0 N2M2YWVlMDYyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE1LTExLTA1ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gR3JpZCBwbGFjZW1lbnQgY29uZmxpY3QgaGFuZGxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDg5MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHRoZSBwbGFjZW1lbnQgZm9yIGEgZ3JpZCBp dGVtIGNvbnRhaW5zIHR3byBsaW5lcywgYW5kIHRoZQorICAgICAgICBzdGFydCBsaW5lIGlzIGZ1 cnRoZXIgZW5kLXdhcmQgdGhhbiB0aGUgZW5kIGxpbmUsIHN3YXAgdGhlIHR3bworICAgICAgICBs aW5lcy4gSWYgdGhlIHN0YXJ0IGxpbmUgaXMgZXF1YWwgdG8gdGhlIGVuZCBsaW5lLCByZW1vdmUg dGhlCisgICAgICAgIGVuZCBsaW5lLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3NzLWdyaWQtbGF5 b3V0L3N3YXAtbGluZXMtaWYtc3RhcnQtaXMtZnVydGhlci1lbmR3YXJkLXRoYW4tZW5kLWxpbmUu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL0dyaWRSZXNvbHZlZFBvc2l0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVOYW1lZEdyaWRMaW5lUG9zaXRpb25Gcm9tU3R5 bGUpOgorICAgICAgICAoV2ViQ29yZTo6cmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21TdHlsZSk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmlkUmVzb2x2ZWRQb3NpdGlvbjo6R3JpZFJlc29sdmVkUG9zaXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6R3JpZFJlc29sdmVkUG9zaXRpb246OnJlc29sdmVHcmlk UG9zaXRpb25zRnJvbVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OmFkanVzdEdyaWRQb3NpdGlv bkZvclNpZGUpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9HcmlkUmVzb2x2 ZWRQb3NpdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6R3JpZFJlc29sdmVkUG9zaXRpb246OnBy ZXYpOgorCiAyMDE1LTExLTAzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBVc2UgR3N0QnVzIHN5bmMgbWVzc2FnZSBoYW5k bGVyIGFuZCBzY2hlZHVsZSB0YXNrcyB0byB0aGUgbWFpbiB0aHJlYWQgd2l0aCBSdW5Mb29wOjpk aXNwYXRjaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRS ZXNvbHZlZFBvc2l0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9Hcmlk UmVzb2x2ZWRQb3NpdGlvbi5jcHAKaW5kZXggMjJhODRiMjQ0M2M0MjdjMjQ2ZWZlODU5ZTNlYzRj MTNhYWZhNjQwMy4uMjRlMzMxZThjMzQwNTcyN2M5ZWMwMzllZTRiYjE5MTkyMGYyYzkyNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRSZXNvbHZlZFBvc2l0 aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFJlc29sdmVk UG9zaXRpb24uY3BwCkBAIC0xMTQsMTUgKzExNCw2IEBAIHN0YXRpYyBHcmlkUmVzb2x2ZWRQb3Np dGlvbiBhZGp1c3RHcmlkUG9zaXRpb25Gb3JSb3dFbmRDb2x1bW5FbmRTaWRlKHVuc2lnbmVkIHJl CiAgICAgcmV0dXJuIHJlc29sdmVkUG9zaXRpb24gPyBHcmlkUmVzb2x2ZWRQb3NpdGlvbihyZXNv bHZlZFBvc2l0aW9uIC0gMSkgOiBHcmlkUmVzb2x2ZWRQb3NpdGlvbigwKTsKIH0KIAotc3RhdGlj IEdyaWRSZXNvbHZlZFBvc2l0aW9uIGFkanVzdEdyaWRQb3NpdGlvbkZvclNpZGUodW5zaWduZWQg cmVzb2x2ZWRQb3NpdGlvbiwgR3JpZFBvc2l0aW9uU2lkZSBzaWRlKQotewotICAgIC8vIEFuIGl0 ZW0gZmluaXNoaW5nIG9uIHRoZSBOLXRoIGxpbmUgYmVsb25ncyB0byB0aGUgTi0xLXRoIGNlbGwu Ci0gICAgaWYgKHNpZGUgPT0gQ29sdW1uRW5kU2lkZSB8fCBzaWRlID09IFJvd0VuZFNpZGUpCi0g ICAgICAgIHJldHVybiBhZGp1c3RHcmlkUG9zaXRpb25Gb3JSb3dFbmRDb2x1bW5FbmRTaWRlKHJl c29sdmVkUG9zaXRpb24pOwotCi0gICAgcmV0dXJuIEdyaWRSZXNvbHZlZFBvc2l0aW9uKHJlc29s dmVkUG9zaXRpb24pOwotfQotCiBzdGF0aWMgR3JpZFJlc29sdmVkUG9zaXRpb24gcmVzb2x2ZU5h bWVkR3JpZExpbmVQb3NpdGlvbkZyb21TdHlsZShjb25zdCBSZW5kZXJTdHlsZSYgZ3JpZENvbnRh aW5lclN0eWxlLCBjb25zdCBHcmlkUG9zaXRpb24mIHBvc2l0aW9uLCBHcmlkUG9zaXRpb25TaWRl IHNpZGUpCiB7CiAgICAgQVNTRVJUKCFwb3NpdGlvbi5uYW1lZEdyaWRMaW5lKCkuaXNOdWxsKCkp OwpAQCAtMTMzLDcgKzEyNCw3IEBAIHN0YXRpYyBHcmlkUmVzb2x2ZWRQb3NpdGlvbiByZXNvbHZl TmFtZWRHcmlkTGluZVBvc2l0aW9uRnJvbVN0eWxlKGNvbnN0IFJlbmRlclN0CiAgICAgICAgIGlm IChwb3NpdGlvbi5pc1Bvc2l0aXZlKCkpCiAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAg Y29uc3QgdW5zaWduZWQgbGFzdExpbmUgPSBleHBsaWNpdEdyaWRTaXplRm9yU2lkZShncmlkQ29u dGFpbmVyU3R5bGUsIHNpZGUpOwotICAgICAgICByZXR1cm4gYWRqdXN0R3JpZFBvc2l0aW9uRm9y U2lkZShsYXN0TGluZSwgc2lkZSk7CisgICAgICAgIHJldHVybiBsYXN0TGluZTsKICAgICB9CiAK ICAgICB1bnNpZ25lZCBuYW1lZEdyaWRMaW5lSW5kZXg7CkBAIC0xNDEsNyArMTMyLDcgQEAgc3Rh dGljIEdyaWRSZXNvbHZlZFBvc2l0aW9uIHJlc29sdmVOYW1lZEdyaWRMaW5lUG9zaXRpb25Gcm9t U3R5bGUoY29uc3QgUmVuZGVyU3QKICAgICAgICAgbmFtZWRHcmlkTGluZUluZGV4ID0gc3RkOjpt aW48dW5zaWduZWQ+KHBvc2l0aW9uLmludGVnZXJQb3NpdGlvbigpLCBpdC0+dmFsdWUuc2l6ZSgp KSAtIDE7CiAgICAgZWxzZQogICAgICAgICBuYW1lZEdyaWRMaW5lSW5kZXggPSBzdGQ6Om1heDxp bnQ+KDAsIGl0LT52YWx1ZS5zaXplKCkgLSBhYnMocG9zaXRpb24uaW50ZWdlclBvc2l0aW9uKCkp KTsKLSAgICByZXR1cm4gYWRqdXN0R3JpZFBvc2l0aW9uRm9yU2lkZShpdC0+dmFsdWVbbmFtZWRH cmlkTGluZUluZGV4XSwgc2lkZSk7CisgICAgcmV0dXJuIGl0LT52YWx1ZVtuYW1lZEdyaWRMaW5l SW5kZXhdOwogfQogCiBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGZpcnN0TmFtZWRHcmlkTGluZUJl Zm9yZVBvc2l0aW9uKHVuc2lnbmVkIHBvc2l0aW9uLCBjb25zdCBWZWN0b3I8dW5zaWduZWQ+JiBn cmlkTGluZXMpCkBAIC0yNTUsNyArMjQ2LDcgQEAgc3RhdGljIEdyaWRSZXNvbHZlZFBvc2l0aW9u IHJlc29sdmVHcmlkUG9zaXRpb25Gcm9tU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIGdyaWQKIAog ICAgICAgICAvLyBIYW5kbGUgPGludGVnZXI+IGV4cGxpY2l0IHBvc2l0aW9uLgogICAgICAgICBp ZiAocG9zaXRpb24uaXNQb3NpdGl2ZSgpKQotICAgICAgICAgICAgcmV0dXJuIGFkanVzdEdyaWRQ b3NpdGlvbkZvclNpZGUocG9zaXRpb24uaW50ZWdlclBvc2l0aW9uKCkgLSAxLCBzaWRlKTsKKyAg ICAgICAgICAgIHJldHVybiBwb3NpdGlvbi5pbnRlZ2VyUG9zaXRpb24oKSAtIDE7CiAKICAgICAg ICAgdW5zaWduZWQgcmVzb2x2ZWRQb3NpdGlvbiA9IGFicyhwb3NpdGlvbi5pbnRlZ2VyUG9zaXRp b24oKSkgLSAxOwogICAgICAgICBjb25zdCB1bnNpZ25lZCBlbmRPZlRyYWNrID0gZXhwbGljaXRH cmlkU2l6ZUZvclNpZGUoZ3JpZENvbnRhaW5lclN0eWxlLCBzaWRlKTsKQEAgLTI2NCw3ICsyNTUs NyBAQCBzdGF0aWMgR3JpZFJlc29sdmVkUG9zaXRpb24gcmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21T dHlsZShjb25zdCBSZW5kZXJTdHlsZSYgZ3JpZAogICAgICAgICBpZiAoZW5kT2ZUcmFjayA8IHJl c29sdmVkUG9zaXRpb24pCiAgICAgICAgICAgICByZXR1cm4gMDsKIAotICAgICAgICByZXR1cm4g YWRqdXN0R3JpZFBvc2l0aW9uRm9yU2lkZShlbmRPZlRyYWNrIC0gcmVzb2x2ZWRQb3NpdGlvbiwg c2lkZSk7CisgICAgICAgIHJldHVybiBlbmRPZlRyYWNrIC0gcmVzb2x2ZWRQb3NpdGlvbjsKICAg ICB9CiAgICAgY2FzZSBOYW1lZEdyaWRBcmVhUG9zaXRpb246CiAgICAgewpAQCAtMjc3LDEzICsy NjgsMTMgQEAgc3RhdGljIEdyaWRSZXNvbHZlZFBvc2l0aW9uIHJlc29sdmVHcmlkUG9zaXRpb25G cm9tU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIGdyaWQKICAgICAgICAgY29uc3QgTmFtZWRHcmlk TGluZXNNYXAmIGdyaWRMaW5lTmFtZXMgPSBncmlkTGluZXNGb3JTaWRlKGdyaWRDb250YWluZXJT dHlsZSwgc2lkZSk7CiAgICAgICAgIGF1dG8gaW1wbGljaXRMaW5lID0gZ3JpZExpbmVOYW1lcy5m aW5kKGltcGxpY2l0TmFtZWRHcmlkTGluZUZvclNpZGUobmFtZWRHcmlkTGluZSwgc2lkZSkpOwog ICAgICAgICBpZiAoaW1wbGljaXRMaW5lICE9IGdyaWRMaW5lTmFtZXMuZW5kKCkpCi0gICAgICAg ICAgICByZXR1cm4gYWRqdXN0R3JpZFBvc2l0aW9uRm9yU2lkZShpbXBsaWNpdExpbmUtPnZhbHVl WzBdLCBzaWRlKTsKKyAgICAgICAgICAgIHJldHVybiBpbXBsaWNpdExpbmUtPnZhbHVlWzBdOwog CiAgICAgICAgIC8vIE90aGVyd2lzZSwgaWYgdGhlcmUgaXMgYSBuYW1lZCBsaW5lIHdpdGggdGhl IHNwZWNpZmllZCBuYW1lLCBjb250cmlidXRlcyB0aGUgZmlyc3Qgc3VjaCBsaW5lIHRvIHRoZSBn cmlkCiAgICAgICAgIC8vIGl0ZW0ncyBwbGFjZW1lbnQuCiAgICAgICAgIGF1dG8gZXhwbGljaXRM aW5lID0gZ3JpZExpbmVOYW1lcy5maW5kKG5hbWVkR3JpZExpbmUpOwogICAgICAgICBpZiAoZXhw bGljaXRMaW5lICE9IGdyaWRMaW5lTmFtZXMuZW5kKCkpCi0gICAgICAgICAgICByZXR1cm4gYWRq dXN0R3JpZFBvc2l0aW9uRm9yU2lkZShleHBsaWNpdExpbmUtPnZhbHVlWzBdLCBzaWRlKTsKKyAg ICAgICAgICAgIHJldHVybiBleHBsaWNpdExpbmUtPnZhbHVlWzBdOwogCiAgICAgICAgIC8vIElm IG5vbmUgb2YgdGhlIGFib3ZlIHdvcmtzIHNwZWNzIG1hbmRhdGUgdXMgdG8gdHJlYXQgaXQgYXMg YXV0byBCVVQgd2Ugc2hvdWxkIGhhdmUgZGV0ZWN0ZWQgaXQgYmVmb3JlIGNhbGxpbmcKICAgICAg ICAgLy8gdGhpcyBmdW5jdGlvbiBpbiByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZSgpLiBX ZSBzaG91bGQgYmUgY292ZXJlZCBhbnl3YXkgYnkgdGhlIEFTU0VSVCBhdCB0aGUgYmVnaW5uaW5n CkBAIC0zMDYsNyArMjk3LDcgQEAgR3JpZFJlc29sdmVkUG9zaXRpb246OkdyaWRSZXNvbHZlZFBv c2l0aW9uKGNvbnN0IEdyaWRQb3NpdGlvbiYgcG9zaXRpb24sIEdyaWRQb3MKICAgICBBU1NFUlQo cG9zaXRpb24uaW50ZWdlclBvc2l0aW9uKCkpOwogICAgIHVuc2lnbmVkIGludGVnZXJQb3NpdGlv biA9IHBvc2l0aW9uLmludGVnZXJQb3NpdGlvbigpIC0gMTsKIAotICAgIG1faW50ZWdlclBvc2l0 aW9uID0gYWRqdXN0R3JpZFBvc2l0aW9uRm9yU2lkZShpbnRlZ2VyUG9zaXRpb24sIHNpZGUpLm1f aW50ZWdlclBvc2l0aW9uOworICAgIG1faW50ZWdlclBvc2l0aW9uID0gaXNTdGFydFNpZGUoc2lk ZSkgPyBpbnRlZ2VyUG9zaXRpb24gOiBzdGQ6Om1heDxpbnQ+KDAsIGludGVnZXJQb3NpdGlvbiAt IDEpOwogfQogCiBHcmlkVW5yZXNvbHZlZFNwYW4gR3JpZFJlc29sdmVkUG9zaXRpb246OnVucmVz b2x2ZWRTcGFuRnJvbVN0eWxlKGNvbnN0IFJlbmRlclN0eWxlJiBncmlkQ29udGFpbmVyU3R5bGUs IGNvbnN0IFJlbmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJl Y3Rpb24pCkBAIC0zMjYsMTAgKzMxNywxMyBAQCBHcmlkU3BhbiBHcmlkUmVzb2x2ZWRQb3NpdGlv bjo6cmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoY29uc3QgR3JpZFVucmVzb2x2ZQogewog ICAgIEFTU0VSVCghdW5yZXNvbHZlZFNwYW4ucmVxdWlyZXNBdXRvUGxhY2VtZW50KCkpOwogCisg ICAgLy8gV2UgbXVzdCBjcmVhdGUgdGhlIEdyaWRTcGFuIHVzaW5nIGZpbmFsUG9zaXRpb24ucHJl digpIGJlY2F1c2UgR3JpZFNwYW4gc3RvcmVzIGNlbGwgaW5kZXhlcyBhbmQKKyAgICAvLyBhbiBp dGVtIGZpbmlzaGluZyBvbiB0aGUgTi10aCBsaW5lIGJlbG9uZ3MgdG8gdGhlIE4tMS10aCBjZWxs LgorCiAgICAgaWYgKHVucmVzb2x2ZWRTcGFuLmluaXRpYWxQb3NpdGlvbigpLnNob3VsZEJlUmVz b2x2ZWRBZ2FpbnN0T3Bwb3NpdGVQb3NpdGlvbigpKSB7CiAgICAgICAgIC8vIEluZmVyIHRoZSBw b3NpdGlvbiBmcm9tIHRoZSBmaW5hbCBwb3NpdGlvbiAoJ2F1dG8gLyAxJyBvciAnc3BhbiAyIC8g MycgY2FzZSkuCiAgICAgICAgIGF1dG8gZmluYWxSZXNvbHZlZFBvc2l0aW9uID0gcmVzb2x2ZUdy aWRQb3NpdGlvbkZyb21TdHlsZShncmlkQ29udGFpbmVyU3R5bGUsIHVucmVzb2x2ZWRTcGFuLmZp bmFsUG9zaXRpb24oKSwgdW5yZXNvbHZlZFNwYW4uZmluYWxQb3NpdGlvblNpZGUoKSk7Ci0gICAg ICAgIHJldHVybiByZXNvbHZlR3JpZFBvc2l0aW9uQWdhaW5zdE9wcG9zaXRlUG9zaXRpb24oZ3Jp ZENvbnRhaW5lclN0eWxlLCBmaW5hbFJlc29sdmVkUG9zaXRpb24sIHVucmVzb2x2ZWRTcGFuLmlu aXRpYWxQb3NpdGlvbigpLCB1bnJlc29sdmVkU3Bhbi5pbml0aWFsUG9zaXRpb25TaWRlKCkpOwor ICAgICAgICByZXR1cm4gcmVzb2x2ZUdyaWRQb3NpdGlvbkFnYWluc3RPcHBvc2l0ZVBvc2l0aW9u KGdyaWRDb250YWluZXJTdHlsZSwgZmluYWxSZXNvbHZlZFBvc2l0aW9uLnByZXYoKSwgdW5yZXNv bHZlZFNwYW4uaW5pdGlhbFBvc2l0aW9uKCksIHVucmVzb2x2ZWRTcGFuLmluaXRpYWxQb3NpdGlv blNpZGUoKSk7CiAgICAgfQogCiAgICAgaWYgKHVucmVzb2x2ZWRTcGFuLmZpbmFsUG9zaXRpb24o KS5zaG91bGRCZVJlc29sdmVkQWdhaW5zdE9wcG9zaXRlUG9zaXRpb24oKSkgewpAQCAtMzQxLDgg KzMzNSwxMCBAQCBHcmlkU3BhbiBHcmlkUmVzb2x2ZWRQb3NpdGlvbjo6cmVzb2x2ZUdyaWRQb3Np dGlvbnNGcm9tU3R5bGUoY29uc3QgR3JpZFVucmVzb2x2ZQogICAgIEdyaWRSZXNvbHZlZFBvc2l0 aW9uIHJlc29sdmVkSW5pdGlhbFBvc2l0aW9uID0gcmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21TdHls ZShncmlkQ29udGFpbmVyU3R5bGUsIHVucmVzb2x2ZWRTcGFuLmluaXRpYWxQb3NpdGlvbigpLCB1 bnJlc29sdmVkU3Bhbi5pbml0aWFsUG9zaXRpb25TaWRlKCkpOwogICAgIEdyaWRSZXNvbHZlZFBv c2l0aW9uIHJlc29sdmVkRmluYWxQb3NpdGlvbiA9IHJlc29sdmVHcmlkUG9zaXRpb25Gcm9tU3R5 bGUoZ3JpZENvbnRhaW5lclN0eWxlLCB1bnJlc29sdmVkU3Bhbi5maW5hbFBvc2l0aW9uKCksIHVu cmVzb2x2ZWRTcGFuLmZpbmFsUG9zaXRpb25TaWRlKCkpOwogCi0gICAgLy8gSWYgJ2dyaWQtcm93 LWVuZCcgc3BlY2lmaWVzIGEgbGluZSBhdCBvciBiZWZvcmUgdGhhdCBzcGVjaWZpZWQgYnkgJ2dy aWQtcm93LXN0YXJ0JywgaXQgY29tcHV0ZXMgdG8gJ3NwYW4gMScuCi0gICAgcmV0dXJuIEdyaWRT cGFuKHJlc29sdmVkSW5pdGlhbFBvc2l0aW9uLCBzdGQ6Om1heDxHcmlkUmVzb2x2ZWRQb3NpdGlv bj4ocmVzb2x2ZWRJbml0aWFsUG9zaXRpb24sIHJlc29sdmVkRmluYWxQb3NpdGlvbikpOworICAg IGlmIChyZXNvbHZlZEluaXRpYWxQb3NpdGlvbiA+IHJlc29sdmVkRmluYWxQb3NpdGlvbikKKyAg ICAgICAgc3RkOjpzd2FwKHJlc29sdmVkSW5pdGlhbFBvc2l0aW9uLCByZXNvbHZlZEZpbmFsUG9z aXRpb24pOworCisgICAgcmV0dXJuIEdyaWRTcGFuKHJlc29sdmVkSW5pdGlhbFBvc2l0aW9uLCBz dGQ6Om1heChyZXNvbHZlZEluaXRpYWxQb3NpdGlvbiwgcmVzb2x2ZWRGaW5hbFBvc2l0aW9uLnBy ZXYoKSkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFJlc29sdmVkUG9zaXRpb24uaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUmVzb2x2ZWRQb3NpdGlvbi5oCmluZGV4IDk3NTJi MzYwZjA2ZTZhOGRkODI4YWJmNzQwMmY0MmI5Mzc5ZmE1NDcuLjBmM2I1YzAyNWYwZmI5YzIyZGJm MjAwMzUxZjFlNGMxYTVmMzVkZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9HcmlkUmVzb2x2ZWRQb3NpdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9HcmlkUmVzb2x2ZWRQb3NpdGlvbi5oCkBAIC0xMzMsNiArMTMzLDExIEBAIHB1 YmxpYzoKICAgICAgICAgcmV0dXJuIEdyaWRSZXNvbHZlZFBvc2l0aW9uKG1faW50ZWdlclBvc2l0 aW9uICsgMSk7CiAgICAgfQogCisgICAgR3JpZFJlc29sdmVkUG9zaXRpb24gcHJldigpIGNvbnN0 CisgICAgeworICAgICAgICByZXR1cm4gc3RkOjptYXg8aW50PihtX2ludGVnZXJQb3NpdGlvbiAt IDEsIDApOworICAgIH0KKwogICAgIHN0YXRpYyBHcmlkU3BhbiByZXNvbHZlR3JpZFBvc2l0aW9u c0Zyb21BdXRvUGxhY2VtZW50UG9zaXRpb24oY29uc3QgUmVuZGVyU3R5bGUmLCBjb25zdCBSZW5k ZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIGNvbnN0IEdyaWRSZXNvbHZlZFBvc2l0 aW9uJik7CiAgICAgc3RhdGljIEdyaWRTcGFuIHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxl KGNvbnN0IEdyaWRVbnJlc29sdmVkU3BhbiYsIGNvbnN0IFJlbmRlclN0eWxlJik7CiAgICAgc3Rh dGljIEdyaWRVbnJlc29sdmVkU3BhbiB1bnJlc29sdmVkU3BhbkZyb21TdHlsZShjb25zdCBSZW5k ZXJTdHlsZSYsIGNvbnN0IFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbik7CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggNmYyNDRlMTA0MzMzNTJlZTQ1ZTM2NWIwYTFmODEwNDI2MjY1NTE2ZC4uOTQ2NmNlZjZl MzAxZDAyYjVlN2M2YjNlMGQ2NTkxZDMwOThlYzdjOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisy MDE1LTExLTA1ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtjc3MtZ3JpZF0gR3JpZCBwbGFjZW1lbnQgY29uZmxpY3QgaGFuZGxpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDg5MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZWQgdGhlIGV4 cGVjdGF0aW9ucyBmb3IKKyAgICAgICAgbmFtZWQtZ3JpZC1saW5lcy13aXRoLW5hbWVkLWdyaWQt YXJlYXMtZHluYW1pYy1nZXQtc2V0Lmh0bWwKKyAgICAgICAgYmVjYXVzZSB0d28gb2YgdGhlIHRl c3RzIHdoZXJlIHBvc2l0aW9uaW5nIGFuIGl0ZW0gd2l0aCBhCisgICAgICAgIHN0YXJ0LWxpbmUg PiBlbmQtbGluZSAoaXQgd2FzIHJlbW92aW5nIHRoZSBlbmQgbGluZSBpbnN0ZWFkIG9mCisgICAg ICAgIHN3YXBwaW5nIHRoZW0pLgorCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvbmFt ZWQtZ3JpZC1saW5lcy13aXRoLW5hbWVkLWdyaWQtYXJlYXMtZHluYW1pYy1nZXQtc2V0Lmh0bWw6 CisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvc3dhcC1saW5lcy1pZi1zdGFydC1pcy1m dXJ0aGVyLWVuZHdhcmQtdGhhbi1lbmQtbGluZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9zd2FwLWxpbmVzLWlmLXN0YXJ0LWlzLWZ1cnRoZXIt ZW5kd2FyZC10aGFuLWVuZC1saW5lLmh0bWw6IEFkZGVkLgorCiAyMDE1LTExLTAyICBLZWl0aCBS b2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBpbnB1dFt0eXBlPW51bWJlcl0g ZG9lcyBub3QgaW5jcmVtZW50L2RlY3JlbWVudCBpbnRlZ2VycyB3aXRoIHRyYWlsaW5nIGRlY2lt YWwgY2hhcmFjdGVycwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlv dXQvbmFtZWQtZ3JpZC1saW5lcy13aXRoLW5hbWVkLWdyaWQtYXJlYXMtZHluYW1pYy1nZXQtc2V0 Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9uYW1lZC1ncmlkLWxpbmVz LXdpdGgtbmFtZWQtZ3JpZC1hcmVhcy1keW5hbWljLWdldC1zZXQuaHRtbAppbmRleCBjNjMyZGQx NjM5MWNiNjI3NTRkOTI2MDlmYTRkNThmMWI1ZTRmNjE2Li5mNzY5OTI3ZDliZTliOGY5MjQ3OTU3 MDFjZDE0ZTVmNjZhMWI2Yzc2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlk LWxheW91dC9uYW1lZC1ncmlkLWxpbmVzLXdpdGgtbmFtZWQtZ3JpZC1hcmVhcy1keW5hbWljLWdl dC1zZXQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9uYW1lZC1n cmlkLWxpbmVzLXdpdGgtbmFtZWQtZ3JpZC1hcmVhcy1keW5hbWljLWdldC1zZXQuaHRtbApAQCAt MTMwLDggKzEzMCw4IEBAIGZ1bmN0aW9uIHVwZGF0ZVJvd3NDb2x1bW5zKCkKICAgICB0ZXN0TGF5 b3V0KHsgJ2FyZWFzJzogdGVtcGxhdGVBcmVhT25lLCAnY29sdW1ucyc6IGNvbHVtblJlcGVhdGVk TmFtZXMsICdyb3dzJzogcm93UmVwZWF0ZWROYW1lcyB9LCBpdGVtc1JlcGVhdCk7CiAgICAgdGVz dExheW91dCh7ICdjb2x1bW5zJzogY29sdW1uUmVwZWF0ZWROYW1lcywgJ2FyZWFzJzogdGVtcGxh dGVBcmVhT25lLCAncm93cyc6IHJvd1JlcGVhdGVkTmFtZXMgfSwgaXRlbXNSZXBlYXQpOwogCi0g ICAgdmFyIGl0ZW1zUmVwZWF0VHdvID0gWyB7ICdjb2x1bW4nOiAnZCcsICdyb3cnOiAnYycsICd4 JzogJzAnLCAneSc6ICcxNTAnLCAnd2lkdGgnOiAnMzUwJywgJ2hlaWdodCc6ICcyMDAnIH0sCi0J CQkgICB7ICdjb2x1bW4nOiAnZC1zdGFydCAvIGQtZW5kJywgJ3Jvdyc6ICdjLXN0YXJ0IC8gYy1l bmQnLCAneCc6ICcwJywgJ3knOiAnMTUwJywgJ3dpZHRoJzogJzM1MCcsICdoZWlnaHQnOiAnMjAw J30sCisgICAgdmFyIGl0ZW1zUmVwZWF0VHdvID0gWyB7ICdjb2x1bW4nOiAnZCcsICdyb3cnOiAn YycsICd4JzogJzAnLCAneSc6ICc1MCcsICd3aWR0aCc6ICczNTAnLCAnaGVpZ2h0JzogJzEwMCcg fSwKKwkJCSAgIHsgJ2NvbHVtbic6ICdkLXN0YXJ0IC8gZC1lbmQnLCAncm93JzogJ2Mtc3RhcnQg LyBjLWVuZCcsICd4JzogJzAnLCAneSc6ICc1MCcsICd3aWR0aCc6ICczNTAnLCAnaGVpZ2h0Jzog JzEwMCd9LAogCQkJICAgeyAnY29sdW1uJzogJ2MnLCAncm93JzogJ2QnLCAneCc6ICcxNTAnLCAn eSc6ICcwJywgJ3dpZHRoJzogJzIwMCcsICdoZWlnaHQnOiAnMTUwJyB9IF07CiAKICAgICB0ZXN0 TGF5b3V0KHsgJ2FyZWFzJzogdGVtcGxhdGVBcmVhVHdvLCAnYXJlYXMnOiB0ZW1wbGF0ZUFyZWFP bmUsICdjb2x1bW5zJzogY29sdW1uUmVwZWF0ZWROYW1lcywgJ3Jvd3MnOiByb3dSZXBlYXRlZE5h bWVzIH0sIGl0ZW1zUmVwZWF0KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdy aWQtbGF5b3V0L3N3YXAtbGluZXMtaWYtc3RhcnQtaXMtZnVydGhlci1lbmR3YXJkLXRoYW4tZW5k LWxpbmUtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L3N3 YXAtbGluZXMtaWYtc3RhcnQtaXMtZnVydGhlci1lbmR3YXJkLXRoYW4tZW5kLWxpbmUtZXhwZWN0 ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi42YTdlMWNkZjdhOGNmMmM1OTAzYjE1NWNlYzA2NTgxY2NmM2Ri OWQ2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQv c3dhcC1saW5lcy1pZi1zdGFydC1pcy1mdXJ0aGVyLWVuZHdhcmQtdGhhbi1lbmQtbGluZS1leHBl Y3RlZC5odG1sCkBAIC0wLDAgKzEsMzIgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8c3R5bGU+Cisu Z3JpZCB7CisgICAgLXdlYmtpdC1ncmlkLXRlbXBsYXRlLWNvbHVtbnM6IFthXSA1MHB4IFtiXSA1 MHB4IFtjXSA1MHB4IFtkXTsKKyAgICAtd2Via2l0LWdyaWQtYXV0by1yb3dzOiAyMHB4OworICAg IC13ZWJraXQtZ3JpZC1hdXRvLWNvbHVtbnM6IDIwcHg7Cit9Cis8L3N0eWxlPgorCis8ZGl2IGNs YXNzPSJncmlkIj4KKworICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtZ3JpZC1jb2x1bW46IDEgLyAz OyBiYWNrZ3JvdW5kLWNvbG9yOiBncmF5Ij48L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSItd2Via2l0 LWdyaWQtY29sdW1uOiAxIC8gLTI7IGJhY2tncm91bmQtY29sb3I6IHB1cnBsZSI+PC9kaXY+Cisg ICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1ncmlkLWNvbHVtbjogLTIgLyA0OyBiYWNrZ3JvdW5kLWNv bG9yOiBvcmFuZ2UiPjwvZGl2PgorCisgICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1ncmlkLWNvbHVt bjogMiAvIGQ7IGJhY2tncm91bmQtY29sb3I6IGdyYXkiPjwvZGl2PgorICAgIDxkaXYgc3R5bGU9 Ii13ZWJraXQtZ3JpZC1jb2x1bW46IGIgLyAtMTsgYmFja2dyb3VuZC1jb2xvcjogcHVycGxlIj48 L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSItd2Via2l0LWdyaWQtY29sdW1uOiBjIC8gZDsgYmFja2dy b3VuZC1jb2xvcjogb3JhbmdlIj48L2Rpdj4KKworICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtZ3Jp ZC1jb2x1bW46IGEgLTEgLyAzOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmF5Ij48L2Rpdj4KKyAgICA8 ZGl2IHN0eWxlPSItd2Via2l0LWdyaWQtY29sdW1uOiBiIDEgLyAtMTsgYmFja2dyb3VuZC1jb2xv cjogcHVycGxlIj48L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSItd2Via2l0LWdyaWQtY29sdW1uOiBj IC0xIC8gZDsgYmFja2dyb3VuZC1jb2xvcjogb3JhbmdlIj48L2Rpdj4KKworICAgIDxkaXYgc3R5 bGU9Ii13ZWJraXQtZ3JpZC1jb2x1bW46IDIgLyAzOyBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlIj48 L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSItd2Via2l0LWdyaWQtY29sdW1uOiAxIC8gMzsgYmFja2dy b3VuZC1jb2xvcjogbGlnaHRibHVlIj48L2Rpdj4KKyAgICA8ZGl2IHN0eWxlPSItd2Via2l0LWdy aWQtY29sdW1uOiAyIC8gNDsgYmFja2dyb3VuZC1jb2xvcjogbWFyb29uIj48L2Rpdj4KKworICAg IDxkaXYgc3R5bGU9Ii13ZWJraXQtZ3JpZC1jb2x1bW46IC0zIC8gLTM7IGJhY2tncm91bmQtY29s b3I6IGxpZ2h0Z3JlZW4iPjwvZGl2PgorICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtZ3JpZC1jb2x1 bW46IDMgLyAzOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbiI+PC9kaXY+CisKKzwvZGl2PgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvc3dhcC1saW5lcy1pZi1z dGFydC1pcy1mdXJ0aGVyLWVuZHdhcmQtdGhhbi1lbmQtbGluZS5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MtZ3JpZC1sYXlvdXQvc3dhcC1saW5lcy1pZi1zdGFydC1pcy1mdXJ0aGVyLWVuZHdh cmQtdGhhbi1lbmQtbGluZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk0NTNmNDFmZmE2NTYwZjlkZjE4YTI4 YWEyZDIyMDc4YzYwNGNiNjAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy1ncmlkLWxheW91dC9zd2FwLWxpbmVzLWlmLXN0YXJ0LWlzLWZ1cnRoZXItZW5kd2FyZC10aGFu LWVuZC1saW5lLmh0bWwKQEAgLTAsMCArMSwzMyBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxzdHls ZT4KKy5ncmlkIHsKKyAgICAtd2Via2l0LWdyaWQtdGVtcGxhdGUtY29sdW1uczogW2FdIDUwcHgg W2JdIDUwcHggW2NdIDUwcHggW2RdOworICAgIC13ZWJraXQtZ3JpZC1hdXRvLXJvd3M6IDIwcHg7 CisgICAgLXdlYmtpdC1ncmlkLWF1dG8tY29sdW1uczogMjBweDsKK30KKzwvc3R5bGU+CisKKzxk aXYgY2xhc3M9ImdyaWQiPgorCisgICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1ncmlkLWNvbHVtbjog MyAvIDE7IGJhY2tncm91bmQtY29sb3I6IGdyYXkiPjwvZGl2PgorICAgIDxkaXYgc3R5bGU9Ii13 ZWJraXQtZ3JpZC1jb2x1bW46IC0yIC8gMTsgYmFja2dyb3VuZC1jb2xvcjogcHVycGxlIj48L2Rp dj4KKyAgICA8ZGl2IHN0eWxlPSItd2Via2l0LWdyaWQtY29sdW1uOiA0IC8gLTI7IGJhY2tncm91 bmQtY29sb3I6IG9yYW5nZSI+PC9kaXY+CisKKyAgICA8ZGl2IHN0eWxlPSItd2Via2l0LWdyaWQt Y29sdW1uOiBkIC8gMjsgYmFja2dyb3VuZC1jb2xvcjogZ3JheSI+PC9kaXY+CisgICAgPGRpdiBz dHlsZT0iLXdlYmtpdC1ncmlkLWNvbHVtbjogLTEgLyBiOyBiYWNrZ3JvdW5kLWNvbG9yOiBwdXJw bGUiPjwvZGl2PgorICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtZ3JpZC1jb2x1bW46IGQgLyBjOyBi YWNrZ3JvdW5kLWNvbG9yOiBvcmFuZ2UiPjwvZGl2PgorCisgICAgPGRpdiBzdHlsZT0iLXdlYmtp dC1ncmlkLWNvbHVtbjogMyAvIGEgLTE7IGJhY2tncm91bmQtY29sb3I6IGdyYXkiPjwvZGl2Pgor ICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtZ3JpZC1jb2x1bW46IC0xIC8gYiAxOyBiYWNrZ3JvdW5k LWNvbG9yOiBwdXJwbGUiPjwvZGl2PgorICAgIDxkaXYgc3R5bGU9Ii13ZWJraXQtZ3JpZC1jb2x1 bW46IGQgLyBjIC0xOyBiYWNrZ3JvdW5kLWNvbG9yOiBvcmFuZ2UiPjwvZGl2PgorCisgICAgPCEt LSBDaGVjayB0aGF0IHdlIGRvIG5vdCBicmVhayBhbHJlYWR5IHZhbGlkIHVzZSBjYXNlcy4gLS0+ CisgICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1ncmlkLWNvbHVtbjogLTMgLyAtMjsgYmFja2dyb3Vu ZC1jb2xvcjogYmx1ZSI+PC9kaXY+CisgICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1ncmlkLWNvbHVt bjogLTQgLyAtMjsgYmFja2dyb3VuZC1jb2xvcjogbGlnaHRibHVlIj48L2Rpdj4KKyAgICA8ZGl2 IHN0eWxlPSItd2Via2l0LWdyaWQtY29sdW1uOiAtMyAvIC0xOyBiYWNrZ3JvdW5kLWNvbG9yOiBt YXJvb24iPjwvZGl2PgorCisgICAgPGRpdiBzdHlsZT0iLXdlYmtpdC1ncmlkLWNvbHVtbjogMiAv IDI7IGJhY2tncm91bmQtY29sb3I6IGxpZ2h0Z3JlZW4iPjwvZGl2PgorICAgIDxkaXYgc3R5bGU9 Ii13ZWJraXQtZ3JpZC1jb2x1bW46IGMgLyBjOyBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbiI+PC9k aXY+CisKKzwvZGl2Pgo=