165266 2016-12-01 13:05:34 -0800 [CSS Parser] Fix font-variant parsing 2016-12-01 13:42:16 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 1255385 0 hyatt 2016-12-01 13:05:34 -0800 [CSS Parser] Fix font-variant parsing 1255389 1 295882 hyatt 2016-12-01 13:12:49 -0800 Created attachment 295882 Patch 1255424 2 hyatt 2016-12-01 13:42:16 -0800 Fixed in r209199. efl bot caught a real error... changed the nullptr to false. 295882 2016-12-01 13:12:49 -0800 2016-12-01 13:15:11 -0800 Patch bug-165266-20161201151218.patch text/plain 13411 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTE5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTEyLTAxICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBGaXggZm9udC12 YXJpYW50IHBhcnNpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2NTI2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpjb25zdW1lRm9udFZhcmlhbnRFYXN0QXNpYW4pOgorICAgICAgICAoV2ViQ29yZTo6Y29u c3VtZUZvbnRWYXJpYW50QWx0ZXJuYXRlcyk6CisgICAgICAgIChXZWJDb3JlOjpjb25zdW1lRm9u dFZhcmlhbnRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6 cGFyc2VTaW5nbGVWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6 cGFyc2VGb250RmFjZURlc2NyaXB0b3IpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQ YXJzZXI6OmNvbnN1bWVGb250VmFyaWFudFNob3J0aGFuZCk6CisgICAgICAgIChXZWJDb3JlOjpj b25zdW1lRm9udFZhcmlhbnRMaXN0KTogRGVsZXRlZC4KKwogMjAxNi0xMi0wMSAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFBhcmFtZXRlciB0byBET01TdHJpbmdM aXN0LmNvbnRhaW5zKCkgc2hvdWxkIGJlIG1hbmRhdG9yeQpJbmRleDogU291cmNlL1dlYkNvcmUv Y3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAJKHJldmlzaW9uIDIwOTE0OCkK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02NDgsNiArNjQ4LDEwMyBAQCBzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBj b25zdW1lRm9udFZhcmlhCiAgICAgcmV0dXJuIGxpZ2F0dXJlc1BhcnNlci5maW5hbGl6ZVZhbHVl KCk7CiB9CiAKK3N0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1bWVGb250VmFyaWFudEVhc3RB c2lhbihDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSkKK3sKKyAgICBpZiAocmFuZ2UucGVlaygp LmlkKCkgPT0gQ1NTVmFsdWVOb3JtYWwpCisgICAgICAgIHJldHVybiBjb25zdW1lSWRlbnQocmFu Z2UpOworICAgIAorICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IHZhbHVlcyA9IENTU1ZhbHVlTGlz dDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKKyAgICBGb250VmFyaWFudEVhc3RBc2lhblZhcmlh bnQgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Tm9ybWFsOworICAgIEZv bnRWYXJpYW50RWFzdEFzaWFuV2lkdGggd2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRo OjpOb3JtYWw7CisgICAgRm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5IHJ1YnkgPSBGb250VmFyaWFu dEVhc3RBc2lhblJ1Ynk6Ok5vcm1hbDsKKyAgICAKKyAgICB3aGlsZSAoIXJhbmdlLmF0RW5kKCkp IHsKKyAgICAgICAgaWYgKHJhbmdlLnBlZWsoKS50eXBlKCkgIT0gSWRlbnRUb2tlbikKKyAgICAg ICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICAKKyAgICAgICAgYXV0byBpZCA9IHJhbmdl LnBlZWsoKS5pZCgpOworICAgICAgICByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgp OworCisgICAgICAgIHN3aXRjaCAoaWQpIHsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZUppczc4Ogor ICAgICAgICAgICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzNzg7 CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZUppczgzOgorICAgICAg ICAgICAgdmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzODM7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZUppczkwOgorICAgICAgICAgICAg dmFyaWFudCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzOTA7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZUppczA0OgorICAgICAgICAgICAgdmFyaWFu dCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzMDQ7CisgICAgICAgICAgICBicmVh azsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZVNpbXBsaWZpZWQ6CisgICAgICAgICAgICB2YXJpYW50 ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpTaW1wbGlmaWVkOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIGNhc2UgQ1NTVmFsdWVUcmFkaXRpb25hbDoKKyAgICAgICAgICAgIHZh cmlhbnQgPSBGb250VmFyaWFudEVhc3RBc2lhblZhcmlhbnQ6OlRyYWRpdGlvbmFsOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQ1NTVmFsdWVGdWxsV2lkdGg6CisgICAgICAgICAg ICB3aWR0aCA9IEZvbnRWYXJpYW50RWFzdEFzaWFuV2lkdGg6OkZ1bGw7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZVByb3BvcnRpb25hbFdpZHRoOgorICAgICAgICAg ICAgd2lkdGggPSBGb250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpQcm9wb3J0aW9uYWw7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZVJ1Ynk6CisgICAgICAgICAgICBy dWJ5ID0gRm9udFZhcmlhbnRFYXN0QXNpYW5SdWJ5OjpZZXM7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICB9 CisgICAgfQorICAgICAgICAKKyAgICBzd2l0Y2ggKHZhcmlhbnQpIHsKKyAgICBjYXNlIEZvbnRW YXJpYW50RWFzdEFzaWFuVmFyaWFudDo6Tm9ybWFsOgorICAgICAgICBicmVhazsKKyAgICBjYXNl IEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzNzg6CisgICAgICAgIHZhbHVlcy0+YXBw ZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1Zh bHVlSmlzNzgpKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lh blZhcmlhbnQ6OkppczgzOgorICAgICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNp bmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUppczgzKSk7CisgICAgICAg IGJyZWFrOworICAgIGNhc2UgRm9udFZhcmlhbnRFYXN0QXNpYW5WYXJpYW50OjpKaXM5MDoKKyAg ICAgICAgdmFsdWVzLT5hcHBlbmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVu dGlmaWVyVmFsdWUoQ1NTVmFsdWVKaXM5MCkpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEZv bnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6SmlzMDQ6CisgICAgICAgIHZhbHVlcy0+YXBwZW5k KENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVl SmlzMDQpKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGb250VmFyaWFudEVhc3RBc2lhblZh cmlhbnQ6OlNpbXBsaWZpZWQ6CisgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6 c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlU2ltcGxpZmllZCkpOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuVmFyaWFudDo6VHJh ZGl0aW9uYWw6CisgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVlUG9vbDo6c2luZ2xldG9u KCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlVHJhZGl0aW9uYWwpKTsKKyAgICAgICAg YnJlYWs7CisgICAgfQorICAgICAgICAKKyAgICBzd2l0Y2ggKHdpZHRoKSB7CisgICAgY2FzZSBG b250VmFyaWFudEVhc3RBc2lhbldpZHRoOjpOb3JtYWw6CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgRm9udFZhcmlhbnRFYXN0QXNpYW5XaWR0aDo6RnVsbDoKKyAgICAgICAgdmFsdWVzLT5hcHBl bmQoQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFs dWVGdWxsV2lkdGgpKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGb250VmFyaWFudEVhc3RB c2lhbldpZHRoOjpQcm9wb3J0aW9uYWw6CisgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1ZhbHVl UG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlUHJvcG9ydGlv bmFsV2lkdGgpKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgICAgICAKKyAgICBzd2l0Y2gg KHJ1YnkpIHsKKyAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6Tm9ybWFsOgorICAg ICAgICBicmVhazsKKyAgICBjYXNlIEZvbnRWYXJpYW50RWFzdEFzaWFuUnVieTo6WWVzOgorICAg ICAgICB2YWx1ZXMtPmFwcGVuZChDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50 aWZpZXJWYWx1ZShDU1NWYWx1ZVJ1YnkpKTsKKyAgICB9CisKKyAgICBpZiAoIXZhbHVlcy0+bGVu Z3RoKCkpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgcmV0dXJuIHZhbHVlczsKK30K KyAgICAKIHN0YXRpYyBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVGb250VmFyaWFu dENhcHMoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UpCiB7CiAgICAgcmV0dXJuIGNvbnN1bWVJ ZGVudDxDU1NWYWx1ZU5vcm1hbCwgQ1NTVmFsdWVTbWFsbENhcHMsIENTU1ZhbHVlQWxsU21hbGxD YXBzLApAQCAtNjU1LDYgKzc1MiwxNiBAQCBzdGF0aWMgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVl PiBjb25zdW1lCiAgICAgICAgIENTU1ZhbHVlVW5pY2FzZSwgQ1NTVmFsdWVUaXRsaW5nQ2Fwcz4o cmFuZ2UpOwogfQogCitzdGF0aWMgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lRm9u dFZhcmlhbnRBbHRlcm5hdGVzKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQoreworICAgIHJl dHVybiBjb25zdW1lSWRlbnQ8Q1NTVmFsdWVOb3JtYWwsIENTU1ZhbHVlSGlzdG9yaWNhbEZvcm1z PihyYW5nZSk7Cit9CisKK3N0YXRpYyBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNvbnN1bWVG b250VmFyaWFudFBvc2l0aW9uKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlKQoreworICAgIHJl dHVybiBjb25zdW1lSWRlbnQ8Q1NTVmFsdWVOb3JtYWwsIENTU1ZhbHVlU3ViLCBDU1NWYWx1ZVN1 cGVyPihyYW5nZSk7Cit9CisKIGNsYXNzIEZvbnRWYXJpYW50TnVtZXJpY1BhcnNlciB7CiBwdWJs aWM6CiAgICAgRm9udFZhcmlhbnROdW1lcmljUGFyc2VyKCkKQEAgLTc0OSwzMCArODU2LDYgQEAg c3RhdGljIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY29uc3VtZQogICAgIHJldHVybiBjb25z dW1lSWRlbnQ8Q1NTVmFsdWVOb3JtYWwsIENTU1ZhbHVlU21hbGxDYXBzPihyYW5nZSk7CiB9CiAK LXN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1bWVGb250VmFyaWFudExpc3QoQ1NTUGFyc2Vy VG9rZW5SYW5nZSYgcmFuZ2UpCi17Ci0gICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gdmFsdWVzID0g Q1NTVmFsdWVMaXN0OjpjcmVhdGVDb21tYVNlcGFyYXRlZCgpOwotICAgIGRvIHsKLSAgICAgICAg aWYgKHJhbmdlLnBlZWsoKS5pZCgpID09IENTU1ZhbHVlQWxsKSB7Ci0gICAgICAgICAgICAvLyBG SVhNRTogQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlRm9udFZhcmlhbnQoKSBpbXBsZW1lbnRzCi0g ICAgICAgICAgICAvLyB0aGUgb2xkIGNzczMgZHJhZnQ6Ci0gICAgICAgICAgICAvLyBodHRwOi8v d3d3LnczLm9yZy9UUi8yMDAyL1dELWNzczMtd2ViZm9udHMtMjAwMjA4MDIvI2ZvbnQtdmFyaWFu dAotICAgICAgICAgICAgLy8gJ2FsbCcgaXMgb25seSBhbGxvd2VkIGluIEBmb250LWZhY2UgYW5k IHdpdGggbm8gb3RoZXIgdmFsdWVzLgotICAgICAgICAgICAgaWYgKHZhbHVlcy0+bGVuZ3RoKCkp Ci0gICAgICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgICAgICAgICByZXR1cm4gY29u c3VtZUlkZW50KHJhbmdlKTsKLSAgICAgICAgfQotICAgICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZl VmFsdWU+IGZvbnRWYXJpYW50ID0gY29uc3VtZUZvbnRWYXJpYW50Q1NTMjEocmFuZ2UpOwotICAg ICAgICBpZiAoZm9udFZhcmlhbnQpCi0gICAgICAgICAgICB2YWx1ZXMtPmFwcGVuZChmb250VmFy aWFudC5yZWxlYXNlTm9uTnVsbCgpKTsKLSAgICB9IHdoaWxlIChjb25zdW1lQ29tbWFJbmNsdWRp bmdXaGl0ZXNwYWNlKHJhbmdlKSk7Ci0KLSAgICBpZiAodmFsdWVzLT5sZW5ndGgoKSkKLSAgICAg ICAgcmV0dXJuIHZhbHVlczsKLQotICAgIHJldHVybiBudWxscHRyOwotfQotCiBzdGF0aWMgUmVm UHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjb25zdW1lRm9udFdlaWdodChDU1NQYXJzZXJUb2tlblJh bmdlJiByYW5nZSkKIHsKICAgICBjb25zdCBDU1NQYXJzZXJUb2tlbiYgdG9rZW4gPSByYW5nZS5w ZWVrKCk7CkBAIC0zNDg1LDYgKzM1NjgsOCBAQCBSZWZQdHI8Q1NTVmFsdWU+IENTU1Byb3BlcnR5 UGFyc2VyOjpwYXJzCiAgICAgICAgIHJldHVybiBjb25zdW1lRm9udFZhcmlhbnRMaWdhdHVyZXMo bV9yYW5nZSk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVtZXJpYzoKICAgICAg ICAgcmV0dXJuIGNvbnN1bWVGb250VmFyaWFudE51bWVyaWMobV9yYW5nZSk7CisgICAgY2FzZSBD U1NQcm9wZXJ0eUZvbnRWYXJpYW50RWFzdEFzaWFuOgorICAgICAgICByZXR1cm4gY29uc3VtZUZv bnRWYXJpYW50RWFzdEFzaWFuKG1fcmFuZ2UpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250RmVh dHVyZVNldHRpbmdzOgogICAgICAgICByZXR1cm4gY29uc3VtZUZvbnRGZWF0dXJlU2V0dGluZ3Mo bV9yYW5nZSk7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRGYW1pbHk6CkBAIC00MDA3LDkgKzQw OTIsMjYgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VGb250RmFjZURlcwogICAgICAg ICBwYXJzZWRWYWx1ZSA9IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmll clZhbHVlKGlkKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgQ1NTUHJvcGVydHlG b250VmFyaWFudDoKLSAgICAgICAgcGFyc2VkVmFsdWUgPSBjb25zdW1lRm9udFZhcmlhbnRMaXN0 KG1fcmFuZ2UpOworICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFyaWFudENhcHM6CisgICAgICAg IHBhcnNlZFZhbHVlID0gY29uc3VtZUZvbnRWYXJpYW50Q2FwcyhtX3JhbmdlKTsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzOgorICAgICAg ICBwYXJzZWRWYWx1ZSA9IGNvbnN1bWVGb250VmFyaWFudExpZ2F0dXJlcyhtX3JhbmdlKTsKKyAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50TnVtZXJpYzoKKyAg ICAgICAgcGFyc2VkVmFsdWUgPSBjb25zdW1lRm9udFZhcmlhbnROdW1lcmljKG1fcmFuZ2UpOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRFYXN0QXNpYW46 CisgICAgICAgIHBhcnNlZFZhbHVlID0gY29uc3VtZUZvbnRWYXJpYW50RWFzdEFzaWFuKG1fcmFu Z2UpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFZhcmlhbnRBbHRl cm5hdGVzOgorICAgICAgICBwYXJzZWRWYWx1ZSA9IGNvbnN1bWVGb250VmFyaWFudEFsdGVybmF0 ZXMobV9yYW5nZSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ1NTUHJvcGVydHlGb250VmFy aWFudFBvc2l0aW9uOgorICAgICAgICBwYXJzZWRWYWx1ZSA9IGNvbnN1bWVGb250VmFyaWFudFBv c2l0aW9uKG1fcmFuZ2UpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIENTU1Byb3BlcnR5Rm9u dFZhcmlhbnQ6CisgICAgICAgIHJldHVybiBjb25zdW1lRm9udFZhcmlhbnRTaG9ydGhhbmQoZmFs c2UpOwogICAgIGNhc2UgQ1NTUHJvcGVydHlGb250V2VpZ2h0OgogICAgICAgICBwYXJzZWRWYWx1 ZSA9IGNvbnN1bWVGb250V2VpZ2h0KG1fcmFuZ2UpOwogICAgICAgICBicmVhazsKQEAgLTQxNDIs MTAgKzQyNDQsMTYgQEAgYm9vbCBDU1NQcm9wZXJ0eVBhcnNlcjo6Y29uc3VtZUZvbnRWYXJpYQog ICAgIGlmIChpZGVudE1hdGNoZXM8Q1NTVmFsdWVOb3JtYWwsIENTU1ZhbHVlTm9uZT4obV9yYW5n ZS5wZWVrKCkuaWQoKSkpIHsKICAgICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFy aWFudExpZ2F0dXJlcywgQ1NTUHJvcGVydHlGb250VmFyaWFudCwgY29uc3VtZUlkZW50KG1fcmFu Z2UpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFudCk7CiAgICAgICAgIGFkZFByb3BlcnR5KENT U1Byb3BlcnR5Rm9udFZhcmlhbnRDYXBzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1 ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCks IGltcG9ydGFudCk7CisgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5Rm9udFZhcmlhbnRF YXN0QXNpYW4sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIENTU1ZhbHVlUG9vbDo6c2luZ2xldG9u KCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKSwgaW1wb3J0YW50KTsKKyAg ICAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudFBvc2l0aW9uLCBDU1NQcm9w ZXJ0eUZvbnRWYXJpYW50LCBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZp ZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7CiAgICAgICAgIHJldHVybiBtX3Jh bmdlLmF0RW5kKCk7CiAgICAgfQogCiAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBjYXBz VmFsdWU7CisgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBhbHRlcm5hdGVzVmFsdWU7Cisg ICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBwb3NpdGlvblZhbHVlOworCisgICAgUmVmUHRy PENTU1ZhbHVlPiBlYXN0QXNpYW5WYWx1ZTsKICAgICBGb250VmFyaWFudExpZ2F0dXJlc1BhcnNl ciBsaWdhdHVyZXNQYXJzZXI7CiAgICAgRm9udFZhcmlhbnROdW1lcmljUGFyc2VyIG51bWVyaWNQ YXJzZXI7CiAgICAgZG8gewpAQCAtNDE1OSwyNyArNDI2Nyw0NSBAQCBib29sIENTU1Byb3BlcnR5 UGFyc2VyOjpjb25zdW1lRm9udFZhcmlhCiAgICAgICAgICAgICB8fCBudW1lcmljUGFyc2VSZXN1 bHQgPT0gRm9udFZhcmlhbnROdW1lcmljUGFyc2VyOjpQYXJzZVJlc3VsdDo6RGlzYWxsb3dlZFZh bHVlKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgICAgIENTU1ZhbHVlSUQgaWQg PSBtX3JhbmdlLnBlZWsoKS5pZCgpOwotICAgICAgICBzd2l0Y2ggKGlkKSB7Ci0gICAgICAgIGNh c2UgQ1NTVmFsdWVTbWFsbENhcHM6Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVBbGxTbWFsbENhcHM6 Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVQZXRpdGVDYXBzOgotICAgICAgICBjYXNlIENTU1ZhbHVl QWxsUGV0aXRlQ2FwczoKLSAgICAgICAgY2FzZSBDU1NWYWx1ZVVuaWNhc2U6Ci0gICAgICAgIGNh c2UgQ1NTVmFsdWVUaXRsaW5nQ2FwczoKLSAgICAgICAgICAgIC8vIE9ubHkgb25lIGNhcHMgdmFs dWUgcGVybWl0dGVkIGluIGZvbnQtdmFyaWFudCBncmFtbWFyLgorICAgICAgICBpZiAoIWVhc3RB c2lhblZhbHVlKSB7CisgICAgICAgICAgICBlYXN0QXNpYW5WYWx1ZSA9IGNvbnN1bWVGb250VmFy aWFudEVhc3RBc2lhbihtX3JhbmdlKTsKKyAgICAgICAgICAgIGlmIChlYXN0QXNpYW5WYWx1ZSkK KyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAg aWYgKCFjYXBzVmFsdWUpIHsKKyAgICAgICAgICAgIGNhcHNWYWx1ZSA9IGNvbnN1bWVGb250VmFy aWFudENhcHMobV9yYW5nZSk7CiAgICAgICAgICAgICBpZiAoY2Fwc1ZhbHVlKQotICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIGNhcHNWYWx1ZSA9IGNvbnN1bWVJZGVu dChtX3JhbmdlKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9 CisgICAgICAgIAorICAgICAgICBpZiAoIWFsdGVybmF0ZXNWYWx1ZSkgeworICAgICAgICAgICAg YWx0ZXJuYXRlc1ZhbHVlID0gY29uc3VtZUZvbnRWYXJpYW50QWx0ZXJuYXRlcyhtX3JhbmdlKTsK KyAgICAgICAgICAgIGlmIChhbHRlcm5hdGVzVmFsdWUpCisgICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGlmICghcG9zaXRpb25WYWx1ZSkgewor ICAgICAgICAgICAgcG9zaXRpb25WYWx1ZSA9IGNvbnN1bWVGb250VmFyaWFudFBvc2l0aW9uKG1f cmFuZ2UpOworICAgICAgICAgICAgaWYgKHBvc2l0aW9uVmFsdWUpCisgICAgICAgICAgICAgICAg Y29udGludWU7CiAgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIC8vIFNhdyBzb21lIHZhbHVl IHRoYXQgZGlkbid0IG1hdGNoIGFueXRoaW5nIGVsc2UuCisgICAgICAgIHJldHVybiBudWxscHRy OworCiAgICAgfSB3aGlsZSAoIW1fcmFuZ2UuYXRFbmQoKSk7CiAKICAgICBhZGRQcm9wZXJ0eShD U1NQcm9wZXJ0eUZvbnRWYXJpYW50TGlnYXR1cmVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBs aWdhdHVyZXNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VOb25OdWxsKCksIGltcG9ydGFu dCk7CiAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudE51bWVyaWMsIENTU1By b3BlcnR5Rm9udFZhcmlhbnQsIG51bWVyaWNQYXJzZXIuZmluYWxpemVWYWx1ZSgpLnJlbGVhc2VO b25OdWxsKCksIGltcG9ydGFudCk7CiAgICAgYWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFy aWFudENhcHMsIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIGNhcHNWYWx1ZSA/IGNhcHNWYWx1ZS5y ZWxlYXNlTm9uTnVsbCgpIDogQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlm aWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpLCBpbXBvcnRhbnQpOworICAgIGFkZFByb3BlcnR5KENT U1Byb3BlcnR5Rm9udFZhcmlhbnRBbHRlcm5hdGVzLCBDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBh bHRlcm5hdGVzVmFsdWUgPyBhbHRlcm5hdGVzVmFsdWUucmVsZWFzZU5vbk51bGwoKSA6IENTU1Zh bHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFs KSwgaW1wb3J0YW50KTsKKyAgICBhZGRQcm9wZXJ0eShDU1NQcm9wZXJ0eUZvbnRWYXJpYW50UG9z aXRpb24sIENTU1Byb3BlcnR5Rm9udFZhcmlhbnQsIHBvc2l0aW9uVmFsdWUgPyBwb3NpdGlvblZh bHVlLnJlbGVhc2VOb25OdWxsKCkgOiBDU1NWYWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZUlk ZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCksIGltcG9ydGFudCk7CisgICAgCisgICAgaWYg KCFlYXN0QXNpYW5WYWx1ZSkKKyAgICAgICAgZWFzdEFzaWFuVmFsdWUgPSBDU1NWYWx1ZVBvb2w6 OnNpbmdsZXRvbigpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vcm1hbCk7CisgICAg YWRkUHJvcGVydHkoQ1NTUHJvcGVydHlGb250VmFyaWFudEVhc3RBc2lhbiwgQ1NTUHJvcGVydHlG b250VmFyaWFudCwgZWFzdEFzaWFuVmFsdWUucmVsZWFzZU5vbk51bGwoKSwgaW1wb3J0YW50KTsK KyAgICAKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjA5MTk0KQor KysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTYtMTItMDEgIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NT UyBQYXJzZXJdIEZpeCBmb250LXZhcmlhbnQgcGFyc2luZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1MjY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDE2LTEy LTAxICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW01vZGVy biBNZWRpYSBDb250cm9sc10gVHVybiBvZmYgdGV4dCBzZWxlY3Rpb24KSW5kZXg6IExheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucwkocmV2aXNpb24gMjA5MTI4KQorKysgTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u cwkod29ya2luZyBjb3B5KQpAQCAtMTAxMiw2ICsxMDEyLDcgQEAgd2Via2l0Lm9yZy9iLzE2NTE5 NSBmYXN0L3NoYWRvdy1kb20vc2xvdAogCiAjIFRoZSBmb2xsb3dpbmcgbGF5b3V0IHRlc3RzIG5l ZWQgdG8gYmUgY2hhbmdlZCB3aGVuIHRoZSBuZXcgQ1NTIFBhcnNlciBpcyB0dXJuZWQgb24sIHNp bmNlIHRoZXkKICMgaW5jb3JyZWN0bHkgaW5kaWNhdGUgZmFpbHVyZXMgb24gdmFsaWQgc3ludGF4 Lgord2Via2l0Lm9yZy9iLzE2NTE5NSBjc3MzL2ZvbnQtdmFyaWFudC1wYXJzaW5nLmh0bWwgWyBQ YXNzIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzE2NTE5NSBjc3MzL3N1cHBvcnRzLWNzc29tLmh0 bWwgWyBQYXNzIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzE2NTE5NSBmYXN0L2Nzcy9hdHRyLXBh cnNpbmcuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTY1MTk1IGZhc3QvY3Nz L2ZvbnQtZmFtaWx5LXBhcnNlLWtleXdvcmQuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCkBAIC0xMDUy LDggKzEwNTMsMyBAQCB3ZWJraXQub3JnL2IvMTY1MTk1IGZhc3QvdGV4dC90ZXh0LWNvbWJpCiB3 ZWJraXQub3JnL2IvMTY1MTk1IHN2Zy9kb20vU1ZHQ29sb3IuaHRtbCBbIFBhc3MgRmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMTY1MTk1IHN2Zy9kb20vU1ZHUGFpbnQuaHRtbCBbIFBhc3MgRmFpbHVy ZSBdCiAKLQotCi0KLQotCg==