111918 2013-03-08 20:41:02 -0800 [CSS Grid Layout] Handle spanning grid items over specified grid tracks 2013-03-11 12:10:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 103314 1 jchaffraix jchaffraix eric esprehn+autocc ojan.autocc ojan tony webkit.review.bot xan.lopez oldest_to_newest 851700 0 jchaffraix 2013-03-08 20:41:02 -0800 The current code assumes that a grid item only spans one grid track in every direction. Now that we can parse multiple positions and properly resolve them, we can allow spanning grid items to be properly sized after their spanning grid areas. 851702 1 192332 jchaffraix 2013-03-08 20:51:51 -0800 Created attachment 192332 Proposed change 1: Added a helper method to compute the spanned grid tracks' sizes. 852430 2 192332 tony 2013-03-11 10:14:58 -0700 Comment on attachment 192332 Proposed change 1: Added a helper method to compute the spanned grid tracks' sizes. View in context: https://bugs.webkit.org/attachment.cgi?id=192332&action=review > Source/WebCore/rendering/RenderGrid.cpp:750 > + // We don't support spanning with auto positions yet. Nit: Should this be a FIXME? 852525 3 192332 jchaffraix 2013-03-11 11:44:30 -0700 Comment on attachment 192332 Proposed change 1: Added a helper method to compute the spanned grid tracks' sizes. View in context: https://bugs.webkit.org/attachment.cgi?id=192332&action=review >> Source/WebCore/rendering/RenderGrid.cpp:750 >> + // We don't support spanning with auto positions yet. > > Nit: Should this be a FIXME? Good point, there is also not a single bug I can't point to as it really depends how much of the <grid-line> grammar we support. 852531 4 192521 jchaffraix 2013-03-11 11:48:29 -0700 Created attachment 192521 Patch for landing 852555 5 192521 webkit.review.bot 2013-03-11 12:10:05 -0700 Comment on attachment 192521 Patch for landing Clearing flags on attachment: 192521 Committed r145378: <http://trac.webkit.org/changeset/145378> 852556 6 webkit.review.bot 2013-03-11 12:10:08 -0700 All reviewed patches have been landed. Closing bug. 192332 2013-03-08 20:51:51 -0800 2013-03-11 11:48:27 -0700 Proposed change 1: Added a helper method to compute the spanned grid tracks' sizes. bug-111918-20130308204754.patch text/plain 9180 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc3OTQ1YzI4NmVlODI1 ODM3ZmI2ODVlOTdkNmQ4ZTBkNzAwZmViYy4uZGRmMDk1MDMzYThjMTA3MTU1NzQ0NmVmZjNmNTFh ZWNmMmNmYWZmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDEzLTAzLTA4ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgogCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEhhbmRsZSBzcGFubmluZyBncmlkIGl0ZW1zIG92ZXIgc3BlY2lmaWVkIGdyaWQg dHJhY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTE5MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGNoYW5nZSB1cGRhdGVzIHRoZSBjb250YWluaW5nIGJsb2NrIG92ZXJyaWRlIGxvZ2ljIHRv IGhhbmRsZSBtdWx0aXBsZQorICAgICAgICBzcGFubmVkIHRyYWNrcy4gVGhpcyBtYWtlcyB0aGUg bXVsdGlwbGUgc3BlY2lmaWVkIGdyaWQgdHJhY2tzIGNhc2Ugd29yayBhbmQKKyAgICAgICAgd2ls bCBlbmFibGUgdXMgdG8gaGFuZGxlIHRoZSBtaW5tYXggY2FzZSBvbmNlIHRoZSBjb21wdXRhdGlv biBsb2dpYyBoYXMgYmVlbgorICAgICAgICB1cGRhdGVkLgorCisgICAgICAgIFRlc3Q6IGZhc3Qv Y3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLmh0bWwKKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckdyaWQ6OmxvZ2ljYWxDb250ZW50SGVpZ2h0Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyR3JpZDo6bGF5b3V0R3JpZEl0ZW1zKToKKyAgICAgICAgVXBkYXRlZCB0aGVzZSBmdW5j dGlvbnMgdG8gdXNlIGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkLgorCisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJHcmlkOjpncmlkQXJlYUJyZWFkdGhGb3JDaGlsZCk6CisgICAgICAgIEFkZGVkIHRo aXMgaGVscGVyIGZ1bmN0aW9uIHRvIGhhbmRsZSBtdWx0aXBsZSBzcGFubmVkIGdyaWQgdHJhY2tz LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDogQWRkZWQgdGhlIHByZXZpb3Vz IGZ1bmN0aW9uLgorCisyMDEzLTAzLTA4ICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3 ZWJraXQub3JnPgorCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIFJlc29sdmUgZ3JpZC17ZW5k fGFmdGVyfSBpbnRlZ2VyIGFnYWluc3QgdGhlIGVuZHxhZnRlciBlZGdlCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE4ODUKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGNjZTU3MTRhNmQxODU4N2Q5ZTBkMzZmZWM1 MDM2NjQ1NWFhMWFkYjMuLjg3YmVjNDg3MzQ0NjQ1NzRhMWVlZmQ3N2Q4M2UxY2IxMzk4MTU0OGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTM1OSw4ICszNTks NyBAQCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6OmxvZ2ljYWxDb250ZW50SGVpZ2h0Rm9yQ2hpbGQo UmVuZGVyQm94KiBjaGlsZCwgVmVjdG9yPEdyaQogICAgIGlmICghY2hpbGQtPm5lZWRzTGF5b3V0 KCkpCiAgICAgICAgIGNoaWxkLT5zZXROZWVkc0xheW91dCh0cnVlLCBNYXJrT25seVRoaXMpOwog Ci0gICAgY29uc3QgR3JpZENvb3JkaW5hdGUmIGNvb3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRp bmF0ZShjaGlsZCk7Ci0gICAgY2hpbGQtPnNldE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVu dExvZ2ljYWxXaWR0aChjb2x1bW5UcmFja3NbY29vcmRpbmF0ZS5jb2x1bW5JbmRleF0ubV91c2Vk QnJlYWR0aCk7CisgICAgY2hpbGQtPnNldE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExv Z2ljYWxXaWR0aChncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjaGlsZCwgRm9yQ29sdW1ucywgY29s dW1uVHJhY2tzKSk7CiAgICAgY2hpbGQtPmNsZWFyT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250 ZW50TG9naWNhbEhlaWdodCgpOwogICAgIGNoaWxkLT5sYXlvdXQoKTsKICAgICByZXR1cm4gY2hp bGQtPmxvZ2ljYWxIZWlnaHQoKTsKQEAgLTY0NSw4ICs2NDQsNiBAQCB2b2lkIFJlbmRlckdyaWQ6 OmxheW91dEdyaWRJdGVtcygpCiAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gZmlyc3RDaGls ZEJveCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgewogICAgICAg ICBMYXlvdXRQb2ludCBjaGlsZFBvc2l0aW9uID0gZmluZENoaWxkTG9naWNhbFBvc2l0aW9uKGNo aWxkLCBjb2x1bW5UcmFja3MsIHJvd1RyYWNrcyk7CiAKLSAgICAgICAgY29uc3QgR3JpZENvb3Jk aW5hdGUmIGNoaWxkQ29vcmRpbmF0ZSA9IGNhY2hlZEdyaWRDb29yZGluYXRlKGNoaWxkKTsKLQog ICAgICAgICAvLyBCZWNhdXNlIHRoZSBncmlkIGFyZWEgY2Fubm90IGJlIHN0eWxlZCwgd2UgZG9u J3QgbmVlZCB0byBhZGp1c3QKICAgICAgICAgLy8gdGhlIGdyaWQgYnJlYWR0aCB0byBhY2NvdW50 IGZvciAnYm94LXNpemluZycuCiAgICAgICAgIExheW91dFVuaXQgb2xkT3ZlcnJpZGVDb250YWlu aW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoID0gY2hpbGQtPmhhc092ZXJyaWRlQ29udGFpbmlu Z0Jsb2NrTG9naWNhbFdpZHRoKCkgPyBjaGlsZC0+b3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250 ZW50TG9naWNhbFdpZHRoKCkgOiBMYXlvdXRVbml0KCk7CkBAIC02NTQsMTEgKzY1MSwxMyBAQCB2 b2lkIFJlbmRlckdyaWQ6OmxheW91dEdyaWRJdGVtcygpCiAKICAgICAgICAgLy8gRklYTUU6IEZv ciBjaGlsZHJlbiBpbiBhIGNvbnRlbnQgc2l6ZWQgdHJhY2ssIHdlIGNsZWFyIHRoZSBvdmVycmlk ZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsSGVpZ2h0CiAgICAgICAgIC8vIGluIG1pbkNv bnRlbnRGb3JDaGlsZCAvIG1heENvbnRlbnRGb3JDaGlsZCB3aGljaCBtZWFucyB0aGF0IHdlIHdp bGwgYWx3YXlzIHJlbGF5b3V0IHRoZSBjaGlsZC4KLSAgICAgICAgaWYgKG9sZE92ZXJyaWRlQ29u dGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCAhPSBjb2x1bW5UcmFja3NbY2hpbGRDb29y ZGluYXRlLmNvbHVtbkluZGV4XS5tX3VzZWRCcmVhZHRoIHx8IG9sZE92ZXJyaWRlQ29udGFpbmlu Z0Jsb2NrQ29udGVudExvZ2ljYWxIZWlnaHQgIT0gcm93VHJhY2tzW2NoaWxkQ29vcmRpbmF0ZS5y b3dJbmRleF0ubV91c2VkQnJlYWR0aCkKKyAgICAgICAgTGF5b3V0VW5pdCBvdmVycmlkZUNvbnRh aW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGggPSBncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChj aGlsZCwgRm9yQ29sdW1ucywgY29sdW1uVHJhY2tzKTsKKyAgICAgICAgTGF5b3V0VW5pdCBvdmVy cmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsSGVpZ2h0ID0gZ3JpZEFyZWFCcmVhZHRo Rm9yQ2hpbGQoY2hpbGQsIEZvclJvd3MsIHJvd1RyYWNrcyk7CisgICAgICAgIGlmIChvbGRPdmVy cmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGggIT0gb3ZlcnJpZGVDb250YWlu aW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoIHx8IG9sZE92ZXJyaWRlQ29udGFpbmluZ0Jsb2Nr Q29udGVudExvZ2ljYWxIZWlnaHQgIT0gb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9n aWNhbEhlaWdodCkKICAgICAgICAgICAgIGNoaWxkLT5zZXROZWVkc0xheW91dCh0cnVlLCBNYXJr T25seVRoaXMpOwogCi0gICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRMb2dpY2FsV2lkdGgoY29sdW1uVHJhY2tzW2NoaWxkQ29vcmRpbmF0ZS5jb2x1bW5JbmRl eF0ubV91c2VkQnJlYWR0aCk7Ci0gICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUNvbnRhaW5pbmdC bG9ja0NvbnRlbnRMb2dpY2FsSGVpZ2h0KHJvd1RyYWNrc1tjaGlsZENvb3JkaW5hdGUucm93SW5k ZXhdLm1fdXNlZEJyZWFkdGgpOworICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVDb250YWluaW5n QmxvY2tDb250ZW50TG9naWNhbFdpZHRoKG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExv Z2ljYWxXaWR0aCk7CisgICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRMb2dpY2FsSGVpZ2h0KG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxI ZWlnaHQpOwogCiAgICAgICAgIC8vIEZJWE1FOiBHcmlkIGl0ZW1zIHNob3VsZCBzdHJldGNoIHRv IGZpbGwgdGhlaXIgY2VsbHMuIE9uY2Ugd2UKICAgICAgICAgLy8gaW1wbGVtZW50IGdyaWQte2Nv bHVtbixyb3d9LWFsaWduLCB3ZSBjYW4gYWxzbyBzaHJpbmsgdG8gZml0LiBGb3IKQEAgLTc0Miw2 ICs3NDEsMjMgQEAgc2l6ZV90IFJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRpb25Gcm9tU3R5 bGUoY29uc3QgR3JpZFBvc2l0aW9uJiBwb3NpdGlvbiwgR3IKICAgICByZXR1cm4gMDsKIH0KIAor TGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjb25zdCBSZW5k ZXJCb3gqIGNoaWxkLCBUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIGNvbnN0IFZlY3Rv cjxHcmlkVHJhY2s+JiB0cmFja3MpIGNvbnN0Cit7CisgICAgY29uc3QgR3JpZENvb3JkaW5hdGUm IGNvb3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRpbmF0ZShjaGlsZCk7CisgICAgc2l6ZV90IHRy YWNrSW5kZXggPSAoZGlyZWN0aW9uID09IEZvckNvbHVtbnMpID8gY29vcmRpbmF0ZS5jb2x1bW5J bmRleCA6IGNvb3JkaW5hdGUucm93SW5kZXg7CisgICAgT3duUHRyPEdyaWRTcGFuPiBzcGFuID0g cmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoY2hpbGQsIGRpcmVjdGlvbik7CisgICAgaWYg KCFzcGFuKSB7CisgICAgICAgIC8vIFdlIGRvbid0IHN1cHBvcnQgc3Bhbm5pbmcgd2l0aCBhdXRv IHBvc2l0aW9ucyB5ZXQuCisgICAgICAgIHNwYW4gPSBhZG9wdFB0cihuZXcgR3JpZFNwYW4odHJh Y2tJbmRleCwgdHJhY2tJbmRleCkpOworICAgIH0KKworICAgIEFTU0VSVChzcGFuLT5pbml0aWFs UG9zaXRpb25JbmRleCA9PSB0cmFja0luZGV4KTsKKyAgICBMYXlvdXRVbml0IGdyaWRBcmVhQnJl YWR0aCA9IDA7CisgICAgZm9yICg7IHRyYWNrSW5kZXggPD0gc3Bhbi0+ZmluYWxQb3NpdGlvbklu ZGV4OyArK3RyYWNrSW5kZXgpCisgICAgICAgIGdyaWRBcmVhQnJlYWR0aCArPSB0cmFja3NbdHJh Y2tJbmRleF0ubV91c2VkQnJlYWR0aDsKKyAgICByZXR1cm4gZ3JpZEFyZWFCcmVhZHRoOworfQor CiBMYXlvdXRQb2ludCBSZW5kZXJHcmlkOjpmaW5kQ2hpbGRMb2dpY2FsUG9zaXRpb24oUmVuZGVy Qm94KiBjaGlsZCwgY29uc3QgVmVjdG9yPEdyaWRUcmFjaz4mIGNvbHVtblRyYWNrcywgY29uc3Qg VmVjdG9yPEdyaWRUcmFjaz4mIHJvd1RyYWNrcykKIHsKICAgICBjb25zdCBHcmlkQ29vcmRpbmF0 ZSYgY29vcmRpbmF0ZSA9IGNhY2hlZEdyaWRDb29yZGluYXRlKGNoaWxkKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDdlNTg3OGVkMjAzNWU1N2YxNTI4OWQxYmEzMWE4 OTQyNzBlYWE3OTkuLjI2NjQzOGYyY2MxYWE3ODIzODdkZWJkMTJkMzI3YmJjZWNkYWM4ZTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtMTI1LDYgKzEyNSw4IEBAIHBy aXZhdGU6CiAgICAgfTsKICAgICBzaXplX3QgcmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21TdHlsZShj b25zdCBHcmlkUG9zaXRpb24mLCBHcmlkUG9zaXRpb25TaWRlKSBjb25zdDsKIAorICAgIExheW91 dFVuaXQgZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgVHJh Y2tTaXppbmdEaXJlY3Rpb24sIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JikgY29uc3Q7CisKICNp Zm5kZWYgTkRFQlVHCiAgICAgYm9vbCB0cmFja3NBcmVXaWRlclRoYW5NaW5UcmFja0JyZWFkdGgo VHJhY2tTaXppbmdEaXJlY3Rpb24sIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+Jik7CiAgICAgYm9v bCBncmlkV2FzUG9wdWxhdGVkKCkgY29uc3QgeyByZXR1cm4gIW1fZ3JpZC5pc0VtcHR5KCkgJiYg IW1fZ3JpZFswXS5pc0VtcHR5KCk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlY2I3YjkyNzE1MDgyNjUzZjAwN2MxNjk1 Mzk5NDdiYzcwMDI5Y2U1Li4zMmJhMmZmZjU2YzAyMDYzMTlkYjlmYWZiOTQzYThlMjc0MjgxMGI1 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDMtMDggIEp1bGllbiBDaGFmZnJhaXggIDxq Y2hhZmZyYWl4QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBHcmlkIExheW91dF0gSGFuZGxl IHNwYW5uaW5nIGdyaWQgaXRlbXMgb3ZlciBzcGVjaWZpZWQgZ3JpZCB0cmFja3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTkxOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1s YXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24tZXhwZWN0ZWQudHh0OgorICAgICAg ICBXZSBub3cgcGFzcyBhbGwgdGhlIHRlc3RzLgorCiAyMDEzLTAzLTA4ICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTQ1MjU0LCByMTQ1MjY0LCBhbmQgcjE0NTI4OC4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9u LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRl bS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dAppbmRleCBhNzU3N2I3ZjUyMGEzNGFl MzIzYTZkMWQwNGYyMjJmNTM3NzgzZTQ1Li5kZmVkNGY2NGQ2ZmY4ODE3NmRiZTZmYTViNmYzZWRk MDA2ZmM5NzRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24tZXhw ZWN0ZWQudHh0CkBAIC0xLDM2ICsxLDEwIEBACiBUZXN0IHRoYXQgc3Bhbm5pZyByb3dzIC8gY29s dW1ucyBpbnNpZGUgcGVyY2VudGFnZSBzaXplZCBncmlkIGFyZWFzIGdldCBwcm9wZXJseSBzaXpl ZC4KIAotRkFJTDoKLUV4cGVjdGVkIDQwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTYwLiAKLQotPGRp diBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhl aWdodD0iMzAwIj4KLSAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RSb3dCb3Ro Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI5MCI+PC9kaXY+Ci08L2Rpdj4KLUZB SUw6Ci1FeHBlY3RlZCA0MDAgZm9yIHdpZHRoLCBidXQgZ290IDE2MC4gCi0KLTxkaXYgY2xhc3M9 ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMw MCI+Ci0gICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHNlY29uZFJvd0JvdGhDb2x1bW4i IGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjkwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMTAiPjwvZGl2PgotPC9kaXY+Ci1GQUlMOgot RXhwZWN0ZWQgMzAwIGZvciBoZWlnaHQsIGJ1dCBnb3QgOTAuIAotCi08ZGl2IGNsYXNzPSJncmlk IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgot ICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBib3RoUm93Rmlyc3RDb2x1bW4iIGRhdGEt b2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE2MCIg ZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+PC9kaXY+Ci08L2Rpdj4KLUZBSUw6Ci1FeHBlY3Rl ZCAzMDAgZm9yIGhlaWdodCwgYnV0IGdvdCA5MC4gCi0KLTxkaXYgY2xhc3M9ImdyaWQiIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+Ci0gICAgPGRp diBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGJvdGhSb3dTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0 LXg9IjE2MCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjQwIiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iMzAwIj48L2Rpdj4KLTwvZGl2PgotRkFJTDoKLUV4cGVjdGVkIDQw MCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTYwLiAKLUV4cGVjdGVkIDMwMCBmb3IgaGVpZ2h0LCBidXQg Z290IDkwLiAKLQotPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj4KLSAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFy ZWEgYm90aFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+PC9k aXY+Ci08L2Rpdj4KK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKIFBBU1MKIFBBU1MKIFBB U1MK 192521 2013-03-11 11:48:29 -0700 2013-03-11 12:10:05 -0700 Patch for landing bug-111918-20130311114429.patch text/plain 9144 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY4NGRmZDg0ZjQ5ZTQ5 NWJhM2M3MDA0MTAyN2IwZDc0MzU3ZWE1OC4uOTQ4NzBkNTQzM2EzZDJjYjcwOTBlZDk0ZmQxM2Iw MzZmNzlmZjlkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAzLTExICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEhhbmRsZSBzcGFubmluZyBncmlkIGl0ZW1zIG92ZXIgc3BlY2lmaWVkIGdyaWQg dHJhY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTE5MTgKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAgICAgIFRoaXMg Y2hhbmdlIHVwZGF0ZXMgdGhlIGNvbnRhaW5pbmcgYmxvY2sgb3ZlcnJpZGUgbG9naWMgdG8gaGFu ZGxlIG11bHRpcGxlCisgICAgICAgIHNwYW5uZWQgdHJhY2tzLiBUaGlzIG1ha2VzIHRoZSBtdWx0 aXBsZSBzcGVjaWZpZWQgZ3JpZCB0cmFja3MgY2FzZSB3b3JrIGFuZAorICAgICAgICB3aWxsIGVu YWJsZSB1cyB0byBoYW5kbGUgdGhlIG1pbm1heCBjYXNlIG9uY2UgdGhlIGNvbXB1dGF0aW9uIGxv Z2ljIGhhcyBiZWVuCisgICAgICAgIHVwZGF0ZWQuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3Mt Z3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24uaHRtbAorCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3Jp ZDo6bG9naWNhbENvbnRlbnRIZWlnaHRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJHcmlkOjpsYXlvdXRHcmlkSXRlbXMpOgorICAgICAgICBVcGRhdGVkIHRoZXNlIGZ1bmN0aW9u cyB0byB1c2UgZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQuCisKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckdyaWQ6OmdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKToKKyAgICAgICAgQWRkZWQgdGhpcyBo ZWxwZXIgZnVuY3Rpb24gdG8gaGFuZGxlIG11bHRpcGxlIHNwYW5uZWQgZ3JpZCB0cmFja3MuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5oOiBBZGRlZCB0aGUgcHJldmlvdXMgZnVu Y3Rpb24uCisKIDIwMTMtMDMtMTEgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEluYXBwcm9wcmlhdGUgdmFsaWRhdGlvbiBtZXNzYWdlIGZvciByZXF1aXJlZCBu dW1iZXIvZGF0ZSBpbnB1dCBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdy aWQuY3BwCmluZGV4IGNjZTU3MTRhNmQxODU4N2Q5ZTBkMzZmZWM1MDM2NjQ1NWFhMWFkYjMuLmFi ZjZkYzEyNGRiYzhlMzRjYWY0ZGRkY2FiMjc1N2JhZTIyNDNmYjYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTM1OSw4ICszNTksNyBAQCBMYXlvdXRVbml0IFJl bmRlckdyaWQ6OmxvZ2ljYWxDb250ZW50SGVpZ2h0Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwg VmVjdG9yPEdyaQogICAgIGlmICghY2hpbGQtPm5lZWRzTGF5b3V0KCkpCiAgICAgICAgIGNoaWxk LT5zZXROZWVkc0xheW91dCh0cnVlLCBNYXJrT25seVRoaXMpOwogCi0gICAgY29uc3QgR3JpZENv b3JkaW5hdGUmIGNvb3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRpbmF0ZShjaGlsZCk7Ci0gICAg Y2hpbGQtPnNldE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aChjb2x1 bW5UcmFja3NbY29vcmRpbmF0ZS5jb2x1bW5JbmRleF0ubV91c2VkQnJlYWR0aCk7CisgICAgY2hp bGQtPnNldE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aChncmlkQXJl YUJyZWFkdGhGb3JDaGlsZChjaGlsZCwgRm9yQ29sdW1ucywgY29sdW1uVHJhY2tzKSk7CiAgICAg Y2hpbGQtPmNsZWFyT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbEhlaWdodCgp OwogICAgIGNoaWxkLT5sYXlvdXQoKTsKICAgICByZXR1cm4gY2hpbGQtPmxvZ2ljYWxIZWlnaHQo KTsKQEAgLTY0NSw4ICs2NDQsNiBAQCB2b2lkIFJlbmRlckdyaWQ6OmxheW91dEdyaWRJdGVtcygp CiAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gZmlyc3RDaGlsZEJveCgpOyBjaGlsZDsgY2hp bGQgPSBjaGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgewogICAgICAgICBMYXlvdXRQb2ludCBjaGls ZFBvc2l0aW9uID0gZmluZENoaWxkTG9naWNhbFBvc2l0aW9uKGNoaWxkLCBjb2x1bW5UcmFja3Ms IHJvd1RyYWNrcyk7CiAKLSAgICAgICAgY29uc3QgR3JpZENvb3JkaW5hdGUmIGNoaWxkQ29vcmRp bmF0ZSA9IGNhY2hlZEdyaWRDb29yZGluYXRlKGNoaWxkKTsKLQogICAgICAgICAvLyBCZWNhdXNl IHRoZSBncmlkIGFyZWEgY2Fubm90IGJlIHN0eWxlZCwgd2UgZG9uJ3QgbmVlZCB0byBhZGp1c3QK ICAgICAgICAgLy8gdGhlIGdyaWQgYnJlYWR0aCB0byBhY2NvdW50IGZvciAnYm94LXNpemluZycu CiAgICAgICAgIExheW91dFVuaXQgb2xkT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9n aWNhbFdpZHRoID0gY2hpbGQtPmhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRo KCkgPyBjaGlsZC0+b3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoKCkg OiBMYXlvdXRVbml0KCk7CkBAIC02NTQsMTEgKzY1MSwxMyBAQCB2b2lkIFJlbmRlckdyaWQ6Omxh eW91dEdyaWRJdGVtcygpCiAKICAgICAgICAgLy8gRklYTUU6IEZvciBjaGlsZHJlbiBpbiBhIGNv bnRlbnQgc2l6ZWQgdHJhY2ssIHdlIGNsZWFyIHRoZSBvdmVycmlkZUNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRMb2dpY2FsSGVpZ2h0CiAgICAgICAgIC8vIGluIG1pbkNvbnRlbnRGb3JDaGlsZCAvIG1h eENvbnRlbnRGb3JDaGlsZCB3aGljaCBtZWFucyB0aGF0IHdlIHdpbGwgYWx3YXlzIHJlbGF5b3V0 IHRoZSBjaGlsZC4KLSAgICAgICAgaWYgKG9sZE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVu dExvZ2ljYWxXaWR0aCAhPSBjb2x1bW5UcmFja3NbY2hpbGRDb29yZGluYXRlLmNvbHVtbkluZGV4 XS5tX3VzZWRCcmVhZHRoIHx8IG9sZE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2lj YWxIZWlnaHQgIT0gcm93VHJhY2tzW2NoaWxkQ29vcmRpbmF0ZS5yb3dJbmRleF0ubV91c2VkQnJl YWR0aCkKKyAgICAgICAgTGF5b3V0VW5pdCBvdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRM b2dpY2FsV2lkdGggPSBncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjaGlsZCwgRm9yQ29sdW1ucywg Y29sdW1uVHJhY2tzKTsKKyAgICAgICAgTGF5b3V0VW5pdCBvdmVycmlkZUNvbnRhaW5pbmdCbG9j a0NvbnRlbnRMb2dpY2FsSGVpZ2h0ID0gZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQoY2hpbGQsIEZv clJvd3MsIHJvd1RyYWNrcyk7CisgICAgICAgIGlmIChvbGRPdmVycmlkZUNvbnRhaW5pbmdCbG9j a0NvbnRlbnRMb2dpY2FsV2lkdGggIT0gb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9n aWNhbFdpZHRoIHx8IG9sZE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxIZWln aHQgIT0gb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbEhlaWdodCkKICAgICAg ICAgICAgIGNoaWxkLT5zZXROZWVkc0xheW91dCh0cnVlLCBNYXJrT25seVRoaXMpOwogCi0gICAg ICAgIGNoaWxkLT5zZXRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgo Y29sdW1uVHJhY2tzW2NoaWxkQ29vcmRpbmF0ZS5jb2x1bW5JbmRleF0ubV91c2VkQnJlYWR0aCk7 Ci0gICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2Fs SGVpZ2h0KHJvd1RyYWNrc1tjaGlsZENvb3JkaW5hdGUucm93SW5kZXhdLm1fdXNlZEJyZWFkdGgp OworICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNh bFdpZHRoKG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCk7CisgICAg ICAgIGNoaWxkLT5zZXRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsSGVpZ2h0 KG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxIZWlnaHQpOwogCiAgICAgICAg IC8vIEZJWE1FOiBHcmlkIGl0ZW1zIHNob3VsZCBzdHJldGNoIHRvIGZpbGwgdGhlaXIgY2VsbHMu IE9uY2Ugd2UKICAgICAgICAgLy8gaW1wbGVtZW50IGdyaWQte2NvbHVtbixyb3d9LWFsaWduLCB3 ZSBjYW4gYWxzbyBzaHJpbmsgdG8gZml0LiBGb3IKQEAgLTc0Miw2ICs3NDEsMjMgQEAgc2l6ZV90 IFJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRpb25Gcm9tU3R5bGUoY29uc3QgR3JpZFBvc2l0 aW9uJiBwb3NpdGlvbiwgR3IKICAgICByZXR1cm4gMDsKIH0KIAorTGF5b3V0VW5pdCBSZW5kZXJH cmlkOjpncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBUcmFj a1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JiB0cmFj a3MpIGNvbnN0Cit7CisgICAgY29uc3QgR3JpZENvb3JkaW5hdGUmIGNvb3JkaW5hdGUgPSBjYWNo ZWRHcmlkQ29vcmRpbmF0ZShjaGlsZCk7CisgICAgc2l6ZV90IHRyYWNrSW5kZXggPSAoZGlyZWN0 aW9uID09IEZvckNvbHVtbnMpID8gY29vcmRpbmF0ZS5jb2x1bW5JbmRleCA6IGNvb3JkaW5hdGUu cm93SW5kZXg7CisgICAgT3duUHRyPEdyaWRTcGFuPiBzcGFuID0gcmVzb2x2ZUdyaWRQb3NpdGlv bnNGcm9tU3R5bGUoY2hpbGQsIGRpcmVjdGlvbik7CisgICAgaWYgKCFzcGFuKSB7CisgICAgICAg IC8vIEZJWE1FOiBXZSBkb24ndCBzdXBwb3J0IHNwYW5uaW5nIHdpdGggYXV0byBwb3NpdGlvbnMg eWV0LiBPbmNlIHdlIGRvLCB0aGlzIGlzIHdyb25nLgorICAgICAgICBzcGFuID0gYWRvcHRQdHIo bmV3IEdyaWRTcGFuKHRyYWNrSW5kZXgsIHRyYWNrSW5kZXgpKTsKKyAgICB9CisKKyAgICBBU1NF UlQoc3Bhbi0+aW5pdGlhbFBvc2l0aW9uSW5kZXggPT0gdHJhY2tJbmRleCk7CisgICAgTGF5b3V0 VW5pdCBncmlkQXJlYUJyZWFkdGggPSAwOworICAgIGZvciAoOyB0cmFja0luZGV4IDw9IHNwYW4t PmZpbmFsUG9zaXRpb25JbmRleDsgKyt0cmFja0luZGV4KQorICAgICAgICBncmlkQXJlYUJyZWFk dGggKz0gdHJhY2tzW3RyYWNrSW5kZXhdLm1fdXNlZEJyZWFkdGg7CisgICAgcmV0dXJuIGdyaWRB cmVhQnJlYWR0aDsKK30KKwogTGF5b3V0UG9pbnQgUmVuZGVyR3JpZDo6ZmluZENoaWxkTG9naWNh bFBvc2l0aW9uKFJlbmRlckJveCogY2hpbGQsIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JiBjb2x1 bW5UcmFja3MsIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JiByb3dUcmFja3MpCiB7CiAgICAgY29u c3QgR3JpZENvb3JkaW5hdGUmIGNvb3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRpbmF0ZShjaGls ZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCA3ZTU4NzhlZDIwMzVl NTdmMTUyODlkMWJhMzFhODk0MjcwZWFhNzk5Li4yNjY0MzhmMmNjMWFhNzgyMzg3ZGViZDEyZDMy N2JiY2VjZGFjOGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy R3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTEy NSw2ICsxMjUsOCBAQCBwcml2YXRlOgogICAgIH07CiAgICAgc2l6ZV90IHJlc29sdmVHcmlkUG9z aXRpb25Gcm9tU3R5bGUoY29uc3QgR3JpZFBvc2l0aW9uJiwgR3JpZFBvc2l0aW9uU2lkZSkgY29u c3Q7CiAKKyAgICBMYXlvdXRVbml0IGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNvbnN0IFJlbmRl ckJveCogY2hpbGQsIFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBjb25zdCBWZWN0b3I8R3JpZFRyYWNr PiYpIGNvbnN0OworCiAjaWZuZGVmIE5ERUJVRwogICAgIGJvb2wgdHJhY2tzQXJlV2lkZXJUaGFu TWluVHJhY2tCcmVhZHRoKFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBjb25zdCBWZWN0b3I8R3JpZFRy YWNrPiYpOwogICAgIGJvb2wgZ3JpZFdhc1BvcHVsYXRlZCgpIGNvbnN0IHsgcmV0dXJuICFtX2dy aWQuaXNFbXB0eSgpICYmICFtX2dyaWRbMF0uaXNFbXB0eSgpOyB9CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOWQwMTMxNjMw M2I1MDQyYjdjYzE1NGM5MjMxYjIwYjFhNGIwOWI1Mi4uMGNlYjdjNzliNzQ3ZTM3ODYxOGYyNmRi M2QxOTg5MjVkMzBkMmI4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTAzLTExICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEhhbmRsZSBzcGFubmluZyBncmlkIGl0ZW1zIG92ZXIgc3BlY2lmaWVkIGdyaWQg dHJhY2tzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTE5MTgKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAgICAgICogZmFz dC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24tZXhwZWN0ZWQu dHh0OgorICAgICAgICBXZSBub3cgcGFzcyBhbGwgdGhlIHRlc3RzLgorCiAyMDEzLTAzLTExICBL ZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbmFwcHJvcHJpYXRl IHZhbGlkYXRpb24gbWVzc2FnZSBmb3IgcmVxdWlyZWQgbnVtYmVyL2RhdGUgaW5wdXQgZWxlbWVu dHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRl bS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3Nz LWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dApp bmRleCBhNzU3N2I3ZjUyMGEzNGFlMzIzYTZkMWQwNGYyMjJmNTM3NzgzZTQ1Li5kZmVkNGY2NGQ2 ZmY4ODE3NmRiZTZmYTViNmYzZWRkMDA2ZmM5NzRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9m YXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi1leHBlY3Rl ZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNw YW5uaW5nLXJlc29sdXRpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDM2ICsxLDEwIEBACiBUZXN0IHRo YXQgc3Bhbm5pZyByb3dzIC8gY29sdW1ucyBpbnNpZGUgcGVyY2VudGFnZSBzaXplZCBncmlkIGFy ZWFzIGdldCBwcm9wZXJseSBzaXplZC4KIAotRkFJTDoKLUV4cGVjdGVkIDQwMCBmb3Igd2lkdGgs IGJ1dCBnb3QgMTYwLiAKLQotPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0i NDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj4KLSAgICA8ZGl2IGNsYXNzPSJzaXplZFRv R3JpZEFyZWEgZmlyc3RSb3dCb3RoQ29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNl dC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI5 MCI+PC9kaXY+Ci08L2Rpdj4KLUZBSUw6Ci1FeHBlY3RlZCA0MDAgZm9yIHdpZHRoLCBidXQgZ290 IDE2MC4gCi0KLTxkaXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0 YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+Ci0gICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVh IHNlY29uZFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9Ijkw IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMTAiPjwv ZGl2PgotPC9kaXY+Ci1GQUlMOgotRXhwZWN0ZWQgMzAwIGZvciBoZWlnaHQsIGJ1dCBnb3QgOTAu IAotCi08ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PSIzMDAiPgotICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBib3Ro Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjE2MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+PC9kaXY+Ci08 L2Rpdj4KLUZBSUw6Ci1FeHBlY3RlZCAzMDAgZm9yIGhlaWdodCwgYnV0IGdvdCA5MC4gCi0KLTxk aXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1o ZWlnaHQ9IjMwMCI+Ci0gICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGJvdGhSb3dTZWNv bmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjE2MCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBl Y3RlZC13aWR0aD0iMjQwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj48L2Rpdj4KLTwvZGl2 PgotRkFJTDoKLUV4cGVjdGVkIDQwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTYwLiAKLUV4cGVjdGVk IDMwMCBmb3IgaGVpZ2h0LCBidXQgZ290IDkwLiAKLQotPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1l eHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj4KLSAgICA8ZGl2 IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYm90aFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9 IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBl Y3RlZC1oZWlnaHQ9IjMwMCI+PC9kaXY+Ci08L2Rpdj4KK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MK K1BBU1MKIFBBU1MKIFBBU1MKIFBBU1MK