66220 2011-08-15 05:16:52 -0700 [chromium] Update WebSettings to support per-script font settings 2011-08-23 11:30:50 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66744 0 falken webkit-unassigned falken fishd jamesr tony webkit.review.bot oldest_to_newest 451039 0 falken 2011-08-15 05:16:52 -0700 Update Chromium WebSettings to support the new per-script font settings (see bug 20797). 451043 1 103907 falken 2011-08-15 05:28:27 -0700 Created attachment 103907 Patch 451044 2 103908 falken 2011-08-15 05:39:32 -0700 Created attachment 103908 updated patch 452035 3 falken 2011-08-16 17:51:12 -0700 Tony, can you review this small patch please? 452044 4 103908 tony 2011-08-16 18:11:11 -0700 Comment on attachment 103908 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=103908&action=review > Source/WebKit/chromium/src/WebSettingsImpl.cpp:59 > + m_settings->setStandardFontFamily((String)font, script); Doesn't the conversion from WebString to String happen implicitly? If not, we should be using static_cast rather than the c-style cast. 454458 5 104643 falken 2011-08-21 22:52:24 -0700 Created attachment 104643 removed explicit casts 455154 6 104643 webkit.review.bot 2011-08-22 19:15:35 -0700 Comment on attachment 104643 removed explicit casts Clearing flags on attachment: 104643 Committed r93575: <http://trac.webkit.org/changeset/93575> 455155 7 webkit.review.bot 2011-08-22 19:15:39 -0700 All reviewed patches have been landed. Closing bug. 455160 8 jamesr 2011-08-22 19:45:49 -0700 This is not compiling on the canaries on any platform. Build logs: windows: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win%20Builder/builds/12753/steps/compile/logs/stdio mac: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Mac%20Builder%20%28CG%29/builds/207/steps/compile/logs/stdio linux: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Linux%20%28dbg%29%281%29/builds/9654/steps/compile/logs/stdio 455208 9 falken 2011-08-22 23:19:36 -0700 The build failure was caused by including ICU headers needed for the UScriptCode enum used to identify scripts. I consulted a little with Kent Tamura and he brought up that it might be bad to rely on ICU types in WebSettings. Perhaps we can use a new type to hide UScriptCode (like WebString does for strings), or just use int. Darin, what do you think? 455212 10 fishd 2011-08-22 23:26:10 -0700 (In reply to comment #9) > The build failure was caused by including ICU headers needed for the UScriptCode enum used to identify scripts. > > I consulted a little with Kent Tamura and he brought up that it might be bad to rely on ICU types in WebSettings. Perhaps we can use a new type to hide UScriptCode (like WebString does for strings), or just use int. > > Darin, what do you think? Have you tried adding '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc' to the export_dependent_settings section of the webkit target? 455315 11 104817 falken 2011-08-23 04:33:42 -0700 Created attachment 104817 added ICU dependency 455321 12 falken 2011-08-23 04:42:08 -0700 Thanks, I've added the dependency in the latest patch and now it seems to be compiling on the trybots (previously I just tested locally). I'm also not sure whether the #if WEBKIT_IMPLEMENTATION part was needed (I originally was following similar header files in this directory). I've removed it in the latest patch. 455478 13 104817 tony 2011-08-23 10:25:04 -0700 Comment on attachment 104817 added ICU dependency This built for me with ToT chrome and the ews bots passed, so let's try this again. 455547 14 104817 webkit.review.bot 2011-08-23 11:30:45 -0700 Comment on attachment 104817 added ICU dependency Clearing flags on attachment: 104817 Committed r93618: <http://trac.webkit.org/changeset/93618> 455548 15 webkit.review.bot 2011-08-23 11:30:50 -0700 All reviewed patches have been landed. Closing bug. 103907 2011-08-15 05:28:27 -0700 2011-08-15 05:39:25 -0700 Patch bug-66220-20110815212825.patch text/plain 6036 falken U3VidmVyc2lvbiBSZXZpc2lvbjogOTI4MzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NDNkNDI1MDBmZjc3NDk0MGM2YmFhNjgwZjQzMTZjNDA5YTM5N2MyOS4uNmU1N2VjZmY1YTIyNjUz ODFiNzViYTYxY2IyZjc4OWM2YzhhNGQ0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMCBAQAorMjAxMS0wOC0xNSAgTWF0dCBGYWxrZW5oYWdlbiAgPGZhbGtlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVcGRhdGUgV2ViU2V0dGluZ3MgdG8gc3Vw cG9ydCBwZXItc2NyaXB0IGZvbnQgc2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGluZ3MuaDoKKyAgICAgICAgKiBz cmMvV2ViU2V0dGluZ3NJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJbXBs OjpzZXRTdGFuZGFyZEZvbnRGYW1pbHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJTZXR0aW5nc0lt cGw6OnNldEZpeGVkRm9udEZhbWlseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1w bDo6c2V0U2VyaWZGb250RmFtaWx5KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJbXBs OjpzZXRTYW5zU2VyaWZGb250RmFtaWx5KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJ bXBsOjpzZXRDdXJzaXZlRm9udEZhbWlseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdz SW1wbDo6c2V0RmFudGFzeUZvbnRGYW1pbHkpOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0lt cGwuaDoKKwogMjAxMS0wOC0xMCAgSm9obiBBYmQtRWwtTWFsZWsgIDxqYW1AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtjaHJvbWl1bV0gVXBkYXRlIFdlYlNjcm9sbGJhciBzbyB0aGF0IGl0IHdv cmtzIHdpdGggb3ZlcmxheSBzY3JvbGxiYXJzIG9uIExpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCmluZGV4IDI1ZTc2YTg2YzlmYjYzNzk5NDIwZmU1YzFh YjVlZmY3NjJhYmRjMDAuLjIyODIzYWYzNDg4NzY4MzhiNGZhODc4MDE0NWU0YzNmZWY2MTAyYzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaApAQCAtMzIs NiArMzIsMTIgQEAKICNkZWZpbmUgV2ViU2V0dGluZ3NfaAogCiAjaW5jbHVkZSAiV2ViQ29tbW9u LmgiCisjaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCisjaW5jbHVkZSA8d3RmL3VuaWNvZGUvVW5p Y29kZS5oPgorI2Vsc2UKKyNpbmNsdWRlIDx1bmljb2RlL3VjaGFyLmg+CisjaW5jbHVkZSA8dW5p Y29kZS91c2NyaXB0Lmg+CisjZW5kaWYKIAogI2RlZmluZSBIQVNfV0VCQVVESU9fRkVBVFVSRV9F TkFCTEUgMQogCkBAIC01MSwxMiArNTcsMTIgQEAgcHVibGljOgogICAgICAgICBFZGl0aW5nQmVo YXZpb3JVbml4CiAgICAgfTsKIAotICAgIHZpcnR1YWwgdm9pZCBzZXRTdGFuZGFyZEZvbnRGYW1p bHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGaXhlZEZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTZXJpZkZv bnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTYW5z U2VyaWZGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQg c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwg dm9pZCBzZXRGYW50YXN5Rm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmKSA9IDA7CisgICAgdmly dHVhbCB2b2lkIHNldFN0YW5kYXJkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0 Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldEZpeGVkRm9u dEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9 IDA7CisgICAgdmlydHVhbCB2b2lkIHNldFNlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcm LCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNl dFNhbnNTZXJpZkZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NS SVBUX0NPTU1PTikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJzaXZlRm9udEZhbWlseShj b25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAg dmlydHVhbCB2b2lkIHNldEZhbnRhc3lGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3Jp cHRDb2RlID0gVVNDUklQVF9DT01NT04pID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmYXVs dEZvbnRTaXplKGludCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWZhdWx0Rml4ZWRGb250 U2l6ZShpbnQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TWluaW11bUZvbnRTaXplKGludCkg PSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAK aW5kZXggMDRhMzQyODE0ZTJiYmY2YjBiMjUwNDNlOWRiM2IxZGY3YzJmNzM1YS4uNWExZjVjNDg1 NTI1YTk3MmRlNjA2NWM3Y2VhNzNmNTBhMDliZmNiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCkBAIC01NCwzMiArNTQsMzIgQEAgV2ViU2V0 dGluZ3NJbXBsOjpXZWJTZXR0aW5nc0ltcGwoU2V0dGluZ3MqIHNldHRpbmdzKQogICAgIEFTU0VS VChzZXR0aW5ncyk7CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRTdGFuZGFyZEZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldFN0 YW5kYXJkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQsIFVTY3JpcHRDb2RlIHNjcmlw dCkKIHsKLSAgICBtX3NldHRpbmdzLT5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoZm9udCk7CisgICAg bV9zZXR0aW5ncy0+c2V0U3RhbmRhcmRGb250RmFtaWx5KChTdHJpbmcpZm9udCwgc2NyaXB0KTsK IH0KIAotdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJT dHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0Rml4ZWRGb250RmFtaWx5KGNv bnN0IFdlYlN0cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0KQogewotICAgIG1fc2V0dGlu Z3MtPnNldEZpeGVkRm9udEZhbWlseSgoU3RyaW5nKWZvbnQpOworICAgIG1fc2V0dGluZ3MtPnNl dEZpeGVkRm9udEZhbWlseSgoU3RyaW5nKWZvbnQsIHNjcmlwdCk7CiB9CiAKLXZvaWQgV2ViU2V0 dGluZ3NJbXBsOjpzZXRTZXJpZkZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9p ZCBXZWJTZXR0aW5nc0ltcGw6OnNldFNlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZv bnQsIFVTY3JpcHRDb2RlIHNjcmlwdCkKIHsKICAgICBtX3NldHRpbmdzLT5zZXRTZXJpZkZvbnRG YW1pbHkoKFN0cmluZylmb250KTsKIH0KIAotdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldFNhbnNT ZXJpZkZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9pZCBXZWJTZXR0aW5nc0lt cGw6OnNldFNhbnNTZXJpZkZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250LCBVU2NyaXB0 Q29kZSBzY3JpcHQpCiB7CiAgICAgbV9zZXR0aW5ncy0+c2V0U2Fuc1NlcmlmRm9udEZhbWlseSgo U3RyaW5nKWZvbnQpOwogfQogCi12b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0Q3Vyc2l2ZUZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldEN1 cnNpdmVGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0 KQogewogICAgIG1fc2V0dGluZ3MtPnNldEN1cnNpdmVGb250RmFtaWx5KChTdHJpbmcpZm9udCk7 CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRGYW50YXN5Rm9udEZhbWlseShjb25zdCBX ZWJTdHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0RmFudGFzeUZvbnRGYW1p bHkoY29uc3QgV2ViU3RyaW5nJiBmb250LCBVU2NyaXB0Q29kZSBzY3JpcHQpCiB7CiAgICAgbV9z ZXR0aW5ncy0+c2V0RmFudGFzeUZvbnRGYW1pbHkoKFN0cmluZylmb250KTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgKaW5kZXggNThmMjVjY2Y4ZTBi N2UyNTYxY2YwODA5YzM4YTNiMTI5MDRhMmRjMy4uMTkwNjk5NWRiNzk1MTE5OTQxYmExOTFjNmU1 NjIwZGIwNTE5YWRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi U2V0dGluZ3NJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGlu Z3NJbXBsLmgKQEAgLTQ0LDEyICs0NCwxMiBAQCBwdWJsaWM6CiAgICAgZXhwbGljaXQgV2ViU2V0 dGluZ3NJbXBsKFdlYkNvcmU6OlNldHRpbmdzKik7CiAgICAgdmlydHVhbCB+V2ViU2V0dGluZ3NJ bXBsKCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0U3RhbmRhcmRGb250RmFtaWx5KGNvbnN0 IFdlYlN0cmluZyYpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGaXhlZEZvbnRGYW1pbHkoY29uc3Qg V2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNlcmlmRm9udEZhbWlseShjb25zdCBX ZWJTdHJpbmcmKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0U2Fuc1NlcmlmRm9udEZhbWlseShjb25z dCBXZWJTdHJpbmcmKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoY29u c3QgV2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldEZhbnRhc3lGb250RmFtaWx5KGNv bnN0IFdlYlN0cmluZyYpOworICAgIHZpcnR1YWwgdm9pZCBzZXRTdGFuZGFyZEZvbnRGYW1pbHko Y29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NSSVBUX0NPTU1PTik7CisgICAgdmly dHVhbCB2b2lkIHNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29k ZSA9IFVTQ1JJUFRfQ09NTU9OKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2VyaWZGb250RmFtaWx5 KGNvbnN0IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pOworICAgIHZp cnR1YWwgdm9pZCBzZXRTYW5zU2VyaWZGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3Jp cHRDb2RlID0gVVNDUklQVF9DT01NT04pOworICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJzaXZlRm9u dEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKTsK KyAgICB2aXJ0dWFsIHZvaWQgc2V0RmFudGFzeUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiwg VVNjcmlwdENvZGUgPSBVU0NSSVBUX0NPTU1PTik7CiAgICAgdmlydHVhbCB2b2lkIHNldERlZmF1 bHRGb250U2l6ZShpbnQpOwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWZhdWx0Rml4ZWRGb250U2l6 ZShpbnQpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRNaW5pbXVtRm9udFNpemUoaW50KTsK 103908 2011-08-15 05:39:32 -0700 2011-08-21 22:52:17 -0700 updated patch bug-66220-20110815213930.patch text/plain 6334 falken U3VidmVyc2lvbiBSZXZpc2lvbjogOTI4MzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NDNkNDI1MDBmZjc3NDk0MGM2YmFhNjgwZjQzMTZjNDA5YTM5N2MyOS4uNmU1N2VjZmY1YTIyNjUz ODFiNzViYTYxY2IyZjc4OWM2YzhhNGQ0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMCBAQAorMjAxMS0wOC0xNSAgTWF0dCBGYWxrZW5oYWdlbiAgPGZhbGtlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVcGRhdGUgV2ViU2V0dGluZ3MgdG8gc3Vw cG9ydCBwZXItc2NyaXB0IGZvbnQgc2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGluZ3MuaDoKKyAgICAgICAgKiBz cmMvV2ViU2V0dGluZ3NJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJbXBs OjpzZXRTdGFuZGFyZEZvbnRGYW1pbHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJTZXR0aW5nc0lt cGw6OnNldEZpeGVkRm9udEZhbWlseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1w bDo6c2V0U2VyaWZGb250RmFtaWx5KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJbXBs OjpzZXRTYW5zU2VyaWZGb250RmFtaWx5KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJ bXBsOjpzZXRDdXJzaXZlRm9udEZhbWlseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdz SW1wbDo6c2V0RmFudGFzeUZvbnRGYW1pbHkpOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0lt cGwuaDoKKwogMjAxMS0wOC0xMCAgSm9obiBBYmQtRWwtTWFsZWsgIDxqYW1AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtjaHJvbWl1bV0gVXBkYXRlIFdlYlNjcm9sbGJhciBzbyB0aGF0IGl0IHdv cmtzIHdpdGggb3ZlcmxheSBzY3JvbGxiYXJzIG9uIExpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCmluZGV4IDI1ZTc2YTg2YzlmYjYzNzk5NDIwZmU1YzFh YjVlZmY3NjJhYmRjMDAuLjIyODIzYWYzNDg4NzY4MzhiNGZhODc4MDE0NWU0YzNmZWY2MTAyYzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaApAQCAtMzIs NiArMzIsMTIgQEAKICNkZWZpbmUgV2ViU2V0dGluZ3NfaAogCiAjaW5jbHVkZSAiV2ViQ29tbW9u LmgiCisjaWYgV0VCS0lUX0lNUExFTUVOVEFUSU9OCisjaW5jbHVkZSA8d3RmL3VuaWNvZGUvVW5p Y29kZS5oPgorI2Vsc2UKKyNpbmNsdWRlIDx1bmljb2RlL3VjaGFyLmg+CisjaW5jbHVkZSA8dW5p Y29kZS91c2NyaXB0Lmg+CisjZW5kaWYKIAogI2RlZmluZSBIQVNfV0VCQVVESU9fRkVBVFVSRV9F TkFCTEUgMQogCkBAIC01MSwxMiArNTcsMTIgQEAgcHVibGljOgogICAgICAgICBFZGl0aW5nQmVo YXZpb3JVbml4CiAgICAgfTsKIAotICAgIHZpcnR1YWwgdm9pZCBzZXRTdGFuZGFyZEZvbnRGYW1p bHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGaXhlZEZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTZXJpZkZv bnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTYW5z U2VyaWZGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQg c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwg dm9pZCBzZXRGYW50YXN5Rm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmKSA9IDA7CisgICAgdmly dHVhbCB2b2lkIHNldFN0YW5kYXJkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0 Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldEZpeGVkRm9u dEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9 IDA7CisgICAgdmlydHVhbCB2b2lkIHNldFNlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcm LCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNl dFNhbnNTZXJpZkZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NS SVBUX0NPTU1PTikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJzaXZlRm9udEZhbWlseShj b25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAg dmlydHVhbCB2b2lkIHNldEZhbnRhc3lGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3Jp cHRDb2RlID0gVVNDUklQVF9DT01NT04pID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmYXVs dEZvbnRTaXplKGludCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWZhdWx0Rml4ZWRGb250 U2l6ZShpbnQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TWluaW11bUZvbnRTaXplKGludCkg PSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAK aW5kZXggMDRhMzQyODE0ZTJiYmY2YjBiMjUwNDNlOWRiM2IxZGY3YzJmNzM1YS4uYzQwZWE4NjM4 MzQ4M2EzMzc0ZTYyOGM5ZjAxZTczNDJkZjk3MTI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCkBAIC01NCwzNCArNTQsMzQgQEAgV2ViU2V0 dGluZ3NJbXBsOjpXZWJTZXR0aW5nc0ltcGwoU2V0dGluZ3MqIHNldHRpbmdzKQogICAgIEFTU0VS VChzZXR0aW5ncyk7CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRTdGFuZGFyZEZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldFN0 YW5kYXJkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQsIFVTY3JpcHRDb2RlIHNjcmlw dCkKIHsKLSAgICBtX3NldHRpbmdzLT5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoZm9udCk7CisgICAg bV9zZXR0aW5ncy0+c2V0U3RhbmRhcmRGb250RmFtaWx5KChTdHJpbmcpZm9udCwgc2NyaXB0KTsK IH0KIAotdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJT dHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0Rml4ZWRGb250RmFtaWx5KGNv bnN0IFdlYlN0cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0KQogewotICAgIG1fc2V0dGlu Z3MtPnNldEZpeGVkRm9udEZhbWlseSgoU3RyaW5nKWZvbnQpOworICAgIG1fc2V0dGluZ3MtPnNl dEZpeGVkRm9udEZhbWlseSgoU3RyaW5nKWZvbnQsIHNjcmlwdCk7CiB9CiAKLXZvaWQgV2ViU2V0 dGluZ3NJbXBsOjpzZXRTZXJpZkZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9p ZCBXZWJTZXR0aW5nc0ltcGw6OnNldFNlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZv bnQsIFVTY3JpcHRDb2RlIHNjcmlwdCkKIHsKLSAgICBtX3NldHRpbmdzLT5zZXRTZXJpZkZvbnRG YW1pbHkoKFN0cmluZylmb250KTsKKyAgICBtX3NldHRpbmdzLT5zZXRTZXJpZkZvbnRGYW1pbHko KFN0cmluZylmb250LCBzY3JpcHQpOwogfQogCi12b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0U2Fu c1NlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdz SW1wbDo6c2V0U2Fuc1NlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQsIFVTY3Jp cHRDb2RlIHNjcmlwdCkKIHsKLSAgICBtX3NldHRpbmdzLT5zZXRTYW5zU2VyaWZGb250RmFtaWx5 KChTdHJpbmcpZm9udCk7CisgICAgbV9zZXR0aW5ncy0+c2V0U2Fuc1NlcmlmRm9udEZhbWlseSgo U3RyaW5nKWZvbnQsIHNjcmlwdCk7CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRDdXJz aXZlRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdzSW1w bDo6c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250LCBVU2NyaXB0Q29k ZSBzY3JpcHQpCiB7Ci0gICAgbV9zZXR0aW5ncy0+c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoKFN0cmlu Zylmb250KTsKKyAgICBtX3NldHRpbmdzLT5zZXRDdXJzaXZlRm9udEZhbWlseSgoU3RyaW5nKWZv bnQsIHNjcmlwdCk7CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRGYW50YXN5Rm9udEZh bWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0RmFu dGFzeUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250LCBVU2NyaXB0Q29kZSBzY3JpcHQp CiB7Ci0gICAgbV9zZXR0aW5ncy0+c2V0RmFudGFzeUZvbnRGYW1pbHkoKFN0cmluZylmb250KTsK KyAgICBtX3NldHRpbmdzLT5zZXRGYW50YXN5Rm9udEZhbWlseSgoU3RyaW5nKWZvbnQsIHNjcmlw dCk7CiB9CiAKIHZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXREZWZhdWx0Rm9udFNpemUoaW50IHNp emUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0lt cGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCmluZGV4 IDU4ZjI1Y2NmOGUwYjdlMjU2MWNmMDgwOWMzOGEzYjEyOTA0YTJkYzMuLjE5MDY5OTVkYjc5NTEx OTk0MWJhMTkxYzZlNTYyMGRiMDUxOWFkZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlNldHRpbmdzSW1wbC5oCkBAIC00NCwxMiArNDQsMTIgQEAgcHVibGljOgogICAgIGV4 cGxpY2l0IFdlYlNldHRpbmdzSW1wbChXZWJDb3JlOjpTZXR0aW5ncyopOwogICAgIHZpcnR1YWwg fldlYlNldHRpbmdzSW1wbCgpIHsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNldFN0YW5kYXJkRm9u dEZhbWlseShjb25zdCBXZWJTdHJpbmcmKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Rml4ZWRGb250 RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTZXJpZkZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNhbnNTZXJpZkZv bnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldEN1cnNpdmVG b250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGYW50YXN5 Rm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U3RhbmRh cmRGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01N T04pOworICAgIHZpcnR1YWwgdm9pZCBzZXRGaXhlZEZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5n JiwgVVNjcmlwdENvZGUgPSBVU0NSSVBUX0NPTU1PTik7CisgICAgdmlydHVhbCB2b2lkIHNldFNl cmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09N TU9OKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2Fuc1NlcmlmRm9udEZhbWlseShjb25zdCBXZWJT dHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKTsKKyAgICB2aXJ0dWFsIHZvaWQg c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NS SVBUX0NPTU1PTik7CisgICAgdmlydHVhbCB2b2lkIHNldEZhbnRhc3lGb250RmFtaWx5KGNvbnN0 IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pOwogICAgIHZpcnR1YWwg dm9pZCBzZXREZWZhdWx0Rm9udFNpemUoaW50KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmYXVs dEZpeGVkRm9udFNpemUoaW50KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TWluaW11bUZvbnRTaXpl KGludCk7Cg== 104643 2011-08-21 22:52:24 -0700 2011-08-23 04:33:33 -0700 removed explicit casts bug-66220-20110822145222.patch text/plain 6268 falken U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0OTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ODQ4MGY1NGIwNTZiZjk2ZWNmYjkyMzA1NWFjZjExMGJjMjRmMzRlNi4uM2QwZTI2YmU2OWMxNWE3 MDVkMGMyMWM1Njg4MDZlZjJhMDIxZDE1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMCBAQAorMjAxMS0wOC0yMCAgTWF0dCBGYWxrZW5oYWdlbiAgPGZhbGtlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVcGRhdGUgV2ViU2V0dGluZ3MgdG8gc3Vw cG9ydCBwZXItc2NyaXB0IGZvbnQgc2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGluZ3MuaDoKKyAgICAgICAgKiBz cmMvV2ViU2V0dGluZ3NJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJbXBs OjpzZXRTdGFuZGFyZEZvbnRGYW1pbHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJTZXR0aW5nc0lt cGw6OnNldEZpeGVkRm9udEZhbWlseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdzSW1w bDo6c2V0U2VyaWZGb250RmFtaWx5KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJbXBs OjpzZXRTYW5zU2VyaWZGb250RmFtaWx5KToKKyAgICAgICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJ bXBsOjpzZXRDdXJzaXZlRm9udEZhbWlseSk6CisgICAgICAgIChXZWJLaXQ6OldlYlNldHRpbmdz SW1wbDo6c2V0RmFudGFzeUZvbnRGYW1pbHkpOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0lt cGwuaDoKKwogMjAxMS0wOC0yMCAgTmVib2pzYSBDaXJpYyAgPGNpcmFAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIEFkZCBkZXBlbmRlbmN5IG9uIHY4LWkxOG4gbGlicmFyeS4gV2UgdXNlZCB2OCBy ZXBvc2l0b3J5IGJlZm9yZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlNldHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTZXR0 aW5ncy5oCmluZGV4IDI1ZTc2YTg2YzlmYjYzNzk5NDIwZmU1YzFhYjVlZmY3NjJhYmRjMDAuLjIy ODIzYWYzNDg4NzY4MzhiNGZhODc4MDE0NWU0YzNmZWY2MTAyYzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaApAQCAtMzIsNiArMzIsMTIgQEAKICNkZWZp bmUgV2ViU2V0dGluZ3NfaAogCiAjaW5jbHVkZSAiV2ViQ29tbW9uLmgiCisjaWYgV0VCS0lUX0lN UExFTUVOVEFUSU9OCisjaW5jbHVkZSA8d3RmL3VuaWNvZGUvVW5pY29kZS5oPgorI2Vsc2UKKyNp bmNsdWRlIDx1bmljb2RlL3VjaGFyLmg+CisjaW5jbHVkZSA8dW5pY29kZS91c2NyaXB0Lmg+Cisj ZW5kaWYKIAogI2RlZmluZSBIQVNfV0VCQVVESU9fRkVBVFVSRV9FTkFCTEUgMQogCkBAIC01MSwx MiArNTcsMTIgQEAgcHVibGljOgogICAgICAgICBFZGl0aW5nQmVoYXZpb3JVbml4CiAgICAgfTsK IAotICAgIHZpcnR1YWwgdm9pZCBzZXRTdGFuZGFyZEZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5n JikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGaXhlZEZvbnRGYW1pbHkoY29uc3QgV2ViU3Ry aW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTZXJpZkZvbnRGYW1pbHkoY29uc3QgV2Vi U3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTYW5zU2VyaWZGb250RmFtaWx5KGNv bnN0IFdlYlN0cmluZyYpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q3Vyc2l2ZUZvbnRGYW1p bHkoY29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGYW50YXN5Rm9u dEZhbWlseShjb25zdCBXZWJTdHJpbmcmKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldFN0YW5k YXJkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09N TU9OKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJT dHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAgdmlydHVhbCB2 b2lkIHNldFNlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVT Q1JJUFRfQ09NTU9OKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldFNhbnNTZXJpZkZvbnRGYW1p bHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NSSVBUX0NPTU1PTikgPSAwOwor ICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJzaXZlRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBV U2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldEZh bnRhc3lGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9D T01NT04pID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmYXVsdEZvbnRTaXplKGludCkgPSAw OwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWZhdWx0Rml4ZWRGb250U2l6ZShpbnQpID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0TWluaW11bUZvbnRTaXplKGludCkgPSAwOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5jcHAKaW5kZXggMDRhMzQyODE0ZTJi YmY2YjBiMjUwNDNlOWRiM2IxZGY3YzJmNzM1YS4uYjQ2MzQwMTkxZTJmYjYxMmQ2Y2YzM2NhZDY3 OTY2ZDNiMGQyMzRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi U2V0dGluZ3NJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0 aW5nc0ltcGwuY3BwCkBAIC01NCwzNCArNTQsMzQgQEAgV2ViU2V0dGluZ3NJbXBsOjpXZWJTZXR0 aW5nc0ltcGwoU2V0dGluZ3MqIHNldHRpbmdzKQogICAgIEFTU0VSVChzZXR0aW5ncyk7CiB9CiAK LXZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRTdGFuZGFyZEZvbnRGYW1pbHkoY29uc3QgV2ViU3Ry aW5nJiBmb250KQordm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldFN0YW5kYXJkRm9udEZhbWlseShj b25zdCBXZWJTdHJpbmcmIGZvbnQsIFVTY3JpcHRDb2RlIHNjcmlwdCkKIHsKLSAgICBtX3NldHRp bmdzLT5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoZm9udCk7CisgICAgbV9zZXR0aW5ncy0+c2V0U3Rh bmRhcmRGb250RmFtaWx5KGZvbnQsIHNjcmlwdCk7CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBs OjpzZXRGaXhlZEZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9pZCBXZWJTZXR0 aW5nc0ltcGw6OnNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQsIFVTY3Jp cHRDb2RlIHNjcmlwdCkKIHsKLSAgICBtX3NldHRpbmdzLT5zZXRGaXhlZEZvbnRGYW1pbHkoKFN0 cmluZylmb250KTsKKyAgICBtX3NldHRpbmdzLT5zZXRGaXhlZEZvbnRGYW1pbHkoZm9udCwgc2Ny aXB0KTsKIH0KIAotdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldFNlcmlmRm9udEZhbWlseShjb25z dCBXZWJTdHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0U2VyaWZGb250RmFt aWx5KGNvbnN0IFdlYlN0cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0KQogewotICAgIG1f c2V0dGluZ3MtPnNldFNlcmlmRm9udEZhbWlseSgoU3RyaW5nKWZvbnQpOworICAgIG1fc2V0dGlu Z3MtPnNldFNlcmlmRm9udEZhbWlseShmb250LCBzY3JpcHQpOwogfQogCi12b2lkIFdlYlNldHRp bmdzSW1wbDo6c2V0U2Fuc1NlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQpCit2 b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0U2Fuc1NlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJp bmcmIGZvbnQsIFVTY3JpcHRDb2RlIHNjcmlwdCkKIHsKLSAgICBtX3NldHRpbmdzLT5zZXRTYW5z U2VyaWZGb250RmFtaWx5KChTdHJpbmcpZm9udCk7CisgICAgbV9zZXR0aW5ncy0+c2V0U2Fuc1Nl cmlmRm9udEZhbWlseShmb250LCBzY3JpcHQpOwogfQogCi12b2lkIFdlYlNldHRpbmdzSW1wbDo6 c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9pZCBXZWJTZXR0 aW5nc0ltcGw6OnNldEN1cnNpdmVGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYgZm9udCwgVVNj cmlwdENvZGUgc2NyaXB0KQogewotICAgIG1fc2V0dGluZ3MtPnNldEN1cnNpdmVGb250RmFtaWx5 KChTdHJpbmcpZm9udCk7CisgICAgbV9zZXR0aW5ncy0+c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoZm9u dCwgc2NyaXB0KTsKIH0KIAotdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldEZhbnRhc3lGb250RmFt aWx5KGNvbnN0IFdlYlN0cmluZyYgZm9udCkKK3ZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRGYW50 YXN5Rm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQsIFVTY3JpcHRDb2RlIHNjcmlwdCkK IHsKLSAgICBtX3NldHRpbmdzLT5zZXRGYW50YXN5Rm9udEZhbWlseSgoU3RyaW5nKWZvbnQpOwor ICAgIG1fc2V0dGluZ3MtPnNldEZhbnRhc3lGb250RmFtaWx5KGZvbnQsIHNjcmlwdCk7CiB9CiAK IHZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXREZWZhdWx0Rm9udFNpemUoaW50IHNpemUpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oCmluZGV4IDU4ZjI1Y2Nm OGUwYjdlMjU2MWNmMDgwOWMzOGEzYjEyOTA0YTJkYzMuLjE5MDY5OTVkYjc5NTExOTk0MWJhMTkx YzZlNTYyMGRiMDUxOWFkZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNldHRpbmdzSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNl dHRpbmdzSW1wbC5oCkBAIC00NCwxMiArNDQsMTIgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IFdl YlNldHRpbmdzSW1wbChXZWJDb3JlOjpTZXR0aW5ncyopOwogICAgIHZpcnR1YWwgfldlYlNldHRp bmdzSW1wbCgpIHsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNldFN0YW5kYXJkRm9udEZhbWlseShj b25zdCBXZWJTdHJpbmcmKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Rml4ZWRGb250RmFtaWx5KGNv bnN0IFdlYlN0cmluZyYpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRTZXJpZkZvbnRGYW1pbHkoY29u c3QgV2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNhbnNTZXJpZkZvbnRGYW1pbHko Y29uc3QgV2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldEN1cnNpdmVGb250RmFtaWx5 KGNvbnN0IFdlYlN0cmluZyYpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGYW50YXN5Rm9udEZhbWls eShjb25zdCBXZWJTdHJpbmcmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U3RhbmRhcmRGb250RmFt aWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pOworICAg IHZpcnR1YWwgdm9pZCBzZXRGaXhlZEZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlw dENvZGUgPSBVU0NSSVBUX0NPTU1PTik7CisgICAgdmlydHVhbCB2b2lkIHNldFNlcmlmRm9udEZh bWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKTsKKyAg ICB2aXJ0dWFsIHZvaWQgc2V0U2Fuc1NlcmlmRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBV U2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q3Vyc2l2 ZUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NSSVBUX0NPTU1P Tik7CisgICAgdmlydHVhbCB2b2lkIHNldEZhbnRhc3lGb250RmFtaWx5KGNvbnN0IFdlYlN0cmlu ZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pOwogICAgIHZpcnR1YWwgdm9pZCBzZXRE ZWZhdWx0Rm9udFNpemUoaW50KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0RGVmYXVsdEZpeGVkRm9u dFNpemUoaW50KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TWluaW11bUZvbnRTaXplKGludCk7Cg== 104817 2011-08-23 04:33:42 -0700 2011-08-23 11:30:45 -0700 added ICU dependency bug-66220-20110823203340.patch text/plain 7239 falken U3VidmVyc2lvbiBSZXZpc2lvbjogOTM1NzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg MTYyYjFiNWYxOGI5YmZiMjUwNmY3NjU5NzU4ZTE2YmUyOTJjYjkwMC4uNWFkYzMzY2IzMDZlOTkz NzkyYjliY2Q0ODIxYmU0NDI0NjNhMGVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAxMS0wOC0yMyAgTWF0dCBGYWxrZW5oYWdlbiAgPGZhbGtlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVcGRhdGUgV2ViU2V0dGluZ3MgdG8gc3Vw cG9ydCBwZXItc2NyaXB0IGZvbnQgc2V0dGluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQuZ3lwOgorICAgICAgICAqIHB1YmxpYy9XZWJT ZXR0aW5ncy5oOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0ltcGwuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OnNldFN0YW5kYXJkRm9udEZhbWlseSk6CisgICAgICAg IChXZWJLaXQ6OldlYlNldHRpbmdzSW1wbDo6c2V0Rml4ZWRGb250RmFtaWx5KToKKyAgICAgICAg KFdlYktpdDo6V2ViU2V0dGluZ3NJbXBsOjpzZXRTZXJpZkZvbnRGYW1pbHkpOgorICAgICAgICAo V2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OnNldFNhbnNTZXJpZkZvbnRGYW1pbHkpOgorICAgICAg ICAoV2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OnNldEN1cnNpdmVGb250RmFtaWx5KToKKyAgICAg ICAgKFdlYktpdDo6V2ViU2V0dGluZ3NJbXBsOjpzZXRGYW50YXN5Rm9udEZhbWlseSk6CisgICAg ICAgICogc3JjL1dlYlNldHRpbmdzSW1wbC5oOgorCiAyMDExLTA4LTIyICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByOTM1NzUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktp dC5neXAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5kZXggOTRhZDFmYzE5 YTdlZDAwODNlZmFkM2I5M2VlZjNiZWIxODAyOWM5MC4uZTdhYTNjYTE2ZDU3NzU4MTYzMGYzMzFi MDYxMWU5N2MwZjFhMmNlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJL aXQuZ3lwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApAQCAtNjksMTIg KzY5LDE0IEBACiAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzogWwogICAgICAgICAgICAgICAg ICcuLi8uLi9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwOndlYmNvcmUnLAogICAgICAg ICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3NraWEvc2tpYS5neXA6c2tpYScsCisgICAg ICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhpcmRfcGFydHkvaWN1L2ljdS5neXA6 aWN1dWMnLAogICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3RoaXJkX3BhcnR5 L25wYXBpL25wYXBpLmd5cDpucGFwaScsCiAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3Jj X2RpcikvdGhpcmRfcGFydHkvYW5nbGUvc3JjL2J1aWxkX2FuZ2xlLmd5cDp0cmFuc2xhdG9yX2ds c2wnLAogICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3Y4L3Rvb2xzL2d5cC92 OC5neXA6djgnLAogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdleHBvcnRfZGVwZW5kZW50 X3NldHRpbmdzJzogWwogICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3NraWEv c2tpYS5neXA6c2tpYScsCisgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhp cmRfcGFydHkvaWN1L2ljdS5neXA6aWN1dWMnLAogICAgICAgICAgICAgICAgICc8KGNocm9taXVt X3NyY19kaXIpL3RoaXJkX3BhcnR5L25wYXBpL25wYXBpLmd5cDpucGFwaScsCiAgICAgICAgICAg ICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdjgvdG9vbHMvZ3lwL3Y4Lmd5cDp2OCcsCiAgICAg ICAgICAgICBdLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi U2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNldHRpbmdzLmgK aW5kZXggMjVlNzZhODZjOWZiNjM3OTk0MjBmZTVjMWFiNWVmZjc2MmFiZGMwMC4uMDQ0ZDA2MTg3 NzRmZWY0MTg1M2M2YjAxYzIyOGU3NjgwM2VjYzM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViU2V0dGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJTZXR0aW5ncy5oCkBAIC0zMiw2ICszMiw3IEBACiAjZGVmaW5lIFdlYlNl dHRpbmdzX2gKIAogI2luY2x1ZGUgIldlYkNvbW1vbi5oIgorI2luY2x1ZGUgPHVuaWNvZGUvdXNj cmlwdC5oPgogCiAjZGVmaW5lIEhBU19XRUJBVURJT19GRUFUVVJFX0VOQUJMRSAxCiAKQEAgLTUx LDEyICs1MiwxMiBAQCBwdWJsaWM6CiAgICAgICAgIEVkaXRpbmdCZWhhdmlvclVuaXgKICAgICB9 OwogCi0gICAgdmlydHVhbCB2b2lkIHNldFN0YW5kYXJkRm9udEZhbWlseShjb25zdCBXZWJTdHJp bmcmKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIHNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJT dHJpbmcmKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNlcmlmRm9udEZhbWlseShjb25zdCBX ZWJTdHJpbmcmKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNhbnNTZXJpZkZvbnRGYW1pbHko Y29uc3QgV2ViU3RyaW5nJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJzaXZlRm9udEZh bWlseShjb25zdCBXZWJTdHJpbmcmKSA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIHNldEZhbnRhc3lG b250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U3Rh bmRhcmRGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9D T01NT04pID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Rml4ZWRGb250RmFtaWx5KGNvbnN0IFdl YlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pID0gMDsKKyAgICB2aXJ0dWFs IHZvaWQgc2V0U2VyaWZGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0g VVNDUklQVF9DT01NT04pID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2Fuc1NlcmlmRm9udEZh bWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKSA9IDA7 CisgICAgdmlydHVhbCB2b2lkIHNldEN1cnNpdmVGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYs IFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0 RmFudGFzeUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NSSVBU X0NPTU1PTikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWZhdWx0Rm9udFNpemUoaW50KSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIHNldERlZmF1bHRGaXhlZEZvbnRTaXplKGludCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRNaW5pbXVtRm9udFNpemUoaW50KSA9IDA7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAppbmRleCAwNGEzNDI4MTRl MmJiZjZiMGIyNTA0M2U5ZGIzYjFkZjdjMmY3MzVhLi5iNDYzNDAxOTFlMmZiNjEyZDZjZjMzY2Fk Njc5NjZkM2IwZDIzNGVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJTZXR0aW5nc0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNl dHRpbmdzSW1wbC5jcHAKQEAgLTU0LDM0ICs1NCwzNCBAQCBXZWJTZXR0aW5nc0ltcGw6OldlYlNl dHRpbmdzSW1wbChTZXR0aW5ncyogc2V0dGluZ3MpCiAgICAgQVNTRVJUKHNldHRpbmdzKTsKIH0K IAotdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldFN0YW5kYXJkRm9udEZhbWlseShjb25zdCBXZWJT dHJpbmcmIGZvbnQpCit2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0U3RhbmRhcmRGb250RmFtaWx5 KGNvbnN0IFdlYlN0cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0KQogewotICAgIG1fc2V0 dGluZ3MtPnNldFN0YW5kYXJkRm9udEZhbWlseShmb250KTsKKyAgICBtX3NldHRpbmdzLT5zZXRT dGFuZGFyZEZvbnRGYW1pbHkoZm9udCwgc2NyaXB0KTsKIH0KIAotdm9pZCBXZWJTZXR0aW5nc0lt cGw6OnNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQpCit2b2lkIFdlYlNl dHRpbmdzSW1wbDo6c2V0Rml4ZWRGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYgZm9udCwgVVNj cmlwdENvZGUgc2NyaXB0KQogewotICAgIG1fc2V0dGluZ3MtPnNldEZpeGVkRm9udEZhbWlseSgo U3RyaW5nKWZvbnQpOworICAgIG1fc2V0dGluZ3MtPnNldEZpeGVkRm9udEZhbWlseShmb250LCBz Y3JpcHQpOwogfQogCi12b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0U2VyaWZGb250RmFtaWx5KGNv bnN0IFdlYlN0cmluZyYgZm9udCkKK3ZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRTZXJpZkZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250LCBVU2NyaXB0Q29kZSBzY3JpcHQpCiB7Ci0gICAg bV9zZXR0aW5ncy0+c2V0U2VyaWZGb250RmFtaWx5KChTdHJpbmcpZm9udCk7CisgICAgbV9zZXR0 aW5ncy0+c2V0U2VyaWZGb250RmFtaWx5KGZvbnQsIHNjcmlwdCk7CiB9CiAKLXZvaWQgV2ViU2V0 dGluZ3NJbXBsOjpzZXRTYW5zU2VyaWZGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYgZm9udCkK K3ZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRTYW5zU2VyaWZGb250RmFtaWx5KGNvbnN0IFdlYlN0 cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0KQogewotICAgIG1fc2V0dGluZ3MtPnNldFNh bnNTZXJpZkZvbnRGYW1pbHkoKFN0cmluZylmb250KTsKKyAgICBtX3NldHRpbmdzLT5zZXRTYW5z U2VyaWZGb250RmFtaWx5KGZvbnQsIHNjcmlwdCk7CiB9CiAKLXZvaWQgV2ViU2V0dGluZ3NJbXBs OjpzZXRDdXJzaXZlRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmIGZvbnQpCit2b2lkIFdlYlNl dHRpbmdzSW1wbDo6c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250LCBV U2NyaXB0Q29kZSBzY3JpcHQpCiB7Ci0gICAgbV9zZXR0aW5ncy0+c2V0Q3Vyc2l2ZUZvbnRGYW1p bHkoKFN0cmluZylmb250KTsKKyAgICBtX3NldHRpbmdzLT5zZXRDdXJzaXZlRm9udEZhbWlseShm b250LCBzY3JpcHQpOwogfQogCi12b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0RmFudGFzeUZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJiBmb250KQordm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldEZh bnRhc3lGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYgZm9udCwgVVNjcmlwdENvZGUgc2NyaXB0 KQogewotICAgIG1fc2V0dGluZ3MtPnNldEZhbnRhc3lGb250RmFtaWx5KChTdHJpbmcpZm9udCk7 CisgICAgbV9zZXR0aW5ncy0+c2V0RmFudGFzeUZvbnRGYW1pbHkoZm9udCwgc2NyaXB0KTsKIH0K IAogdm9pZCBXZWJTZXR0aW5nc0ltcGw6OnNldERlZmF1bHRGb250U2l6ZShpbnQgc2l6ZSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlNldHRpbmdzSW1wbC5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgKaW5kZXggNThmMjVj Y2Y4ZTBiN2UyNTYxY2YwODA5YzM4YTNiMTI5MDRhMmRjMy4uMTkwNjk5NWRiNzk1MTE5OTQxYmEx OTFjNmU1NjIwZGIwNTE5YWRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViU2V0dGluZ3NJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi U2V0dGluZ3NJbXBsLmgKQEAgLTQ0LDEyICs0NCwxMiBAQCBwdWJsaWM6CiAgICAgZXhwbGljaXQg V2ViU2V0dGluZ3NJbXBsKFdlYkNvcmU6OlNldHRpbmdzKik7CiAgICAgdmlydHVhbCB+V2ViU2V0 dGluZ3NJbXBsKCkgeyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0U3RhbmRhcmRGb250RmFtaWx5 KGNvbnN0IFdlYlN0cmluZyYpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRGaXhlZEZvbnRGYW1pbHko Y29uc3QgV2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNlcmlmRm9udEZhbWlseShj b25zdCBXZWJTdHJpbmcmKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0U2Fuc1NlcmlmRm9udEZhbWls eShjb25zdCBXZWJTdHJpbmcmKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q3Vyc2l2ZUZvbnRGYW1p bHkoY29uc3QgV2ViU3RyaW5nJik7Ci0gICAgdmlydHVhbCB2b2lkIHNldEZhbnRhc3lGb250RmFt aWx5KGNvbnN0IFdlYlN0cmluZyYpOworICAgIHZpcnR1YWwgdm9pZCBzZXRTdGFuZGFyZEZvbnRG YW1pbHkoY29uc3QgV2ViU3RyaW5nJiwgVVNjcmlwdENvZGUgPSBVU0NSSVBUX0NPTU1PTik7Cisg ICAgdmlydHVhbCB2b2lkIHNldEZpeGVkRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2Ny aXB0Q29kZSA9IFVTQ1JJUFRfQ09NTU9OKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2VyaWZGb250 RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYsIFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pOwor ICAgIHZpcnR1YWwgdm9pZCBzZXRTYW5zU2VyaWZGb250RmFtaWx5KGNvbnN0IFdlYlN0cmluZyYs IFVTY3JpcHRDb2RlID0gVVNDUklQVF9DT01NT04pOworICAgIHZpcnR1YWwgdm9pZCBzZXRDdXJz aXZlRm9udEZhbWlseShjb25zdCBXZWJTdHJpbmcmLCBVU2NyaXB0Q29kZSA9IFVTQ1JJUFRfQ09N TU9OKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0RmFudGFzeUZvbnRGYW1pbHkoY29uc3QgV2ViU3Ry aW5nJiwgVVNjcmlwdENvZGUgPSBVU0NSSVBUX0NPTU1PTik7CiAgICAgdmlydHVhbCB2b2lkIHNl dERlZmF1bHRGb250U2l6ZShpbnQpOwogICAgIHZpcnR1YWwgdm9pZCBzZXREZWZhdWx0Rml4ZWRG b250U2l6ZShpbnQpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRNaW5pbXVtRm9udFNpemUoaW50KTsK