175382 2017-08-09 08:18:01 -0700 Parse font-display 2017-08-21 16:04:34 -0700 1 1 1 Unclassified WebKit Text Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 167332 175384 1 mmaxfield mmaxfield commit-queue darin mmaxfield simon.fraser webkit-bug-importer oldest_to_newest 1336953 0 mmaxfield 2017-08-09 08:18:01 -0700 Parse font-display 1336983 1 317708 mmaxfield 2017-08-09 09:02:12 -0700 Created attachment 317708 WIP 1337174 2 webkit-bug-importer 2017-08-09 15:34:33 -0700 <rdar://problem/33813229> 1337268 3 317771 mmaxfield 2017-08-09 18:19:43 -0700 Created attachment 317771 WIP 1337325 4 317787 mmaxfield 2017-08-10 00:11:04 -0700 Created attachment 317787 Patch 1338450 5 317787 simon.fraser 2017-08-14 13:47:41 -0700 Comment on attachment 317787 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=317787&action=review > Source/WebCore/css/CSSFontFace.cpp:409 > + iterateClients(m_clients, [&](Client& client) { > + client.fontPropertyChanged(*this); > + }); Should you detect whether it's being set to the existing values, and therefore hasn't changed? > Source/WebCore/css/CSSValueKeywords.in:1354 > +swap > +fallback > +optional We usually list them all, and comment out the replicated ones. 1338469 6 318063 mmaxfield 2017-08-14 14:42:49 -0700 Created attachment 318063 Patch for committing 1338550 7 318063 commit-queue 2017-08-14 17:04:01 -0700 Comment on attachment 318063 Patch for committing Clearing flags on attachment: 318063 Committed r220725: <http://trac.webkit.org/changeset/220725> 1340267 8 318063 darin 2017-08-18 15:22:07 -0700 Comment on attachment 318063 Patch for committing View in context: https://bugs.webkit.org/attachment.cgi?id=318063&action=review > Source/WebCore/css/CSSFontFace.cpp:273 > + if (ranges.size() == m_ranges.size()) { > + bool same = true; > + for (size_t i = 0; i < ranges.size(); ++i) { > + if (ranges[i] != m_ranges[i]) { > + same = false; > + break; > + } > + } > + if (same) > + return true; > } This should just be: if (ranges == m_ranges) return true; Vector already has an operator== that does this. 1340797 9 mmaxfield 2017-08-21 16:04:34 -0700 Committed r220986: <http://trac.webkit.org/changeset/220986> 317708 2017-08-09 09:02:12 -0700 2017-08-09 18:19:41 -0700 WIP bug-175382-20170809090211.patch text/plain 11783 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI1NGNlMTcxNmYyMDZj NDAwNzAyYzJlZWIwYzdkNTVlYmNkNDhiNC4uOTY2ZDcwNTE1YWI4ZDQ4NzEzNzY0NmY2YzIzODYw ZDMyMDk4MGI3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA4LTA5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUGFyc2UgZm9u dC1kaXNwbGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzUzODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0ZWRTdHlsZUV4dHJhY3Rv cjo6cHJvcGVydHlWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlOjpzZXRMb2FkaW5nQmVoYXZpb3IpOgorICAgICAgICAq IGNzcy9DU1NGb250RmFjZS5oOgorICAgICAgICAqIGNzcy9DU1NGb250U2VsZWN0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjphZGRGb250RmFjZVJ1bGUpOgorICAg ICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3Jl OjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEZvbnRMb2FkaW5nQmVoYXZpb3IgY29uc3Qp OgorICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0aWVzLmpzb246CisgICAgICAgICogY3NzL0NTU1By b3BlcnR5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5Ojppc0Rlc2NyaXB0b3JP bmx5KToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNvbnN1bWVGb250RmFjZUZvbnREaXNwbGF5KToKKyAgICAgICAgKFdlYkNv cmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZUZvbnRGYWNlRGVzY3JpcHRvcik6CisgICAgICAg ICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6CisKIDIwMTctMDgtMDkg IE1zMmdlciAgPE1zMmdlckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbW92ZSB1bm5lY2Vzc2Fy eSBjb3BpZXMgb2YgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjptX3Nlc3Npb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmlu ZGV4IDdlYzhlYjg2MjQxMGMyNjliOTdmMjAzZjEzNGIzNzdmNDFkYzFhNzguLjE5MTQzYjdlMGRm Y2VlN2UzNjNjZDM5YTk2YmM0OGZiZDlhZWMwNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC00MDE1LDYgKzQwMTUsNyBA QCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUo Q1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELAogICAgICAgICAvKiBVbmltcGxlbWVudGVkIEBmb250 LWZhY2UgcHJvcGVydGllcyAqLwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5U3JjOgogICAgICAg ICBjYXNlIENTU1Byb3BlcnR5VW5pY29kZVJhbmdlOgorICAgICAgICBjYXNlIENTU1Byb3BlcnR5 Rm9udERpc3BsYXk6CiAgICAgICAgICAgICBicmVhazsKIAogICAgICAgICAvKiBPdGhlciB1bmlt cGxlbWVudGVkIHByb3BlcnRpZXMgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NGb250RmFjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuY3BwCmluZGV4 IDQ3ODhmYmI4OWUzY2YzN2QxODU1ZWE3Y2Q0MGEzMzkyMzRhZjk1OWEuLjcyMzRhYWRkMWI5ZDE3 MjQ2MDM1NTcxOGU3ZDhiZTNhYzBkOWI4MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NGb250RmFjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNw cApAQCAtMzk3LDYgKzM5NywxOCBAQCB2b2lkIENTU0ZvbnRGYWNlOjpzZXRGZWF0dXJlU2V0dGlu Z3MoQ1NTVmFsdWUmIGZlYXR1cmVTZXR0aW5ncykKICAgICB9KTsKIH0KIAordm9pZCBDU1NGb250 RmFjZTo6c2V0TG9hZGluZ0JlaGF2aW9yKENTU1ZhbHVlJiBsb2FkaW5nQmVoYXZpb3JWYWx1ZSkK K3sKKyAgICBtX2xvYWRpbmdCZWhhdmlvciA9IHN0YXRpY19jYXN0PEZvbnRMb2FkaW5nQmVoYXZp b3I+KGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPihsb2FkaW5nQmVoYXZpb3JWYWx1ZSkudmFs dWVJRCgpKTsKKworICAgIGlmIChtX2Nzc0Nvbm5lY3Rpb24pCisgICAgICAgIG1fY3NzQ29ubmVj dGlvbi0+bXV0YWJsZVByb3BlcnRpZXMoKS5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnREaXNw bGF5LCAmbG9hZGluZ0JlaGF2aW9yVmFsdWUpOworCisgICAgaXRlcmF0ZUNsaWVudHMobV9jbGll bnRzLCBbJl0oQ2xpZW50JiBjbGllbnQpIHsKKyAgICAgICAgY2xpZW50LmZvbnRQcm9wZXJ0eUNo YW5nZWQoKnRoaXMpOworICAgIH0pOworfQorCiBib29sIENTU0ZvbnRGYWNlOjpyYW5nZXNNYXRj aENvZGVQb2ludChVQ2hhcjMyIGNoYXJhY3RlcikgY29uc3QKIHsKICAgICBpZiAobV9yYW5nZXMu aXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaAppbmRleCAzYjQyYjEwOWI3YjBmMDVj NThiZmIzNTkyMDk4NTNlNDQxNDc2YjQ1Li4zYjM2NTYwOWJjODEzYzgyZmNlMzZhYmE3YzM3MDk1 NDdhYTA3ZDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaApAQCAtNzYsNiArNzYsNyBAQCBw dWJsaWM6CiAgICAgYm9vbCBzZXRWYXJpYW50QWx0ZXJuYXRlcyhDU1NWYWx1ZSYpOwogICAgIGJv b2wgc2V0VmFyaWFudEVhc3RBc2lhbihDU1NWYWx1ZSYpOwogICAgIHZvaWQgc2V0RmVhdHVyZVNl dHRpbmdzKENTU1ZhbHVlJik7CisgICAgdm9pZCBzZXRMb2FkaW5nQmVoYXZpb3IoQ1NTVmFsdWUm KTsKIAogICAgIGVudW0gY2xhc3MgU3RhdHVzOwogICAgIHN0cnVjdCBVbmljb2RlUmFuZ2U7CkBA IC0xNzksNiArMTgwLDcgQEAgcHJpdmF0ZToKICAgICBIYXNoU2V0PENsaWVudCo+IG1fY2xpZW50 czsKICAgICBXZWFrUHRyPEZvbnRGYWNlPiBtX3dyYXBwZXI7CiAgICAgRm9udFNlbGVjdGlvblNw ZWNpZmllZENhcGFiaWxpdGllcyBtX2ZvbnRTZWxlY3Rpb25DYXBhYmlsaXRpZXM7CisgICAgRm9u dExvYWRpbmdCZWhhdmlvciBtX2xvYWRpbmdCZWhhdmlvciB7IEZvbnRMb2FkaW5nQmVoYXZpb3I6 OkF1dG8gfTsKICAgICBTdGF0dXMgbV9zdGF0dXMgeyBTdGF0dXM6OlBlbmRpbmcgfTsKICAgICBi b29sIG1faXNMb2NhbEZhbGxiYWNrIHsgZmFsc2UgfTsKICAgICBib29sIG1fc291cmNlc1BvcHVs YXRlZCB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNl bGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCmluZGV4 IDBiMmU2ZmY0NDI1MTQ1YTBiN2RhOTc0YzkyZDk4MzYwYzM0MjYzZDEuLjRhMDVlMTgyZDAxNDE0 OGY1ZDZjMmM0ZmMwNWQ0NzE3MmU5M2IyNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NGb250U2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2Vs ZWN0b3IuY3BwCkBAIC0xNTcsNiArMTU3LDcgQEAgdm9pZCBDU1NGb250U2VsZWN0b3I6OmFkZEZv bnRGYWNlUnVsZShTdHlsZVJ1bGVGb250RmFjZSYgZm9udEZhY2VSdWxlLCBib29sIGlzSW4KICAg ICBSZWZQdHI8Q1NTVmFsdWU+IHZhcmlhbnROdW1lcmljID0gc3R5bGUuZ2V0UHJvcGVydHlDU1NW YWx1ZShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVtZXJpYyk7CiAgICAgUmVmUHRyPENTU1ZhbHVl PiB2YXJpYW50QWx0ZXJuYXRlcyA9IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVy dHlGb250VmFyaWFudEFsdGVybmF0ZXMpOwogICAgIFJlZlB0cjxDU1NWYWx1ZT4gdmFyaWFudEVh c3RBc2lhbiA9IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250VmFyaWFu dEVhc3RBc2lhbik7CisgICAgUmVmUHRyPENTU1ZhbHVlPiBsb2FkaW5nQmVoYXZpb3IgPSBzdHls ZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5Rm9udERpc3BsYXkpOwogICAgIGlmICgh aXM8Q1NTVmFsdWVMaXN0Pihmb250RmFtaWx5LmdldCgpKSB8fCAhaXM8Q1NTVmFsdWVMaXN0Pihz cmMuZ2V0KCkpIHx8ICh1bmljb2RlUmFuZ2UgJiYgIWlzPENTU1ZhbHVlTGlzdD4oKnVuaWNvZGVS YW5nZSkpKQogICAgICAgICByZXR1cm47CiAKQEAgLTE5Nyw2ICsxOTgsOCBAQCB2b2lkIENTU0Zv bnRTZWxlY3Rvcjo6YWRkRm9udEZhY2VSdWxlKFN0eWxlUnVsZUZvbnRGYWNlJiBmb250RmFjZVJ1 bGUsIGJvb2wgaXNJbgogICAgICAgICByZXR1cm47CiAgICAgaWYgKGZlYXR1cmVTZXR0aW5ncykK ICAgICAgICAgZm9udEZhY2UtPnNldEZlYXR1cmVTZXR0aW5ncygqZmVhdHVyZVNldHRpbmdzKTsK KyAgICBpZiAobG9hZGluZ0JlaGF2aW9yKQorICAgICAgICBmb250RmFjZS0+c2V0TG9hZGluZ0Jl aGF2aW9yKCpsb2FkaW5nQmVoYXZpb3IpOwogCiAgICAgQ1NTRm9udEZhY2U6OmFwcGVuZFNvdXJj ZXMoZm9udEZhY2UsIHNyY0xpc3QsIG1fZG9jdW1lbnQsIGlzSW5pdGlhdGluZ0VsZW1lbnRJblVz ZXJBZ2VudFNoYWRvd1RyZWUpOwogICAgIGlmIChmb250RmFjZS0+YWxsU291cmNlc0ZhaWxlZCgp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGlu Z3MuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKaW5k ZXggNjQ3Yjg1NTNiNzU4ZjdlYzViMTYwNTVkYWIzMTRlMTZlM2M2MTI4Yi4uMjMxNjliNWZmMzA3 OTgyNDU4NDRhYmQzMGZiYTkxNDc2OWI3OGI4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCkBAIC01Njk3LDQgKzU2OTcsNTcgQEAgdGVtcGxh dGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEZvbnRPcHRpY2FsU2l6aW5n KCkgY29uc3QKICAgICByZXR1cm4gRm9udE9wdGljYWxTaXppbmc6OkVuYWJsZWQ7CiB9CiAKK3Rl bXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShGb250 TG9hZGluZ0JlaGF2aW9yIGJlaGF2aW9yKQorICAgIDogQ1NTVmFsdWUoUHJpbWl0aXZlQ2xhc3Mp Cit7CisgICAgbV9wcmltaXRpdmVVbml0VHlwZSA9IENTU19WQUxVRV9JRDsKKyAgICBzd2l0Y2gg KGJlaGF2aW9yKSB7CisgICAgY2FzZSBGb250TG9hZGluZ0JlaGF2aW9yOjpBdXRvOgorICAgICAg ICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZUF1dG87CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgRm9udExvYWRpbmdCZWhhdmlvcjo6QmxvY2s6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9 IENTU1ZhbHVlQmxvY2s7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRm9udExvYWRpbmdCZWhh dmlvcjo6U3dhcDoKKyAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVTd2FwOworICAg ICAgICBicmVhazsKKyAgICBjYXNlIEZvbnRMb2FkaW5nQmVoYXZpb3I6OkZhbGxiYWNrOgorICAg ICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZUZhbGxiYWNrOworICAgICAgICBicmVhazsK KyAgICBjYXNlIEZvbnRMb2FkaW5nQmVoYXZpb3I6Ok9wdGlvbmFsOgorICAgICAgICBtX3ZhbHVl LnZhbHVlSUQgPSBDU1NWYWx1ZU9wdGlvbmFsOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0 OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQor fQorCit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgRm9udExv YWRpbmdCZWhhdmlvcigpIGNvbnN0Cit7CisgICAgQVNTRVJUKGlzVmFsdWVJRCgpKTsKKyAgICBz d2l0Y2ggKG1fdmFsdWUudmFsdWVJRCkgeworICAgIGNhc2UgQ1NTVmFsdWVBdXRvOgorICAgICAg ICByZXR1cm4gRm9udExvYWRpbmdCZWhhdmlvcjo6QXV0bzsKKyAgICBjYXNlIENTU1ZhbHVlQmxv Y2s6CisgICAgICAgIHJldHVybiBGb250TG9hZGluZ0JlaGF2aW9yOjpCbG9jazsKKyAgICBjYXNl IENTU1ZhbHVlU3dhcDoKKyAgICAgICAgcmV0dXJuIEZvbnRMb2FkaW5nQmVoYXZpb3I6OlN3YXA7 CisgICAgY2FzZSBDU1NWYWx1ZUZhbGxiYWNrOgorICAgICAgICByZXR1cm4gRm9udExvYWRpbmdC ZWhhdmlvcjo6RmFsbGJhY2s7CisgICAgY2FzZSBDU1NWYWx1ZU9wdGlvbmFsOgorICAgICAgICBy ZXR1cm4gRm9udExvYWRpbmdCZWhhdmlvcjo6T3B0aW9uYWw7CisgICAgZGVmYXVsdDoKKyAgICAg ICAgYnJlYWs7CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBG b250TG9hZGluZ0JlaGF2aW9yOjpFbmFibGVBdXRvZDsKK30KKworLyoKK2VudW0gY2xhc3MgRm9u dExvYWRpbmdCZWhhdmlvciB7CisgICAgQXV0bywgQmxvY2ssIFN3YXAsIEZhbGxiYWNrLCBPcHRp b25hbAorfTsKKyovCisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9w ZXJ0aWVzLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCmluZGV4 IDAxMWE5NTk3Y2ZmOWFkOTEyYmYxZGE2NjNlNGY4YjAzYTViNTU5ZjUuLjZkNzgzMzI5YWNkMDY3 NTE3MmIwNTNjNWYwNzJmYzNlODcyYTQzY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcm9wZXJ0aWVzLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRp ZXMuanNvbgpAQCAtMzk2LDggKzM5Niw4IEBACiAgICAgICAgICAgICAgICAgImVuYWJsZS1pZiI6 ICJFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJz cGVjaWZpY2F0aW9uIjogewotICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtZm9udHMi LAotICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1m b250cy00LyNsb3ctbGV2ZWwtZm9udC12YXJpYXRpb24tc2V0dGluZ3MtY29udHJvbC10aGUtZm9u dC12YXJpYXRpb24tc2V0dGluZ3MtcHJvcGVydHkiCisgICAgICAgICAgICAgICAgImNhdGVnb3J5 IjogImNzcy1mb250cy00IiwKKyAgICAgICAgICAgICAgICAidXJsIjogImh0dHBzOi8vZHJhZnRz LmNzc3dnLm9yZy9jc3MtZm9udHMtNC8jZm9udC12YXJpYXRpb24tc2V0dGluZ3MtZGVmIgogICAg ICAgICAgICAgfQogICAgICAgICB9LAogICAgICAgICAiLXdlYmtpdC1mb250LWtlcm5pbmciOiB7 CkBAIC01NTYsOCArNTU2LDggQEAKICAgICAgICAgICAgICAgICAiZW5hYmxlLWlmIjogIkVOQUJM RV9WQVJJQVRJT05fRk9OVFMiCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmlj YXRpb24iOiB7Ci0gICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1mb250cyIsCi0gICAg ICAgICAgICAgICAgInVybCI6ICJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZvbnRzLTQv I29wdGljYWwtc2l6aW5nLWNvbnRyb2wtdGhlLWZvbnQtb3B0aWNhbC1zaXppbmctcHJvcGVydHki CisgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1mb250cy00IiwKKyAgICAgICAgICAg ICAgICAidXJsIjogImh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZm9udHMtNC8jZm9udC1v cHRpY2FsLXNpemluZy1kZWYiCiAgICAgICAgICAgICB9CiAgICAgICAgIH0sCiAgICAgICAgICJm b250IjogewpAQCAtMzU0MCw2ICszNTQwLDIyIEBACiAgICAgICAgICAgICAgICAgInVybCI6ICJo dHRwczovL3d3dy53My5vcmcvVFIvY3NzLWZvbnRzLTMvI2Rlc2NkZWYtdW5pY29kZS1yYW5nZSIK ICAgICAgICAgICAgIH0KICAgICAgICAgfSwKKyAgICAgICAgImZvbnQtZGlzcGxheSI6IHsKKyAg ICAgICAgICAgICJjb2RlZ2VuLXByb3BlcnRpZXMiOiB7CisgICAgICAgICAgICAgICAgInNraXAt YnVpbGRlciI6IHRydWUKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICAic3BlY2lmaWNhdGlv biI6IHsKKyAgICAgICAgICAgICAgICAiY2F0ZWdvcnkiOiAiY3NzLWZvbnRzLTQiLAorICAgICAg ICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mb250cy00LyNm b250LWRpc3BsYXktZGVzYyIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICAidmFsdWVzIjog WworICAgICAgICAgICAgICAgICJhdXRvIiwKKyAgICAgICAgICAgICAgICAiYmxvY2siLAorICAg ICAgICAgICAgICAgICJzd2FwIiwKKyAgICAgICAgICAgICAgICAiZmFsbGJhY2siLAorICAgICAg ICAgICAgICAgICJvcHRpb25hbCIKKyAgICAgICAgICAgIF0KKyAgICAgICAgfSwKICAgICAgICAg InZlY3Rvci1lZmZlY3QiOiB7CiAgICAgICAgICAgICAidmFsdWVzIjogWwogICAgICAgICAgICAg ICAgICJub25lIiwKQEAgLTY3NDEsNiArNjc1NywxMSBAQAogICAgICAgICAgICAgImxvbmduYW1l IjogIkNTUyBGb250cyBNb2R1bGUiLAogICAgICAgICAgICAgInVybCI6ICJodHRwczovL3d3dy53 My5vcmcvVFIvY3NzLWZvbnRzLTMvIgogICAgICAgICB9LAorICAgICAgICAiY3NzLWZvbnRzLTQi OiB7CisgICAgICAgICAgICAic2hvcnRuYW1lIjogIkNTUyBGb250cyBMZXZlbCA0IiwKKyAgICAg ICAgICAgICJsb25nbmFtZSI6ICJDU1MgRm9udHMgTW9kdWxlIExldmVsIDQiLAorICAgICAgICAg ICAgInVybCI6ICJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZvbnRzLTQiCisgICAgICAg IH0sCiAgICAgICAgICJjc3MtZ3JpZCI6IHsKICAgICAgICAgICAgICJzaG9ydG5hbWUiOiAiQ1NT IEdyaWQgTGF5b3V0IiwKICAgICAgICAgICAgICJsb25nbmFtZSI6ICJDU1MgR3JpZCBMYXlvdXQg TW9kdWxlIiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwCmluZGV4IDhhOTFhMzkxNTE0ZWI1 NDIzYzc2ZDAwNDhmMjBmNGE1Y2U0ODk2MzQuLjMyMmY3NTQ4NGEwNTVhMmFiZjAzYjUwYjBiYjFm OGY1ZGE0MDdiYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5LmNwcApAQCAtMTY0LDYgKzE2 NCw3IEBAIGJvb2wgQ1NTUHJvcGVydHk6OmlzRGVzY3JpcHRvck9ubHkoQ1NTUHJvcGVydHlJRCBw cm9wZXJ0eUlEKQogI2VuZGlmCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVNyYzoKICAgICBjYXNlIENT U1Byb3BlcnR5VW5pY29kZVJhbmdlOgorICAgIGNhc2UgQ1NTUHJvcGVydHlGb250RGlzcGxheToK ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIGZhbHNl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcApp bmRleCA2MTE2YTQ5MjM1YmMxNTJjOGMzNGRjOGYxZjgyMDFhYWEzZDQ2NDMwLi40YzQwNmU3MWRh YTE0YTBiNGZiMzA2OTAwNDdmNTZhZmIxYjJhYmQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcApAQCAtNDI5NSw2ICs0Mjk1LDExIEBAIHN0 YXRpYyBSZWZQdHI8Q1NTVmFsdWVMaXN0PiBjb25zdW1lRm9udEZhY2VVbmljb2RlUmFuZ2UoQ1NT UGFyc2VyVG9rZW5SYW5nZSYgcmFuCiAgICAgcmV0dXJuIHZhbHVlczsKIH0KIAorc3RhdGljIFJl ZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZUZvbnRGYWNlRm9udERpc3BsYXkoQ1NTUGFy c2VyVG9rZW5SYW5nZSYgcmFuZ2UpCit7CisgICAgcmV0dXJuIGNvbnN1bWVJZGVudDxDU1NWYWx1 ZUF1dG8sIENTU1ZhbHVlQmxvY2ssIENTU1ZhbHVlU3dhcCwgQ1NTVmFsdWVGYWxsYmFjaywgQ1NT VmFsdWVPcHRpb25hbD4ocmFuZ2UpOworfQorCiBzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25z dW1lRm9udEZhY2VTcmNVUkkoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIGNvbnN0IENTU1Bh cnNlckNvbnRleHQmIGNvbnRleHQpCiB7CiAgICAgU3RyaW5nIHVybCA9IGNvbnN1bWVVcmxBc1N0 cmluZ1ZpZXcocmFuZ2UpLnRvU3RyaW5nKCk7CkBAIC00MzY4LDYgKzQzNzMsOSBAQCBib29sIENT U1Byb3BlcnR5UGFyc2VyOjpwYXJzZUZvbnRGYWNlRGVzY3JpcHRvcihDU1NQcm9wZXJ0eUlEIHBy b3BJZCkKICAgICBjYXNlIENTU1Byb3BlcnR5VW5pY29kZVJhbmdlOgogICAgICAgICBwYXJzZWRW YWx1ZSA9IGNvbnN1bWVGb250RmFjZVVuaWNvZGVSYW5nZShtX3JhbmdlKTsKICAgICAgICAgYnJl YWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnREaXNwbGF5OgorICAgICAgICBwYXJzZWRWYWx1 ZSA9IGNvbnN1bWVGb250RmFjZUZvbnREaXNwbGF5KG1fcmFuZ2UpOworICAgICAgICBicmVhazsK ICAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFdlaWdodDoKICNpZiBFTkFCTEUoVkFSSUFUSU9OX0ZP TlRTKQogICAgICAgICBwYXJzZWRWYWx1ZSA9IGNvbnN1bWVGb250V2VpZ2h0UmFuZ2UobV9yYW5n ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGVDb25zdGFudHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZUNvbnN0YW50cy5oCmluZGV4IGJiOTlhYzY0ZTkzNmUzMGU4YzBlZDQwODcxNTE4ZjFiZTYwY2Y5 NjYuLjFkN2M5NjAwODg4YTJjZmM0ZTcwYjFlNjFmMzAyOTJiMDExM2Y4MDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5o CkBAIC03NTEsNiArNzUxLDEwIEBAIGVudW0gY2xhc3MgUGFpbnRUeXBlIHsKICAgICBNYXJrZXJz CiB9OwogCitlbnVtIGNsYXNzIEZvbnRMb2FkaW5nQmVoYXZpb3IgeworICAgIEF1dG8sIEJsb2Nr LCBTd2FwLCBGYWxsYmFjaywgT3B0aW9uYWwKK307CisKIGV4dGVybiBjb25zdCBmbG9hdCBkZWZh dWx0TWl0ZXJMaW1pdDsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 317771 2017-08-09 18:19:43 -0700 2017-08-10 00:11:03 -0700 WIP bug-175382-20170809181942.patch text/plain 12180 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGVmZjIzYTAyZWE0YWM5 OWFmOGNkNGFkMWRkM2M0ZGVjOGUyY2Y4MS4uZmI1NTk2MGU4MDc1NDJiNmUwYzRmNTIwMjdkMmJk ZjQ5MDAwYzgzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA4LTA5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUGFyc2UgZm9u dC1kaXNwbGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzUzODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0ZWRTdHlsZUV4dHJhY3Rv cjo6cHJvcGVydHlWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlOjpzZXRMb2FkaW5nQmVoYXZpb3IpOgorICAgICAgICAq IGNzcy9DU1NGb250RmFjZS5oOgorICAgICAgICAqIGNzcy9DU1NGb250U2VsZWN0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjphZGRGb250RmFjZVJ1bGUpOgorICAg ICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3Jl OjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEZvbnRMb2FkaW5nQmVoYXZpb3IgY29uc3Qp OgorICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0aWVzLmpzb246CisgICAgICAgICogY3NzL0NTU1By b3BlcnR5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5Ojppc0Rlc2NyaXB0b3JP bmx5KToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNvbnN1bWVGb250RmFjZUZvbnREaXNwbGF5KToKKyAgICAgICAgKFdlYkNv cmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZUZvbnRGYWNlRGVzY3JpcHRvcik6CisgICAgICAg ICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6CisKIDIwMTctMDgtMDkg IENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMjA0NjYsIHIyMjA0NzcsIGFuZCByMjIwNDg3LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRl eCA3ZWM4ZWI4NjI0MTBjMjY5Yjk3ZjIwM2YxMzRiMzc3ZjQxZGMxYTc4Li4xOTE0M2I3ZTBkZmNl ZTdlMzYzY2QzOWE5NmJjNDhmYmQ5YWVjMDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtNDAxNSw2ICs0MDE1LDcgQEAg UmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKENT U1Byb3BlcnR5SUQgcHJvcGVydHlJRCwKICAgICAgICAgLyogVW5pbXBsZW1lbnRlZCBAZm9udC1m YWNlIHByb3BlcnRpZXMgKi8KICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVNyYzoKICAgICAgICAg Y2FzZSBDU1NQcm9wZXJ0eVVuaWNvZGVSYW5nZToKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUZv bnREaXNwbGF5OgogICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgLyogT3RoZXIgdW5pbXBs ZW1lbnRlZCBwcm9wZXJ0aWVzICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udEZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcAppbmRleCA0 Nzg4ZmJiODllM2NmMzdkMTg1NWVhN2NkNDBhMzM5MjM0YWY5NTlhLi43MjM0YWFkZDFiOWQxNzI0 NjAzNTU3MThlN2Q4YmUzYWMwZDliODM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTRm9udEZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5jcHAK QEAgLTM5Nyw2ICszOTcsMTggQEAgdm9pZCBDU1NGb250RmFjZTo6c2V0RmVhdHVyZVNldHRpbmdz KENTU1ZhbHVlJiBmZWF0dXJlU2V0dGluZ3MpCiAgICAgfSk7CiB9CiAKK3ZvaWQgQ1NTRm9udEZh Y2U6OnNldExvYWRpbmdCZWhhdmlvcihDU1NWYWx1ZSYgbG9hZGluZ0JlaGF2aW9yVmFsdWUpCit7 CisgICAgbV9sb2FkaW5nQmVoYXZpb3IgPSBzdGF0aWNfY2FzdDxGb250TG9hZGluZ0JlaGF2aW9y Pihkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4obG9hZGluZ0JlaGF2aW9yVmFsdWUpLnZhbHVl SUQoKSk7CisKKyAgICBpZiAobV9jc3NDb25uZWN0aW9uKQorICAgICAgICBtX2Nzc0Nvbm5lY3Rp b24tPm11dGFibGVQcm9wZXJ0aWVzKCkuc2V0UHJvcGVydHkoQ1NTUHJvcGVydHlGb250RGlzcGxh eSwgJmxvYWRpbmdCZWhhdmlvclZhbHVlKTsKKworICAgIGl0ZXJhdGVDbGllbnRzKG1fY2xpZW50 cywgWyZdKENsaWVudCYgY2xpZW50KSB7CisgICAgICAgIGNsaWVudC5mb250UHJvcGVydHlDaGFu Z2VkKCp0aGlzKTsKKyAgICB9KTsKK30KKwogYm9vbCBDU1NGb250RmFjZTo6cmFuZ2VzTWF0Y2hD b2RlUG9pbnQoVUNoYXIzMiBjaGFyYWN0ZXIpIGNvbnN0CiB7CiAgICAgaWYgKG1fcmFuZ2VzLmlz RW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5oIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmgKaW5kZXggM2I0MmIxMDliN2IwZjA1YzU4 YmZiMzU5MjA5ODUzZTQ0MTQ3NmI0NS4uM2IzNjU2MDliYzgxM2M4MmZjZTM2YWJhN2MzNzA5NTQ3 YWEwN2QzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmgKQEAgLTc2LDYgKzc2LDcgQEAgcHVi bGljOgogICAgIGJvb2wgc2V0VmFyaWFudEFsdGVybmF0ZXMoQ1NTVmFsdWUmKTsKICAgICBib29s IHNldFZhcmlhbnRFYXN0QXNpYW4oQ1NTVmFsdWUmKTsKICAgICB2b2lkIHNldEZlYXR1cmVTZXR0 aW5ncyhDU1NWYWx1ZSYpOworICAgIHZvaWQgc2V0TG9hZGluZ0JlaGF2aW9yKENTU1ZhbHVlJik7 CiAKICAgICBlbnVtIGNsYXNzIFN0YXR1czsKICAgICBzdHJ1Y3QgVW5pY29kZVJhbmdlOwpAQCAt MTc5LDYgKzE4MCw3IEBAIHByaXZhdGU6CiAgICAgSGFzaFNldDxDbGllbnQqPiBtX2NsaWVudHM7 CiAgICAgV2Vha1B0cjxGb250RmFjZT4gbV93cmFwcGVyOwogICAgIEZvbnRTZWxlY3Rpb25TcGVj aWZpZWRDYXBhYmlsaXRpZXMgbV9mb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzOworICAgIEZvbnRM b2FkaW5nQmVoYXZpb3IgbV9sb2FkaW5nQmVoYXZpb3IgeyBGb250TG9hZGluZ0JlaGF2aW9yOjpB dXRvIH07CiAgICAgU3RhdHVzIG1fc3RhdHVzIHsgU3RhdHVzOjpQZW5kaW5nIH07CiAgICAgYm9v bCBtX2lzTG9jYWxGYWxsYmFjayB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3NvdXJjZXNQb3B1bGF0 ZWQgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxl Y3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcAppbmRleCAw YjJlNmZmNDQyNTE0NWEwYjdkYTk3NGM5MmQ5ODM2MGMzNDI2M2QxLi40YTA1ZTE4MmQwMTQxNDhm NWQ2YzJjNGZjMDVkNDcxNzJlOTNiMjZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTRm9udFNlbGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVj dG9yLmNwcApAQCAtMTU3LDYgKzE1Nyw3IEBAIHZvaWQgQ1NTRm9udFNlbGVjdG9yOjphZGRGb250 RmFjZVJ1bGUoU3R5bGVSdWxlRm9udEZhY2UmIGZvbnRGYWNlUnVsZSwgYm9vbCBpc0luCiAgICAg UmVmUHRyPENTU1ZhbHVlPiB2YXJpYW50TnVtZXJpYyA9IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFs dWUoQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWMpOwogICAgIFJlZlB0cjxDU1NWYWx1ZT4g dmFyaWFudEFsdGVybmF0ZXMgPSBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5 Rm9udFZhcmlhbnRBbHRlcm5hdGVzKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhcmlhbnRFYXN0 QXNpYW4gPSBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5Rm9udFZhcmlhbnRF YXN0QXNpYW4pOworICAgIFJlZlB0cjxDU1NWYWx1ZT4gbG9hZGluZ0JlaGF2aW9yID0gc3R5bGUu Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUZvbnREaXNwbGF5KTsKICAgICBpZiAoIWlz PENTU1ZhbHVlTGlzdD4oZm9udEZhbWlseS5nZXQoKSkgfHwgIWlzPENTU1ZhbHVlTGlzdD4oc3Jj LmdldCgpKSB8fCAodW5pY29kZVJhbmdlICYmICFpczxDU1NWYWx1ZUxpc3Q+KCp1bmljb2RlUmFu Z2UpKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xOTcsNiArMTk4LDggQEAgdm9pZCBDU1NGb250 U2VsZWN0b3I6OmFkZEZvbnRGYWNlUnVsZShTdHlsZVJ1bGVGb250RmFjZSYgZm9udEZhY2VSdWxl LCBib29sIGlzSW4KICAgICAgICAgcmV0dXJuOwogICAgIGlmIChmZWF0dXJlU2V0dGluZ3MpCiAg ICAgICAgIGZvbnRGYWNlLT5zZXRGZWF0dXJlU2V0dGluZ3MoKmZlYXR1cmVTZXR0aW5ncyk7Cisg ICAgaWYgKGxvYWRpbmdCZWhhdmlvcikKKyAgICAgICAgZm9udEZhY2UtPnNldExvYWRpbmdCZWhh dmlvcigqbG9hZGluZ0JlaGF2aW9yKTsKIAogICAgIENTU0ZvbnRGYWNlOjphcHBlbmRTb3VyY2Vz KGZvbnRGYWNlLCBzcmNMaXN0LCBtX2RvY3VtZW50LCBpc0luaXRpYXRpbmdFbGVtZW50SW5Vc2Vy QWdlbnRTaGFkb3dUcmVlKTsKICAgICBpZiAoZm9udEZhY2UtPmFsbFNvdXJjZXNGYWlsZWQoKSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdz LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCmluZGV4 IDY0N2I4NTUzYjc1OGY3ZWM1YjE2MDU1ZGFiMzE0ZTE2ZTNjNjEyOGIuLjIzMTY5YjVmZjMwNzk4 MjQ1ODQ0YWJkMzBmYmE5MTQ3NjliNzhiODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaApAQCAtNTY5Nyw0ICs1Njk3LDU3IEBAIHRlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBGb250T3B0aWNhbFNpemluZygp IGNvbnN0CiAgICAgcmV0dXJuIEZvbnRPcHRpY2FsU2l6aW5nOjpFbmFibGVkOwogfQogCit0ZW1w bGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoRm9udExv YWRpbmdCZWhhdmlvciBiZWhhdmlvcikKKyAgICA6IENTU1ZhbHVlKFByaW1pdGl2ZUNsYXNzKQor eworICAgIG1fcHJpbWl0aXZlVW5pdFR5cGUgPSBDU1NfVkFMVUVfSUQ7CisgICAgc3dpdGNoIChi ZWhhdmlvcikgeworICAgIGNhc2UgRm9udExvYWRpbmdCZWhhdmlvcjo6QXV0bzoKKyAgICAgICAg bV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVBdXRvOworICAgICAgICBicmVhazsKKyAgICBjYXNl IEZvbnRMb2FkaW5nQmVoYXZpb3I6OkJsb2NrOgorICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBD U1NWYWx1ZUJsb2NrOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZvbnRMb2FkaW5nQmVoYXZp b3I6OlN3YXA6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1ZhbHVlU3dhcDsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBGb250TG9hZGluZ0JlaGF2aW9yOjpGYWxsYmFjazoKKyAgICAg ICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVGYWxsYmFjazsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBGb250TG9hZGluZ0JlaGF2aW9yOjpPcHRpb25hbDoKKyAgICAgICAgbV92YWx1ZS52 YWx1ZUlEID0gQ1NTVmFsdWVPcHRpb25hbDsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVsdDoK KyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGJyZWFrOworICAgIH0KK30K KwordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEZvbnRMb2Fk aW5nQmVoYXZpb3IoKSBjb25zdAoreworICAgIEFTU0VSVChpc1ZhbHVlSUQoKSk7CisgICAgc3dp dGNoIChtX3ZhbHVlLnZhbHVlSUQpIHsKKyAgICBjYXNlIENTU1ZhbHVlQXV0bzoKKyAgICAgICAg cmV0dXJuIEZvbnRMb2FkaW5nQmVoYXZpb3I6OkF1dG87CisgICAgY2FzZSBDU1NWYWx1ZUJsb2Nr OgorICAgICAgICByZXR1cm4gRm9udExvYWRpbmdCZWhhdmlvcjo6QmxvY2s7CisgICAgY2FzZSBD U1NWYWx1ZVN3YXA6CisgICAgICAgIHJldHVybiBGb250TG9hZGluZ0JlaGF2aW9yOjpTd2FwOwor ICAgIGNhc2UgQ1NTVmFsdWVGYWxsYmFjazoKKyAgICAgICAgcmV0dXJuIEZvbnRMb2FkaW5nQmVo YXZpb3I6OkZhbGxiYWNrOworICAgIGNhc2UgQ1NTVmFsdWVPcHRpb25hbDoKKyAgICAgICAgcmV0 dXJuIEZvbnRMb2FkaW5nQmVoYXZpb3I6Ok9wdGlvbmFsOworICAgIGRlZmF1bHQ6CisgICAgICAg IGJyZWFrOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gRm9u dExvYWRpbmdCZWhhdmlvcjo6RW5hYmxlQXV0b2Q7Cit9CisKKy8qCitlbnVtIGNsYXNzIEZvbnRM b2FkaW5nQmVoYXZpb3IgeworICAgIEF1dG8sIEJsb2NrLCBTd2FwLCBGYWxsYmFjaywgT3B0aW9u YWwKK307CisqLworCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVy dGllcy5qc29uIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgppbmRleCAw MTFhOTU5N2NmZjlhZDkxMmJmMWRhNjYzZTRmOGIwM2E1YjU1OWY1Li42ZDc4MzMyOWFjZDA2NzUx NzJiMDUzYzVmMDcyZmMzZTg3MmE0M2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydGllcy5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0aWVz Lmpzb24KQEAgLTM5Niw4ICszOTYsOCBAQAogICAgICAgICAgICAgICAgICJlbmFibGUtaWYiOiAi RU5BQkxFX1ZBUklBVElPTl9GT05UUyIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAic3Bl Y2lmaWNhdGlvbiI6IHsKLSAgICAgICAgICAgICAgICAiY2F0ZWdvcnkiOiAiY3NzLWZvbnRzIiwK LSAgICAgICAgICAgICAgICAidXJsIjogImh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZm9u dHMtNC8jbG93LWxldmVsLWZvbnQtdmFyaWF0aW9uLXNldHRpbmdzLWNvbnRyb2wtdGhlLWZvbnQt dmFyaWF0aW9uLXNldHRpbmdzLXByb3BlcnR5IgorICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6 ICJjc3MtZm9udHMtNCIsCisgICAgICAgICAgICAgICAgInVybCI6ICJodHRwczovL2RyYWZ0cy5j c3N3Zy5vcmcvY3NzLWZvbnRzLTQvI2ZvbnQtdmFyaWF0aW9uLXNldHRpbmdzLWRlZiIKICAgICAg ICAgICAgIH0KICAgICAgICAgfSwKICAgICAgICAgIi13ZWJraXQtZm9udC1rZXJuaW5nIjogewpA QCAtNTU2LDggKzU1Niw4IEBACiAgICAgICAgICAgICAgICAgImVuYWJsZS1pZiI6ICJFTkFCTEVf VkFSSUFUSU9OX0ZPTlRTIgogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVjaWZpY2F0 aW9uIjogewotICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtZm9udHMiLAotICAgICAg ICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mb250cy00LyNv cHRpY2FsLXNpemluZy1jb250cm9sLXRoZS1mb250LW9wdGljYWwtc2l6aW5nLXByb3BlcnR5Igor ICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtZm9udHMtNCIsCisgICAgICAgICAgICAg ICAgInVybCI6ICJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZvbnRzLTQvI2ZvbnQtb3B0 aWNhbC1zaXppbmctZGVmIgogICAgICAgICAgICAgfQogICAgICAgICB9LAogICAgICAgICAiZm9u dCI6IHsKQEAgLTM1NDAsNiArMzU0MCwyMiBAQAogICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0 cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1mb250cy0zLyNkZXNjZGVmLXVuaWNvZGUtcmFuZ2UiCiAg ICAgICAgICAgICB9CiAgICAgICAgIH0sCisgICAgICAgICJmb250LWRpc3BsYXkiOiB7CisgICAg ICAgICAgICAiY29kZWdlbi1wcm9wZXJ0aWVzIjogeworICAgICAgICAgICAgICAgICJza2lwLWJ1 aWxkZXIiOiB0cnVlCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgInNwZWNpZmljYXRpb24i OiB7CisgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1mb250cy00IiwKKyAgICAgICAg ICAgICAgICAidXJsIjogImh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZm9udHMtNC8jZm9u dC1kaXNwbGF5LWRlc2MiCisgICAgICAgICAgICB9LAorICAgICAgICAgICAgInZhbHVlcyI6IFsK KyAgICAgICAgICAgICAgICAiYXV0byIsCisgICAgICAgICAgICAgICAgImJsb2NrIiwKKyAgICAg ICAgICAgICAgICAic3dhcCIsCisgICAgICAgICAgICAgICAgImZhbGxiYWNrIiwKKyAgICAgICAg ICAgICAgICAib3B0aW9uYWwiCisgICAgICAgICAgICBdCisgICAgICAgIH0sCiAgICAgICAgICJ2 ZWN0b3ItZWZmZWN0IjogewogICAgICAgICAgICAgInZhbHVlcyI6IFsKICAgICAgICAgICAgICAg ICAibm9uZSIsCkBAIC02NzQxLDYgKzY3NTcsMTEgQEAKICAgICAgICAgICAgICJsb25nbmFtZSI6 ICJDU1MgRm9udHMgTW9kdWxlIiwKICAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly93d3cudzMu b3JnL1RSL2Nzcy1mb250cy0zLyIKICAgICAgICAgfSwKKyAgICAgICAgImNzcy1mb250cy00Ijog eworICAgICAgICAgICAgInNob3J0bmFtZSI6ICJDU1MgRm9udHMgTGV2ZWwgNCIsCisgICAgICAg ICAgICAibG9uZ25hbWUiOiAiQ1NTIEZvbnRzIE1vZHVsZSBMZXZlbCA0IiwKKyAgICAgICAgICAg ICJ1cmwiOiAiaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mb250cy00IgorICAgICAgICB9 LAogICAgICAgICAiY3NzLWdyaWQiOiB7CiAgICAgICAgICAgICAic2hvcnRuYW1lIjogIkNTUyBH cmlkIExheW91dCIsCiAgICAgICAgICAgICAibG9uZ25hbWUiOiAiQ1NTIEdyaWQgTGF5b3V0IE1v ZHVsZSIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5LmNwcAppbmRleCA4YTkxYTM5MTUxNGViNTQy M2M3NmQwMDQ4ZjIwZjRhNWNlNDg5NjM0Li4zMjJmNzU0ODRhMDU1YTJhYmYwM2I1MGIwYmIxZjhm NWRhNDA3YmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5jcHAKQEAgLTE2NCw2ICsxNjQs NyBAQCBib29sIENTU1Byb3BlcnR5Ojppc0Rlc2NyaXB0b3JPbmx5KENTU1Byb3BlcnR5SUQgcHJv cGVydHlJRCkKICNlbmRpZgogICAgIGNhc2UgQ1NTUHJvcGVydHlTcmM6CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVVuaWNvZGVSYW5nZToKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udERpc3BsYXk6CiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW4KaW5kZXggMTVjZmIwZjg5YzBmNzFi MzY2ZTAzNGZlYjVhOWYxN2VlZTI3N2Q1MS4uYTAxZTg1MzZlYzhkYmMxZjhhMWY2NjI3Mzg5NWJi ZjZhNTA2MTE4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29y ZHMuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW4KQEAgLTEz NDcsMyArMTM0Nyw5IEBAIG5vLXByZWZlcmVuY2UKIC8vIGF1dG8tcmVwZWF0CiBhdXRvLWZpbGwK IGF1dG8tZml0CisKKy8vIGZvbnQtZGlzcGxheQorc3dhcAorZmFsbGJhY2sKK29wdGlvbmFsCisK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5k ZXggNjExNmE0OTIzNWJjMTUyYzhjMzRkYzhmMWY4MjAxYWFhM2Q0NjQzMC4uNGM0MDZlNzFkYWEx NGEwYjRmYjMwNjkwMDQ3ZjU2YWZiMWIyYWJkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKQEAgLTQyOTUsNiArNDI5NSwxMSBAQCBzdGF0 aWMgUmVmUHRyPENTU1ZhbHVlTGlzdD4gY29uc3VtZUZvbnRGYWNlVW5pY29kZVJhbmdlKENTU1Bh cnNlclRva2VuUmFuZ2UmIHJhbgogICAgIHJldHVybiB2YWx1ZXM7CiB9CiAKK3N0YXRpYyBSZWZQ dHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVGb250RmFjZUZvbnREaXNwbGF5KENTU1BhcnNl clRva2VuUmFuZ2UmIHJhbmdlKQoreworICAgIHJldHVybiBjb25zdW1lSWRlbnQ8Q1NTVmFsdWVB dXRvLCBDU1NWYWx1ZUJsb2NrLCBDU1NWYWx1ZVN3YXAsIENTU1ZhbHVlRmFsbGJhY2ssIENTU1Zh bHVlT3B0aW9uYWw+KHJhbmdlKTsKK30KKwogc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3Vt ZUZvbnRGYWNlU3JjVVJJKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBjb25zdCBDU1NQYXJz ZXJDb250ZXh0JiBjb250ZXh0KQogewogICAgIFN0cmluZyB1cmwgPSBjb25zdW1lVXJsQXNTdHJp bmdWaWV3KHJhbmdlKS50b1N0cmluZygpOwpAQCAtNDM2OCw2ICs0MzczLDkgQEAgYm9vbCBDU1NQ cm9wZXJ0eVBhcnNlcjo6cGFyc2VGb250RmFjZURlc2NyaXB0b3IoQ1NTUHJvcGVydHlJRCBwcm9w SWQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVVuaWNvZGVSYW5nZToKICAgICAgICAgcGFyc2VkVmFs dWUgPSBjb25zdW1lRm9udEZhY2VVbmljb2RlUmFuZ2UobV9yYW5nZSk7CiAgICAgICAgIGJyZWFr OworICAgIGNhc2UgQ1NTUHJvcGVydHlGb250RGlzcGxheToKKyAgICAgICAgcGFyc2VkVmFsdWUg PSBjb25zdW1lRm9udEZhY2VGb250RGlzcGxheShtX3JhbmdlKTsKKyAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRXZWlnaHQ6CiAjaWYgRU5BQkxFKFZBUklBVElPTl9GT05U UykKICAgICAgICAgcGFyc2VkVmFsdWUgPSBjb25zdW1lRm9udFdlaWdodFJhbmdlKG1fcmFuZ2Up OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl Q29uc3RhbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVD b25zdGFudHMuaAppbmRleCBiYjk5YWM2NGU5MzZlMzBlOGMwZWQ0MDg3MTUxOGYxYmU2MGNmOTY2 Li4xZDdjOTYwMDg4OGEyY2ZjNGU3MGIxZTYxZjMwMjkyYjAxMTNmODAwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaApA QCAtNzUxLDYgKzc1MSwxMCBAQCBlbnVtIGNsYXNzIFBhaW50VHlwZSB7CiAgICAgTWFya2Vycwog fTsKIAorZW51bSBjbGFzcyBGb250TG9hZGluZ0JlaGF2aW9yIHsKKyAgICBBdXRvLCBCbG9jaywg U3dhcCwgRmFsbGJhY2ssIE9wdGlvbmFsCit9OworCiBleHRlcm4gY29uc3QgZmxvYXQgZGVmYXVs dE1pdGVyTGltaXQ7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 317787 2017-08-10 00:11:04 -0700 2017-08-14 13:47:41 -0700 Patch bug-175382-20170810001103.patch text/plain 16833 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmEyOTBkZDQ5NTkxNmFk MzJjNTA5YjVjZTUyYTlmOTE2MWE3YTJiMy4uOTc4ZjM3MzA2NzQ4YWI1OWE0ZGM5MWMxNGViN2Fj YWQ3N2VlMjQxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTA4LTEwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUGFyc2UgZm9u dC1kaXNwbGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzUzODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgc3ludGF4IGlzIHZlcnkgc2ltcGxlOiBmb250LWRpc3BsYXk6IGF1dG8gfCBibG9jayB8 IHN3YXAgfCBmYWxsYmFjayB8IG9wdGlvbmFsLgorICAgICAgICBTbywgcGFyc2luZyBzdXBwb3J0 IGlzIHF1aXRlIHN0cmFpZ2h0Zm93YXJkLgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC9mb250 LWRpc3BsYXkvcGFyc2UuaHRtbAorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpw cm9wZXJ0eVZhbHVlKToKKyAgICAgICAgKiBjc3MvQ1NTRm9udEZhY2UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q1NTRm9udEZhY2U6OnNldExvYWRpbmdCZWhhdmlvcik6CisgICAgICAgICogY3Nz L0NTU0ZvbnRGYWNlLmg6CisgICAgICAgICogY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmFkZEZvbnRGYWNlUnVsZSk6CisgICAgICAg ICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNT U1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpD U1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgRm9udExvYWRpbmdCZWhhdmlvciBjb25zdCk6Cisg ICAgICAgICogY3NzL0NTU1Byb3BlcnRpZXMuanNvbjoKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVy dHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHk6OmlzRGVzY3JpcHRvck9ubHkp OgorICAgICAgICAqIGNzcy9DU1NWYWx1ZUtleXdvcmRzLmluOgorICAgICAgICAqIGNzcy9wYXJz ZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29uc3VtZUZvbnRG YWNlRm9udERpc3BsYXkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXI6OnBh cnNlRm9udEZhY2VEZXNjcmlwdG9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGVDb25zdGFudHMuaDoKKwogMjAxNy0wOC0wOSAgWW9zaGlha2kgSml0c3VrYXdhICA8WW9z aGlha2kuSml0c3VrYXdhQHNvbnkuY29tPgogCiAgICAgICAgIFtQQUxdIE1vdmUgc3BpL2NvY29h IGFuZCBzcGkvY2cgZGlyZWN0b3JpZXMgaW50byBQQUwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggN2VjOGViODYyNDEwYzI2 OWI5N2YyMDNmMTM0YjM3N2Y0MWRjMWE3OC4uMTkxNDNiN2UwZGZjZWU3ZTM2M2NkMzlhOTZiYzQ4 ZmJkOWFlYzA0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTQwMTUsNiArNDAxNSw3IEBAIFJlZlB0cjxDU1NWYWx1ZT4g Q29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3Bl cnR5SUQsCiAgICAgICAgIC8qIFVuaW1wbGVtZW50ZWQgQGZvbnQtZmFjZSBwcm9wZXJ0aWVzICov CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlTcmM6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlV bmljb2RlUmFuZ2U6CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlGb250RGlzcGxheToKICAgICAg ICAgICAgIGJyZWFrOwogCiAgICAgICAgIC8qIE90aGVyIHVuaW1wbGVtZW50ZWQgcHJvcGVydGll cyAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5jcHAKaW5kZXggNDc4OGZiYjg5ZTNjZjM3ZDE4 NTVlYTdjZDQwYTMzOTIzNGFmOTU5YS4uNzIzNGFhZGQxYjlkMTcyNDYwMzU1NzE4ZTdkOGJlM2Fj MGQ5YjgzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuY3BwCkBAIC0zOTcsNiArMzk3LDE4 IEBAIHZvaWQgQ1NTRm9udEZhY2U6OnNldEZlYXR1cmVTZXR0aW5ncyhDU1NWYWx1ZSYgZmVhdHVy ZVNldHRpbmdzKQogICAgIH0pOwogfQogCit2b2lkIENTU0ZvbnRGYWNlOjpzZXRMb2FkaW5nQmVo YXZpb3IoQ1NTVmFsdWUmIGxvYWRpbmdCZWhhdmlvclZhbHVlKQoreworICAgIG1fbG9hZGluZ0Jl aGF2aW9yID0gc3RhdGljX2Nhc3Q8Rm9udExvYWRpbmdCZWhhdmlvcj4oZG93bmNhc3Q8Q1NTUHJp bWl0aXZlVmFsdWU+KGxvYWRpbmdCZWhhdmlvclZhbHVlKS52YWx1ZUlEKCkpOworCisgICAgaWYg KG1fY3NzQ29ubmVjdGlvbikKKyAgICAgICAgbV9jc3NDb25uZWN0aW9uLT5tdXRhYmxlUHJvcGVy dGllcygpLnNldFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udERpc3BsYXksICZsb2FkaW5nQmVoYXZp b3JWYWx1ZSk7CisKKyAgICBpdGVyYXRlQ2xpZW50cyhtX2NsaWVudHMsIFsmXShDbGllbnQmIGNs aWVudCkgeworICAgICAgICBjbGllbnQuZm9udFByb3BlcnR5Q2hhbmdlZCgqdGhpcyk7CisgICAg fSk7Cit9CisKIGJvb2wgQ1NTRm9udEZhY2U6OnJhbmdlc01hdGNoQ29kZVBvaW50KFVDaGFyMzIg Y2hhcmFjdGVyKSBjb25zdAogewogICAgIGlmIChtX3Jhbmdlcy5pc0VtcHR5KCkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NGb250RmFjZS5oCmluZGV4IDNiNDJiMTA5YjdiMGYwNWM1OGJmYjM1OTIwOTg1M2U0NDE0 NzZiNDUuLjNiMzY1NjA5YmM4MTNjODJmY2UzNmFiYTdjMzcwOTU0N2FhMDdkMzUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NGb250RmFjZS5oCkBAIC03Niw2ICs3Niw3IEBAIHB1YmxpYzoKICAgICBib29sIHNl dFZhcmlhbnRBbHRlcm5hdGVzKENTU1ZhbHVlJik7CiAgICAgYm9vbCBzZXRWYXJpYW50RWFzdEFz aWFuKENTU1ZhbHVlJik7CiAgICAgdm9pZCBzZXRGZWF0dXJlU2V0dGluZ3MoQ1NTVmFsdWUmKTsK KyAgICB2b2lkIHNldExvYWRpbmdCZWhhdmlvcihDU1NWYWx1ZSYpOwogCiAgICAgZW51bSBjbGFz cyBTdGF0dXM7CiAgICAgc3RydWN0IFVuaWNvZGVSYW5nZTsKQEAgLTE3OSw2ICsxODAsNyBAQCBw cml2YXRlOgogICAgIEhhc2hTZXQ8Q2xpZW50Kj4gbV9jbGllbnRzOwogICAgIFdlYWtQdHI8Rm9u dEZhY2U+IG1fd3JhcHBlcjsKICAgICBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0aWVz IG1fZm9udFNlbGVjdGlvbkNhcGFiaWxpdGllczsKKyAgICBGb250TG9hZGluZ0JlaGF2aW9yIG1f bG9hZGluZ0JlaGF2aW9yIHsgRm9udExvYWRpbmdCZWhhdmlvcjo6QXV0byB9OwogICAgIFN0YXR1 cyBtX3N0YXR1cyB7IFN0YXR1czo6UGVuZGluZyB9OwogICAgIGJvb2wgbV9pc0xvY2FsRmFsbGJh Y2sgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9zb3VyY2VzUG9wdWxhdGVkIHsgZmFsc2UgfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggMGIyZTZmZjQ0MjUxNDVhMGI3 ZGE5NzRjOTJkOTgzNjBjMzQyNjNkMS4uNGEwNWUxODJkMDE0MTQ4ZjVkNmMyYzRmYzA1ZDQ3MTcy ZTkzYjI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKQEAgLTE1Nyw2 ICsxNTcsNyBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6YWRkRm9udEZhY2VSdWxlKFN0eWxlUnVs ZUZvbnRGYWNlJiBmb250RmFjZVJ1bGUsIGJvb2wgaXNJbgogICAgIFJlZlB0cjxDU1NWYWx1ZT4g dmFyaWFudE51bWVyaWMgPSBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5Rm9u dFZhcmlhbnROdW1lcmljKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhcmlhbnRBbHRlcm5hdGVz ID0gc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50QWx0ZXJu YXRlcyk7CiAgICAgUmVmUHRyPENTU1ZhbHVlPiB2YXJpYW50RWFzdEFzaWFuID0gc3R5bGUuZ2V0 UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuKTsKKyAgICBS ZWZQdHI8Q1NTVmFsdWU+IGxvYWRpbmdCZWhhdmlvciA9IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFs dWUoQ1NTUHJvcGVydHlGb250RGlzcGxheSk7CiAgICAgaWYgKCFpczxDU1NWYWx1ZUxpc3Q+KGZv bnRGYW1pbHkuZ2V0KCkpIHx8ICFpczxDU1NWYWx1ZUxpc3Q+KHNyYy5nZXQoKSkgfHwgKHVuaWNv ZGVSYW5nZSAmJiAhaXM8Q1NTVmFsdWVMaXN0PigqdW5pY29kZVJhbmdlKSkpCiAgICAgICAgIHJl dHVybjsKIApAQCAtMTk3LDYgKzE5OCw4IEBAIHZvaWQgQ1NTRm9udFNlbGVjdG9yOjphZGRGb250 RmFjZVJ1bGUoU3R5bGVSdWxlRm9udEZhY2UmIGZvbnRGYWNlUnVsZSwgYm9vbCBpc0luCiAgICAg ICAgIHJldHVybjsKICAgICBpZiAoZmVhdHVyZVNldHRpbmdzKQogICAgICAgICBmb250RmFjZS0+ c2V0RmVhdHVyZVNldHRpbmdzKCpmZWF0dXJlU2V0dGluZ3MpOworICAgIGlmIChsb2FkaW5nQmVo YXZpb3IpCisgICAgICAgIGZvbnRGYWNlLT5zZXRMb2FkaW5nQmVoYXZpb3IoKmxvYWRpbmdCZWhh dmlvcik7CiAKICAgICBDU1NGb250RmFjZTo6YXBwZW5kU291cmNlcyhmb250RmFjZSwgc3JjTGlz dCwgbV9kb2N1bWVudCwgaXNJbml0aWF0aW5nRWxlbWVudEluVXNlckFnZW50U2hhZG93VHJlZSk7 CiAgICAgaWYgKGZvbnRGYWNlLT5hbGxTb3VyY2VzRmFpbGVkKCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAppbmRleCA2NDdiODU1M2I3NThmN2Vj NWIxNjA1NWRhYjMxNGUxNmUzYzYxMjhiLi5hOWQzMGUzM2NiMTA4MzI4ODc1OWYzNzYyNDBiY2M0 NjVjODQyYzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1h cHBpbmdzLmgKQEAgLTU2OTcsNCArNTY5Nyw1NyBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmlt aXRpdmVWYWx1ZTo6b3BlcmF0b3IgRm9udE9wdGljYWxTaXppbmcoKSBjb25zdAogICAgIHJldHVy biBGb250T3B0aWNhbFNpemluZzo6RW5hYmxlZDsKIH0KIAordGVtcGxhdGU8PiBpbmxpbmUgQ1NT UHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKEZvbnRMb2FkaW5nQmVoYXZpb3IgYmVo YXZpb3IpCisgICAgOiBDU1NWYWx1ZShQcmltaXRpdmVDbGFzcykKK3sKKyAgICBtX3ByaW1pdGl2 ZVVuaXRUeXBlID0gQ1NTX1ZBTFVFX0lEOworICAgIHN3aXRjaCAoYmVoYXZpb3IpIHsKKyAgICBj YXNlIEZvbnRMb2FkaW5nQmVoYXZpb3I6OkF1dG86CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9 IENTU1ZhbHVlQXV0bzsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGb250TG9hZGluZ0JlaGF2 aW9yOjpCbG9jazoKKyAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVCbG9jazsKKyAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBGb250TG9hZGluZ0JlaGF2aW9yOjpTd2FwOgorICAgICAg ICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZVN3YXA7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgRm9udExvYWRpbmdCZWhhdmlvcjo6RmFsbGJhY2s6CisgICAgICAgIG1fdmFsdWUudmFsdWVJ RCA9IENTU1ZhbHVlRmFsbGJhY2s7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRm9udExvYWRp bmdCZWhhdmlvcjo6T3B0aW9uYWw6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1ZhbHVl T3B0aW9uYWw7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK3RlbXBsYXRlPD4gaW5s aW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBGb250TG9hZGluZ0JlaGF2aW9yKCkgY29u c3QKK3sKKyAgICBBU1NFUlQoaXNWYWx1ZUlEKCkpOworICAgIHN3aXRjaCAobV92YWx1ZS52YWx1 ZUlEKSB7CisgICAgY2FzZSBDU1NWYWx1ZUF1dG86CisgICAgICAgIHJldHVybiBGb250TG9hZGlu Z0JlaGF2aW9yOjpBdXRvOworICAgIGNhc2UgQ1NTVmFsdWVCbG9jazoKKyAgICAgICAgcmV0dXJu IEZvbnRMb2FkaW5nQmVoYXZpb3I6OkJsb2NrOworICAgIGNhc2UgQ1NTVmFsdWVTd2FwOgorICAg ICAgICByZXR1cm4gRm9udExvYWRpbmdCZWhhdmlvcjo6U3dhcDsKKyAgICBjYXNlIENTU1ZhbHVl RmFsbGJhY2s6CisgICAgICAgIHJldHVybiBGb250TG9hZGluZ0JlaGF2aW9yOjpGYWxsYmFjazsK KyAgICBjYXNlIENTU1ZhbHVlT3B0aW9uYWw6CisgICAgICAgIHJldHVybiBGb250TG9hZGluZ0Jl aGF2aW9yOjpPcHRpb25hbDsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9Cisg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIEZvbnRMb2FkaW5nQmVoYXZpb3I6 OkF1dG87Cit9CisKKy8qCitlbnVtIGNsYXNzIEZvbnRMb2FkaW5nQmVoYXZpb3IgeworICAgIEF1 dG8sIEJsb2NrLCBTd2FwLCBGYWxsYmFjaywgT3B0aW9uYWwKK307CisqLworCiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgppbmRleCAwMTFhOTU5N2NmZjlhZDkxMmJmMWRhNjYz ZTRmOGIwM2E1YjU1OWY1Li42ZDc4MzMyOWFjZDA2NzUxNzJiMDUzYzVmMDcyZmMzZTg3MmE0M2Nl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0aWVzLmpzb24KQEAgLTM5Niw4ICszOTYsOCBA QAogICAgICAgICAgICAgICAgICJlbmFibGUtaWYiOiAiRU5BQkxFX1ZBUklBVElPTl9GT05UUyIK ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAic3BlY2lmaWNhdGlvbiI6IHsKLSAgICAgICAg ICAgICAgICAiY2F0ZWdvcnkiOiAiY3NzLWZvbnRzIiwKLSAgICAgICAgICAgICAgICAidXJsIjog Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZm9udHMtNC8jbG93LWxldmVsLWZvbnQtdmFy aWF0aW9uLXNldHRpbmdzLWNvbnRyb2wtdGhlLWZvbnQtdmFyaWF0aW9uLXNldHRpbmdzLXByb3Bl cnR5IgorICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtZm9udHMtNCIsCisgICAgICAg ICAgICAgICAgInVybCI6ICJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZvbnRzLTQvI2Zv bnQtdmFyaWF0aW9uLXNldHRpbmdzLWRlZiIKICAgICAgICAgICAgIH0KICAgICAgICAgfSwKICAg ICAgICAgIi13ZWJraXQtZm9udC1rZXJuaW5nIjogewpAQCAtNTU2LDggKzU1Niw4IEBACiAgICAg ICAgICAgICAgICAgImVuYWJsZS1pZiI6ICJFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTIgogICAgICAg ICAgICAgfSwKICAgICAgICAgICAgICJzcGVjaWZpY2F0aW9uIjogewotICAgICAgICAgICAgICAg ICJjYXRlZ29yeSI6ICJjc3MtZm9udHMiLAotICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6 Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mb250cy00LyNvcHRpY2FsLXNpemluZy1jb250cm9sLXRo ZS1mb250LW9wdGljYWwtc2l6aW5nLXByb3BlcnR5IgorICAgICAgICAgICAgICAgICJjYXRlZ29y eSI6ICJjc3MtZm9udHMtNCIsCisgICAgICAgICAgICAgICAgInVybCI6ICJodHRwczovL2RyYWZ0 cy5jc3N3Zy5vcmcvY3NzLWZvbnRzLTQvI2ZvbnQtb3B0aWNhbC1zaXppbmctZGVmIgogICAgICAg ICAgICAgfQogICAgICAgICB9LAogICAgICAgICAiZm9udCI6IHsKQEAgLTM1NDAsNiArMzU0MCwy MiBAQAogICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1m b250cy0zLyNkZXNjZGVmLXVuaWNvZGUtcmFuZ2UiCiAgICAgICAgICAgICB9CiAgICAgICAgIH0s CisgICAgICAgICJmb250LWRpc3BsYXkiOiB7CisgICAgICAgICAgICAiY29kZWdlbi1wcm9wZXJ0 aWVzIjogeworICAgICAgICAgICAgICAgICJza2lwLWJ1aWxkZXIiOiB0cnVlCisgICAgICAgICAg ICB9LAorICAgICAgICAgICAgInNwZWNpZmljYXRpb24iOiB7CisgICAgICAgICAgICAgICAgImNh dGVnb3J5IjogImNzcy1mb250cy00IiwKKyAgICAgICAgICAgICAgICAidXJsIjogImh0dHBzOi8v ZHJhZnRzLmNzc3dnLm9yZy9jc3MtZm9udHMtNC8jZm9udC1kaXNwbGF5LWRlc2MiCisgICAgICAg ICAgICB9LAorICAgICAgICAgICAgInZhbHVlcyI6IFsKKyAgICAgICAgICAgICAgICAiYXV0byIs CisgICAgICAgICAgICAgICAgImJsb2NrIiwKKyAgICAgICAgICAgICAgICAic3dhcCIsCisgICAg ICAgICAgICAgICAgImZhbGxiYWNrIiwKKyAgICAgICAgICAgICAgICAib3B0aW9uYWwiCisgICAg ICAgICAgICBdCisgICAgICAgIH0sCiAgICAgICAgICJ2ZWN0b3ItZWZmZWN0IjogewogICAgICAg ICAgICAgInZhbHVlcyI6IFsKICAgICAgICAgICAgICAgICAibm9uZSIsCkBAIC02NzQxLDYgKzY3 NTcsMTEgQEAKICAgICAgICAgICAgICJsb25nbmFtZSI6ICJDU1MgRm9udHMgTW9kdWxlIiwKICAg ICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1mb250cy0zLyIKICAg ICAgICAgfSwKKyAgICAgICAgImNzcy1mb250cy00IjogeworICAgICAgICAgICAgInNob3J0bmFt ZSI6ICJDU1MgRm9udHMgTGV2ZWwgNCIsCisgICAgICAgICAgICAibG9uZ25hbWUiOiAiQ1NTIEZv bnRzIE1vZHVsZSBMZXZlbCA0IiwKKyAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9kcmFmdHMu Y3Nzd2cub3JnL2Nzcy1mb250cy00IgorICAgICAgICB9LAogICAgICAgICAiY3NzLWdyaWQiOiB7 CiAgICAgICAgICAgICAic2hvcnRuYW1lIjogIkNTUyBHcmlkIExheW91dCIsCiAgICAgICAgICAg ICAibG9uZ25hbWUiOiAiQ1NTIEdyaWQgTGF5b3V0IE1vZHVsZSIsCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1By b3BlcnR5LmNwcAppbmRleCA4YTkxYTM5MTUxNGViNTQyM2M3NmQwMDQ4ZjIwZjRhNWNlNDg5NjM0 Li4zMjJmNzU0ODRhMDU1YTJhYmYwM2I1MGIwYmIxZjhmNWRhNDA3YmEzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcm9wZXJ0eS5jcHAKQEAgLTE2NCw2ICsxNjQsNyBAQCBib29sIENTU1Byb3BlcnR5Ojpp c0Rlc2NyaXB0b3JPbmx5KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKICNlbmRpZgogICAgIGNh c2UgQ1NTUHJvcGVydHlTcmM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVVuaWNvZGVSYW5nZToKKyAg ICBjYXNlIENTU1Byb3BlcnR5Rm9udERpc3BsYXk6CiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVl S2V5d29yZHMuaW4KaW5kZXggMTVjZmIwZjg5YzBmNzFiMzY2ZTAzNGZlYjVhOWYxN2VlZTI3N2Q1 MS4uZWM0MDU1ZTBhN2I3ZGJhMTM5OTg2ZTJlZDhhNWMwY2NjMWNhZGI0YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW4KKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW4KQEAgLTEzNDcsMyArMTM0Nyw4IEBAIG5vLXByZWZl cmVuY2UKIC8vIGF1dG8tcmVwZWF0CiBhdXRvLWZpbGwKIGF1dG8tZml0CisKKy8vIGZvbnQtZGlz cGxheQorc3dhcAorZmFsbGJhY2sKK29wdGlvbmFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9w YXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCmluZGV4IDYxMTZhNDkyMzViYzE1MmM4YzM0ZGM4 ZjFmODIwMWFhYTNkNDY0MzAuLjRjNDA2ZTcxZGFhMTRhMGI0ZmIzMDY5MDA0N2Y1NmFmYjFiMmFi ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJz ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIu Y3BwCkBAIC00Mjk1LDYgKzQyOTUsMTEgQEAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IGNv bnN1bWVGb250RmFjZVVuaWNvZGVSYW5nZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW4KICAgICBy ZXR1cm4gdmFsdWVzOwogfQogCitzdGF0aWMgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25z dW1lRm9udEZhY2VGb250RGlzcGxheShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSkKK3sKKyAg ICByZXR1cm4gY29uc3VtZUlkZW50PENTU1ZhbHVlQXV0bywgQ1NTVmFsdWVCbG9jaywgQ1NTVmFs dWVTd2FwLCBDU1NWYWx1ZUZhbGxiYWNrLCBDU1NWYWx1ZU9wdGlvbmFsPihyYW5nZSk7Cit9CisK IHN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1bWVGb250RmFjZVNyY1VSSShDU1NQYXJzZXJU b2tlblJhbmdlJiByYW5nZSwgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYgY29udGV4dCkKIHsKICAg ICBTdHJpbmcgdXJsID0gY29uc3VtZVVybEFzU3RyaW5nVmlldyhyYW5nZSkudG9TdHJpbmcoKTsK QEAgLTQzNjgsNiArNDM3Myw5IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlRm9udEZh Y2VEZXNjcmlwdG9yKENTU1Byb3BlcnR5SUQgcHJvcElkKQogICAgIGNhc2UgQ1NTUHJvcGVydHlV bmljb2RlUmFuZ2U6CiAgICAgICAgIHBhcnNlZFZhbHVlID0gY29uc3VtZUZvbnRGYWNlVW5pY29k ZVJhbmdlKG1fcmFuZ2UpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9u dERpc3BsYXk6CisgICAgICAgIHBhcnNlZFZhbHVlID0gY29uc3VtZUZvbnRGYWNlRm9udERpc3Bs YXkobV9yYW5nZSk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250V2Vp Z2h0OgogI2lmIEVOQUJMRShWQVJJQVRJT05fRk9OVFMpCiAgICAgICAgIHBhcnNlZFZhbHVlID0g Y29uc3VtZUZvbnRXZWlnaHRSYW5nZShtX3JhbmdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKaW5kZXggMjM3YTJkOGYx NTY4YTJlYTNiYmEwMDY3NjVhMTk1ZWY0MDczNDQ3Yi4uZDIxYjgwYzQxZDNjYzg1MjViYTI3Mjdj YzkwYWRjNDE5MGJjYWM1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKQEAgLTc1Myw2ICs3NTMsMTAgQEAgZW51bSBj bGFzcyBQYWludFR5cGUgewogICAgIE1hcmtlcnMKIH07CiAKK2VudW0gY2xhc3MgRm9udExvYWRp bmdCZWhhdmlvciB7CisgICAgQXV0bywgQmxvY2ssIFN3YXAsIEZhbGxiYWNrLCBPcHRpb25hbAor fTsKKwogZXh0ZXJuIGNvbnN0IGZsb2F0IGRlZmF1bHRNaXRlckxpbWl0OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDI5ODU4NDhiZDgyNzhhYTdjZmZlMDljZmZmOWU2YTBhZmM2 NDhmNC4uN2QyZGI2NDdkOGU1MjkxZTlhY2IzZGNiOWZlYmI2ZDEzNGJkOTA1OCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDE3LTA4LTEwICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CisKKyAgICAgICAgUGFyc2UgZm9udC1kaXNwbGF5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzUzODIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvdGV4dC9mb250LWRpc3BsYXkv cGFyc2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvZm9udC1kaXNw bGF5L3BhcnNlLmh0bWw6IEFkZGVkLgorCiAyMDE3LTA4LTA5ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzYWJsZSBCZWFjb24gQVBJIG9uIFdLMSBEUlQgYW5k IFdLMiB3aGVuIG5vdCB1c2luZyBORVRXT1JLX1NFU1NJT04KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvdGV4dC9mb250LWRpc3BsYXkvcGFyc2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvZmFzdC90ZXh0L2ZvbnQtZGlzcGxheS9wYXJzZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u M2NkYWM4ZmM4ZDJmODM1MjhhM2RkYTA1NjNiNjJkMjAzMmQ3ZjhhZgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9mb250LWRpc3BsYXkvcGFyc2UtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMTkgQEAKK1RoaXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgdGhlIGZvbnQtZGlz cGxheSBkZXNjcmlwdG9yIGluIEBmb250LWZhY2UgaXMgYXBwcm9wcmlhdGVseSBwYXJzZWQuCisK K09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZv bGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIHNoZWV0LnJ1bGVzWzBdLnN0eWxl LmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIGlzICIiCitQQVNTIHNoZWV0LnJ1bGVz WzFdLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIGlzICIiCitQQVNTIHNo ZWV0LnJ1bGVzWzJdLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIGlzICIi CitQQVNTIHNoZWV0LnJ1bGVzWzNdLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxh eScpIGlzICJhdXRvIgorUEFTUyBzaGVldC5ydWxlc1s0XS5zdHlsZS5nZXRQcm9wZXJ0eVZhbHVl KCdmb250LWRpc3BsYXknKSBpcyAiYmxvY2siCitQQVNTIHNoZWV0LnJ1bGVzWzVdLnN0eWxlLmdl dFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIGlzICJzd2FwIgorUEFTUyBzaGVldC5ydWxl c1s2XS5zdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LWRpc3BsYXknKSBpcyAiZmFsbGJhY2si CitQQVNTIHNoZWV0LnJ1bGVzWzddLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxh eScpIGlzICJvcHRpb25hbCIKK1BBU1Mgc2hlZXQucnVsZXNbOF0uc3R5bGUuZ2V0UHJvcGVydHlW YWx1ZSgnZm9udC1kaXNwbGF5JykgaXMgIiIKK1BBU1Mgd2luZG93LmdldENvbXB1dGVkU3R5bGUo ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3Q5JykpLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQt ZGlzcGxheScpIGlzICIiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ZvbnQtZGlzcGxh eS9wYXJzZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ZvbnQtZGlzcGxheS9wYXJzZS5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmY2NThiOTY1ZTlkMTdiYzlmODcxOGI5ZmY1YjlhMjI0ZGRjMDkxNWEK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZm9udC1kaXNwbGF5L3Bh cnNlLmh0bWwKQEAgLTAsMCArMSw3MSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp cHQ+Cis8c3R5bGUgaWQ9InN0eWxlIj4KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAi VGVzdDAiOworICAgIHNyYzogbG9jYWwoIlRpbWVzIik7CisgICAgZm9udC1kaXNwbGF5OiBnYXJi YWdlOworfQorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6ICJUZXN0MSI7CisgICAgc3Jj OiBsb2NhbCgiVGltZXMiKTsKK30KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAiVGVz dDIiOworICAgIHNyYzogbG9jYWwoIlRpbWVzIik7CisgICAgZm9udC1kaXNwbGF5OiBibG9jayBz d2FwOworfQorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6ICJUZXN0MyI7CisgICAgc3Jj OiBsb2NhbCgiVGltZXMiKTsKKyAgICBmb250LWRpc3BsYXk6IGF1dG87Cit9CitAZm9udC1mYWNl IHsKKyAgICBmb250LWZhbWlseTogIlRlc3Q0IjsKKyAgICBzcmM6IGxvY2FsKCJUaW1lcyIpOwor ICAgIGZvbnQtZGlzcGxheTogYmxvY2s7Cit9CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWls eTogIlRlc3Q1IjsKKyAgICBzcmM6IGxvY2FsKCJUaW1lcyIpOworICAgIGZvbnQtZGlzcGxheTog c3dhcDsKK30KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAiVGVzdDYiOworICAgIHNy YzogbG9jYWwoIlRpbWVzIik7CisgICAgZm9udC1kaXNwbGF5OiBmYWxsYmFjazsKK30KK0Bmb250 LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAiVGVzdDciOworICAgIHNyYzogbG9jYWwoIlRpbWVz Iik7CisgICAgZm9udC1kaXNwbGF5OiBvcHRpb25hbDsKK30KK0Bmb250LWZhY2UgeworICAgIGZv bnQtZmFtaWx5OiAiVGVzdDgiOworICAgIHNyYzogbG9jYWwoIlRpbWVzIik7CisgICAgZm9udC1k aXNwbGF5OiA7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IGlkPSJ0ZXN0OSIg c3R5bGU9ImZvbnQtZGlzcGxheTogYmxvY2siPjwvZGl2PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9u KCJUaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0IHRoZSBmb250LWRpc3BsYXkgZGVzY3JpcHRvciBp biBAZm9udC1mYWNlIGlzIGFwcHJvcHJpYXRlbHkgcGFyc2VkLiIpOworCit2YXIgc2hlZXQgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3R5bGUiKS5zaGVldDsKK3Nob3VsZEJlRXF1YWxUb1N0 cmluZygic2hlZXQucnVsZXNbMF0uc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5 JykiLCAiIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoInNoZWV0LnJ1bGVzWzFdLnN0eWxlLmdl dFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIiwgIiIpOworc2hvdWxkQmVFcXVhbFRvU3Ry aW5nKCJzaGVldC5ydWxlc1syXS5zdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LWRpc3BsYXkn KSIsICIiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygic2hlZXQucnVsZXNbM10uc3R5bGUuZ2V0 UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykiLCAiYXV0byIpOworc2hvdWxkQmVFcXVhbFRv U3RyaW5nKCJzaGVldC5ydWxlc1s0XS5zdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LWRpc3Bs YXknKSIsICJibG9jayIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJzaGVldC5ydWxlc1s1XS5z dHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LWRpc3BsYXknKSIsICJzd2FwIik7CitzaG91bGRC ZUVxdWFsVG9TdHJpbmcoInNoZWV0LnJ1bGVzWzZdLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2Zv bnQtZGlzcGxheScpIiwgImZhbGxiYWNrIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoInNoZWV0 LnJ1bGVzWzddLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIiwgIm9wdGlv bmFsIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoInNoZWV0LnJ1bGVzWzhdLnN0eWxlLmdldFBy b3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIiwgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5n KCJ3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgndGVzdDkn KSkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykiLCAiIik7Cis8L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K KzwvYm9keT4KKzwvaHRtbD4K 318063 2017-08-14 14:42:49 -0700 2017-08-14 17:04:01 -0700 Patch for committing bug-175382-20170814144248.patch text/plain 22811 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdiNTY1ZDA2ZjdlYWMz MGVmNzliNzZhMGZmYjljZTIzZTZhMDc0My4uYjA3MDc0MGZkMDUzMDI5NTEzMjYwMTk0MjhiZWFh YWY2ZGMzZjZkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTA4LTE0ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUGFyc2UgZm9u dC1kaXNwbGF5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzUzODIKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAg VGhlIHN5bnRheCBpcyB2ZXJ5IHNpbXBsZTogZm9udC1kaXNwbGF5OiBhdXRvIHwgYmxvY2sgfCBz d2FwIHwgZmFsbGJhY2sgfCBvcHRpb25hbC4KKyAgICAgICAgU28sIHBhcnNpbmcgc3VwcG9ydCBp cyBxdWl0ZSBzdHJhaWdodGZvd2FyZC4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvZm9udC1k aXNwbGF5L3BhcnNlLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFy YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6cHJv cGVydHlWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNTU0ZvbnRGYWNlOjpzZXRMb2FkaW5nQmVoYXZpb3IpOgorICAgICAgICAqIGNzcy9D U1NGb250RmFjZS5oOgorICAgICAgICAqIGNzcy9DU1NGb250U2VsZWN0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjphZGRGb250RmFjZVJ1bGUpOgorICAgICAgICAq IGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ cmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NT UHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEZvbnRMb2FkaW5nQmVoYXZpb3IgY29uc3QpOgorICAg ICAgICAqIGNzcy9DU1NQcm9wZXJ0aWVzLmpzb246CisgICAgICAgICogY3NzL0NTU1Byb3BlcnR5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5Ojppc0Rlc2NyaXB0b3JPbmx5KToK KyAgICAgICAgKiBjc3MvQ1NTVmFsdWVLZXl3b3Jkcy5pbjoKKyAgICAgICAgKiBjc3MvcGFyc2Vy L0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN1bWVGb250RmFj ZUZvbnREaXNwbGF5KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpwYXJz ZUZvbnRGYWNlRGVzY3JpcHRvcik6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlQ29uc3RhbnRzLmg6CisKIDIwMTctMDgtMTQgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxh cGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBJbXBsZW1lbnQgV2ViQ29yZTo6c3Rh bmRhcmRVc2VyQWdlbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1 dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCA3MTA0ZGJlODg5ZjkyZGY1NjUzYmYxZTE1NWU2YzY3 NDhmMzE2YzhjLi5mMzRjNWY3M2QzZTViZmUyZjc4NGZjOTczZjRmMzU1MjQ4NGFiZWYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cApAQCAtNDAxOCw2ICs0MDE4LDcgQEAgUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0 cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwKICAgICAgICAg LyogVW5pbXBsZW1lbnRlZCBAZm9udC1mYWNlIHByb3BlcnRpZXMgKi8KICAgICAgICAgY2FzZSBD U1NQcm9wZXJ0eVNyYzoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVVuaWNvZGVSYW5nZToKKyAg ICAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnREaXNwbGF5OgogICAgICAgICAgICAgYnJlYWs7CiAK ICAgICAgICAgLyogT3RoZXIgdW5pbXBsZW1lbnRlZCBwcm9wZXJ0aWVzICovCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0NTU0ZvbnRGYWNlLmNwcAppbmRleCA0Nzg4ZmJiODllM2NmMzdkMTg1NWVhN2NkNDBhMzM5MjM0 YWY5NTlhLi41MGU5NGU4Mzk1MTY2YTljN2YxYzEwMzlhOGZjM2I2YjIwZDk5MWY2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NGb250RmFjZS5jcHAKQEAgLTE0OSw2ICsxNDksOSBAQCBzdGF0aWMgRm9udFNl bGVjdGlvblJhbmdlIGNhbGN1bGF0ZVdlaWdodFJhbmdlKENTU1ZhbHVlJiB2YWx1ZSkKIHZvaWQg Q1NTRm9udEZhY2U6OnNldFdlaWdodChDU1NWYWx1ZSYgd2VpZ2h0KQogewogICAgIGF1dG8gcmFu Z2UgPSBjYWxjdWxhdGVXZWlnaHRSYW5nZSh3ZWlnaHQpOworICAgIGlmIChtX2ZvbnRTZWxlY3Rp b25DYXBhYmlsaXRpZXMud2VpZ2h0ID09IHJhbmdlKQorICAgICAgICByZXR1cm47CisKICAgICBz ZXRXZWlnaHQocmFuZ2UpOwogCiAgICAgaWYgKG1fY3NzQ29ubmVjdGlvbikKQEAgLTE4NCw2ICsx ODcsOSBAQCBzdGF0aWMgRm9udFNlbGVjdGlvblJhbmdlIGNhbGN1bGF0ZVN0cmV0Y2hSYW5nZShD U1NWYWx1ZSYgdmFsdWUpCiB2b2lkIENTU0ZvbnRGYWNlOjpzZXRTdHJldGNoKENTU1ZhbHVlJiBz dHlsZSkKIHsKICAgICBhdXRvIHJhbmdlID0gY2FsY3VsYXRlU3RyZXRjaFJhbmdlKHN0eWxlKTsK KyAgICBpZiAobV9mb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzLndpZHRoID09IHJhbmdlKQorICAg ICAgICByZXR1cm47CisKICAgICBzZXRTdHJldGNoKHJhbmdlKTsKIAogICAgIGlmIChtX2Nzc0Nv bm5lY3Rpb24pCkBAIC0yMjksNiArMjM1LDkgQEAgc3RhdGljIEZvbnRTZWxlY3Rpb25SYW5nZSBj YWxjdWxhdGVJdGFsaWNSYW5nZShDU1NWYWx1ZSYgdmFsdWUpCiB2b2lkIENTU0ZvbnRGYWNlOjpz ZXRTdHlsZShDU1NWYWx1ZSYgc3R5bGUpCiB7CiAgICAgYXV0byByYW5nZSA9IGNhbGN1bGF0ZUl0 YWxpY1JhbmdlKHN0eWxlKTsKKyAgICBpZiAobV9mb250U2VsZWN0aW9uQ2FwYWJpbGl0aWVzLnNs b3BlID09IHJhbmdlKQorICAgICAgICByZXR1cm47CisKICAgICBzZXRTdHlsZShyYW5nZSk7CiAK ICAgICBpZiAobV9jc3NDb25uZWN0aW9uKQpAQCAtMjQ0LDEzICsyNTMsMjcgQEAgYm9vbCBDU1NG b250RmFjZTo6c2V0VW5pY29kZVJhbmdlKENTU1ZhbHVlJiB1bmljb2RlUmFuZ2UpCiAgICAgaWYg KCFpczxDU1NWYWx1ZUxpc3Q+KHVuaWNvZGVSYW5nZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIG1fcmFuZ2VzLmNsZWFyKCk7CisgICAgVmVjdG9yPFVuaWNvZGVSYW5nZT4gcmFuZ2Vz OwogICAgIGF1dG8mIGxpc3QgPSBkb3duY2FzdDxDU1NWYWx1ZUxpc3Q+KHVuaWNvZGVSYW5nZSk7 CiAgICAgZm9yIChhdXRvJiByYW5nZVZhbHVlIDogbGlzdCkgewogICAgICAgICBhdXRvJiByYW5n ZSA9IGRvd25jYXN0PENTU1VuaWNvZGVSYW5nZVZhbHVlPihyYW5nZVZhbHVlLmdldCgpKTsKLSAg ICAgICAgbV9yYW5nZXMuYXBwZW5kKHsgcmFuZ2UuZnJvbSgpLCByYW5nZS50bygpIH0pOworICAg ICAgICByYW5nZXMuYXBwZW5kKHsgcmFuZ2UuZnJvbSgpLCByYW5nZS50bygpIH0pOworICAgIH0K KworICAgIGlmIChyYW5nZXMuc2l6ZSgpID09IG1fcmFuZ2VzLnNpemUoKSkgeworICAgICAgICBi b29sIHNhbWUgPSB0cnVlOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJhbmdlcy5z aXplKCk7ICsraSkgeworICAgICAgICAgICAgaWYgKHJhbmdlc1tpXSAhPSBtX3Jhbmdlc1tpXSkg eworICAgICAgICAgICAgICAgIHNhbWUgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBpZiAoc2FtZSkKKyAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgIH0KIAorICAgIG1fcmFuZ2VzID0gV1RGTW92ZShyYW5nZXMpOwor CiAgICAgaWYgKG1fY3NzQ29ubmVjdGlvbikKICAgICAgICAgbV9jc3NDb25uZWN0aW9uLT5tdXRh YmxlUHJvcGVydGllcygpLnNldFByb3BlcnR5KENTU1Byb3BlcnR5VW5pY29kZVJhbmdlLCAmdW5p Y29kZVJhbmdlKTsKIApAQCAtMjY1LDYgKzI4OCwxMiBAQCBib29sIENTU0ZvbnRGYWNlOjpzZXRW YXJpYW50TGlnYXR1cmVzKENTU1ZhbHVlJiB2YXJpYW50TGlnYXR1cmVzKQogewogICAgIGF1dG8g bGlnYXR1cmVzID0gZXh0cmFjdEZvbnRWYXJpYW50TGlnYXR1cmVzKHZhcmlhbnRMaWdhdHVyZXMp OwogCisgICAgaWYgKG1fdmFyaWFudFNldHRpbmdzLmNvbW1vbkxpZ2F0dXJlcyA9PSBsaWdhdHVy ZXMuY29tbW9uTGlnYXR1cmVzCisgICAgICAgICYmIG1fdmFyaWFudFNldHRpbmdzLmRpc2NyZXRp b25hcnlMaWdhdHVyZXMgPT0gbGlnYXR1cmVzLmRpc2NyZXRpb25hcnlMaWdhdHVyZXMKKyAgICAg ICAgJiYgbV92YXJpYW50U2V0dGluZ3MuaGlzdG9yaWNhbExpZ2F0dXJlcyA9PSBsaWdhdHVyZXMu aGlzdG9yaWNhbExpZ2F0dXJlcworICAgICAgICAmJiBtX3ZhcmlhbnRTZXR0aW5ncy5jb250ZXh0 dWFsQWx0ZXJuYXRlcyA9PSBsaWdhdHVyZXMuY29udGV4dHVhbEFsdGVybmF0ZXMpCisgICAgICAg IHJldHVybiB0cnVlOworCiAgICAgbV92YXJpYW50U2V0dGluZ3MuY29tbW9uTGlnYXR1cmVzID0g bGlnYXR1cmVzLmNvbW1vbkxpZ2F0dXJlczsKICAgICBtX3ZhcmlhbnRTZXR0aW5ncy5kaXNjcmV0 aW9uYXJ5TGlnYXR1cmVzID0gbGlnYXR1cmVzLmRpc2NyZXRpb25hcnlMaWdhdHVyZXM7CiAgICAg bV92YXJpYW50U2V0dGluZ3MuaGlzdG9yaWNhbExpZ2F0dXJlcyA9IGxpZ2F0dXJlcy5oaXN0b3Jp Y2FsTGlnYXR1cmVzOwpAQCAtMjg1LDcgKzMxNCwxMiBAQCBib29sIENTU0ZvbnRGYWNlOjpzZXRW YXJpYW50UG9zaXRpb24oQ1NTVmFsdWUmIHZhcmlhbnRQb3NpdGlvbikKICAgICBpZiAoIWlzPENT U1ByaW1pdGl2ZVZhbHVlPih2YXJpYW50UG9zaXRpb24pKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICBtX3ZhcmlhbnRTZXR0aW5ncy5wb3NpdGlvbiA9IGRvd25jYXN0PENTU1ByaW1pdGl2 ZVZhbHVlPih2YXJpYW50UG9zaXRpb24pOworICAgIEZvbnRWYXJpYW50UG9zaXRpb24gcG9zaXRp b24gPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4odmFyaWFudFBvc2l0aW9uKTsKKworICAg IGlmIChtX3ZhcmlhbnRTZXR0aW5ncy5wb3NpdGlvbiA9PSBwb3NpdGlvbikKKyAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICBtX3ZhcmlhbnRTZXR0aW5ncy5wb3NpdGlvbiA9IHBvc2l0aW9uOwog CiAgICAgaWYgKG1fY3NzQ29ubmVjdGlvbikKICAgICAgICAgbV9jc3NDb25uZWN0aW9uLT5tdXRh YmxlUHJvcGVydGllcygpLnNldFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRQb3NpdGlv biwgJnZhcmlhbnRQb3NpdGlvbik7CkBAIC0zMDIsNyArMzM2LDEyIEBAIGJvb2wgQ1NTRm9udEZh Y2U6OnNldFZhcmlhbnRDYXBzKENTU1ZhbHVlJiB2YXJpYW50Q2FwcykKICAgICBpZiAoIWlzPENT U1ByaW1pdGl2ZVZhbHVlPih2YXJpYW50Q2FwcykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAot ICAgIG1fdmFyaWFudFNldHRpbmdzLmNhcHMgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4o dmFyaWFudENhcHMpOworICAgIEZvbnRWYXJpYW50Q2FwcyBjYXBzID0gZG93bmNhc3Q8Q1NTUHJp bWl0aXZlVmFsdWU+KHZhcmlhbnRDYXBzKTsKKworICAgIGlmIChtX3ZhcmlhbnRTZXR0aW5ncy5j YXBzID09IGNhcHMpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgbV92YXJpYW50U2V0dGlu Z3MuY2FwcyA9IGNhcHM7CiAKICAgICBpZiAobV9jc3NDb25uZWN0aW9uKQogICAgICAgICBtX2Nz c0Nvbm5lY3Rpb24tPm11dGFibGVQcm9wZXJ0aWVzKCkuc2V0UHJvcGVydHkoQ1NTUHJvcGVydHlG b250VmFyaWFudENhcHMsICZ2YXJpYW50Q2Fwcyk7CkBAIC0zMTgsNiArMzU3LDEzIEBAIGJvb2wg Q1NTRm9udEZhY2U6OnNldFZhcmlhbnROdW1lcmljKENTU1ZhbHVlJiB2YXJpYW50TnVtZXJpYykK IHsKICAgICBhdXRvIG51bWVyaWMgPSBleHRyYWN0Rm9udFZhcmlhbnROdW1lcmljKHZhcmlhbnRO dW1lcmljKTsKIAorICAgIGlmIChtX3ZhcmlhbnRTZXR0aW5ncy5udW1lcmljRmlndXJlID09IG51 bWVyaWMuZmlndXJlCisgICAgICAgICYmIG1fdmFyaWFudFNldHRpbmdzLm51bWVyaWNTcGFjaW5n ID09IG51bWVyaWMuc3BhY2luZworICAgICAgICAmJiBtX3ZhcmlhbnRTZXR0aW5ncy5udW1lcmlj RnJhY3Rpb24gPT0gbnVtZXJpYy5mcmFjdGlvbgorICAgICAgICAmJiBtX3ZhcmlhbnRTZXR0aW5n cy5udW1lcmljT3JkaW5hbCA9PSBudW1lcmljLm9yZGluYWwKKyAgICAgICAgJiYgbV92YXJpYW50 U2V0dGluZ3MubnVtZXJpY1NsYXNoZWRaZXJvID09IG51bWVyaWMuc2xhc2hlZFplcm8pCisgICAg ICAgIHJldHVybiB0cnVlOworCiAgICAgbV92YXJpYW50U2V0dGluZ3MubnVtZXJpY0ZpZ3VyZSA9 IG51bWVyaWMuZmlndXJlOwogICAgIG1fdmFyaWFudFNldHRpbmdzLm51bWVyaWNTcGFjaW5nID0g bnVtZXJpYy5zcGFjaW5nOwogICAgIG1fdmFyaWFudFNldHRpbmdzLm51bWVyaWNGcmFjdGlvbiA9 IG51bWVyaWMuZnJhY3Rpb247CkBAIC0zMzksNyArMzg1LDEyIEBAIGJvb2wgQ1NTRm9udEZhY2U6 OnNldFZhcmlhbnRBbHRlcm5hdGVzKENTU1ZhbHVlJiB2YXJpYW50QWx0ZXJuYXRlcykKICAgICBp ZiAoIWlzPENTU1ByaW1pdGl2ZVZhbHVlPih2YXJpYW50QWx0ZXJuYXRlcykpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIG1fdmFyaWFudFNldHRpbmdzLmFsdGVybmF0ZXMgPSBkb3duY2Fz dDxDU1NQcmltaXRpdmVWYWx1ZT4odmFyaWFudEFsdGVybmF0ZXMpOworICAgIEZvbnRWYXJpYW50 QWx0ZXJuYXRlcyBhbHRlcm5hdGVzID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KHZhcmlh bnRBbHRlcm5hdGVzKTsKKworICAgIGlmIChtX3ZhcmlhbnRTZXR0aW5ncy5hbHRlcm5hdGVzID09 IGFsdGVybmF0ZXMpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgbV92YXJpYW50U2V0dGlu Z3MuYWx0ZXJuYXRlcyA9IGFsdGVybmF0ZXM7CiAKICAgICBpZiAobV9jc3NDb25uZWN0aW9uKQog ICAgICAgICBtX2Nzc0Nvbm5lY3Rpb24tPm11dGFibGVQcm9wZXJ0aWVzKCkuc2V0UHJvcGVydHko Q1NTUHJvcGVydHlGb250VmFyaWFudEFsdGVybmF0ZXMsICZ2YXJpYW50QWx0ZXJuYXRlcyk7CkBA IC0zNTUsNiArNDA2LDExIEBAIGJvb2wgQ1NTRm9udEZhY2U6OnNldFZhcmlhbnRFYXN0QXNpYW4o Q1NTVmFsdWUmIHZhcmlhbnRFYXN0QXNpYW4pCiB7CiAgICAgYXV0byBlYXN0QXNpYW4gPSBleHRy YWN0Rm9udFZhcmlhbnRFYXN0QXNpYW4odmFyaWFudEVhc3RBc2lhbik7CiAKKyAgICBpZiAobV92 YXJpYW50U2V0dGluZ3MuZWFzdEFzaWFuVmFyaWFudCA9PSBlYXN0QXNpYW4udmFyaWFudAorICAg ICAgICAmJiBtX3ZhcmlhbnRTZXR0aW5ncy5lYXN0QXNpYW5XaWR0aCA9PSBlYXN0QXNpYW4ud2lk dGgKKyAgICAgICAgJiYgbV92YXJpYW50U2V0dGluZ3MuZWFzdEFzaWFuUnVieSA9PSBlYXN0QXNp YW4ucnVieSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICBtX3ZhcmlhbnRTZXR0aW5ncy5l YXN0QXNpYW5WYXJpYW50ID0gZWFzdEFzaWFuLnZhcmlhbnQ7CiAgICAgbV92YXJpYW50U2V0dGlu Z3MuZWFzdEFzaWFuV2lkdGggPSBlYXN0QXNpYW4ud2lkdGg7CiAgICAgbV92YXJpYW50U2V0dGlu Z3MuZWFzdEFzaWFuUnVieSA9IGVhc3RBc2lhbi5ydWJ5OwpAQCAtMzk3LDYgKzQ1MywyMyBAQCB2 b2lkIENTU0ZvbnRGYWNlOjpzZXRGZWF0dXJlU2V0dGluZ3MoQ1NTVmFsdWUmIGZlYXR1cmVTZXR0 aW5ncykKICAgICB9KTsKIH0KIAordm9pZCBDU1NGb250RmFjZTo6c2V0TG9hZGluZ0JlaGF2aW9y KENTU1ZhbHVlJiBsb2FkaW5nQmVoYXZpb3JWYWx1ZSkKK3sKKyAgICBhdXRvIGxvYWRpbmdCZWhh dmlvciA9IHN0YXRpY19jYXN0PEZvbnRMb2FkaW5nQmVoYXZpb3I+KGRvd25jYXN0PENTU1ByaW1p dGl2ZVZhbHVlPihsb2FkaW5nQmVoYXZpb3JWYWx1ZSkudmFsdWVJRCgpKTsKKworICAgIGlmICht X2xvYWRpbmdCZWhhdmlvciA9PSBsb2FkaW5nQmVoYXZpb3IpCisgICAgICAgIHJldHVybjsKKwor ICAgIG1fbG9hZGluZ0JlaGF2aW9yID0gbG9hZGluZ0JlaGF2aW9yOworCisgICAgaWYgKG1fY3Nz Q29ubmVjdGlvbikKKyAgICAgICAgbV9jc3NDb25uZWN0aW9uLT5tdXRhYmxlUHJvcGVydGllcygp LnNldFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udERpc3BsYXksICZsb2FkaW5nQmVoYXZpb3JWYWx1 ZSk7CisKKyAgICBpdGVyYXRlQ2xpZW50cyhtX2NsaWVudHMsIFsmXShDbGllbnQmIGNsaWVudCkg eworICAgICAgICBjbGllbnQuZm9udFByb3BlcnR5Q2hhbmdlZCgqdGhpcyk7CisgICAgfSk7Cit9 CisKIGJvb2wgQ1NTRm9udEZhY2U6OnJhbmdlc01hdGNoQ29kZVBvaW50KFVDaGFyMzIgY2hhcmFj dGVyKSBjb25zdAogewogICAgIGlmIChtX3Jhbmdlcy5pc0VtcHR5KCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NG b250RmFjZS5oCmluZGV4IDNiNDJiMTA5YjdiMGYwNWM1OGJmYjM1OTIwOTg1M2U0NDE0NzZiNDUu LmQ5Mjc5NDk3YjkyZTc0N2Y1NTM0NWI2NjJkNGRmNWYxOWZlYjlmODIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NGb250RmFjZS5oCkBAIC03Niw2ICs3Niw3IEBAIHB1YmxpYzoKICAgICBib29sIHNldFZhcmlh bnRBbHRlcm5hdGVzKENTU1ZhbHVlJik7CiAgICAgYm9vbCBzZXRWYXJpYW50RWFzdEFzaWFuKENT U1ZhbHVlJik7CiAgICAgdm9pZCBzZXRGZWF0dXJlU2V0dGluZ3MoQ1NTVmFsdWUmKTsKKyAgICB2 b2lkIHNldExvYWRpbmdCZWhhdmlvcihDU1NWYWx1ZSYpOwogCiAgICAgZW51bSBjbGFzcyBTdGF0 dXM7CiAgICAgc3RydWN0IFVuaWNvZGVSYW5nZTsKQEAgLTEzNyw2ICsxMzgsOCBAQCBwdWJsaWM6 CiAgICAgc3RydWN0IFVuaWNvZGVSYW5nZSB7CiAgICAgICAgIFVDaGFyMzIgZnJvbTsKICAgICAg ICAgVUNoYXIzMiB0bzsKKyAgICAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IFVuaWNvZGVSYW5n ZSYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuIGZyb20gPT0gb3RoZXIuZnJvbSAmJiB0byA9PSBvdGhl ci50bzsgfQorICAgICAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgVW5pY29kZVJhbmdlJiBvdGhl cikgY29uc3QgeyByZXR1cm4gISgqdGhpcyA9PSBvdGhlcik7IH0KICAgICB9OwogCiAgICAgYm9v bCByYW5nZXNNYXRjaENvZGVQb2ludChVQ2hhcjMyKSBjb25zdDsKQEAgLTE3OSw2ICsxODIsNyBA QCBwcml2YXRlOgogICAgIEhhc2hTZXQ8Q2xpZW50Kj4gbV9jbGllbnRzOwogICAgIFdlYWtQdHI8 Rm9udEZhY2U+IG1fd3JhcHBlcjsKICAgICBGb250U2VsZWN0aW9uU3BlY2lmaWVkQ2FwYWJpbGl0 aWVzIG1fZm9udFNlbGVjdGlvbkNhcGFiaWxpdGllczsKKyAgICBGb250TG9hZGluZ0JlaGF2aW9y IG1fbG9hZGluZ0JlaGF2aW9yIHsgRm9udExvYWRpbmdCZWhhdmlvcjo6QXV0byB9OwogICAgIFN0 YXR1cyBtX3N0YXR1cyB7IFN0YXR1czo6UGVuZGluZyB9OwogICAgIGJvb2wgbV9pc0xvY2FsRmFs bGJhY2sgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9zb3VyY2VzUG9wdWxhdGVkIHsgZmFsc2UgfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggMGIyZTZmZjQ0MjUxNDVh MGI3ZGE5NzRjOTJkOTgzNjBjMzQyNjNkMS4uNGEwNWUxODJkMDE0MTQ4ZjVkNmMyYzRmYzA1ZDQ3 MTcyZTkzYjI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rv ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKQEAgLTE1 Nyw2ICsxNTcsNyBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6YWRkRm9udEZhY2VSdWxlKFN0eWxl UnVsZUZvbnRGYWNlJiBmb250RmFjZVJ1bGUsIGJvb2wgaXNJbgogICAgIFJlZlB0cjxDU1NWYWx1 ZT4gdmFyaWFudE51bWVyaWMgPSBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5 Rm9udFZhcmlhbnROdW1lcmljKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhcmlhbnRBbHRlcm5h dGVzID0gc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50QWx0 ZXJuYXRlcyk7CiAgICAgUmVmUHRyPENTU1ZhbHVlPiB2YXJpYW50RWFzdEFzaWFuID0gc3R5bGUu Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuKTsKKyAg ICBSZWZQdHI8Q1NTVmFsdWU+IGxvYWRpbmdCZWhhdmlvciA9IHN0eWxlLmdldFByb3BlcnR5Q1NT VmFsdWUoQ1NTUHJvcGVydHlGb250RGlzcGxheSk7CiAgICAgaWYgKCFpczxDU1NWYWx1ZUxpc3Q+ KGZvbnRGYW1pbHkuZ2V0KCkpIHx8ICFpczxDU1NWYWx1ZUxpc3Q+KHNyYy5nZXQoKSkgfHwgKHVu aWNvZGVSYW5nZSAmJiAhaXM8Q1NTVmFsdWVMaXN0PigqdW5pY29kZVJhbmdlKSkpCiAgICAgICAg IHJldHVybjsKIApAQCAtMTk3LDYgKzE5OCw4IEBAIHZvaWQgQ1NTRm9udFNlbGVjdG9yOjphZGRG b250RmFjZVJ1bGUoU3R5bGVSdWxlRm9udEZhY2UmIGZvbnRGYWNlUnVsZSwgYm9vbCBpc0luCiAg ICAgICAgIHJldHVybjsKICAgICBpZiAoZmVhdHVyZVNldHRpbmdzKQogICAgICAgICBmb250RmFj ZS0+c2V0RmVhdHVyZVNldHRpbmdzKCpmZWF0dXJlU2V0dGluZ3MpOworICAgIGlmIChsb2FkaW5n QmVoYXZpb3IpCisgICAgICAgIGZvbnRGYWNlLT5zZXRMb2FkaW5nQmVoYXZpb3IoKmxvYWRpbmdC ZWhhdmlvcik7CiAKICAgICBDU1NGb250RmFjZTo6YXBwZW5kU291cmNlcyhmb250RmFjZSwgc3Jj TGlzdCwgbV9kb2N1bWVudCwgaXNJbml0aWF0aW5nRWxlbWVudEluVXNlckFnZW50U2hhZG93VHJl ZSk7CiAgICAgaWYgKGZvbnRGYWNlLT5hbGxTb3VyY2VzRmFpbGVkKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAppbmRleCA2NDdiODU1M2I3NThm N2VjNWIxNjA1NWRhYjMxNGUxNmUzYzYxMjhiLi5hOWQzMGUzM2NiMTA4MzI4ODc1OWYzNzYyNDBi Y2M0NjVjODQyYzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZl VmFsdWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1 ZU1hcHBpbmdzLmgKQEAgLTU2OTcsNCArNTY5Nyw1NyBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQ cmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgRm9udE9wdGljYWxTaXppbmcoKSBjb25zdAogICAgIHJl dHVybiBGb250T3B0aWNhbFNpemluZzo6RW5hYmxlZDsKIH0KIAordGVtcGxhdGU8PiBpbmxpbmUg Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKEZvbnRMb2FkaW5nQmVoYXZpb3Ig YmVoYXZpb3IpCisgICAgOiBDU1NWYWx1ZShQcmltaXRpdmVDbGFzcykKK3sKKyAgICBtX3ByaW1p dGl2ZVVuaXRUeXBlID0gQ1NTX1ZBTFVFX0lEOworICAgIHN3aXRjaCAoYmVoYXZpb3IpIHsKKyAg ICBjYXNlIEZvbnRMb2FkaW5nQmVoYXZpb3I6OkF1dG86CisgICAgICAgIG1fdmFsdWUudmFsdWVJ RCA9IENTU1ZhbHVlQXV0bzsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGb250TG9hZGluZ0Jl aGF2aW9yOjpCbG9jazoKKyAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVCbG9jazsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGb250TG9hZGluZ0JlaGF2aW9yOjpTd2FwOgorICAg ICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZVN3YXA7CisgICAgICAgIGJyZWFrOworICAg IGNhc2UgRm9udExvYWRpbmdCZWhhdmlvcjo6RmFsbGJhY2s6CisgICAgICAgIG1fdmFsdWUudmFs dWVJRCA9IENTU1ZhbHVlRmFsbGJhY2s7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgRm9udExv YWRpbmdCZWhhdmlvcjo6T3B0aW9uYWw6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1Zh bHVlT3B0aW9uYWw7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK3RlbXBsYXRlPD4g aW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBGb250TG9hZGluZ0JlaGF2aW9yKCkg Y29uc3QKK3sKKyAgICBBU1NFUlQoaXNWYWx1ZUlEKCkpOworICAgIHN3aXRjaCAobV92YWx1ZS52 YWx1ZUlEKSB7CisgICAgY2FzZSBDU1NWYWx1ZUF1dG86CisgICAgICAgIHJldHVybiBGb250TG9h ZGluZ0JlaGF2aW9yOjpBdXRvOworICAgIGNhc2UgQ1NTVmFsdWVCbG9jazoKKyAgICAgICAgcmV0 dXJuIEZvbnRMb2FkaW5nQmVoYXZpb3I6OkJsb2NrOworICAgIGNhc2UgQ1NTVmFsdWVTd2FwOgor ICAgICAgICByZXR1cm4gRm9udExvYWRpbmdCZWhhdmlvcjo6U3dhcDsKKyAgICBjYXNlIENTU1Zh bHVlRmFsbGJhY2s6CisgICAgICAgIHJldHVybiBGb250TG9hZGluZ0JlaGF2aW9yOjpGYWxsYmFj azsKKyAgICBjYXNlIENTU1ZhbHVlT3B0aW9uYWw6CisgICAgICAgIHJldHVybiBGb250TG9hZGlu Z0JlaGF2aW9yOjpPcHRpb25hbDsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9 CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIEZvbnRMb2FkaW5nQmVoYXZp b3I6OkF1dG87Cit9CisKKy8qCitlbnVtIGNsYXNzIEZvbnRMb2FkaW5nQmVoYXZpb3IgeworICAg IEF1dG8sIEJsb2NrLCBTd2FwLCBGYWxsYmFjaywgT3B0aW9uYWwKK307CisqLworCiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgppbmRleCA3MTdmMjY1YmU0MmJhYjE0NDg2ZTM1 MjcyNjM3NDBmYWUyY2E3YjUxLi5kNTc5NDUyZDUyNjFlNmMyOGQ2YjczODgwZTVhNDNiMjgzMzgw NzkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCisr KyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0aWVzLmpzb24KQEAgLTQwNyw4ICs0MDcs OCBAQAogICAgICAgICAgICAgICAgICJlbmFibGUtaWYiOiAiRU5BQkxFX1ZBUklBVElPTl9GT05U UyIKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAic3BlY2lmaWNhdGlvbiI6IHsKLSAgICAg ICAgICAgICAgICAiY2F0ZWdvcnkiOiAiY3NzLWZvbnRzIiwKLSAgICAgICAgICAgICAgICAidXJs IjogImh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZm9udHMtNC8jbG93LWxldmVsLWZvbnQt dmFyaWF0aW9uLXNldHRpbmdzLWNvbnRyb2wtdGhlLWZvbnQtdmFyaWF0aW9uLXNldHRpbmdzLXBy b3BlcnR5IgorICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtZm9udHMtNCIsCisgICAg ICAgICAgICAgICAgInVybCI6ICJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZvbnRzLTQv I2ZvbnQtdmFyaWF0aW9uLXNldHRpbmdzLWRlZiIKICAgICAgICAgICAgIH0KICAgICAgICAgfSwK ICAgICAgICAgIi13ZWJraXQtZm9udC1rZXJuaW5nIjogewpAQCAtNTY3LDggKzU2Nyw4IEBACiAg ICAgICAgICAgICAgICAgImVuYWJsZS1pZiI6ICJFTkFCTEVfVkFSSUFUSU9OX0ZPTlRTIgogICAg ICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVjaWZpY2F0aW9uIjogewotICAgICAgICAgICAg ICAgICJjYXRlZ29yeSI6ICJjc3MtZm9udHMiLAotICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0 cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mb250cy00LyNvcHRpY2FsLXNpemluZy1jb250cm9s LXRoZS1mb250LW9wdGljYWwtc2l6aW5nLXByb3BlcnR5IgorICAgICAgICAgICAgICAgICJjYXRl Z29yeSI6ICJjc3MtZm9udHMtNCIsCisgICAgICAgICAgICAgICAgInVybCI6ICJodHRwczovL2Ry YWZ0cy5jc3N3Zy5vcmcvY3NzLWZvbnRzLTQvI2ZvbnQtb3B0aWNhbC1zaXppbmctZGVmIgogICAg ICAgICAgICAgfQogICAgICAgICB9LAogICAgICAgICAiZm9udCI6IHsKQEAgLTM1NTEsNiArMzU1 MSwyMiBAQAogICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nz cy1mb250cy0zLyNkZXNjZGVmLXVuaWNvZGUtcmFuZ2UiCiAgICAgICAgICAgICB9CiAgICAgICAg IH0sCisgICAgICAgICJmb250LWRpc3BsYXkiOiB7CisgICAgICAgICAgICAiY29kZWdlbi1wcm9w ZXJ0aWVzIjogeworICAgICAgICAgICAgICAgICJza2lwLWJ1aWxkZXIiOiB0cnVlCisgICAgICAg ICAgICB9LAorICAgICAgICAgICAgInNwZWNpZmljYXRpb24iOiB7CisgICAgICAgICAgICAgICAg ImNhdGVnb3J5IjogImNzcy1mb250cy00IiwKKyAgICAgICAgICAgICAgICAidXJsIjogImh0dHBz Oi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZm9udHMtNC8jZm9udC1kaXNwbGF5LWRlc2MiCisgICAg ICAgICAgICB9LAorICAgICAgICAgICAgInZhbHVlcyI6IFsKKyAgICAgICAgICAgICAgICAiYXV0 byIsCisgICAgICAgICAgICAgICAgImJsb2NrIiwKKyAgICAgICAgICAgICAgICAic3dhcCIsCisg ICAgICAgICAgICAgICAgImZhbGxiYWNrIiwKKyAgICAgICAgICAgICAgICAib3B0aW9uYWwiCisg ICAgICAgICAgICBdCisgICAgICAgIH0sCiAgICAgICAgICJ2ZWN0b3ItZWZmZWN0IjogewogICAg ICAgICAgICAgInZhbHVlcyI6IFsKICAgICAgICAgICAgICAgICAibm9uZSIsCkBAIC02NzUyLDYg KzY3NjgsMTEgQEAKICAgICAgICAgICAgICJsb25nbmFtZSI6ICJDU1MgRm9udHMgTW9kdWxlIiwK ICAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1mb250cy0zLyIK ICAgICAgICAgfSwKKyAgICAgICAgImNzcy1mb250cy00IjogeworICAgICAgICAgICAgInNob3J0 bmFtZSI6ICJDU1MgRm9udHMgTGV2ZWwgNCIsCisgICAgICAgICAgICAibG9uZ25hbWUiOiAiQ1NT IEZvbnRzIE1vZHVsZSBMZXZlbCA0IiwKKyAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9kcmFm dHMuY3Nzd2cub3JnL2Nzcy1mb250cy00IgorICAgICAgICB9LAogICAgICAgICAiY3NzLWdyaWQi OiB7CiAgICAgICAgICAgICAic2hvcnRuYW1lIjogIkNTUyBHcmlkIExheW91dCIsCiAgICAgICAg ICAgICAibG9uZ25hbWUiOiAiQ1NTIEdyaWQgTGF5b3V0IE1vZHVsZSIsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1Byb3BlcnR5LmNwcAppbmRleCA4YTkxYTM5MTUxNGViNTQyM2M3NmQwMDQ4ZjIwZjRhNWNlNDg5 NjM0Li4zMjJmNzU0ODRhMDU1YTJhYmYwM2I1MGIwYmIxZjhmNWRhNDA3YmEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcm9wZXJ0eS5jcHAKQEAgLTE2NCw2ICsxNjQsNyBAQCBib29sIENTU1Byb3BlcnR5 Ojppc0Rlc2NyaXB0b3JPbmx5KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKICNlbmRpZgogICAg IGNhc2UgQ1NTUHJvcGVydHlTcmM6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVVuaWNvZGVSYW5nZToK KyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udERpc3BsYXk6CiAgICAgICAgIHJldHVybiB0cnVlOwog ICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Zh bHVlS2V5d29yZHMuaW4KaW5kZXggMTVjZmIwZjg5YzBmNzFiMzY2ZTAzNGZlYjVhOWYxN2VlZTI3 N2Q1MS4uY2ZmODYwOTRkZGMxMGRkZTI5NTI0ZmUwZmY3ZTc2ODM2ZDBiZTRhYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW4KKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW4KQEAgLTEzNDcsMyArMTM0NywxMCBAQCBuby1w cmVmZXJlbmNlCiAvLyBhdXRvLXJlcGVhdAogYXV0by1maWxsCiBhdXRvLWZpdAorCisvLyBmb250 LWRpc3BsYXkKKy8vIGF1dG8KKy8vIGJsb2NrCitzd2FwCitmYWxsYmFjaworb3B0aW9uYWwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKaW5kZXgg N2RmODFhMmJkZTM3MTA1MTQ4MTI0NmQ1YzZjZWIxZTYxODA0NDZiOC4uNDAyNjdiMGViODM2ZWQ4 NzBlNzI2MGY4ZGY2ZGRjMTYzYmNhNzJiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKQEAgLTQzMDQsNiArNDMwNCwxMSBAQCBzdGF0aWMg UmVmUHRyPENTU1ZhbHVlTGlzdD4gY29uc3VtZUZvbnRGYWNlVW5pY29kZVJhbmdlKENTU1BhcnNl clRva2VuUmFuZ2UmIHJhbgogICAgIHJldHVybiB2YWx1ZXM7CiB9CiAKK3N0YXRpYyBSZWZQdHI8 Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVGb250RmFjZUZvbnREaXNwbGF5KENTU1BhcnNlclRv a2VuUmFuZ2UmIHJhbmdlKQoreworICAgIHJldHVybiBjb25zdW1lSWRlbnQ8Q1NTVmFsdWVBdXRv LCBDU1NWYWx1ZUJsb2NrLCBDU1NWYWx1ZVN3YXAsIENTU1ZhbHVlRmFsbGJhY2ssIENTU1ZhbHVl T3B0aW9uYWw+KHJhbmdlKTsKK30KKwogc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUZv bnRGYWNlU3JjVVJJKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBjb25zdCBDU1NQYXJzZXJD b250ZXh0JiBjb250ZXh0KQogewogICAgIFN0cmluZyB1cmwgPSBjb25zdW1lVXJsQXNTdHJpbmdW aWV3KHJhbmdlKS50b1N0cmluZygpOwpAQCAtNDM3Nyw2ICs0MzgyLDkgQEAgYm9vbCBDU1NQcm9w ZXJ0eVBhcnNlcjo6cGFyc2VGb250RmFjZURlc2NyaXB0b3IoQ1NTUHJvcGVydHlJRCBwcm9wSWQp CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVVuaWNvZGVSYW5nZToKICAgICAgICAgcGFyc2VkVmFsdWUg PSBjb25zdW1lRm9udEZhY2VVbmljb2RlUmFuZ2UobV9yYW5nZSk7CiAgICAgICAgIGJyZWFrOwor ICAgIGNhc2UgQ1NTUHJvcGVydHlGb250RGlzcGxheToKKyAgICAgICAgcGFyc2VkVmFsdWUgPSBj b25zdW1lRm9udEZhY2VGb250RGlzcGxheShtX3JhbmdlKTsKKyAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eUZvbnRXZWlnaHQ6CiAjaWYgRU5BQkxFKFZBUklBVElPTl9GT05UUykK ICAgICAgICAgcGFyc2VkVmFsdWUgPSBjb25zdW1lRm9udFdlaWdodFJhbmdlKG1fcmFuZ2UpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29u c3RhbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25z dGFudHMuaAppbmRleCAyMzdhMmQ4ZjE1NjhhMmVhM2JiYTAwNjc2NWExOTVlZjQwNzM0NDdiLi5k MjFiODBjNDFkM2NjODUyNWJhMjcyN2NjOTBhZGM0MTkwYmNhYzVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaApAQCAt NzUzLDYgKzc1MywxMCBAQCBlbnVtIGNsYXNzIFBhaW50VHlwZSB7CiAgICAgTWFya2VycwogfTsK IAorZW51bSBjbGFzcyBGb250TG9hZGluZ0JlaGF2aW9yIHsKKyAgICBBdXRvLCBCbG9jaywgU3dh cCwgRmFsbGJhY2ssIE9wdGlvbmFsCit9OworCiBleHRlcm4gY29uc3QgZmxvYXQgZGVmYXVsdE1p dGVyTGltaXQ7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0OWZhMzlhZmJiMWZh ZDkzMmJkMDRmODEyZWI1OTA1MmRlMTFkZWRhLi5jZDczMzNlZjU2MGU3YjQ2MmQwZTI0MzM0NTgz ZmM2YzZhN2I3ZTEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMDgtMTQgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBQYXJzZSBmb250LWRp c3BsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 NTM4MgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICAqIGZh c3QvdGV4dC9mb250LWRpc3BsYXkvcGFyc2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L3RleHQvZm9udC1kaXNwbGF5L3BhcnNlLmh0bWw6IEFkZGVkLgorCiAyMDE3LTA4LTE0 ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbY3NzLXVpXSBJ bXBsZW1lbnQgY2FyZXQtY29sb3Igc3VwcG9ydApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC90ZXh0L2ZvbnQtZGlzcGxheS9wYXJzZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0 L3RleHQvZm9udC1kaXNwbGF5L3BhcnNlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zY2RhYzhm YzhkMmY4MzUyOGEzZGRhMDU2M2I2MmQyMDMyZDdmOGFmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L2ZvbnQtZGlzcGxheS9wYXJzZS1leHBlY3RlZC50eHQKQEAgLTAs MCArMSwxOSBAQAorVGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCB0aGUgZm9udC1kaXNwbGF5IGRl c2NyaXB0b3IgaW4gQGZvbnQtZmFjZSBpcyBhcHByb3ByaWF0ZWx5IHBhcnNlZC4KKworT24gc3Vj Y2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQg YnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mgc2hlZXQucnVsZXNbMF0uc3R5bGUuZ2V0UHJv cGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykgaXMgIiIKK1BBU1Mgc2hlZXQucnVsZXNbMV0uc3R5 bGUuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykgaXMgIiIKK1BBU1Mgc2hlZXQucnVs ZXNbMl0uc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykgaXMgIiIKK1BBU1Mg c2hlZXQucnVsZXNbM10uc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykgaXMg ImF1dG8iCitQQVNTIHNoZWV0LnJ1bGVzWzRdLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQt ZGlzcGxheScpIGlzICJibG9jayIKK1BBU1Mgc2hlZXQucnVsZXNbNV0uc3R5bGUuZ2V0UHJvcGVy dHlWYWx1ZSgnZm9udC1kaXNwbGF5JykgaXMgInN3YXAiCitQQVNTIHNoZWV0LnJ1bGVzWzZdLnN0 eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIGlzICJmYWxsYmFjayIKK1BBU1Mg c2hlZXQucnVsZXNbN10uc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykgaXMg Im9wdGlvbmFsIgorUEFTUyBzaGVldC5ydWxlc1s4XS5zdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCdm b250LWRpc3BsYXknKSBpcyAiIgorUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZShkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgndGVzdDknKSkuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5 JykgaXMgIiIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVU RQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZm9udC1kaXNwbGF5L3BhcnNl Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZm9udC1kaXNwbGF5L3BhcnNlLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZjY1OGI5NjVlOWQxN2JjOWY4NzE4YjlmZjViOWEyMjRkZGMwOTE1YQotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9mb250LWRpc3BsYXkvcGFyc2UuaHRt bApAQCAtMCwwICsxLDcxIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxz dHlsZSBpZD0ic3R5bGUiPgorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6ICJUZXN0MCI7 CisgICAgc3JjOiBsb2NhbCgiVGltZXMiKTsKKyAgICBmb250LWRpc3BsYXk6IGdhcmJhZ2U7Cit9 CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTogIlRlc3QxIjsKKyAgICBzcmM6IGxvY2Fs KCJUaW1lcyIpOworfQorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6ICJUZXN0MiI7Cisg ICAgc3JjOiBsb2NhbCgiVGltZXMiKTsKKyAgICBmb250LWRpc3BsYXk6IGJsb2NrIHN3YXA7Cit9 CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTogIlRlc3QzIjsKKyAgICBzcmM6IGxvY2Fs KCJUaW1lcyIpOworICAgIGZvbnQtZGlzcGxheTogYXV0bzsKK30KK0Bmb250LWZhY2UgeworICAg IGZvbnQtZmFtaWx5OiAiVGVzdDQiOworICAgIHNyYzogbG9jYWwoIlRpbWVzIik7CisgICAgZm9u dC1kaXNwbGF5OiBibG9jazsKK30KK0Bmb250LWZhY2UgeworICAgIGZvbnQtZmFtaWx5OiAiVGVz dDUiOworICAgIHNyYzogbG9jYWwoIlRpbWVzIik7CisgICAgZm9udC1kaXNwbGF5OiBzd2FwOwor fQorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6ICJUZXN0NiI7CisgICAgc3JjOiBsb2Nh bCgiVGltZXMiKTsKKyAgICBmb250LWRpc3BsYXk6IGZhbGxiYWNrOworfQorQGZvbnQtZmFjZSB7 CisgICAgZm9udC1mYW1pbHk6ICJUZXN0NyI7CisgICAgc3JjOiBsb2NhbCgiVGltZXMiKTsKKyAg ICBmb250LWRpc3BsYXk6IG9wdGlvbmFsOworfQorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1p bHk6ICJUZXN0OCI7CisgICAgc3JjOiBsb2NhbCgiVGltZXMiKTsKKyAgICBmb250LWRpc3BsYXk6 IDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXYgaWQ9InRlc3Q5IiBzdHlsZT0i Zm9udC1kaXNwbGF5OiBibG9jayI+PC9kaXY+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIlRoaXMg dGVzdCBtYWtlcyBzdXJlIHRoYXQgdGhlIGZvbnQtZGlzcGxheSBkZXNjcmlwdG9yIGluIEBmb250 LWZhY2UgaXMgYXBwcm9wcmlhdGVseSBwYXJzZWQuIik7CisKK3ZhciBzaGVldCA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJzdHlsZSIpLnNoZWV0Oworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJz aGVldC5ydWxlc1swXS5zdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCdmb250LWRpc3BsYXknKSIsICIi KTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygic2hlZXQucnVsZXNbMV0uc3R5bGUuZ2V0UHJvcGVy dHlWYWx1ZSgnZm9udC1kaXNwbGF5JykiLCAiIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoInNo ZWV0LnJ1bGVzWzJdLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIiwgIiIp Oworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJzaGVldC5ydWxlc1szXS5zdHlsZS5nZXRQcm9wZXJ0 eVZhbHVlKCdmb250LWRpc3BsYXknKSIsICJhdXRvIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmco InNoZWV0LnJ1bGVzWzRdLnN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIiwg ImJsb2NrIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoInNoZWV0LnJ1bGVzWzVdLnN0eWxlLmdl dFByb3BlcnR5VmFsdWUoJ2ZvbnQtZGlzcGxheScpIiwgInN3YXAiKTsKK3Nob3VsZEJlRXF1YWxU b1N0cmluZygic2hlZXQucnVsZXNbNl0uc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNw bGF5JykiLCAiZmFsbGJhY2siKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygic2hlZXQucnVsZXNb N10uc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnZm9udC1kaXNwbGF5JykiLCAib3B0aW9uYWwiKTsK K3Nob3VsZEJlRXF1YWxUb1N0cmluZygic2hlZXQucnVsZXNbOF0uc3R5bGUuZ2V0UHJvcGVydHlW YWx1ZSgnZm9udC1kaXNwbGF5JykiLCAiIik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoIndpbmRv dy5nZXRDb21wdXRlZFN0eWxlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0OScpKS5nZXRQ cm9wZXJ0eVZhbHVlKCdmb250LWRpc3BsYXknKSIsICIiKTsKKzwvc2NyaXB0PgorPHNjcmlwdCBz cmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5 PgorPC9odG1sPgo=