89232 2012-06-15 11:01:08 -0700 [BlackBerry] Use platform font settings for the standard settings. 2012-06-15 16:10:10 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 efidler efidler rwlbuis tonikitoo webkit.review.bot oldest_to_newest 650341 0 efidler 2012-06-15 11:01:08 -0700 Use platform font settings for the standard settings instead of harcoding them. Line up WebCore::Settings and WebSettings. 650349 1 147861 efidler 2012-06-15 11:08:03 -0700 Created attachment 147861 Patch 650351 2 147861 rwlbuis 2012-06-15 11:09:26 -0700 Comment on attachment 147861 Patch Looks good. 650468 3 147861 webkit.review.bot 2012-06-15 13:50:26 -0700 Comment on attachment 147861 Patch Rejecting attachment 147861 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/page/blackberry/SettingsBlackBerry.cpp Hunk #1 FAILED at 19. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/page/blackberry/SettingsBlackBerry.cpp.rej patching file Source/WebKit/blackberry/Api/WebSettings.cpp Hunk #2 succeeded at 184 (offset -1 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Rob Buis']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12955867 650548 4 147908 efidler 2012-06-15 15:02:10 -0700 Created attachment 147908 Patch 650556 5 147908 rwlbuis 2012-06-15 15:07:00 -0700 Comment on attachment 147908 Patch Looks good, let's try again. Filling in the Reviewed by line may cause it to fail again.... 650604 6 147908 webkit.review.bot 2012-06-15 16:10:05 -0700 Comment on attachment 147908 Patch Clearing flags on attachment: 147908 Committed r120506: <http://trac.webkit.org/changeset/120506> 650605 7 webkit.review.bot 2012-06-15 16:10:10 -0700 All reviewed patches have been landed. Closing bug. 147861 2012-06-15 11:08:03 -0700 2012-06-15 15:02:06 -0700 Patch bug-89232-20120615140802.patch text/plain 6181 efidler U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDczYjA1M2JjZTQ4NDE1 MWRmMTA3MzE3ZTlkMWNmZGQzYzBhZjY3My4uOTZlYzkzNzI0ZTI2ODZkMjQxMWFmYjc4MTBmZmVm MmRmMWRjMWE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTE0ICBFbGkg RmlkbGVyICA8ZWZpZGxlckByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBVc2UgcGxh dGZvcm0gZm9udCBzZXR0aW5ncyBmb3IgdGhlIHN0YW5kYXJkIHNldHRpbmdzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkyMzIKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSSU0gUFIgMTU5NzA4CisKKyAg ICAgICAgKiBwYWdlL2JsYWNrYmVycnkvU2V0dGluZ3NCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAg KFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OmluaXRpYWxpemVEZWZhdWx0 Rm9udEZhbWlsaWVzKToKKwogMjAxMi0wNi0xMyAgRWxpIEZpZGxlciAgPGVmaWRsZXJAcmltLmNv bT4KIAogICAgICAgICBGaXggQ01ha2UgYnVpbGQgd2l0aCBTTU9PVEhfU0NST0xMSU5HIGVuYWJs ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IGEwZmI4MmI3NjJmOTgxNTM4NDlh ZjUxZjM0ZTM5MGIxMzgzMGZkYjUuLjg1YWE4ODBiY2I1NDA1Njg3OWM1Zjc5ODA3NTU1NTBjZmU2 YjY4N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisy MDEyLTA2LTE0ICBFbGkgRmlkbGVyICA8ZWZpZGxlckByaW0uY29tPgorCisgICAgICAgIFtCbGFj a0JlcnJ5XSBVc2UgcGxhdGZvcm0gZm9udCBzZXR0aW5ncyBmb3IgdGhlIHN0YW5kYXJkIHNldHRp bmdzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODky MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSSU0g UFIgMTU5NzA4CisKKyAgICAgICAgKiBBcGkvV2ViU2V0dGluZ3MuY3BwOgorICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpXZWJTZXR0aW5nczo6c3RhbmRhcmRTZXR0aW5ncyk6CisKIDIwMTIt MDYtMTIgIEphY2t5IEppYW5nICA8emhhamlhbmdAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tC ZXJyeV0gU2NhbGUgd2FzIGluY29ycmVjdCB3aGVuIHJlbG9hZGluZyBhIHNpbXBsZSB3ZWIgcGFn ZSBhZnRlciBpbml0aWFsIGxvYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYmxh Y2tiZXJyeS9TZXR0aW5nc0JsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ibGFj a2JlcnJ5L1NldHRpbmdzQmxhY2tCZXJyeS5jcHAKaW5kZXggNjA1YmFmZGYzYTVmOWU4YjdmMjE5 NzdjZDVkYzJjNmRhMGQ2M2FkNS4uNjM2YWQ4ZTRkZmYyM2U3MGQ2NTBlNzgwOTE0ZjM1OThmMzMy ZDcyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9ibGFja2JlcnJ5L1NldHRpbmdz QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ibGFja2JlcnJ5L1NldHRp bmdzQmxhY2tCZXJyeS5jcHAKQEAgLTE5LDQzICsxOSw0NiBAQAogI2luY2x1ZGUgImNvbmZpZy5o IgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAKLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotdm9pZCBT ZXR0aW5nczo6aW5pdGlhbGl6ZURlZmF1bHRGb250RmFtaWxpZXMoKQotewotICAgIHNldEN1cnNp dmVGb250RmFtaWx5KCJDb21pYyBTYW5zIE1TIik7Ci0gICAgc2V0RmFudGFzeUZvbnRGYW1pbHko IkltcGFjdCIpOwotICAgIHNldEZpeGVkRm9udEZhbWlseSgiQW5kYWxlIE1vbm8iKTsKLSAgICBz ZXRTYW5zU2VyaWZGb250RmFtaWx5KCJWZXJkYW5hIik7Ci0gICAgc2V0U2VyaWZGb250RmFtaWx5 KCJHZW9yZ2lhIik7Ci0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJTbGF0ZSBQcm8iKTsKLQot ICAgIHNldFN0YW5kYXJkRm9udEZhbWlseSgiTVN1bmcgTWVkaXVtIENQOTUwIiwgVVNDUklQVF9U UkFESVRJT05BTF9IQU4pOwotCi0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJNb25vdHlwZSBI ZWkgTWVkaXVtIEdCMTgwMzAiLCBVU0NSSVBUX1NJTVBMSUZJRURfSEFOKTsKKyNpbmNsdWRlICJM b2NhbGVUb1NjcmlwdE1hcHBpbmcuaCIKIAotICAgIHNldFNhbnNTZXJpZkZvbnRGYW1pbHkoIkhl aXNlaUtha3VHb3RoVzVfSklTMDIxM0MiLCBVU0NSSVBUX0tBVEFLQU5BX09SX0hJUkFHQU5BKTsK LSAgICBzZXRTZXJpZkZvbnRGYW1pbHkoIkhlaXNlaU1pbmNob1czX0pJUzAyMTNfQyIsIFVTQ1JJ UFRfS0FUQUtBTkFfT1JfSElSQUdBTkEpOwotICAgIHNldFN0YW5kYXJkRm9udEZhbWlseSgiSGVp c2VpS2FrdUdvdGhXNV9KSVMwMjEzQyIsIFVTQ1JJUFRfS0FUQUtBTkFfT1JfSElSQUdBTkEpOwor I2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUZvbnRJbmZvLmg+CiAKLSAgICBzZXRTdGFuZGFy ZEZvbnRGYW1pbHkoIkhZR290aGljLU1lZGl1bSIsIFVTQ1JJUFRfSEFOR1VMKTsKLQotICAgIHNl dFN0YW5kYXJkRm9udEZhbWlseSgiQnJvd2FsbGlhIE5ldyIsIFVTQ1JJUFRfVEhBSSk7CituYW1l c3BhY2UgV2ViQ29yZSB7CiAKLSAgICBzZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkFraGJhciBNVCBP VFMiLCBVU0NSSVBUX0FSQUJJQyk7CitzdGF0aWMgY29uc3QgY2hhciogbGFuZ3VhZ2VzW10gPSB7 CisgICAgImFyIiwKKyAgICAiYm4iLAorICAgICJndSIsCisgICAgImhlIiwKKyAgICAiaGkiLAor ICAgICJqYSIsCisgICAgImtuIiwKKyAgICAia28iLAorICAgICJtbCIsCisgICAgInBhIiwKKyAg ICAidGEiLAorICAgICJ0ZSIsCisgICAgInRoIiwKKyAgICAiemgtQ04iLAorICAgICJ6aC1UVyIs Cit9OwogCi0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJIYWRhc3NhaCBPVFMiLCBVU0NSSVBU X0hFQlJFVyk7Cit2b2lkIFNldHRpbmdzOjppbml0aWFsaXplRGVmYXVsdEZvbnRGYW1pbGllcygp Cit7CisgICAgc2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoQmxhY2tCZXJyeTo6UGxhdGZvcm06OmZvbnRG YW1pbHkoIi13ZWJraXQtY3Vyc2l2ZSIsICIiKS5jX3N0cigpKTsKKyAgICBzZXRGYW50YXN5Rm9u dEZhbWlseShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Zm9udEZhbWlseSgiLXdlYmtpdC1mYW50YXN5 IiwgIiIpLmNfc3RyKCkpOworICAgIHNldEZpeGVkRm9udEZhbWlseShCbGFja0JlcnJ5OjpQbGF0 Zm9ybTo6Zm9udEZhbWlseSgiLXdlYmtpdC1tb25vc3BhY2UiLCAiIikuY19zdHIoKSk7CisgICAg c2V0U2Fuc1NlcmlmRm9udEZhbWlseShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Zm9udEZhbWlseSgi LXdlYmtpdC1zYW5zLXNlcmlmIiwgIiIpLmNfc3RyKCkpOworICAgIHNldFNlcmlmRm9udEZhbWls eShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Zm9udEZhbWlseSgiLXdlYmtpdC1zZXJpZiIsICIiKS5j X3N0cigpKTsKKyAgICBzZXRTdGFuZGFyZEZvbnRGYW1pbHkoQmxhY2tCZXJyeTo6UGxhdGZvcm06 OmZvbnRGYW1pbHkoIi13ZWJraXQtc3RhbmRhcmQiLCAiIikuY19zdHIoKSk7CiAKLSAgICBzZXRT dGFuZGFyZEZvbnRGYW1pbHkoIkJlbmdhbGkgT1RTIiwgVVNDUklQVF9CRU5HQUxJKTsKLSAgICBz ZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkRldmFuYWdhcmkgT1RTIiwgVVNDUklQVF9ERVZBTkFHQVJJ KTsKLSAgICBzZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkd1amFyYXRpIE9UUyIsIFVTQ1JJUFRfR1VK QVJBVEkpOwotICAgIHNldFN0YW5kYXJkRm9udEZhbWlseSgiR3VybXVraGkgT1RTIiwgVVNDUklQ VF9HVVJNVUtISSk7Ci0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJLYW5uYWRhIE9UUyIsIFVT Q1JJUFRfS0FOTkFEQSk7Ci0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJNYWxheWFsYW0gT1RT IiwgVVNDUklQVF9NQUxBWUFMQU0pOwotICAgIHNldFN0YW5kYXJkRm9udEZhbWlseSgiU2luaGFs YSBPVFMiLCBVU0NSSVBUX1NJTkhBTEEpOwotICAgIHNldFN0YW5kYXJkRm9udEZhbWlseSgiVGFt aWwgT1RTIiwgVVNDUklQVF9UQU1JTCk7Ci0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJUZWx1 Z3UgT1RTIiwgVVNDUklQVF9URUxVR1UpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgV1RG X0FSUkFZX0xFTkdUSChsYW5ndWFnZXMpOyArK2kpIHsKKyAgICAgICAgVVNjcmlwdENvZGUgc2Ny aXB0ID0gbG9jYWxlVG9TY3JpcHRDb2RlRm9yRm9udFNlbGVjdGlvbihsYW5ndWFnZXNbaV0pOwor ICAgICAgICBzZXRGaXhlZEZvbnRGYW1pbHkoQmxhY2tCZXJyeTo6UGxhdGZvcm06OmZvbnRGYW1p bHkoIm1vbm9zcGFjZSIsIGxhbmd1YWdlc1tpXSkuY19zdHIoKSwgc2NyaXB0KTsKKyAgICAgICAg c2V0U2Fuc1NlcmlmRm9udEZhbWlseShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Zm9udEZhbWlseSgi c2Fucy1zZXJpZiIsIGxhbmd1YWdlc1tpXSkuY19zdHIoKSwgc2NyaXB0KTsKKyAgICAgICAgc2V0 U2VyaWZGb250RmFtaWx5KEJsYWNrQmVycnk6OlBsYXRmb3JtOjpmb250RmFtaWx5KCJzZXJpZiIs IGxhbmd1YWdlc1tpXSkuY19zdHIoKSwgc2NyaXB0KTsKKyAgICAgICAgc2V0U3RhbmRhcmRGb250 RmFtaWx5KEJsYWNrQmVycnk6OlBsYXRmb3JtOjpmb250RmFtaWx5KCIiLCBsYW5ndWFnZXNbaV0p LmNfc3RyKCksIHNjcmlwdCk7CisgICAgfQogfQogCi0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViU2V0dGluZ3MuY3Bw IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5jcHAKaW5kZXggZDQ5 NTg3NzVmYzExZmVmNmRmYzllNGYxZTMwZDZkMzYzYzI4N2U1Ny4uNmY0N2YyYzk3Y2M4MzIxZDkz NzQ3ZTA3ODAwZDI2ODU5YTcyMWZiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJTZXR0aW5ncy5jcHAKQEAgLTI0LDYgKzI0LDcgQEAKIAogI2luY2x1ZGUgIldlYlN0cmlu Zy5oIgogI2luY2x1ZGUgPEJhc2U2NC5oPgorI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUZv bnRJbmZvLmg+CiAjaW5jbHVkZSA8Q29sb3IuaD4KICNpbmNsdWRlIDxQYWdlQ2FjaGUuaD4KICNp bmNsdWRlIDx3dGYvSGFzaFNldC5oPgpAQCAtMTg0LDYgKzE4NSwxMSBAQCBXZWJTZXR0aW5ncyog V2ViU2V0dGluZ3M6OnN0YW5kYXJkU2V0dGluZ3MoKQogICAgIHNldHRpbmdzLT5tX3ByaXZhdGUt PnNldEludGVnZXIoV2ViS2l0TWluaW11bUZvbnRTaXplLCA4KTsKICAgICBzZXR0aW5ncy0+bV9w cml2YXRlLT5zZXRCb29sZWFuKFdlYktpdFdlYlNvY2tldHNFbmFibGVkLCB0cnVlKTsKIAorICAg IHNldHRpbmdzLT5tX3ByaXZhdGUtPnNldFN0cmluZyhXZWJLaXRGaXhlZEZvbnRGYW1pbHksIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpmb250RmFtaWx5KCItd2Via2l0LW1vbm9zcGFjZSIsICIiKS5j X3N0cigpKTsKKyAgICBzZXR0aW5ncy0+bV9wcml2YXRlLT5zZXRTdHJpbmcoV2ViS2l0U2Fuc1Nl cmlmZkZvbnRGYW1pbHksIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpmb250RmFtaWx5KCItd2Via2l0 LXNhbnMtc2VyaWYiLCAiIikuY19zdHIoKSk7CisgICAgc2V0dGluZ3MtPm1fcHJpdmF0ZS0+c2V0 U3RyaW5nKFdlYktpdFNlcmlmZkZvbnRGYW1pbHksIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpmb250 RmFtaWx5KCItd2Via2l0LXNlcmlmIiwgIiIpLmNfc3RyKCkpOworICAgIHNldHRpbmdzLT5tX3By aXZhdGUtPnNldFN0cmluZyhXZWJLaXRTdGFuZGFyZEZvbnRGYW1pbHksIEJsYWNrQmVycnk6OlBs YXRmb3JtOjpmb250RmFtaWx5KCItd2Via2l0LXN0YW5kYXJkIiwgIiIpLmNfc3RyKCkpOworCiAg ICAgcmV0dXJuIHNldHRpbmdzOwogfQogCg== 147908 2012-06-15 15:02:10 -0700 2012-06-15 16:10:05 -0700 Patch bug-89232-20120615180209.patch text/plain 6259 efidler U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJlZTQ1MzMzZmE3MDI5 YjhhN2YyNTU1YTFjMmQ0MTM5ZjRjMWQ5MS4uMjA1YmQ4MmFjZjhmMGI5YWY2ZDQyM2NlOTFiMjk3 NzU4NzgyNzY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTE1ICBFbGkg RmlkbGVyICA8ZWZpZGxlckByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBVc2UgcGxh dGZvcm0gZm9udCBzZXR0aW5ncyBmb3IgdGhlIHN0YW5kYXJkIHNldHRpbmdzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkyMzIKKworICAgICAgICBS ZXZpZXdlZCBieSBSb2IgQnVpcy4KKworICAgICAgICBSSU0gUFIgMTU5NzA4CisKKyAgICAgICAg KiBwYWdlL2JsYWNrYmVycnkvU2V0dGluZ3NCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OmluaXRpYWxpemVEZWZhdWx0Rm9udEZh bWlsaWVzKToKKwogMjAxMi0wNi0xMyAgVmluY2VudCBTY2hlaWIgIDxzY2hlaWJAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIEFkZCBuZXcgUG9pbnRlciBMb2NrIHNwZWMgd2Via2l0UmVxdWVzdFBv aW50ZXJMb2NrIGFuZCB3ZWJraXRFeGl0UG9pbnRlckxvY2sgbWV0aG9kcy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQ2hhbmdlTG9nCmluZGV4IDAxMzkwZWNhZTY5ZGFhOTUyMDQ3ZmJkMDUxNmY2ODRmZDJm MzI4NmQuLmUxYmVjNWY1Yjg2OTg0NjVkNDI4NzM4ZGRhNDIxNWEzZmZkMDNjMDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTE1ICBFbGkg RmlkbGVyICA8ZWZpZGxlckByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBVc2UgcGxh dGZvcm0gZm9udCBzZXR0aW5ncyBmb3IgdGhlIHN0YW5kYXJkIHNldHRpbmdzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkyMzIKKworICAgICAgICBS ZXZpZXdlZCBieSBSb2IgQnVpcy4KKworICAgICAgICBSSU0gUFIgMTU5NzA4CisKKyAgICAgICAg KiBBcGkvV2ViU2V0dGluZ3MuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJT ZXR0aW5nczo6c3RhbmRhcmRTZXR0aW5ncyk6CisKIDIwMTItMDYtMTUgIEFudG9uaW8gR29tZXMg IDxhZ29tZXNAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRGlzYWJsZSBXZWJDb3Jl OjpFdmVudEhhbmRsZXIgc3ludGhlc2l6ZWQgbW91c2UgZXZlbnRzIGR1cmluZyB0b3VjaCBzY3Jv bGxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYmxhY2tiZXJyeS9TZXR0aW5n c0JsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ibGFja2JlcnJ5L1NldHRpbmdz QmxhY2tCZXJyeS5jcHAKaW5kZXggNGJmNTkzY2MyYzAzY2NhOGM4NTJlZDI1NzA2NTM4YjhkMDQy MjQwMy4uNjM2YWQ4ZTRkZmYyM2U3MGQ2NTBlNzgwOTE0ZjM1OThmMzMyZDcyOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ibGFja2JlcnJ5L1NldHRpbmdzQmxhY2tCZXJyeS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ibGFja2JlcnJ5L1NldHRpbmdzQmxhY2tCZXJyeS5j cHAKQEAgLTE5LDQ0ICsxOSw0NiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNl dHRpbmdzLmgiCiAKLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotdm9pZCBTZXR0aW5nczo6aW5pdGlh bGl6ZURlZmF1bHRGb250RmFtaWxpZXMoKQotewotICAgIHNldEN1cnNpdmVGb250RmFtaWx5KCJD b21pYyBTYW5zIE1TIik7Ci0gICAgc2V0RmFudGFzeUZvbnRGYW1pbHkoIkltcGFjdCIpOwotICAg IHNldEZpeGVkRm9udEZhbWlseSgiQ291cmllciBOZXciKTsKLSAgICBzZXRTYW5zU2VyaWZGb250 RmFtaWx5KCJBcmlhbCIpOwotICAgIHNldFNlcmlmRm9udEZhbWlseSgiVGltZXMgTmV3IFJvbWFu Iik7Ci0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJUaW1lcyBOZXcgUm9tYW4iKTsKLQotICAg IHNldFN0YW5kYXJkRm9udEZhbWlseSgiQWRvYmUgTWluZyBTdGQgTCIsIFVTQ1JJUFRfVFJBRElU SU9OQUxfSEFOKTsKLQotICAgIHNldFN0YW5kYXJkRm9udEZhbWlseSgiQWRvYmUgSGVpdGkgU3Rk IFIiLCBVU0NSSVBUX1NJTVBMSUZJRURfSEFOKTsKKyNpbmNsdWRlICJMb2NhbGVUb1NjcmlwdE1h cHBpbmcuaCIKIAotICAgIHNldEZpeGVkRm9udEZhbWlseSgiUnlvIEdvdGhpYyBQbHVzTiBSIiwg VVNDUklQVF9LQVRBS0FOQV9PUl9ISVJBR0FOQSk7Ci0gICAgc2V0U2Fuc1NlcmlmRm9udEZhbWls eSgiUnlvIEdvdGhpYyBQbHVzTiBSIiwgVVNDUklQVF9LQVRBS0FOQV9PUl9ISVJBR0FOQSk7Ci0g ICAgc2V0U2VyaWZGb250RmFtaWx5KCJSeW8gVGV4dCBQbHVzTiBMIiwgVVNDUklQVF9LQVRBS0FO QV9PUl9ISVJBR0FOQSk7Ci0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJSeW8gR290aGljIFBs dXNOIFIiLCBVU0NSSVBUX0tBVEFLQU5BX09SX0hJUkFHQU5BKTsKKyNpbmNsdWRlIDxCbGFja0Jl cnJ5UGxhdGZvcm1Gb250SW5mby5oPgogCi0gICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KCJBZG9i ZSBHb3RoaWMgU3RkIiwgVVNDUklQVF9IQU5HVUwpOwotCi0gICAgc2V0U3RhbmRhcmRGb250RmFt aWx5KCJHYXJ1ZGEiLCBVU0NSSVBUX1RIQUkpOworbmFtZXNwYWNlIFdlYkNvcmUgewogCi0gICAg c2V0U3RhbmRhcmRGb250RmFtaWx5KCJUYWhvbWEiLCBVU0NSSVBUX0FSQUJJQyk7CitzdGF0aWMg Y29uc3QgY2hhciogbGFuZ3VhZ2VzW10gPSB7CisgICAgImFyIiwKKyAgICAiYm4iLAorICAgICJn dSIsCisgICAgImhlIiwKKyAgICAiaGkiLAorICAgICJqYSIsCisgICAgImtuIiwKKyAgICAia28i LAorICAgICJtbCIsCisgICAgInBhIiwKKyAgICAidGEiLAorICAgICJ0ZSIsCisgICAgInRoIiwK KyAgICAiemgtQ04iLAorICAgICJ6aC1UVyIsCit9OwogCi0gICAgc2V0U3RhbmRhcmRGb250RmFt aWx5KCJUYWhvbWEiLCBVU0NSSVBUX0hFQlJFVyk7Cit2b2lkIFNldHRpbmdzOjppbml0aWFsaXpl RGVmYXVsdEZvbnRGYW1pbGllcygpCit7CisgICAgc2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoQmxhY2tC ZXJyeTo6UGxhdGZvcm06OmZvbnRGYW1pbHkoIi13ZWJraXQtY3Vyc2l2ZSIsICIiKS5jX3N0cigp KTsKKyAgICBzZXRGYW50YXN5Rm9udEZhbWlseShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Zm9udEZh bWlseSgiLXdlYmtpdC1mYW50YXN5IiwgIiIpLmNfc3RyKCkpOworICAgIHNldEZpeGVkRm9udEZh bWlseShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Zm9udEZhbWlseSgiLXdlYmtpdC1tb25vc3BhY2Ui LCAiIikuY19zdHIoKSk7CisgICAgc2V0U2Fuc1NlcmlmRm9udEZhbWlseShCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6Zm9udEZhbWlseSgiLXdlYmtpdC1zYW5zLXNlcmlmIiwgIiIpLmNfc3RyKCkpOwor ICAgIHNldFNlcmlmRm9udEZhbWlseShCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Zm9udEZhbWlseSgi LXdlYmtpdC1zZXJpZiIsICIiKS5jX3N0cigpKTsKKyAgICBzZXRTdGFuZGFyZEZvbnRGYW1pbHko QmxhY2tCZXJyeTo6UGxhdGZvcm06OmZvbnRGYW1pbHkoIi13ZWJraXQtc3RhbmRhcmQiLCAiIiku Y19zdHIoKSk7CiAKLSAgICBzZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkJlbmdhbGkgT1RTIiwgVVND UklQVF9CRU5HQUxJKTsKLSAgICBzZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkRldmFuYWdhcmkgT1RT IiwgVVNDUklQVF9ERVZBTkFHQVJJKTsKLSAgICBzZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkd1amFy YXRpIE9UUyIsIFVTQ1JJUFRfR1VKQVJBVEkpOwotICAgIHNldFN0YW5kYXJkRm9udEZhbWlseSgi R3VybXVraGkgT1RTIiwgVVNDUklQVF9HVVJNVUtISSk7Ci0gICAgc2V0U3RhbmRhcmRGb250RmFt aWx5KCJLYW5uYWRhIE9UUyIsIFVTQ1JJUFRfS0FOTkFEQSk7Ci0gICAgc2V0U3RhbmRhcmRGb250 RmFtaWx5KCJNYWxheWFsYW0gT1RTIiwgVVNDUklQVF9NQUxBWUFMQU0pOwotICAgIHNldFN0YW5k YXJkRm9udEZhbWlseSgiU2luaGFsYSBPVFMiLCBVU0NSSVBUX1NJTkhBTEEpOwotICAgIHNldFN0 YW5kYXJkRm9udEZhbWlseSgiVGFtaWwgT1RTIiwgVVNDUklQVF9UQU1JTCk7Ci0gICAgc2V0U3Rh bmRhcmRGb250RmFtaWx5KCJUZWx1Z3UgT1RTIiwgVVNDUklQVF9URUxVR1UpOworICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgV1RGX0FSUkFZX0xFTkdUSChsYW5ndWFnZXMpOyArK2kpIHsKKyAg ICAgICAgVVNjcmlwdENvZGUgc2NyaXB0ID0gbG9jYWxlVG9TY3JpcHRDb2RlRm9yRm9udFNlbGVj dGlvbihsYW5ndWFnZXNbaV0pOworICAgICAgICBzZXRGaXhlZEZvbnRGYW1pbHkoQmxhY2tCZXJy eTo6UGxhdGZvcm06OmZvbnRGYW1pbHkoIm1vbm9zcGFjZSIsIGxhbmd1YWdlc1tpXSkuY19zdHIo KSwgc2NyaXB0KTsKKyAgICAgICAgc2V0U2Fuc1NlcmlmRm9udEZhbWlseShCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6Zm9udEZhbWlseSgic2Fucy1zZXJpZiIsIGxhbmd1YWdlc1tpXSkuY19zdHIoKSwg c2NyaXB0KTsKKyAgICAgICAgc2V0U2VyaWZGb250RmFtaWx5KEJsYWNrQmVycnk6OlBsYXRmb3Jt Ojpmb250RmFtaWx5KCJzZXJpZiIsIGxhbmd1YWdlc1tpXSkuY19zdHIoKSwgc2NyaXB0KTsKKyAg ICAgICAgc2V0U3RhbmRhcmRGb250RmFtaWx5KEJsYWNrQmVycnk6OlBsYXRmb3JtOjpmb250RmFt aWx5KCIiLCBsYW5ndWFnZXNbaV0pLmNfc3RyKCksIHNjcmlwdCk7CisgICAgfQogfQogCi0KIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViU2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJT ZXR0aW5ncy5jcHAKaW5kZXggYTY3OGQ1MjUxNzEwYjYyYjIzMTY1YzhmNWEyODM2NDM4YWNkOGNk OS4uNzAyZGNjNzczZDc3NThmMjk2OTY3NmMyODkxMDc1ODIyMjg1YWFjMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJTZXR0aW5ncy5jcHAKQEAgLTI0LDYgKzI0LDcgQEAK IAogI2luY2x1ZGUgIldlYlN0cmluZy5oIgogI2luY2x1ZGUgPEJhc2U2NC5oPgorI2luY2x1ZGUg PEJsYWNrQmVycnlQbGF0Zm9ybUZvbnRJbmZvLmg+CiAjaW5jbHVkZSA8Q29sb3IuaD4KICNpbmNs dWRlIDxQYWdlQ2FjaGUuaD4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgpAQCAtMTgzLDYgKzE4 NCwxMSBAQCBXZWJTZXR0aW5ncyogV2ViU2V0dGluZ3M6OnN0YW5kYXJkU2V0dGluZ3MoKQogICAg IHNldHRpbmdzLT5tX3ByaXZhdGUtPnNldEludGVnZXIoV2ViS2l0TWluaW11bUZvbnRTaXplLCA4 KTsKICAgICBzZXR0aW5ncy0+bV9wcml2YXRlLT5zZXRCb29sZWFuKFdlYktpdFdlYlNvY2tldHNF bmFibGVkLCB0cnVlKTsKIAorICAgIHNldHRpbmdzLT5tX3ByaXZhdGUtPnNldFN0cmluZyhXZWJL aXRGaXhlZEZvbnRGYW1pbHksIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpmb250RmFtaWx5KCItd2Vi a2l0LW1vbm9zcGFjZSIsICIiKS5jX3N0cigpKTsKKyAgICBzZXR0aW5ncy0+bV9wcml2YXRlLT5z ZXRTdHJpbmcoV2ViS2l0U2Fuc1NlcmlmZkZvbnRGYW1pbHksIEJsYWNrQmVycnk6OlBsYXRmb3Jt Ojpmb250RmFtaWx5KCItd2Via2l0LXNhbnMtc2VyaWYiLCAiIikuY19zdHIoKSk7CisgICAgc2V0 dGluZ3MtPm1fcHJpdmF0ZS0+c2V0U3RyaW5nKFdlYktpdFNlcmlmZkZvbnRGYW1pbHksIEJsYWNr QmVycnk6OlBsYXRmb3JtOjpmb250RmFtaWx5KCItd2Via2l0LXNlcmlmIiwgIiIpLmNfc3RyKCkp OworICAgIHNldHRpbmdzLT5tX3ByaXZhdGUtPnNldFN0cmluZyhXZWJLaXRTdGFuZGFyZEZvbnRG YW1pbHksIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpmb250RmFtaWx5KCItd2Via2l0LXN0YW5kYXJk IiwgIiIpLmNfc3RyKCkpOworCiAgICAgcmV0dXJuIHNldHRpbmdzOwogfQogCg==