124345 2013-11-14 04:47:24 -0800 [CSS Grid Layout] Fix positioning of grid items with margins 2013-11-27 00:40:40 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 60731 123994 1 svillar svillar commit-queue darin dino eflews.bot esprehn+autocc glenn gyuyoung.kim hyatt kling koivisto kondapallykalyan svillar oldest_to_newest 950599 0 svillar 2013-11-14 04:47:24 -0800 There are some FIXME's in the code mentioning that we aren't considering the margins in the layouting of the grid items. Apart from that margins should be also considered when computing the grid's intrinsic size. Fixing this would involve merging these two changes from Blink: Positioning should account for the grid items' margins This change just adds the margin before / start to the grid items' positions. In order to get consistent behavior, we now have to call findChildLogicalPosition after layout (that's where we compute the margins). Also removed some FIXMEs that were handled in the code. Review URL: https://chromiumcodereview.appspot.com/23463036 and RenderGrid should include grid items' margins in its intrinsic size To match flexbox and the author's intent, the grid element's intrinsic logical widths should account for the fixed margins on any grid items'. The change is straightforward and moves the code from RenderFlexibleBox to RenderBlock for easy sharing. Review URL: https://chromiumcodereview.appspot.com/24031007 950610 1 216923 svillar 2013-11-14 05:11:27 -0800 Created attachment 216923 Patch 950614 2 216923 eflews.bot 2013-11-14 05:23:39 -0800 Comment on attachment 216923 Patch Attachment 216923 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/22640307 953915 3 svillar 2013-11-25 01:08:27 -0800 (In reply to comment #2) > (From update of attachment 216923 [details]) > Attachment 216923 [details] did not pass efl-wk2-ews (efl-wk2): > Output: http://webkit-queues.appspot.com/results/22640307 The patch is ready for review. That failure in the efl EWS affected some other bugs and is not related to the actual patch. 954271 4 svillar 2013-11-26 08:47:10 -0800 dhyatt is the refactoring of marginIntrinsicLogicalWidthForChild() compatible with your ongoing RenderBlockFlow work? 954288 5 216923 hyatt 2013-11-26 09:51:29 -0800 Comment on attachment 216923 Patch r=me 954475 6 svillar 2013-11-27 00:40:40 -0800 Committed r159809: <http://trac.webkit.org/changeset/159809> 216923 2013-11-14 05:11:27 -0800 2013-11-26 09:51:29 -0800 Patch bug-124345-20131114141125.patch text/plain 21958 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5Mjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFjNTg3NDBhNDJkYmI1 MzZlZTJhMGU5MDE1ZDI3ZjViYmExOGVlYy4uNThjZjk4YWQyOThmMmI4NDQzODZiM2NiNmI3Zjgy ZjViMmQ3ZDM3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTExLTE0ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEZpeCBwb3NpdGlvbmluZyBvZiBncmlkIGl0ZW1zIHdpdGggbWFyZ2lucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0MzQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJvbSBCbGluayBy MTU3OTI1IGFuZCByMTU4MDQxIGJ5IDxqY2hhZmZyYWl4QGNocm9taXVtLm9yZz4KKworICAgICAg ICBUZXN0OiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tbWFyZ2luLXJlc29sdXRpb24u aHRtbAorCisgICAgICAgIEFkZHMgbWFyZ2luIHN0YXJ0L2JlZm9yZSB0byB0aGUgcG9zaXRpb25z IG9mIGdyaWQgaXRlbXMgKHJlbW92aW5nCisgICAgICAgIHNldmVyYWwgRklYTUUncyBpbiB0aGUg Y3VycmVudCBjb2RlKS4gVGhpcyBtZWFucyBjYWxsaW5nCisgICAgICAgIGZpbmRDaGlsZExvZ2lj YWxQb3NpdGlvbigpIGFmdGVyIHRoZSBsYXlvdXQgaW4gb3JkZXIgdG8gaGF2ZSB0aGUKKyAgICAg ICAgcmlnaHQgdmFsdWVzIGZvciB0aGUgbWFyZ2lucy4KKworICAgICAgICBJbiBvcmRlciB0byBt YXRjaCBmbGV4Ym94IGFuZCBhdXRob3IncyBpbnRlbnRzIHdlJ3JlIGFsc28KKyAgICAgICAgaW5j bHVkaW5nIHRoZSBtYXJnaW5zIG9mIGdyaWQgaXRlbXMgaW4gdGhlIGludHJpbnNpYyBzaXplIG9m IHRoZQorICAgICAgICBncmlkLiBUaGF0J3Mgd2h5IGZsZXhib3gncyBtYXJnaW5Mb2dpY2FsUG9z aXRpb25Gb3JDaGlsZCgpIGlzCisgICAgICAgIG1vdmVkIHVwIHRvIFJlbmRlckJsb2NrIGluIG9y ZGVyIHRvIHNoYXJlIGl0IHdpdGggUmVuZGVyR3JpZC4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bWFyZ2luSW50 cmluc2ljTG9naWNhbFdpZHRoRm9yQ2hpbGQpOiBNb3ZlZAorICAgICAgICBmcm9tIFJlbmRlckZs ZXhpYmxlQm94OjptYXJnaW5Mb2dpY2FsV2lkdGhGb3JDaGlsZCgpLgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9jay5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmNvbXB1dGVQcmVmZXJyZWRUcmFja1dpZHRo KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmxheW91dEdyaWRJdGVtcyk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpmaW5kQ2hpbGRMb2dpY2FsUG9zaXRpb24pOgorCiAy MDEzLTExLTEzICBWaWN0b3IgQ29zdGFuICA8Y29zdGFuQGdtYWlsLmNvbT4KIAogICAgICAgICBC bG9iIGNvbnN0cnVjdG9yIGFjY2VwdHMgYSBzZXF1ZW5jZSAoYXJyYXktbGlrZSBvYmplY3QpIGFz IGZpcnN0IGFyZy4gCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRl eCAwNjU2YzU5MmNkZmM4MmVjYTBlNTg2MTNkYzI3MjgxZWMyYmU3MzAzLi4wYWNmNTlkYmJiZWZl NDY4ZjEyODAxOTM5NmEwYTk2ODM4NGE0ZDYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKQEAgLTIwNzcsNiArMjA3NywyMSBAQCB2b2lkIFJlbmRlckJsb2NrOjpt YXJrRml4ZWRQb3NpdGlvbk9iamVjdEZvckxheW91dElmTmVlZGVkKFJlbmRlck9iamVjdCYgY2hp bGQpCiAgICAgfQogfQogCitMYXlvdXRVbml0IFJlbmRlckJsb2NrOjptYXJnaW5JbnRyaW5zaWNM b2dpY2FsV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAoreworICAgIC8vIEEg bWFyZ2luIGhhcyB0aHJlZSB0eXBlczogZml4ZWQsIHBlcmNlbnRhZ2UsIGFuZCBhdXRvICh2YXJp YWJsZSkuCisgICAgLy8gQXV0byBhbmQgcGVyY2VudGFnZSBtYXJnaW5zIGJlY29tZSAwIHdoZW4g Y29tcHV0aW5nIG1pbi9tYXggd2lkdGguCisgICAgLy8gRml4ZWQgbWFyZ2lucyBjYW4gYmUgYWRk ZWQgaW4gYXMgaXMuCisgICAgTGVuZ3RoIG1hcmdpbkxlZnQgPSBjaGlsZC5zdHlsZSgpLm1hcmdp blN0YXJ0VXNpbmcoJnN0eWxlKCkpOworICAgIExlbmd0aCBtYXJnaW5SaWdodCA9IGNoaWxkLnN0 eWxlKCkubWFyZ2luRW5kVXNpbmcoJnN0eWxlKCkpOworICAgIExheW91dFVuaXQgbWFyZ2luID0g MDsKKyAgICBpZiAobWFyZ2luTGVmdC5pc0ZpeGVkKCkpCisgICAgICAgIG1hcmdpbiArPSBtYXJn aW5MZWZ0LnZhbHVlKCk7CisgICAgaWYgKG1hcmdpblJpZ2h0LmlzRml4ZWQoKSkKKyAgICAgICAg bWFyZ2luICs9IG1hcmdpblJpZ2h0LnZhbHVlKCk7CisgICAgcmV0dXJuIG1hcmdpbjsKK30KKwog dm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0UG9zaXRpb25lZE9iamVjdHMoYm9vbCByZWxheW91dENo aWxkcmVuLCBib29sIGZpeGVkUG9zaXRpb25PYmplY3RzT25seSkKIHsKICAgICBUcmFja2VkUmVu ZGVyZXJMaXN0SGFzaFNldCogcG9zaXRpb25lZERlc2NlbmRhbnRzID0gcG9zaXRpb25lZE9iamVj dHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggN2I5NGExZTkw NjFlNWNkMzkyZjdiMDdjNTM3M2YzODRmNDA4ZDRmZC4uNGJlYTNlYjI3YjlkZjczODNlYTUwYmZm ZDg4YjM1ZmY2NDFjMWFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgK QEAgLTQwOSw2ICs0MDksOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBsYXlvdXRQb3NpdGlvbmVk T2JqZWN0cyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIGJvb2wgZml4ZWRQb3NpdGlvbk9iamVjdHNP bmx5ID0gZmFsc2UpOwogICAgIHZvaWQgbWFya0ZpeGVkUG9zaXRpb25PYmplY3RGb3JMYXlvdXRJ Zk5lZWRlZChSZW5kZXJPYmplY3QmIGNoaWxkKTsKIAorICAgIExheW91dFVuaXQgbWFyZ2luSW50 cmluc2ljTG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JikgY29uc3Q7CisKICAgICB2aXJ0 dWFsIHZvaWQgcGFpbnQoUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9pbnQmKSBPVkVSUklERTsK ICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRPYmplY3QoUGFpbnRJbmZvJiwgY29uc3QgTGF5b3V0UG9p bnQmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDaGlsZHJlbihQYWludEluZm8m IGZvclNlbGYsIGNvbnN0IExheW91dFBvaW50JiwgUGFpbnRJbmZvJiBmb3JDaGlsZCwgYm9vbCB1 c2VQcmludFJlY3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5jcHAKaW5kZXggODFhNTQ2OWZhNGE2ZWJjZDc1YzBkNzhlMDUxN2NkZDE2ZGUzMWEwMi4u NjBkNDYzMjQyYmU0ZDlhNTYzN2YwOTZkYTM5Y2U4Y2M1ZmQxYTVhYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC05MSwyMSArOTEsNiBA QCBjb25zdCBjaGFyKiBSZW5kZXJGbGV4aWJsZUJveDo6cmVuZGVyTmFtZSgpIGNvbnN0CiAgICAg cmV0dXJuICJSZW5kZXJGbGV4aWJsZUJveCI7CiB9CiAKLXN0YXRpYyBMYXlvdXRVbml0IG1hcmdp bkxvZ2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIFJlbmRlclN0eWxlKiBwYXJl bnRTdHlsZSkKLXsKLSAgICAvLyBBIG1hcmdpbiBoYXMgdGhyZWUgdHlwZXM6IGZpeGVkLCBwZXJj ZW50YWdlLCBhbmQgYXV0byAodmFyaWFibGUpLgotICAgIC8vIEF1dG8gYW5kIHBlcmNlbnRhZ2Ug bWFyZ2lucyBiZWNvbWUgMCB3aGVuIGNvbXB1dGluZyBtaW4vbWF4IHdpZHRoLgotICAgIC8vIEZp eGVkIG1hcmdpbnMgY2FuIGJlIGFkZGVkIGluIGFzIGlzLgotICAgIExlbmd0aCBtYXJnaW5MZWZ0 ID0gY2hpbGQuc3R5bGUoKS5tYXJnaW5TdGFydFVzaW5nKHBhcmVudFN0eWxlKTsKLSAgICBMZW5n dGggbWFyZ2luUmlnaHQgPSBjaGlsZC5zdHlsZSgpLm1hcmdpbkVuZFVzaW5nKHBhcmVudFN0eWxl KTsKLSAgICBMYXlvdXRVbml0IG1hcmdpbiA9IDA7Ci0gICAgaWYgKG1hcmdpbkxlZnQuaXNGaXhl ZCgpKQotICAgICAgICBtYXJnaW4gKz0gbWFyZ2luTGVmdC52YWx1ZSgpOwotICAgIGlmIChtYXJn aW5SaWdodC5pc0ZpeGVkKCkpCi0gICAgICAgIG1hcmdpbiArPSBtYXJnaW5SaWdodC52YWx1ZSgp OwotICAgIHJldHVybiBtYXJnaW47Ci19Ci0KIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1 dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5 b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdAogewogICAgIC8vIEZJWE1FOiBXZSdyZSBp Z25vcmluZyBmbGV4LWJhc2lzIGhlcmUgYW5kIHdlIHNob3VsZG4ndC4gV2UgY2FuJ3Qgc3RhcnQg aG9ub3JpbmcgaXQgdGhvdWdoIHVudGlsCkBAIC0xMTUsNyArMTAwLDcgQEAgdm9pZCBSZW5kZXJG bGV4aWJsZUJveDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWlu TG9naWNhbFdpZHQKICAgICAgICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkK ICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIExheW91dFVuaXQgbWFyZ2luID0gbWFy Z2luTG9naWNhbFdpZHRoRm9yQ2hpbGQoKmNoaWxkLCAmc3R5bGUoKSk7CisgICAgICAgIExheW91 dFVuaXQgbWFyZ2luID0gbWFyZ2luSW50cmluc2ljTG9naWNhbFdpZHRoRm9yQ2hpbGQoKmNoaWxk KTsKICAgICAgICAgYm9vbCBoYXNPcnRob2dvbmFsV3JpdGluZ01vZGUgPSBjaGlsZC0+aXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKSAhPSBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpOwogICAgICAg ICBMYXlvdXRVbml0IG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGhhc09ydGhvZ29uYWxXcml0 aW5nTW9kZSA/IGNoaWxkLT5sb2dpY2FsSGVpZ2h0KCkgOiBjaGlsZC0+bWluUHJlZmVycmVkTG9n aWNhbFdpZHRoKCk7CiAgICAgICAgIExheW91dFVuaXQgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo ID0gaGFzT3J0aG9nb25hbFdyaXRpbmdNb2RlID8gY2hpbGQtPmxvZ2ljYWxIZWlnaHQoKSA6IGNo aWxkLT5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJHcmlkLmNwcAppbmRleCA3Njc4MmI1MTQ5NjJiZGE4NzFlZDAxNmEzMjliOTdkYmZjMGY1 NzllLi4wMzUwOWQ0YWRjY2E2ODNhZmY0ODAzMmQ1ZmQwNTRmOGM4ZjdmMjg3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC0yNTQsMjAgKzI1NCwxOCBAQCBMYXlv dXRVbml0IFJlbmRlckdyaWQ6OmNvbXB1dGVQcmVmZXJyZWRUcmFja1dpZHRoKGNvbnN0IEdyaWRM ZW5ndGgmIGdyaWRMZW5ndGgsCiAgICAgaWYgKGxlbmd0aC5pc01pbkNvbnRlbnQoKSkgewogICAg ICAgICBMYXlvdXRVbml0IG1pbkNvbnRlbnRTaXplID0gMDsKICAgICAgICAgR3JpZEl0ZXJhdG9y IGl0ZXJhdG9yKG1fZ3JpZCwgRm9yQ29sdW1ucywgdHJhY2tJbmRleCk7Ci0gICAgICAgIHdoaWxl IChSZW5kZXJCb3gqIGdyaWRJdGVtID0gaXRlcmF0b3IubmV4dEdyaWRJdGVtKCkpIHsKLSAgICAg ICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgaW5jbHVkZSB0aGUgY2hpbGQncyBmaXhlZCBtYXJn aW5zIGxpa2UgUmVuZGVyRmxleGlibGVCb3guCi0gICAgICAgICAgICBtaW5Db250ZW50U2l6ZSA9 IHN0ZDo6bWF4KG1pbkNvbnRlbnRTaXplLCBncmlkSXRlbS0+bWluUHJlZmVycmVkTG9naWNhbFdp ZHRoKCkpOwotICAgICAgICB9CisgICAgICAgIHdoaWxlIChSZW5kZXJCb3gqIGdyaWRJdGVtID0g aXRlcmF0b3IubmV4dEdyaWRJdGVtKCkpCisgICAgICAgICAgICBtaW5Db250ZW50U2l6ZSA9IHN0 ZDo6bWF4KG1pbkNvbnRlbnRTaXplLCBncmlkSXRlbS0+bWluUHJlZmVycmVkTG9naWNhbFdpZHRo KCkgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhGb3JDaGlsZCgqZ3JpZEl0ZW0pKTsKKwog ICAgICAgICByZXR1cm4gbWluQ29udGVudFNpemU7CiAgICAgfQogCiAgICAgaWYgKGxlbmd0aC5p c01heENvbnRlbnQoKSkgewogICAgICAgICBMYXlvdXRVbml0IG1heENvbnRlbnRTaXplID0gMDsK ICAgICAgICAgR3JpZEl0ZXJhdG9yIGl0ZXJhdG9yKG1fZ3JpZCwgRm9yQ29sdW1ucywgdHJhY2tJ bmRleCk7Ci0gICAgICAgIHdoaWxlIChSZW5kZXJCb3gqIGdyaWRJdGVtID0gaXRlcmF0b3IubmV4 dEdyaWRJdGVtKCkpIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgaW5jbHVkZSB0 aGUgY2hpbGQncyBmaXhlZCBtYXJnaW5zIGxpa2UgUmVuZGVyRmxleGlibGVCb3guCi0gICAgICAg ICAgICBtYXhDb250ZW50U2l6ZSA9IHN0ZDo6bWF4KG1heENvbnRlbnRTaXplLCBncmlkSXRlbS0+ bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkpOwotICAgICAgICB9CisgICAgICAgIHdoaWxlIChS ZW5kZXJCb3gqIGdyaWRJdGVtID0gaXRlcmF0b3IubmV4dEdyaWRJdGVtKCkpCisgICAgICAgICAg ICBtYXhDb250ZW50U2l6ZSA9IHN0ZDo6bWF4KG1heENvbnRlbnRTaXplLCBncmlkSXRlbS0+bWF4 UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhGb3JD aGlsZCgqZ3JpZEl0ZW0pKTsKKwogICAgICAgICByZXR1cm4gbWF4Q29udGVudFNpemU7CiAgICAg fQogCkBAIC03NjEsMTUgKzc1OSwxMSBAQCB2b2lkIFJlbmRlckdyaWQ6OmxheW91dEdyaWRJdGVt cygpCiAgICAgQVNTRVJUKHRyYWNrc0FyZVdpZGVyVGhhbk1pblRyYWNrQnJlYWR0aChGb3JSb3dz LCByb3dUcmFja3MpKTsKIAogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGZpcnN0Q2hpbGRC b3goKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94KCkpIHsKLSAgICAgICAg TGF5b3V0UG9pbnQgY2hpbGRQb3NpdGlvbiA9IGZpbmRDaGlsZExvZ2ljYWxQb3NpdGlvbihjaGls ZCwgY29sdW1uVHJhY2tzLCByb3dUcmFja3MpOwotCiAgICAgICAgIC8vIEJlY2F1c2UgdGhlIGdy aWQgYXJlYSBjYW5ub3QgYmUgc3R5bGVkLCB3ZSBkb24ndCBuZWVkIHRvIGFkanVzdAogICAgICAg ICAvLyB0aGUgZ3JpZCBicmVhZHRoIHRvIGFjY291bnQgZm9yICdib3gtc2l6aW5nJy4KICAgICAg ICAgTGF5b3V0VW5pdCBvbGRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lk dGggPSBjaGlsZC0+aGFzT3ZlcnJpZGVDb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGgoKSA/IGNo aWxkLT5vdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgoKSA6IExheW91 dFVuaXQoKTsKICAgICAgICAgTGF5b3V0VW5pdCBvbGRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRMb2dpY2FsSGVpZ2h0ID0gY2hpbGQtPmhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9n aWNhbEhlaWdodCgpID8gY2hpbGQtPm92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2lj YWxIZWlnaHQoKSA6IExheW91dFVuaXQoKTsKIAotICAgICAgICAvLyBGSVhNRTogRm9yIGNoaWxk cmVuIGluIGEgY29udGVudCBzaXplZCB0cmFjaywgd2UgY2xlYXIgdGhlIG92ZXJyaWRlQ29udGFp bmluZ0Jsb2NrQ29udGVudExvZ2ljYWxIZWlnaHQKLSAgICAgICAgLy8gaW4gbWluQ29udGVudEZv ckNoaWxkIC8gbWF4Q29udGVudEZvckNoaWxkIHdoaWNoIG1lYW5zIHRoYXQgd2Ugd2lsbCBhbHdh eXMgcmVsYXlvdXQgdGhlIGNoaWxkLgogICAgICAgICBMYXlvdXRVbml0IG92ZXJyaWRlQ29udGFp bmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCA9IGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNo aWxkLCBGb3JDb2x1bW5zLCBjb2x1bW5UcmFja3MpOwogICAgICAgICBMYXlvdXRVbml0IG92ZXJy aWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxIZWlnaHQgPSBncmlkQXJlYUJyZWFkdGhG b3JDaGlsZChjaGlsZCwgRm9yUm93cywgcm93VHJhY2tzKTsKICAgICAgICAgaWYgKG9sZE92ZXJy aWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCAhPSBvdmVycmlkZUNvbnRhaW5p bmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGggfHwgb2xkT3ZlcnJpZGVDb250YWluaW5nQmxvY2tD b250ZW50TG9naWNhbEhlaWdodCAhPSBvdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dp Y2FsSGVpZ2h0KQpAQCAtNzg1LDggKzc3OSw3IEBAIHZvaWQgUmVuZGVyR3JpZDo6bGF5b3V0R3Jp ZEl0ZW1zKCkKICAgICAgICAgLy8gbm93LCBqdXN0IHNpemUgYXMgaWYgd2Ugd2VyZSBhIHJlZ3Vs YXIgY2hpbGQuCiAgICAgICAgIGNoaWxkLT5sYXlvdXRJZk5lZWRlZCgpOwogCi0gICAgICAgIC8v IEZJWE1FOiBIYW5kbGUgYm9yZGVyICYgcGFkZGluZyBvbiB0aGUgZ3JpZCBlbGVtZW50LgotICAg ICAgICBjaGlsZC0+c2V0TG9naWNhbExvY2F0aW9uKGNoaWxkUG9zaXRpb24pOworICAgICAgICBj aGlsZC0+c2V0TG9naWNhbExvY2F0aW9uKGZpbmRDaGlsZExvZ2ljYWxQb3NpdGlvbihjaGlsZCwg Y29sdW1uVHJhY2tzLCByb3dUcmFja3MpKTsKIAogICAgICAgICAvLyBJZiB0aGUgY2hpbGQgbW92 ZWQsIHdlIGhhdmUgdG8gcmVwYWludCBpdCBhcyB3ZWxsIGFzIGFueSBmbG9hdGluZy9wb3NpdGlv bmVkCiAgICAgICAgIC8vIGRlc2NlbmRhbnRzLiBBbiBleGNlcHRpb24gaXMgaWYgd2UgbmVlZCBh IGxheW91dC4gSW4gdGhpcyBjYXNlLCB3ZSBrbm93IHdlJ3JlIGdvaW5nIHRvCkBAIC0xMDMxLDE0 ICsxMDI0LDEzIEBAIExheW91dFBvaW50IFJlbmRlckdyaWQ6OmZpbmRDaGlsZExvZ2ljYWxQb3Np dGlvbihSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBWZWN0b3I8CiAgICAgY29uc3QgR3JpZENvb3Jk aW5hdGUmIGNvb3JkaW5hdGUgPSBjYWNoZWRHcmlkQ29vcmRpbmF0ZShjaGlsZCk7CiAKICAgICAv LyBUaGUgZ3JpZCBpdGVtcyBzaG91bGQgYmUgaW5zaWRlIHRoZSBncmlkIGNvbnRhaW5lcidzIGJv cmRlciBib3gsIHRoYXQncyB3aHkgdGhleSBuZWVkIHRvIGJlIHNoaWZ0ZWQuCi0gICAgTGF5b3V0 UG9pbnQgb2Zmc2V0KGJvcmRlckFuZFBhZGRpbmdTdGFydCgpLCBib3JkZXJBbmRQYWRkaW5nQmVm b3JlKCkpOworICAgIExheW91dFBvaW50IG9mZnNldChib3JkZXJBbmRQYWRkaW5nU3RhcnQoKSAr IG1hcmdpblN0YXJ0Rm9yQ2hpbGQoKmNoaWxkKSwgYm9yZGVyQW5kUGFkZGluZ0JlZm9yZSgpICsg bWFyZ2luQmVmb3JlRm9yQ2hpbGQoKmNoaWxkKSk7CiAgICAgLy8gRklYTUU6IHxjb2x1bW5UcmFj a3wgYW5kIHxyb3dUcmFja3wgc2hvdWxkIGJlIHNtYWxsZXIgdGhhbiBvdXIgY29sdW1uIC8gcm93 IGNvdW50LgogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29vcmRpbmF0ZS5jb2x1bW5zLmlu aXRpYWxQb3NpdGlvbkluZGV4ICYmIGkgPCBjb2x1bW5UcmFja3Muc2l6ZSgpOyArK2kpCiAgICAg ICAgIG9mZnNldC5zZXRYKG9mZnNldC54KCkgKyBjb2x1bW5UcmFja3NbaV0ubV91c2VkQnJlYWR0 aCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb29yZGluYXRlLnJvd3MuaW5pdGlhbFBv c2l0aW9uSW5kZXggJiYgaSA8IHJvd1RyYWNrcy5zaXplKCk7ICsraSkKICAgICAgICAgb2Zmc2V0 LnNldFkob2Zmc2V0LnkoKSArIHJvd1RyYWNrc1tpXS5tX3VzZWRCcmVhZHRoKTsKIAotICAgIC8v IEZJWE1FOiBIYW5kbGUgbWFyZ2lucyBvbiB0aGUgZ3JpZCBpdGVtLgogICAgIHJldHVybiBvZmZz ZXQ7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCA5NTA3ZGFjYjE1YjhlODE4ODgwNmFlYTBkNTllYzhjODRmMTA3ZTI2 Li4xM2VmYTBhYzgyNGZkY2U2Y2Q4NzAxMjRkZmY2OWIyMTRhOWVlYjhmIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTMtMTEtMTQgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxp YS5jb20+CisKKyAgICAgICAgW0NTUyBHcmlkIExheW91dF0gRml4IHBvc2l0aW9uaW5nIG9mIGdy aWQgaXRlbXMgd2l0aCBtYXJnaW5zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjQzNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGcm9tIEJsaW5rIHIxNTc5MjUgYW5kIHIxNTgwNDEgYnkgPGpjaGFmZnJh aXhAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE5ldyB0ZXN0IGNhc2UgZm9yIGdyaWQgaXRlbXMg bWFyZ2luIHJlc29sdXRpb24uIEV4dGVuZGVkIHRoZQorICAgICAgICBwcmVmZXJyZWQgbG9naWNh bCB3aWR0aHMgY2hlY2tzIHdpdGggZ3JpZCBpdGVtcyB3aXRoIG1hcmdpbnMuCisKKyAgICAgICAg KiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tbWFyZ2luLXJlc29sdXRpb24tZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0t bWFyZ2luLXJlc29sdXRpb24uaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1s YXlvdXQvZ3JpZC1wcmVmZXJyZWQtbG9naWNhbC13aWR0aHMtZXhwZWN0ZWQudHh0OgorICAgICAg ICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtcHJlZmVycmVkLWxvZ2ljYWwtd2lkdGhzLmh0 bWw6CisKIDIwMTMtMTEtMTMgIFZpY3RvciBDb3N0YW4gIDxjb3N0YW5AZ21haWwuY29tPgogCiAg ICAgICAgIEJsb2IgY29uc3RydWN0b3IgYWNjZXB0cyBhIHNlcXVlbmNlIChhcnJheS1saWtlIG9i amVjdCkgYXMgZmlyc3QgYXJnLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3Jp ZC1sYXlvdXQvZ3JpZC1pdGVtLW1hcmdpbi1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1tYXJnaW4tcmVzb2x1dGlvbi1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGFjYzQ2OWYxZmNjMWZlZjc0MWFhZWM0Y2VlODg3YmZl NWY2YTdmYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5 b3V0L2dyaWQtaXRlbS1tYXJnaW4tcmVzb2x1dGlvbi1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw5 IEBACitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgdGhlIGdyaWQgaXRlbXMgYXJlIHNoaWZ0ZWQgYnkg dGhlaXJzIGJlZm9yZSBhbmQgc3RhcnQgbWFyZ2lucyBpbnNpZGUgdGhlaXIgZ3JpZCBhcmVhLgor UEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLW1hcmdpbi1yZXNv bHV0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0t bWFyZ2luLXJlc29sdXRpb24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41MTY2ZGRmMTAyNmM5OTNiNmE1N2U0 MTNmMzcwNWYwN2UyMTNiNWE5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLW1hcmdpbi1yZXNvbHV0aW9uLmh0bWwKQEAgLTAsMCAr MSwxMDIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQ+CitpZiAo d2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2UoIldl YktpdENTU0dyaWRMYXlvdXRFbmFibGVkIiwgMSk7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIu Li8uLi9yZXNvdXJjZXMvY2hlY2stbGF5b3V0LmpzIj48L3NjcmlwdD4KKzxsaW5rIGhyZWY9InJl c291cmNlcy9ncmlkLmNzcyIgcmVsPSJzdHlsZXNoZWV0Ij4KKzxzdHlsZT4KKy5ncmlkIHsKKyAg ICAtd2Via2l0LWdyaWQtZGVmaW5pdGlvbi1yb3dzOiAxMDBweCAxMDBweDsKKyAgICAtd2Via2l0 LWdyaWQtZGVmaW5pdGlvbi1jb2x1bW5zOiAxMDBweCAxMDBweDsKKyAgICB3aWR0aDogMjAwcHg7 Cit9CisKKy5ncmlkSXRlbSB7CisgICAgbWFyZ2luOiAyMHB4IDMwcHggNDBweCA1MHB4OworICAg IHdpZHRoOiAyMHB4OworICAgIGhlaWdodDogNDBweDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8 Ym9keSBvbmxvYWQ9ImNoZWNrTGF5b3V0KCcuZ3JpZCcpIj4KKworPGRpdj5UaGlzIHRlc3QgY2hl Y2tzIHRoYXQgdGhlIGdyaWQgaXRlbXMgYXJlIHNoaWZ0ZWQgYnkgdGhlaXJzIGJlZm9yZSBhbmQg c3RhcnQgbWFyZ2lucyBpbnNpZGUgdGhlaXIgZ3JpZCBhcmVhLjwvZGl2PgorCis8ZGl2IHN0eWxl PSJwb3NpdGlvbjogcmVsYXRpdmUiPgorICAgIDxkaXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjIwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwMCI+CisgICAgICAgIDxkaXYg Y2xhc3M9ImdyaWRJdGVtIGZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjUwIiBk YXRhLW9mZnNldC15PSIyMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSI0MCI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIGZpcnN0Um93 U2Vjb25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSIxNTAiIGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRh LWV4cGVjdGVkLXdpZHRoPSIyMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjQwIj48L2Rpdj4KKyAg ICAgICAgPGRpdiBjbGFzcz0iZ3JpZEl0ZW0gc2Vjb25kUm93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zm c2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIxMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJncmlk SXRlbSBzZWNvbmRSb3dTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjE1MCIgZGF0YS1vZmZz ZXQteT0iMTIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9 IjQwIj48L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjog cmVsYXRpdmUiPgorICAgIDxkaXYgY2xhc3M9ImdyaWQgdmVydGljYWxSTCIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMjAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjAwIj4KKyAgICAgICAgPGRpdiBj bGFzcz0iZ3JpZEl0ZW0gZmlyc3RSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMTUwIiBk YXRhLW9mZnNldC15PSIyMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSI0MCI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIGZpcnN0Um93 U2Vjb25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSIxNTAiIGRhdGEtb2Zmc2V0LXk9IjEyMCIgZGF0 YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0MCI+PC9kaXY+Cisg ICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIHNlY29uZFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9m ZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJncmlk SXRlbSBzZWNvbmRSb3dTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNl dC15PSIxMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i NDAiPjwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiBy ZWxhdGl2ZSI+CisgICAgPGRpdiBjbGFzcz0iZ3JpZCB2ZXJ0aWNhbExSIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSIyMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMDAiPgorICAgICAgICA8ZGl2IGNs YXNzPSJncmlkSXRlbSBmaXJzdFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSI1MCIgZGF0 YS1vZmZzZXQteT0iMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBkYXRhLWV4cGVjdGVkLWhl aWdodD0iNDAiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJncmlkSXRlbSBmaXJzdFJvd1Nl Y29uZENvbHVtbiIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjEyMCIgZGF0YS1l eHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0MCI+PC9kaXY+CisgICAg ICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIHNlY29uZFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNl dC14PSIxNTAiIGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMCIgZGF0 YS1leHBlY3RlZC1oZWlnaHQ9IjQwIj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iZ3JpZEl0 ZW0gc2Vjb25kUm93U2Vjb25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSIxNTAiIGRhdGEtb2Zmc2V0 LXk9IjEyMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0 MCI+PC9kaXY+CisgICAgPC9kaXY+Cis8L2Rpdj4KKworPGRpdiBzdHlsZT0icG9zaXRpb246IHJl bGF0aXZlIj4KKyAgICA8ZGl2IGNsYXNzPSJncmlkIGhvcml6b250YWxCVCIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMjAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjAwIj4KKyAgICAgICAgPGRpdiBj bGFzcz0iZ3JpZEl0ZW0gZmlyc3RSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQteD0iNTAiIGRh dGEtb2Zmc2V0LXk9IjEyMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSI0MCI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIGZpcnN0Um93 U2Vjb25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSIxNTAiIGRhdGEtb2Zmc2V0LXk9IjEyMCIgZGF0 YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0MCI+PC9kaXY+Cisg ICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIHNlY29uZFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9m ZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJncmlk SXRlbSBzZWNvbmRSb3dTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjE1MCIgZGF0YS1vZmZz ZXQteT0iMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i NDAiPjwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKKzwhLS0gcnRsIGRpcmVjdGlvbiAtLT4K KzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+CisgICAgPGRpdiBjbGFzcz0iZ3JpZCBk aXJlY3Rpb25SVEwiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwMCIgZGF0YS1leHBlY3RlZC1oZWln aHQ9IjIwMCI+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIGZpcnN0Um93Rmlyc3RDb2x1 bW4iIGRhdGEtb2Zmc2V0LXg9IjMwIiBkYXRhLW9mZnNldC15PSIyMCIgZGF0YS1leHBlY3RlZC13 aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0MCI+PC9kaXY+CisgICAgICAgIDxkaXYg Y2xhc3M9ImdyaWRJdGVtIGZpcnN0Um93U2Vjb25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSIxMzAi IGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMCIgZGF0YS1leHBlY3Rl ZC1oZWlnaHQ9IjQwIj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iZ3JpZEl0ZW0gc2Vjb25k Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjMwIiBkYXRhLW9mZnNldC15PSIxMjAiIGRh dGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiPjwvZGl2Pgor ICAgICAgICA8ZGl2IGNsYXNzPSJncmlkSXRlbSBzZWNvbmRSb3dTZWNvbmRDb2x1bW4iIGRhdGEt b2Zmc2V0LXg9IjEzMCIgZGF0YS1vZmZzZXQteT0iMTIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIy MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjQwIj48L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2Pgor Cis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorICAgIDxkaXYgY2xhc3M9ImdyaWQg dmVydGljYWxSTCBkaXJlY3Rpb25SVEwiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwMCIgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9IjIwMCI+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIGZpcnN0 Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjE1MCIgZGF0YS1vZmZzZXQteT0iNDAiIGRh dGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiPjwvZGl2Pgor ICAgICAgICA8ZGl2IGNsYXNzPSJncmlkSXRlbSBmaXJzdFJvd1NlY29uZENvbHVtbiIgZGF0YS1v ZmZzZXQteD0iMTUwIiBkYXRhLW9mZnNldC15PSIxNDAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIw IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJn cmlkSXRlbSBzZWNvbmRSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zm c2V0LXk9IjQwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9 IjQwIj48L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iZ3JpZEl0ZW0gc2Vjb25kUm93U2Vjb25k Q29sdW1uIiBkYXRhLW9mZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMTQwIiBkYXRhLWV4cGVj dGVkLXdpZHRoPSIyMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjQwIj48L2Rpdj4KKyAgICA8L2Rp dj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorICAgIDxkaXYg Y2xhc3M9ImdyaWQgdmVydGljYWxMUiBkaXJlY3Rpb25SVEwiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjIwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwMCI+CisgICAgICAgIDxkaXYgY2xhc3M9Imdy aWRJdGVtIGZpcnN0Um93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNl dC15PSI0MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0 MCI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIGZpcnN0Um93U2Vjb25kQ29s dW1uIiBkYXRhLW9mZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMTQwIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSIyMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjQwIj48L2Rpdj4KKyAgICAgICAgPGRp diBjbGFzcz0iZ3JpZEl0ZW0gc2Vjb25kUm93Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjE1 MCIgZGF0YS1vZmZzZXQteT0iNDAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iNDAiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJncmlkSXRlbSBzZWNv bmRSb3dTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjE1MCIgZGF0YS1vZmZzZXQteT0iMTQw IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjQwIj48L2Rp dj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUi PgorICAgIDxkaXYgY2xhc3M9ImdyaWQgaG9yaXpvbnRhbEJUIGRpcmVjdGlvblJUTCIgZGF0YS1l eHBlY3RlZC13aWR0aD0iMjAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjAwIj4KKyAgICAgICAg PGRpdiBjbGFzcz0iZ3JpZEl0ZW0gZmlyc3RSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQteD0i MzAiIGRhdGEtb2Zmc2V0LXk9IjEyMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PSI0MCI+PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIGZp cnN0Um93U2Vjb25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSIxMzAiIGRhdGEtb2Zmc2V0LXk9IjEy MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI0MCI+PC9k aXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImdyaWRJdGVtIHNlY29uZFJvd0ZpcnN0Q29sdW1uIiBk YXRhLW9mZnNldC14PSIzMCIgZGF0YS1vZmZzZXQteT0iMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjIwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNDAiPjwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNz PSJncmlkSXRlbSBzZWNvbmRSb3dTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjEzMCIgZGF0 YS1vZmZzZXQteT0iMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwIiBkYXRhLWV4cGVjdGVkLWhl aWdodD0iNDAiPjwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtcHJlZmVy cmVkLWxvZ2ljYWwtd2lkdGhzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdy aWQtbGF5b3V0L2dyaWQtcHJlZmVycmVkLWxvZ2ljYWwtd2lkdGhzLWV4cGVjdGVkLnR4dAppbmRl eCA5ZDAzYzVlY2ZkMGRiYmRmNGEwNTIxZjZjZmMyOTk3Yjk0OWNkYWVhLi42NjMwZWMyNGJkNzgy OTgwY2IzODE5YTdiOGM2ZTRkMzhjNzc0ZjBlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy1ncmlkLWxheW91dC9ncmlkLXByZWZlcnJlZC1sb2dpY2FsLXdpZHRocy1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1wcmVmZXJyZWQt bG9naWNhbC13aWR0aHMtZXhwZWN0ZWQudHh0CkBAIC0yNiwzICsyNiwyMSBAQCBQQVNTCiBYWCBY WCBYWAogWFggWFggWFgKIFBBU1MKK1hYIFhYIFhYCitYWCBYWCBYWAorUEFTUworWFggWFggWFgK K1hYIFhYIFhYCitQQVNTCitYWFhYWCBYWFhYWAorWFhYWFggWFhYWFgKK1BBU1MKK1hYWFhYIFhY WFhYCitYWFhYWCBYWFhYWAorUEFTUworWFggWFggWFgKK1hYIFhYIFhYCitQQVNTCitYWCBYWCBY WAorWFggWFggWFgKK1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQt bGF5b3V0L2dyaWQtcHJlZmVycmVkLWxvZ2ljYWwtd2lkdGhzLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLXByZWZlcnJlZC1sb2dpY2FsLXdpZHRocy5odG1sCm9s ZCBtb2RlIDEwMDY0NApuZXcgbW9kZSAxMDA3NTUKaW5kZXggNjY5NTYwZTVkMzYxZmNiNWQxYzhl NWVkNGIxMDQzNmE0MmE2YTQxYi4uMTQ0ZThlNzlhYzc0M2ZmMGZkNjRiYzVjYWUwMjdiZjk3ZTdl NDYxMQotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLXByZWZlcnJl ZC1sb2dpY2FsLXdpZHRocy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5 b3V0L2dyaWQtcHJlZmVycmVkLWxvZ2ljYWwtd2lkdGhzLmh0bWwKQEAgLTM2LDYgKzM2LDEwIEBA CiAgICAgLXdlYmtpdC1ncmlkLWRlZmluaXRpb24tcm93czogMTBweDsKICAgICBmb250OiAxMHB4 LzEgQWhlbTsKIH0KKworLm1hcmdpbnMgeworICAgIG1hcmdpbjogMTBweCAyMHB4IDMwcHggNDBw eDsKK30KIDwvc3R5bGU+CiA8L2hlYWQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2No ZWNrLWxheW91dC5qcyI+PC9zY3JpcHQ+CkBAIC03Nyw1ICs4MSwzMSBAQAogICAgIDxkaXYgY2xh c3M9ImZpcnN0Um93U2Vjb25kQ29sdW1uIj5YWCBYWCBYWDwvZGl2PgogPC9kaXY+CiAKKzwhLS0g Tm93IHdpdGggbWFyZ2luIG9uIG9uZSBvZiB0aGUgZ3JpZCBpdGVtcy4gLS0+Cis8ZGl2IGNsYXNz PSJncmlkIGdyaWRNaW5Db250ZW50Rml4ZWQgbWluLWNvbnRlbnQiIGRhdGEtZXhwZWN0ZWQtaGVp Z2h0PSIxMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTAwIj4KKyAgICA8ZGl2IGNsYXNzPSJmaXJz dFJvd0ZpcnN0Q29sdW1uIj5YWCBYWCBYWDwvZGl2PgorICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93 U2Vjb25kQ29sdW1uIG1hcmdpbnMiPlhYIFhYIFhYPC9kaXY+Cis8L2Rpdj4KKzxkaXYgY2xhc3M9 ImdyaWQgZ3JpZE1pbkNvbnRlbnRGaXhlZCBtYXgtY29udGVudCIgZGF0YS1leHBlY3RlZC1oZWln aHQ9IjEwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMjAiPgorICAgIDxkaXYgY2xhc3M9ImZpcnN0 Um93Rmlyc3RDb2x1bW4gbWFyZ2lucyI+WFggWFggWFg8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJm aXJzdFJvd1NlY29uZENvbHVtbiI+WFggWFggWFg8L2Rpdj4KKzwvZGl2PgorPGRpdiBjbGFzcz0i Z3JpZCBncmlkRml4ZWRNaW5Db250ZW50IG1pbi1jb250ZW50IiBkYXRhLWV4cGVjdGVkLWhlaWdo dD0iMTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjYwIj4KKyAgICA8ZGl2IGNsYXNzPSJmaXJzdFJv d0ZpcnN0Q29sdW1uIj5YWFhYWCBYWFhYWDwvZGl2PgorICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93 U2Vjb25kQ29sdW1uIG1hcmdpbnMiPlhYWFhYIFhYWFhYPC9kaXY+Cis8L2Rpdj4KKzxkaXYgY2xh c3M9ImdyaWQgZ3JpZEZpeGVkTWluQ29udGVudCBtYXgtY29udGVudCIgZGF0YS1leHBlY3RlZC1o ZWlnaHQ9IjEwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxNjAiPgorICAgIDxkaXYgY2xhc3M9ImZp cnN0Um93Rmlyc3RDb2x1bW4gbWFyZ2lucyI+WFhYWFggWFhYWFg8L2Rpdj4KKyAgICA8ZGl2IGNs YXNzPSJmaXJzdFJvd1NlY29uZENvbHVtbiI+WFhYWFggWFhYWFg8L2Rpdj4KKzwvZGl2PgorPGRp diBjbGFzcz0iZ3JpZCBncmlkRml4ZWRNYXhDb250ZW50IG1pbi1jb250ZW50IiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iMTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjgwIj4KKyAgICA8ZGl2IGNsYXNz PSJmaXJzdFJvd0ZpcnN0Q29sdW1uIj5YWCBYWCBYWDwvZGl2PgorICAgIDxkaXYgY2xhc3M9ImZp cnN0Um93U2Vjb25kQ29sdW1uIG1hcmdpbnMiPlhYIFhYIFhYPC9kaXY+Cis8L2Rpdj4KKzxkaXYg Y2xhc3M9ImdyaWQgZ3JpZEZpeGVkTWF4Q29udGVudCBtYXgtY29udGVudCIgZGF0YS1leHBlY3Rl ZC1oZWlnaHQ9IjEwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMjAiPgorICAgIDxkaXYgY2xhc3M9 ImZpcnN0Um93Rmlyc3RDb2x1bW4gbWFyZ2lucyI+WFggWFggWFg8L2Rpdj4KKyAgICA8ZGl2IGNs YXNzPSJmaXJzdFJvd1NlY29uZENvbHVtbiI+WFggWFggWFg8L2Rpdj4KKzwvZGl2PgorCiA8L2Jv ZHk+CiA8L2h0bWw+Cg==