123668 2013-11-02 10:34:22 -0700 Fix UnicodeWchar after r157330. 2013-11-02 14:45:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 122635 1 paroga paroga commit-queue darin oldest_to_newest 946232 0 paroga 2013-11-02 10:34:22 -0700 Fix UnicodeWchar after r157330. 946233 1 215811 paroga 2013-11-02 10:36:15 -0700 Created attachment 215811 Patch 946236 2 commit-queue 2013-11-02 10:38:52 -0700 Attachment 215811 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp', u'Source/WTF/wtf/unicode/wchar/UnicodeWchar.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/editing/TextIterator.cpp', u'Source/WebCore/platform/graphics/wince/FontWinCE.cpp', u'Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp', u'Source/WebCore/platform/text/wchar/TextBreakIteratorWchar.cpp']" exit_code: 1 Source/WTF/wtf/unicode/wchar/UnicodeWchar.h:66: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Source/WTF/wtf/unicode/wchar/UnicodeWchar.h:119: More than one command on the same line [whitespace/newline] [4] Source/WTF/wtf/unicode/wchar/UnicodeWchar.h:119: u_foldCase is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/unicode/wchar/UnicodeWchar.h:123: u_isprint is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/unicode/wchar/UnicodeWchar.h:125: u_isspace is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 5 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 946306 3 215811 darin 2013-11-02 14:19:20 -0700 Comment on attachment 215811 Patch This looks fine. I’d like you to go further and move these functions into files with the names of the ICU header files instead of UnicodeWchar.h/cpp, and put them in a directory with some name like "FakeICU" or whatever we want to call this minimal ICU-compatible shim you are using for WinCE. This requires changes to the WinCE build system, which is why I didn’t do it. 946308 4 paroga 2013-11-02 14:21:11 -0700 (In reply to comment #3) > (From update of attachment 215811 [details]) > This looks fine. I’d like you to go further and move these functions into files with the names of the ICU header files instead of UnicodeWchar.h/cpp, and put them in a directory with some name like "FakeICU" or whatever we want to call this minimal ICU-compatible shim you are using for WinCE. > > This requires changes to the WinCE build system, which is why I didn’t do it. That's exactly my plan, but I want to fix the build errors first. :-) 946311 5 215811 commit-queue 2013-11-02 14:45:54 -0700 Comment on attachment 215811 Patch Clearing flags on attachment: 215811 Committed r158499: <http://trac.webkit.org/changeset/158499> 946312 6 commit-queue 2013-11-02 14:45:56 -0700 All reviewed patches have been landed. Closing bug. 215811 2013-11-02 10:36:15 -0700 2013-11-02 14:45:54 -0700 Patch bug-123668-20131102183615.patch text/plain 11452 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4NDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDM4ZDQzYjVlNTM1N2Q4ODU1NjU2Njc5 ZTJlMmEzMThkMGQ4NGNiZTkuLjBjNmRiYmYzM2NlNjk3MjljYzE3ZTRlNTIxNGQxNjZmOTc1MTYy MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMTEtMDIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8 cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IFVuaWNvZGVXY2hhciBhZnRlciByMTU3 MzMwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIz NjY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3 dGYvdW5pY29kZS93Y2hhci9Vbmljb2RlV2NoYXIuY3BwOgorICAgICAgICAodW5vcm1fbm9ybWFs aXplKToKKyAgICAgICAgKHVfc3RyRm9sZENhc2UpOgorICAgICAgICAodV9zdHJUb0xvd2VyKToK KyAgICAgICAgKHVfc3RyVG9VcHBlcik6CisgICAgICAgICogd3RmL3VuaWNvZGUvd2NoYXIvVW5p Y29kZVdjaGFyLmg6CisgICAgICAgICh1X2ZvbGRDYXNlKToKKyAgICAgICAgKHVfaXNwcmludCk6 CisgICAgICAgICh1X2lzc3BhY2UpOgorCiAyMDEzLTExLTAyICBBbmRyZWFzIEtsaW5nICA8YWts aW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBTdHJpbmdJbXBsOjp1cHBlcigpIHNob3VsZCByZXR1 cm4gUGFzc1JlZi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0OTQxMzg2YmMzMDA3ODU1MzA0YWI4NWVjMGU4OGVh ZmIxOGE3MDQyLi5hMWIxY2YzMDhiM2QwOTE4OTEyMmZkNmZjMTg3ODZlNjhlMGFiMDY4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTMtMTEtMDIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8 cGFyb2dhQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgRml4IFVuaWNvZGVXY2hhciBhZnRlciByMTU3 MzMwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIz NjY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBl ZGl0aW5nL1RleHRJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWFyY2hCdWZmZXI6 OmFwcGVuZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9udFdpbkNFLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmdlbmVyYXRlQ29tcG9uZW50cyk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0V2luQ0UuY3BwOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0v dGV4dC93Y2hhci9UZXh0QnJlYWtJdGVyYXRvcldjaGFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmlzQ2hhclN0b3ApOgorICAgICAgICAoV2ViQ29yZTo6aXNMaW5lU3RvcCk6CisgICAgICAgIChX ZWJDb3JlOjppc1NlbnRlbmNlU3RvcCk6CisgICAgICAgIChXZWJDb3JlOjpXb3JkQnJlYWtJdGVy YXRvcjo6bmV4dCk6CisgICAgICAgIChXZWJDb3JlOjpXb3JkQnJlYWtJdGVyYXRvcjo6cHJldmlv dXMpOgorCisyMDEzLTExLTAyICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3Jn PgorCiAgICAgICAgIFZhcmlvdXMgc21hbGwgV2luQ0UgYnVpbGQgZml4ZXMKIAogICAgICAgICAq IGVkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3Vu aWNvZGUvd2NoYXIvVW5pY29kZVdjaGFyLmNwcCBiL1NvdXJjZS9XVEYvd3RmL3VuaWNvZGUvd2No YXIvVW5pY29kZVdjaGFyLmNwcAppbmRleCBmMTdjMDUyNjdhNDBmZjE2NjE5ODg1N2JmMjQ2N2Yz NWIwMzJlZWNmLi5kZmRjNzNkMDZmMTM4ODliZThjNDJhZWY3MTI3NTVkMDZhOTliMTIxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi91bmljb2RlL3djaGFyL1VuaWNvZGVXY2hhci5jcHAKKysr IGIvU291cmNlL1dURi93dGYvdW5pY29kZS93Y2hhci9Vbmljb2RlV2NoYXIuY3BwCkBAIC0zMCw2 ICszMCw3IEBACiBpbnQgdW5vcm1fbm9ybWFsaXplKGNvbnN0IFVDaGFyKiwgaW50MzJfdCwgVU5v cm1hbGl6YXRpb25Nb2RlLCBpbnQzMl90LCBVQ2hhciosIGludDMyX3QsIFVFcnJvckNvZGUqKQog ewogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiAwOwogfQogCiBVQ2hhckRp cmVjdGlvbiB1X2NoYXJEaXJlY3Rpb24oVUNoYXIzMikKQEAgLTgyLDcgKzgzLDcgQEAgaW50IHVf bWVtY2FzZWNtcChjb25zdCBVQ2hhciogYSwgY29uc3QgVUNoYXIqIGIsIGludCBsZW5ndGgsIHVu c2lnbmVkIG9wdGlvbnMpCiAgICAgcmV0dXJuIDA7CiB9CiAKLXRlbXBsYXRlPFVDaGFyIEZ1bmN0 aW9uKFVDaGFyKT4KK3RlbXBsYXRlPHdpbnRfdCBGdW5jdGlvbih3aW50X3QpPgogc3RhdGljIGlu bGluZSBpbnQgY29udmVydFdpdGhGdW5jdGlvbihVQ2hhciogcmVzdWx0LCBpbnQgcmVzdWx0TGVu Z3RoLCBjb25zdCBVQ2hhciogc291cmNlLCBpbnQgc291cmNlTGVuZ3RoLCBVRXJyb3JDb2RlJiBz dGF0dXMpCiB7CiAgICAgVUNoYXIqIHJlc3VsdEl0ZXJhdG9yID0gcmVzdWx0OwpAQCAtMTAwLDE1 ICsxMDEsMTUgQEAgc3RhdGljIGlubGluZSBpbnQgY29udmVydFdpdGhGdW5jdGlvbihVQ2hhciog cmVzdWx0LCBpbnQgcmVzdWx0TGVuZ3RoLCBjb25zdCBVQ2gKIGludCB1X3N0ckZvbGRDYXNlKFVD aGFyKiByZXN1bHQsIGludCByZXN1bHRMZW5ndGgsIGNvbnN0IFVDaGFyKiBzb3VyY2UsIGludCBz b3VyY2VMZW5ndGgsIHVuc2lnbmVkIG9wdGlvbnMsIFVFcnJvckNvZGUqIHN0YXR1cykKIHsKICAg ICBBU1NFUlRfVU5VU0VEKG9wdGlvbnMsIG9wdGlvbnMgPT0gVV9GT0xEX0NBU0VfREVGQVVMVCk7 Ci0gICAgcmV0dXJuIGNvbnZlcnRXaXRoRnVuY3Rpb248dV9mb2xkQ2FzZT4ocmVzdWx0LCByZXN1 bHRMZW5ndGgsIHNvdXJjZSwgc291cmNlTGVuZ3RoLCAqc3RhdHVzKTsKKyAgICByZXR1cm4gY29u dmVydFdpdGhGdW5jdGlvbjx0b3dsb3dlcj4ocmVzdWx0LCByZXN1bHRMZW5ndGgsIHNvdXJjZSwg c291cmNlTGVuZ3RoLCAqc3RhdHVzKTsKIH0KIAogaW50IHVfc3RyVG9Mb3dlcihVQ2hhciogcmVz dWx0LCBpbnQgcmVzdWx0TGVuZ3RoLCBjb25zdCBVQ2hhciogc291cmNlLCBpbnQgc291cmNlTGVu Z3RoLCBjb25zdCBjaGFyKiwgVUVycm9yQ29kZSogc3RhdHVzKQogewotICAgIHJldHVybiBjb252 ZXJ0V2l0aEZ1bmN0aW9uPHVfdG9sb3dlcj4ocmVzdWx0LCByZXN1bHRMZW5ndGgsIHNvdXJjZSwg c291cmNlTGVuZ3RoLCAqc3RhdHVzKTsKKyAgICByZXR1cm4gY29udmVydFdpdGhGdW5jdGlvbjx0 b3dsb3dlcj4ocmVzdWx0LCByZXN1bHRMZW5ndGgsIHNvdXJjZSwgc291cmNlTGVuZ3RoLCAqc3Rh dHVzKTsKIH0KIAogaW50IHVfc3RyVG9VcHBlcihVQ2hhciogcmVzdWx0LCBpbnQgcmVzdWx0TGVu Z3RoLCBjb25zdCBVQ2hhciogc291cmNlLCBpbnQgc291cmNlTGVuZ3RoLCBjb25zdCBjaGFyKiwg VUVycm9yQ29kZSogc3RhdHVzKQogewotICAgIHJldHVybiBjb252ZXJ0V2l0aEZ1bmN0aW9uPHVf dG91cHBlcj4ocmVzdWx0LCByZXN1bHRMZW5ndGgsIHNvdXJjZSwgc291cmNlTGVuZ3RoLCAqc3Rh dHVzKTsKKyAgICByZXR1cm4gY29udmVydFdpdGhGdW5jdGlvbjx0b3d1cHBlcj4ocmVzdWx0LCBy ZXN1bHRMZW5ndGgsIHNvdXJjZSwgc291cmNlTGVuZ3RoLCAqc3RhdHVzKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XVEYvd3RmL3VuaWNvZGUvd2NoYXIvVW5pY29kZVdjaGFyLmggYi9Tb3VyY2Uv V1RGL3d0Zi91bmljb2RlL3djaGFyL1VuaWNvZGVXY2hhci5oCmluZGV4IDIyMDZlZGU4MTkwZjFi OTgwZmY1YWNmZWE2ZDEwNzU4ZDk0M2ZhMzMuLjA4MjEyYjZjMTJlZjJiNzM3NTllOWNkMWQ1ZGQ3 MDQ2OWRkYWJiOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3VuaWNvZGUvd2NoYXIvVW5p Y29kZVdjaGFyLmgKKysrIGIvU291cmNlL1dURi93dGYvdW5pY29kZS93Y2hhci9Vbmljb2RlV2No YXIuaApAQCAtNjMsNyArNjMsNyBAQCBlbnVtIFVDaGFyRGlyZWN0aW9uIHsKICAgICBVX0JPVU5E QVJZX05FVVRSQUwKIH07CiAKLWVudW0gVURlY29tcG9zaXRpb25UeXBlIHsgVV9EVF9OT05FLCBV X0RUX0NPTVBBVCwgVV9EVF9GT05UIH0KK2VudW0gVURlY29tcG9zaXRpb25UeXBlIHsgVV9EVF9O T05FLCBVX0RUX0NPTVBBVCwgVV9EVF9GT05UIH07CiAKIGVudW0gVUVycm9yQ29kZSB7IFVfWkVS T19FUlJPUiA9IDAsIFVfRVJST1IgfTsKIApAQCAtNzksNiArNzksNyBAQCBlbnVtIHsgVU5PUk1f VU5JQ09ERV8zXzIgfTsKIC8vIGlzIGltcGxlbWVudGVkLCB0aGF0J3Mgbm90IHJlYWxseSB3b3J0 aCB0aGUgdGltZS4KIAogI2RlZmluZSBVX0dDX0NDX01BU0sgMAorI2RlZmluZSBVX0dDX0NTX01B U0sgMAogI2RlZmluZSBVX0dDX0NGX01BU0sgMAogI2RlZmluZSBVX0dDX0NOX01BU0sgMAogI2Rl ZmluZSBVX0dDX0xMX01BU0sgMApAQCAtMTE0LDEyICsxMTUsMTQgQEAgaW5saW5lIFVCbG9ja0Nv ZGUgdWJsb2NrX2dldENvZGUoVUNoYXIzMiBjaGFyYWN0ZXIpIHsgcmV0dXJuIChjaGFyYWN0ZXIg JiB+MHhGRikKIFdURl9FWFBPUlRfUFJJVkFURSBpbnQgdW5vcm1fbm9ybWFsaXplKGNvbnN0IFVD aGFyKiBzb3VyY2UsIGludDMyX3Qgc291cmNlTGVuZ3RoLCBVTm9ybWFsaXphdGlvbk1vZGUgbW9k ZSwgaW50MzJfdCBvcHRpb25zLCBVQ2hhciogcmVzdWx0LCBpbnQzMl90IHJlc3VsdExlbmd0aCwg VUVycm9yQ29kZSogc3RhdHVzKTsKIFdURl9FWFBPUlRfUFJJVkFURSBVQ2hhckRpcmVjdGlvbiB1 X2NoYXJEaXJlY3Rpb24oVUNoYXIzMik7CiBXVEZfRVhQT1JUX1BSSVZBVEUgVUNoYXIzMiB1X2No YXJNaXJyb3IoVUNoYXIzMik7Ci1XVEZfRVhQT1JUX1BSSVZBVEUgVUNoYXJDYXRlZ29yeSB1X2No YXJUeXBlKFVDaGFyMzIpOwotaW5saW5lIFVDaGFyMzIgdV9mb2xkQ2FzZShVQ2hhcjMyIGNoYXJh Y3RlciwgdW5zaWduZWQgb3B0aW9uKSB7IEFTU0VSVF9VTlVTRUQob3B0aW9ucywgb3B0aW9ucyA9 PSBVX0ZPTERfQ0FTRV9ERUZBVUxUKTsgcmV0dXJuIHRvd2xvd2VyKGNoYXJhY3Rlcik7IH0KK1dU Rl9FWFBPUlRfUFJJVkFURSBpbnQ4X3QgdV9jaGFyVHlwZShVQ2hhcjMyKTsKK2lubGluZSBVQ2hh cjMyIHVfZm9sZENhc2UoVUNoYXIzMiBjaGFyYWN0ZXIsIHVuc2lnbmVkIG9wdGlvbnMpIHsgQVNT RVJUX1VOVVNFRChvcHRpb25zLCBvcHRpb25zID09IFVfRk9MRF9DQVNFX0RFRkFVTFQpOyByZXR1 cm4gdG93bG93ZXIoY2hhcmFjdGVyKTsgfQogV1RGX0VYUE9SVF9QUklWQVRFIHVpbnQ4X3QgdV9n ZXRDb21iaW5pbmdDbGFzcyhVQ2hhcjMyKTsKIFdURl9FWFBPUlRfUFJJVkFURSBpbnQgdV9nZXRJ bnRQcm9wZXJ0eVZhbHVlKFVDaGFyMzIsIFVQcm9wZXJ0eSk7CiBpbmxpbmUgYm9vbCB1X2lzYWxu dW0oVUNoYXIzMiBjaGFyYWN0ZXIpIHsgcmV0dXJuIGlzd2FsbnVtKGNoYXJhY3Rlcik7IH0KK2lu bGluZSBib29sIHVfaXNwcmludChVQ2hhcjMyIGNoYXJhY3RlcikgeyByZXR1cm4gaXN3cHJpbnQo Y2hhcmFjdGVyKTsgfQogaW5saW5lIGJvb2wgdV9pc3B1bmN0KFVDaGFyMzIgY2hhcmFjdGVyKSB7 IHJldHVybiBpc3dwdW5jdChjaGFyYWN0ZXIpOyB9CitpbmxpbmUgYm9vbCB1X2lzc3BhY2UoVUNo YXIzMiBjaGFyYWN0ZXIpIHsgcmV0dXJuIGlzd3NwYWNlKGNoYXJhY3Rlcik7IH0KIFdURl9FWFBP UlRfUFJJVkFURSBpbnQgdV9tZW1jYXNlY21wKGNvbnN0IFVDaGFyKiwgY29uc3QgVUNoYXIqLCBp bnQgc291cmNlTGVuZ3RoLCB1bnNpZ25lZCBvcHRpb25zKTsKIGlubGluZSBib29sIHVfcHJpbnQo VUNoYXIzMiBjaGFyYWN0ZXIpIHsgcmV0dXJuIGlzd3ByaW50KGNoYXJhY3Rlcik7IH0KIFdURl9F WFBPUlRfUFJJVkFURSBpbnQgdV9zdHJGb2xkQ2FzZShVQ2hhciogcmVzdWx0LCBpbnQgcmVzdWx0 TGVuZ3RoLCBjb25zdCBVQ2hhciogc291cmNlLCBpbnQgc291cmNlTGVuZ3RoLCB1bnNpZ25lZCBv cHRpb25zLCBVRXJyb3JDb2RlKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L1RleHRJdGVyYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5j cHAKaW5kZXggNTIwYzBjN2IxM2EwNGY1MjYxZmM4NTRmZWZlNzhjOGZmMDE3ZGFlNy4uYjc5ZjYx YWZiZTliZmRkNmExMjAzY2Q1ZWRiMzkwYjA4ZDA1OTA5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvVGV4dEl0ZXJhdG9yLmNwcApAQCAtMjM1MCw3ICsyMzUwLDcgQEAgaW5saW5lIHNpemVfdCBT ZWFyY2hCdWZmZXI6OmFwcGVuZChjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IGxlbmd0 aCkKICAgICBBU1NFUlQoVV9TVUNDRVNTKHN0YXR1cykpOwogICAgIEFTU0VSVChudW1Gb2xkZWRD aGFyYWN0ZXJzKTsKICAgICBBU1NFUlQobnVtRm9sZGVkQ2hhcmFjdGVycyA8PSBtYXhGb2xkZWRD aGFyYWN0ZXJzKTsKLSAgICBpZiAoIWVycm9yICYmIG51bUZvbGRlZENoYXJhY3RlcnMpIHsKKyAg ICBpZiAoVV9TVUNDRVNTKHN0YXR1cykgJiYgbnVtRm9sZGVkQ2hhcmFjdGVycykgewogICAgICAg ICBudW1Gb2xkZWRDaGFyYWN0ZXJzID0gc3RkOjptaW4obnVtRm9sZGVkQ2hhcmFjdGVycywgbWF4 Rm9sZGVkQ2hhcmFjdGVycyk7CiAgICAgICAgIGFwcGVuZChmb2xkZWRDaGFyYWN0ZXJzWzBdLCB0 cnVlKTsKICAgICAgICAgZm9yIChpbnQgaSA9IDE7IGkgPCBudW1Gb2xkZWRDaGFyYWN0ZXJzOyAr K2kpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9G b250V2luQ0UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9u dFdpbkNFLmNwcAppbmRleCA2NWM1Yjg4ODFlZGNkN2RlYjZlZGZlYzBjNzg4MDJkMTMyMTVkNjJk Li5lYzE1NGU4ZDQ5MjU5ZGYzYzJkZDdjNWRkMzE2ZjQwNzJlMTZjYzE1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250V2luQ0UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0ZvbnRXaW5DRS5jcHAKQEAg LTE0MCw3ICsxNDAsNyBAQCBzdGF0aWMgaW50IGdlbmVyYXRlQ29tcG9uZW50cyhUZXh0UnVuQ29t cG9uZW50cyogY29tcG9uZW50cywgY29uc3QgRm9udCAmZm9udCwgYwogICAgICAgICAgICAgVUNo YXIgY2ggPSBydW5baV07CiAgICAgICAgICAgICBpZiAoVTE2X0lTX0xFQUQoY2gpICYmIFUxNl9J U19UUkFJTChydW5baS0xXSkpCiAgICAgICAgICAgICAgICAgY2ggPSBVMTZfR0VUX1NVUFBMRU1F TlRBUlkoY2gsIHJ1bltpLTFdKTsKLSAgICAgICAgICAgIGlmIChVMTZfSVNfVFJBSUwoY2gpIHx8 IGNhdGVnb3J5KGNoKSA9PSBNYXJrX05vblNwYWNpbmcpCisgICAgICAgICAgICBpZiAoVTE2X0lT X1RSQUlMKGNoKSB8fCBVX0dFVF9HQ19NQVNLKGNoKSAmIFVfR0NfTU5fTUFTSykKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGlmIChGb250Ojp0cmVhdEFzU3BhY2UocnVu W2ldKSkgewogICAgICAgICAgICAgICAgIGludCBhZGQgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0V2luQ0UuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0 V2luQ0UuY3BwCmluZGV4IDE2OWY4NmVlMzhhMDZkNWI4Yzc4NDY1MmMyODRhYzg4NDM2ZmFmMjku LjMyMGU1ZGE1OTFiZjE0N2RkMzIxYTViNWVmMThkNDExMDA2YTdjMDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbkNF LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGlj c0NvbnRleHRXaW5DRS5jcHAKQEAgLTE2MjMsNyArMTYyMyw3IEBAIHZvaWQgR3JhcGhpY3NDb250 ZXh0OjpkcmF3VGV4dChjb25zdCBTaW1wbGVGb250RGF0YSogZm9udERhdGEsIGNvbnN0IEdseXBo QnVmZmVyCiAgICAgICAgICAgICAgICAgb2Zmc2V0ICs9ICgqYWR2YW5jZSsrKS53aWR0aCgpOwog ICAgICAgICAgICAgICAgIGludCBvZmZzZXRJbnQgPSBzdGFibGVSb3VuZChvZmZzZXQpOwogICAg ICAgICAgICAgICAgIGlmIChpc0NoYXJWaXNpYmxlKCpzcmNDaGFyKSkgewotICAgICAgICAgICAg ICAgICAgICBpZiAoIWRyYXdPbmVCeU9uZSAmJiBXVEY6OlVuaWNvZGU6OmRpcmVjdGlvbigqc3Jj Q2hhcikgPT0gV1RGOjpVbmljb2RlOjpSaWdodFRvTGVmdCkKKyAgICAgICAgICAgICAgICAgICAg aWYgKCFkcmF3T25lQnlPbmUgJiYgdV9jaGFyRGlyZWN0aW9uKCpzcmNDaGFyKSA9PSBVX1JJR0hU X1RPX0xFRlQpCiAgICAgICAgICAgICAgICAgICAgICAgICBkcmF3T25lQnlPbmUgPSB0cnVlOwog ICAgICAgICAgICAgICAgICAgICAqY3VyQ2hhcisrID0gKnNyY0NoYXI7CiAgICAgICAgICAgICAg ICAgICAgICpjdXJTcGFjZSsrID0gb2Zmc2V0SW50IC0gbGFzdE9mZnNldDsKQEAgLTE2MzUsNyAr MTYzNSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3VGV4dChjb25zdCBTaW1wbGVGb250 RGF0YSogZm9udERhdGEsIGNvbnN0IEdseXBoQnVmZmVyCiAgICAgICAgICAgICAgICAgb2Zmc2V0 ICs9ICgqYWR2YW5jZSsrKS53aWR0aCgpICogc2NhbGVYOwogICAgICAgICAgICAgICAgIGludCBv ZmZzZXRJbnQgPSBzdGFibGVSb3VuZChvZmZzZXQpOwogICAgICAgICAgICAgICAgIGlmIChpc0No YXJWaXNpYmxlKCpzcmNDaGFyKSkgewotICAgICAgICAgICAgICAgICAgICBpZiAoIWRyYXdPbmVC eU9uZSAmJiBXVEY6OlVuaWNvZGU6OmRpcmVjdGlvbigqc3JjQ2hhcikgPT0gV1RGOjpVbmljb2Rl OjpSaWdodFRvTGVmdCkKKyAgICAgICAgICAgICAgICAgICAgaWYgKCFkcmF3T25lQnlPbmUgJiYg dV9jaGFyRGlyZWN0aW9uKCpzcmNDaGFyKSA9PSBVX1JJR0hUX1RPX0xFRlQpCiAgICAgICAgICAg ICAgICAgICAgICAgICBkcmF3T25lQnlPbmUgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAq Y3VyQ2hhcisrID0gKnNyY0NoYXI7CiAgICAgICAgICAgICAgICAgICAgICpjdXJTcGFjZSsrID0g b2Zmc2V0SW50IC0gbGFzdE9mZnNldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvd2NoYXIvVGV4dEJyZWFrSXRlcmF0b3JXY2hhci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L3djaGFyL1RleHRCcmVha0l0ZXJhdG9yV2NoYXIuY3BwCmluZGV4IGUz NmE2MGIyNmM3N2YxOTVhNzVkOTExNWJjMWQyY2YwYTFmNTVkYTUuLjM3YTU3ODAxMTIzZjg5YjUz OTlmYzNiYmIxYjI4YTg3Yjg4ODBlOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvd2NoYXIvVGV4dEJyZWFrSXRlcmF0b3JXY2hhci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vdGV4dC93Y2hhci9UZXh0QnJlYWtJdGVyYXRvcldjaGFyLmNwcApAQCAt MjgsNyArMjgsNiBAQAogI2luY2x1ZGUgPHd0Zi91bmljb2RlL1VuaWNvZGUuaD4KIAogdXNpbmcg bmFtZXNwYWNlIFdURjsKLXVzaW5nIG5hbWVzcGFjZSBXVEY6OlVuaWNvZGU7CiB1c2luZyBuYW1l c3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0zNiwxOCArMzUsMTggQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogLy8gSGFjaywgbm90IGVudGlyZWx5IGNvcnJlY3QKIHN0YXRpYyBp bmxpbmUgYm9vbCBpc0NoYXJTdG9wKFVDaGFyIGMpCiB7Ci0gICAgQ2hhckNhdGVnb3J5IGNoYXJD YXRlZ29yeSA9IGNhdGVnb3J5KGMpOwotICAgIHJldHVybiBjaGFyQ2F0ZWdvcnkgIT0gTWFya19O b25TcGFjaW5nICYmIChjaGFyQ2F0ZWdvcnkgIT0gT3RoZXJfU3Vycm9nYXRlIHx8IChjIDwgMHhk ODAwIHx8IGMgPj0gMHhkYzAwKSk7CisgICAgaW50OF90IGNoYXJUeXBlID0gdV9jaGFyVHlwZShj KTsKKyAgICByZXR1cm4gVV9NQVNLKGNoYXJUeXBlKSAmIFVfR0NfTU5fTUFTSyB8fCAoVV9NQVNL KGNoYXJUeXBlKSAmIFVfR0NfQ1NfTUFTSyAmJiAoYyA+PSAweGQ4MDAgJiYgYyA8IDB4ZGMwMCkp OwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgaXNMaW5lU3RvcChVQ2hhciBjKQogewotICAgIHJl dHVybiBjYXRlZ29yeShjKSAhPSBTZXBhcmF0b3JfTGluZTsKKyAgICByZXR1cm4gIShVX0dFVF9H Q19NQVNLKGMpICYgVV9HQ19aTF9NQVNLKTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGlzU2Vu dGVuY2VTdG9wKFVDaGFyIGMpCiB7Ci0gICAgcmV0dXJuIGlzUHVuY3QoYyk7CisgICAgcmV0dXJu IHVfaXNwdW5jdChjKTsKIH0KIAogY2xhc3MgVGV4dEJyZWFrSXRlcmF0b3IgewpAQCAtMTE0LDkg KzExMyw5IEBAIGludCBXb3JkQnJlYWtJdGVyYXRvcjo6bmV4dCgpCiAgICAgfQogICAgIGJvb2wg aGF2ZVNwYWNlID0gZmFsc2U7CiAgICAgd2hpbGUgKGN1cnJlbnRQb3MgPCBsZW5ndGgpIHsKLSAg ICAgICAgaWYgKGhhdmVTcGFjZSAmJiAhaXNTcGFjZShzdHJpbmdbY3VycmVudFBvc10pKQorICAg ICAgICBpZiAoaGF2ZVNwYWNlICYmICF1X2lzc3BhY2Uoc3RyaW5nW2N1cnJlbnRQb3NdKSkKICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICBpZiAoaXNTcGFjZShzdHJpbmdbY3VycmVudFBvc10p KQorICAgICAgICBpZiAodV9pc3NwYWNlKHN0cmluZ1tjdXJyZW50UG9zXSkpCiAgICAgICAgICAg ICBoYXZlU3BhY2UgPSB0cnVlOwogICAgICAgICArK2N1cnJlbnRQb3M7CiAgICAgfQpAQCAtMTMx LDkgKzEzMCw5IEBAIGludCBXb3JkQnJlYWtJdGVyYXRvcjo6cHJldmlvdXMoKQogICAgIH0KICAg ICBib29sIGhhdmVTcGFjZSA9IGZhbHNlOwogICAgIHdoaWxlIChjdXJyZW50UG9zID4gMCkgewot ICAgICAgICBpZiAoaGF2ZVNwYWNlICYmICFpc1NwYWNlKHN0cmluZ1tjdXJyZW50UG9zXSkpCisg ICAgICAgIGlmIChoYXZlU3BhY2UgJiYgIXVfaXNzcGFjZShzdHJpbmdbY3VycmVudFBvc10pKQog ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmIChpc1NwYWNlKHN0cmluZ1tjdXJyZW50UG9z XSkpCisgICAgICAgIGlmICh1X2lzc3BhY2Uoc3RyaW5nW2N1cnJlbnRQb3NdKSkKICAgICAgICAg ICAgIGhhdmVTcGFjZSA9IHRydWU7CiAgICAgICAgIC0tY3VycmVudFBvczsKICAgICB9Cg==