20531 2008-08-26 15:49:12 -0700 make alternativeFamilyName platform-dependent 2009-02-19 12:13:36 -0800 1 1 1 Unclassified WebKit Layout and Rendering 525.x (Safari 3.1) PC Windows XP RESOLVED FIXED P2 Normal --- 1 jshin jshin aroben eric hyatt sfalken oldest_to_newest 89422 0 jshin 2008-08-26 15:49:12 -0700 On Windows, Courier New, Times New Roman, Arial are 'guaranteed' to exist and they look good (TTF/OTFs) while 'Times', 'Courier' and 'Helvetica' are bitmap and their coverages are not so wide as the former group. Therefore, instead of having two-way mapping (as on Mac OS X), it's better to have a one-way mapping on Windows. Patch coming up. 89434 1 23010 jshin 2008-08-26 17:39:00 -0700 Created attachment 23010 patch (layout testing yet missing) 89438 2 23010 eric 2008-08-26 17:53:43 -0700 Comment on attachment 23010 patch (layout testing yet missing) Hum... it seems instead of copying this function to each platform, there should just be a shared function which platforms can choose to call or not? I assume part of this is that you're suggesting that some platforms don't want these mappings? Or maybe this should just be a case-ignoring HashMap: HashMap<AtomicString, AtomicString, CaseFoldingHash> Then the "default" alternateFamilyName hash can be provided by a private function on FontCache (in FontCache.cpp) and platforms can provide their own alternateFamilyName implementation which either does a lookup in this provided HashMap, or modifies the HashMap, or just does their own lookup disregarding the HashMap. 89439 3 eric 2008-08-26 17:55:18 -0700 (In reply to comment #2) > (From update of attachment 23010 [edit]) I guess at some level this function doesn't make any sense outside of Mac OS X. So all of the non-mac implementations should probably be empty. Except for the windows one. 106768 4 dglazkov 2009-01-23 10:05:29 -0800 Why not just use #if PLATFORM(WIN_OS) guards and keep the method in place? I can cook up a patch for this, if you'd like. 106782 5 26978 jshin 2009-01-23 12:25:09 -0800 Created attachment 26978 patch update (simpler) Dimitri, yes, that's exactly what I was about to do. 108179 6 26978 eric 2009-02-03 15:02:23 -0800 Comment on attachment 26978 patch update (simpler) This looks good to me. Ideally steve or Adam would comment before I land, but as far as I can tell this is just fine. 108184 7 hyatt 2009-02-03 15:18:13 -0800 All bitmap fonts are blocked by all Windows ports so I'm not sure you need the Chromium part of the #ifdef. These changes would be good for Safari also. 108329 8 27327 jshin 2009-02-04 14:30:58 -0800 Created attachment 27327 patch updated (removed CHROMIUM check) Per David's comment, I got rid of PLATFORM(CHROMIUM) and changed the comment accordingly. I'm transferring Eric's r+ because nothing else has changed. 108348 9 eric 2009-02-04 15:27:42 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/graphics/FontCache.cpp Committed r40636 108989 10 27486 jshin 2009-02-09 10:39:18 -0800 Created attachment 27486 patch for Chromium only (missed in the previous patch) I forgot to include changes necessary for platform/graphics/chromium. Chromium used to have the 1st patch to this bug (https://bugs.webkit.org/attachment.cgi?id=23010). That needs to be removed. 108991 11 27486 jshin 2009-02-09 10:46:06 -0800 Comment on attachment 27486 patch for Chromium only (missed in the previous patch) This patch is pending review on the Chromium-side at http://codereview.chromium.org/21174 108997 12 27486 eric 2009-02-09 11:11:57 -0800 Comment on attachment 27486 patch for Chromium only (missed in the previous patch) LGTM. 110270 13 dglazkov 2009-02-19 12:13:36 -0800 Follow-up landed as http://trac.webkit.org/changeset/41082. 23010 2008-08-26 17:39:00 -0700 2009-01-23 12:25:09 -0800 patch (layout testing yet missing) 20531.patch.1 text/plain 9463 jshin SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAJKHJldmlzaW9uIDM1 NTQwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMjEsMzIgKzEyMSw2IEBAIHR5cGVkZWYgSGFzaE1hcDxGb250UGxhdGZvcm1E YXRhQ2FjaGVLZXkKIAogc3RhdGljIEZvbnRQbGF0Zm9ybURhdGFDYWNoZSogZ0ZvbnRQbGF0Zm9y bURhdGFDYWNoZSA9IDA7CiAKLXN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIGFsdGVybmF0ZUZh bWlseU5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHlOYW1lKQotewotICAgIC8vIEFsaWFz IENvdXJpZXIgPC0+IENvdXJpZXIgTmV3Ci0gICAgc3RhdGljIEF0b21pY1N0cmluZyBjb3VyaWVy KCJDb3VyaWVyIiksIGNvdXJpZXJOZXcoIkNvdXJpZXIgTmV3Iik7Ci0gICAgaWYgKGVxdWFsSWdu b3JpbmdDYXNlKGZhbWlseU5hbWUsIGNvdXJpZXIpKQotICAgICAgICByZXR1cm4gY291cmllck5l dzsKLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgY291cmllck5ldykpCi0g ICAgICAgIHJldHVybiBjb3VyaWVyOwotCi0gICAgLy8gQWxpYXMgVGltZXMgYW5kIFRpbWVzIE5l dyBSb21hbi4KLSAgICBzdGF0aWMgQXRvbWljU3RyaW5nIHRpbWVzKCJUaW1lcyIpLCB0aW1lc05l d1JvbWFuKCJUaW1lcyBOZXcgUm9tYW4iKTsKLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFt aWx5TmFtZSwgdGltZXMpKQotICAgICAgICByZXR1cm4gdGltZXNOZXdSb21hbjsKLSAgICBpZiAo ZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgdGltZXNOZXdSb21hbikpCi0gICAgICAgIHJl dHVybiB0aW1lczsKLSAgICAKLSAgICAvLyBBbGlhcyBBcmlhbCBhbmQgSGVsdmV0aWNhCi0gICAg c3RhdGljIEF0b21pY1N0cmluZyBhcmlhbCgiQXJpYWwiKSwgaGVsdmV0aWNhKCJIZWx2ZXRpY2Ei KTsKLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgYXJpYWwpKQotICAgICAg ICByZXR1cm4gaGVsdmV0aWNhOwotICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1l LCBoZWx2ZXRpY2EpKQotICAgICAgICByZXR1cm4gYXJpYWw7Ci0KLSAgICByZXR1cm4gZW1wdHlB dG9tOwotfQotCiBGb250UGxhdGZvcm1EYXRhKiBGb250Q2FjaGU6OmdldENhY2hlZEZvbnRQbGF0 Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEF0 b21pY1N0cmluZyYgZmFtaWx5TmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBib29sIGNoZWNraW5nQWx0ZXJuYXRlTmFtZSkKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAkocmV2aXNpb24gMzU1NDApCisrKyBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04 NSw2ICs4NSw3IEBAIHByaXZhdGU6CiAgICAgLy8gVGhlc2UgbWV0aG9kcyBhcmUgaW1wbGVtZW50 ZWQgYnkgZWFjaCBwbGF0Zm9ybS4KICAgICBzdGF0aWMgRm9udFBsYXRmb3JtRGF0YSogZ2V0U2lt aWxhckZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udCYpOwogICAgIHN0YXRpYyBGb250UGxhdGZv cm1EYXRhKiBjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNv bnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KTsKKyAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5n JiBhbHRlcm5hdGVGYW1pbHlOYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KTsKIAogICAg IGZyaWVuZCBjbGFzcyBTaW1wbGVGb250RGF0YTsKICAgICBmcmllbmQgY2xhc3MgRm9udEZhbGxi YWNrTGlzdDsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRDYWNoZUd0 ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udENh Y2hlR3RrLmNwcAkocmV2aXNpb24gMzU1NDApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2d0ay9Gb250Q2FjaGVHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwzMSBAQCBj b25zdCBTaW1wbGVGb250RGF0YSogRm9udENhY2hlOjpnZXRGb250CiAgICAgcmV0dXJuIG5ldyBT aW1wbGVGb250RGF0YShGb250UGxhdGZvcm1EYXRhKGZvbnQuZm9udERlc2NyaXB0aW9uKCksIGZv bnQuZmFtaWx5KCkuZmFtaWx5KCkpKTsKIH0KIAorY29uc3QgQXRvbWljU3RyaW5nJiBGb250Q2Fj aGVXaW46OmFsdGVybmF0ZUZhbWlseU5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHlOYW1l KSB7CisgICAgLy8gQWxpYXMgQ291cmllciA8LT4gQ291cmllciBOZXcKKyAgICBzdGF0aWMgQXRv bWljU3RyaW5nIGNvdXJpZXIoIkNvdXJpZXIiKSwgY291cmllck5ldygiQ291cmllciBOZXciKTsK KyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgY291cmllcikpCisgICAgICAg IHJldHVybiBjb3VyaWVyTmV3OworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1l LCBjb3VyaWVyTmV3KSkKKyAgICAgICAgcmV0dXJuIGNvdXJpZXI7CisKKyAgICAvLyBBbGlhcyBU aW1lcyBhbmQgVGltZXMgTmV3IFJvbWFuLgorICAgIHN0YXRpYyBBdG9taWNTdHJpbmcgdGltZXMo IlRpbWVzIiksIHRpbWVzTmV3Um9tYW4oIlRpbWVzIE5ldyBSb21hbiIpOworICAgIGlmIChlcXVh bElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCB0aW1lcykpCisgICAgICAgIHJldHVybiB0aW1lc05l d1JvbWFuOworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCB0aW1lc05ld1Jv bWFuKSkKKyAgICAgICAgcmV0dXJuIHRpbWVzOworICAgIAorICAgIC8vIEFsaWFzIEFyaWFsIGFu ZCBIZWx2ZXRpY2EKKyAgICBzdGF0aWMgQXRvbWljU3RyaW5nIGFyaWFsKCJBcmlhbCIpLCBoZWx2 ZXRpY2EoIkhlbHZldGljYSIpOworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1l LCBhcmlhbCkpCisgICAgICAgIHJldHVybiBoZWx2ZXRpY2E7CisgICAgaWYgKGVxdWFsSWdub3Jp bmdDYXNlKGZhbWlseU5hbWUsIGhlbHZldGljYSkpCisgICAgICAgIHJldHVybiBhcmlhbDsKKwor ICAgIHJldHVybiBlbXB0eUF0b207Cit9CisKIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6 Z2V0U2ltaWxhckZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udCYgZm9udCkKIHsKICAgICByZXR1 cm4gbmV3IEZvbnRQbGF0Zm9ybURhdGEoZm9udC5mb250RGVzY3JpcHRpb24oKSwgZm9udC5mYW1p bHkoKS5mYW1pbHkoKSk7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250 Q2FjaGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMv Rm9udENhY2hlTWFjLm1tCShyZXZpc2lvbiAzNTU0MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTMwLDYgKzEzMCwz MiBAQCBjb25zdCBTaW1wbGVGb250RGF0YSogRm9udENhY2hlOjpnZXRGb250CiAgICAgcmV0dXJu IGdldENhY2hlZEZvbnREYXRhKCZhbHRlcm5hdGVGb250KTsKIH0KIAorY29uc3QgQXRvbWljU3Ry aW5nJiBGb250Q2FjaGU6OmFsdGVybmF0ZUZhbWlseU5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBm YW1pbHlOYW1lKQoreworICAgIC8vIEFsaWFzIENvdXJpZXIgPC0+IENvdXJpZXIgTmV3CisgICAg c3RhdGljIEF0b21pY1N0cmluZyBjb3VyaWVyKCJDb3VyaWVyIiksIGNvdXJpZXJOZXcoIkNvdXJp ZXIgTmV3Iik7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseU5hbWUsIGNvdXJpZXIp KQorICAgICAgICByZXR1cm4gY291cmllck5ldzsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo ZmFtaWx5TmFtZSwgY291cmllck5ldykpCisgICAgICAgIHJldHVybiBjb3VyaWVyOworCisgICAg Ly8gQWxpYXMgVGltZXMgYW5kIFRpbWVzIE5ldyBSb21hbi4KKyAgICBzdGF0aWMgQXRvbWljU3Ry aW5nIHRpbWVzKCJUaW1lcyIpLCB0aW1lc05ld1JvbWFuKCJUaW1lcyBOZXcgUm9tYW4iKTsKKyAg ICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgdGltZXMpKQorICAgICAgICByZXR1 cm4gdGltZXNOZXdSb21hbjsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwg dGltZXNOZXdSb21hbikpCisgICAgICAgIHJldHVybiB0aW1lczsKKyAgICAKKyAgICAvLyBBbGlh cyBBcmlhbCBhbmQgSGVsdmV0aWNhCisgICAgc3RhdGljIEF0b21pY1N0cmluZyBhcmlhbCgiQXJp YWwiKSwgaGVsdmV0aWNhKCJIZWx2ZXRpY2EiKTsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo ZmFtaWx5TmFtZSwgYXJpYWwpKQorICAgICAgICByZXR1cm4gaGVsdmV0aWNhOworICAgIGlmIChl cXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCBoZWx2ZXRpY2EpKQorICAgICAgICByZXR1cm4g YXJpYWw7CisKKyAgICByZXR1cm4gZW1wdHlBdG9tOworfQorCiBGb250UGxhdGZvcm1EYXRhKiBG b250Q2FjaGU6OmdldFNpbWlsYXJGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnQmIGZvbnQpCiB7 CiAgICAgLy8gQXR0ZW1wdCB0byBmaW5kIGFuIGFwcHJvcHJpYXRlIGZvbnQgdXNpbmcgYSBtYXRj aCBiYXNlZCBvbiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENhY2hl UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENh Y2hlUXQuY3BwCShyZXZpc2lvbiAzNTU0MCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvRm9udENhY2hlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw2ICszMCwzMSBAQCB2b2lk IEZvbnRDYWNoZTo6Z2V0VHJhaXRzSW5GYW1pbHkoY29uc3QgCiB7CiB9CiAKK2NvbnN0IEF0b21p Y1N0cmluZyYgRm9udENhY2hlV2luOjphbHRlcm5hdGVGYW1pbHlOYW1lKGNvbnN0IEF0b21pY1N0 cmluZyYgZmFtaWx5TmFtZSkgeworICAgIC8vIEFsaWFzIENvdXJpZXIgPC0+IENvdXJpZXIgTmV3 CisgICAgc3RhdGljIEF0b21pY1N0cmluZyBjb3VyaWVyKCJDb3VyaWVyIiksIGNvdXJpZXJOZXco IkNvdXJpZXIgTmV3Iik7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseU5hbWUsIGNv dXJpZXIpKQorICAgICAgICByZXR1cm4gY291cmllck5ldzsKKyAgICBpZiAoZXF1YWxJZ25vcmlu Z0Nhc2UoZmFtaWx5TmFtZSwgY291cmllck5ldykpCisgICAgICAgIHJldHVybiBjb3VyaWVyOwor CisgICAgLy8gQWxpYXMgVGltZXMgYW5kIFRpbWVzIE5ldyBSb21hbi4KKyAgICBzdGF0aWMgQXRv bWljU3RyaW5nIHRpbWVzKCJUaW1lcyIpLCB0aW1lc05ld1JvbWFuKCJUaW1lcyBOZXcgUm9tYW4i KTsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgdGltZXMpKQorICAgICAg ICByZXR1cm4gdGltZXNOZXdSb21hbjsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5 TmFtZSwgdGltZXNOZXdSb21hbikpCisgICAgICAgIHJldHVybiB0aW1lczsKKyAgICAKKyAgICAv LyBBbGlhcyBBcmlhbCBhbmQgSGVsdmV0aWNhCisgICAgc3RhdGljIEF0b21pY1N0cmluZyBhcmlh bCgiQXJpYWwiKSwgaGVsdmV0aWNhKCJIZWx2ZXRpY2EiKTsKKyAgICBpZiAoZXF1YWxJZ25vcmlu Z0Nhc2UoZmFtaWx5TmFtZSwgYXJpYWwpKQorICAgICAgICByZXR1cm4gaGVsdmV0aWNhOworICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCBoZWx2ZXRpY2EpKQorICAgICAgICBy ZXR1cm4gYXJpYWw7CisKKyAgICByZXR1cm4gZW1wdHlBdG9tOworfQorCiBGb250UGxhdGZvcm1E YXRhKiBGb250Q2FjaGU6OmdldENhY2hlZEZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2Ny aXB0aW9uJiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHksIGJvb2wgY2hlY2tpbmdBbHRlcm5h dGVOYW1lKQogewogICAgIHJldHVybiAwOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93aW4vRm9udENhY2hlV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCShyZXZpc2lvbiAzNTU0MCkKKysrIFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI5NSw2ICsyOTUsMzYgQEAgY29uc3QgU2ltcGxlRm9udERhdGEqIEZvbnRDYWNoZTo6Z2V0Rm9u dAogICAgIHJldHVybiBmb250RGF0YTsKIH0KIAorY29uc3QgQXRvbWljU3RyaW5nJiBGb250Q2Fj aGU6OmFsdGVybmF0ZUZhbWlseU5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHlOYW1lKQor eworICAgIC8vIE5vdGUgdGhhdCBtYXBwaW5nIHRvIENvdXJpZXIgaXMgcmVtb3ZlZAorICAgIC8v IGJlY2F1c2UgaXQncyBhIGJpdG1hcCBmb250IG9uIFdpbmRvd3MuCisgICAgLy8gQWxpYXMgQ291 cmllciAtPiBDb3VyaWVyIE5ldworICAgIHN0YXRpYyBBdG9taWNTdHJpbmcgY291cmllcigiQ291 cmllciIpLCBjb3VyaWVyTmV3KCJDb3VyaWVyIE5ldyIpOworICAgIGlmIChlcXVhbElnbm9yaW5n Q2FzZShmYW1pbHlOYW1lLCBjb3VyaWVyKSkKKyAgICAgICAgcmV0dXJuIGNvdXJpZXJOZXc7CisK KyAgICAvLyBBbGlhcyBUaW1lcyBhbmQgVGltZXMgTmV3IFJvbWFuLgorICAgIHN0YXRpYyBBdG9t aWNTdHJpbmcgdGltZXMoIlRpbWVzIiksIHRpbWVzTmV3Um9tYW4oIlRpbWVzIE5ldyBSb21hbiIp OworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCB0aW1lcykpCisgICAgICAg IHJldHVybiB0aW1lc05ld1JvbWFuOworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlO YW1lLCB0aW1lc05ld1JvbWFuKSkKKyAgICAgICAgcmV0dXJuIHRpbWVzOworICAgIAorICAgIC8v IEFsaWFzIEFyaWFsIGFuZCBIZWx2ZXRpY2EKKyAgICBzdGF0aWMgQXRvbWljU3RyaW5nIGFyaWFs KCJBcmlhbCIpLCBoZWx2ZXRpY2EoIkhlbHZldGljYSIpOworICAgIGlmIChlcXVhbElnbm9yaW5n Q2FzZShmYW1pbHlOYW1lLCBhcmlhbCkpCisgICAgICAgIHJldHVybiBoZWx2ZXRpY2E7CisgICAg aWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseU5hbWUsIGhlbHZldGljYSkpCisgICAgICAgIHJl dHVybiBhcmlhbDsKKworICAgIC8vIElmIHdlIGJsb2NrIGJpdG1hcCBmb250cyBhbHRvZ2V0aGVy LCB3ZSBjYW4gbWFwIE1TIFNhbnMgU2VyaWYgKGJpdG1hcCkKKyAgICAvLyB0byBNaWNyb3NvZnQg U2FucyBTZXJpZiAoVFRGKS4gQWx0aG91Z2ggbm90IGFzIGdvb2QgYW4gbWF0Y2gsIHdlIGNhbgor ICAgIC8vIGFsc28gY29uc2lkZXIgbWFwcGluZyBNUyBTZXJpZiAoYml0bWFwKSB0byBUaW1lcyBO ZXcgUm9tYW4uCisKKyAgICByZXR1cm4gZW1wdHlBdG9tOworfQorCiBGb250UGxhdGZvcm1EYXRh KiBGb250Q2FjaGU6OmdldFNpbWlsYXJGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnQmIGZvbnQp CiB7CiAgICAgcmV0dXJuIDA7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4L0Zv bnRDYWNoZVd4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4 L0ZvbnRDYWNoZVd4LmNwcAkocmV2aXNpb24gMzU1NDApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3d4L0ZvbnRDYWNoZVd4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsMzEg QEAgY29uc3QgU2ltcGxlRm9udERhdGEqIEZvbnRDYWNoZTo6Z2V0Rm9udAogICAgIHJldHVybiBm b250RGF0YTsKIH0KIAorY29uc3QgQXRvbWljU3RyaW5nJiBGb250Q2FjaGVXaW46OmFsdGVybmF0 ZUZhbWlseU5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHlOYW1lKSB7CisgICAgLy8gQWxp YXMgQ291cmllciA8LT4gQ291cmllciBOZXcKKyAgICBzdGF0aWMgQXRvbWljU3RyaW5nIGNvdXJp ZXIoIkNvdXJpZXIiKSwgY291cmllck5ldygiQ291cmllciBOZXciKTsKKyAgICBpZiAoZXF1YWxJ Z25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgY291cmllcikpCisgICAgICAgIHJldHVybiBjb3VyaWVy TmV3OworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCBjb3VyaWVyTmV3KSkK KyAgICAgICAgcmV0dXJuIGNvdXJpZXI7CisKKyAgICAvLyBBbGlhcyBUaW1lcyBhbmQgVGltZXMg TmV3IFJvbWFuLgorICAgIHN0YXRpYyBBdG9taWNTdHJpbmcgdGltZXMoIlRpbWVzIiksIHRpbWVz TmV3Um9tYW4oIlRpbWVzIE5ldyBSb21hbiIpOworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShm YW1pbHlOYW1lLCB0aW1lcykpCisgICAgICAgIHJldHVybiB0aW1lc05ld1JvbWFuOworICAgIGlm IChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCB0aW1lc05ld1JvbWFuKSkKKyAgICAgICAg cmV0dXJuIHRpbWVzOworICAgIAorICAgIC8vIEFsaWFzIEFyaWFsIGFuZCBIZWx2ZXRpY2EKKyAg ICBzdGF0aWMgQXRvbWljU3RyaW5nIGFyaWFsKCJBcmlhbCIpLCBoZWx2ZXRpY2EoIkhlbHZldGlj YSIpOworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCBhcmlhbCkpCisgICAg ICAgIHJldHVybiBoZWx2ZXRpY2E7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseU5h bWUsIGhlbHZldGljYSkpCisgICAgICAgIHJldHVybiBhcmlhbDsKKworICAgIHJldHVybiBlbXB0 eUF0b207Cit9CisKIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Z2V0U2ltaWxhckZvbnRQ bGF0Zm9ybURhdGEoY29uc3QgRm9udCYgZm9udCkKIHsKICAgICByZXR1cm4gbmV3IEZvbnRQbGF0 Zm9ybURhdGEoZm9udC5mb250RGVzY3JpcHRpb24oKSwgZm9udC5mYW1pbHkoKS5mYW1pbHkoKSk7 Cg== 26978 2009-01-23 12:25:09 -0800 2009-02-04 14:30:58 -0800 patch update (simpler) 20531.patch.2 text/plain 2309 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDE2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDEtMjMgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTMxCisKKyAgICAgICAg TWFrZSBhbHRlcm5hdGVGYW1pbHlOYW1lIGN1c3RvbWl6ZWQgZm9yIFdpbmRvd3MgYW5kIENocm9t aXVtLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmFsdGVybmF0ZUZhbWlseU5hbWUpOgorCiAyMDA5LTAxLTIzICBIb2xnZXIg RnJleXRoZXIgIDx6ZWNrZUBzZWxmaXNoLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxk IGZpeC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAJKHJldmlz aW9uIDQwMTM0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzksOCArMTM5LDEzIEBAIHN0YXRpYyBjb25zdCBBdG9taWNTdHJp bmcmIGFsdGVybmF0ZUZhbWkKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywg Y291cmllck5ldywgKCJDb3VyaWVyIE5ldyIpKTsKICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo ZmFtaWx5TmFtZSwgY291cmllcikpCiAgICAgICAgIHJldHVybiBjb3VyaWVyTmV3OworI2lmICFQ TEFURk9STShXSU5fT1MpCisgICAgLy8gT24gV2luZG93cywgQ291cmllciBOZXcgKHRydWV0eXBl IGZvbnQpIGlzIGFsd2F5cyBwcmVzZW50IGFuZAorICAgIC8vIENvdXJpZXIgaXMgYSBiaXRtYXAg Zm9udC4gU28sIHdlIGRvbid0IHdhbnQgdG8gbWFwIENvdXJpZXIgTmV3IHRvCisgICAgLy8gQ291 cmllci4KICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgY291cmllck5ldykp CiAgICAgICAgIHJldHVybiBjb3VyaWVyOworI2VuZGlmCiAKICAgICAvLyBBbGlhcyBUaW1lcyBh bmQgVGltZXMgTmV3IFJvbWFuLgogICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5n LCB0aW1lcywgKCJUaW1lcyIpKTsKQEAgLTE1OCw2ICsxNjMsMjIgQEAgc3RhdGljIGNvbnN0IEF0 b21pY1N0cmluZyYgYWx0ZXJuYXRlRmFtaQogICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1p bHlOYW1lLCBoZWx2ZXRpY2EpKQogICAgICAgICByZXR1cm4gYXJpYWw7CiAKKyNpZiBQTEFURk9S TShXSU5fT1MpICYmIFBMQVRGT1JNKENIUk9NSVVNKQorICAgIC8vIENocm9taXVtIG9uIFdpbmRv d3MgYmxvY2tzIGJpdG1hcCBmb250cyBhbHRvZ2V0aGVyIHNvIHRoYXQgd2UgaGF2ZSB0byAKKyAg ICAvLyBhbGlhcyBNUyBTYW5zIFNlcmlmIChiaXRtYXAgZm9udCkgLT4gTWljcm9zb2Z0IFNhbnMg U2VyaWYgKHRydWV0eXBlIGZvbnQpCisgICAgc3RhdGljIEF0b21pY1N0cmluZyBtc1NhbnMoIk1T IFNhbnMgU2VyaWYiKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgbXNT YW5zLCAoIk1TIFNhbnMgU2VyaWYiKSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNT dHJpbmcsIG1pY3Jvc29mdFNhbnMsICgiTWljcm9zb2Z0IFNhbnMgU2VyaWYiKSk7CisgICAgaWYg KGVxdWFsSWdub3JpbmdDYXNlKGZhbWlseU5hbWUsIG1zU2FucykpCisgICAgICAgIHJldHVybiBt aWNyb3NvZnRTYW5zOworCisgICAgLy8gQWxpYXMgTVMgU2VyaWYgKGJpdG1hcCkgLT4gVGltZXMg TmV3IFJvbWFuICh0cnVldHlwZSBmb250KS4gVGhlcmUncyBubyAKKyAgICAvLyAnTWljcm9zb2Z0 IFNhbnMgU2VyaWYtZXF1aXZhbGVudCcgZm9yIFNlcmlmLiAKKyAgICBzdGF0aWMgQXRvbWljU3Ry aW5nIG1zU2VyaWYoIk1TIFNlcmlmIik7CisgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGZhbWls eU5hbWUsIG1zU2VyaWYpKQorICAgICAgICByZXR1cm4gdGltZXNOZXdSb21hbjsKKyNlbmRpZgor CiAgICAgcmV0dXJuIGVtcHR5QXRvbTsKIH0KIAo= 27327 2009-02-04 14:30:58 -0800 2009-02-04 14:30:58 -0800 patch updated (removed CHROMIUM check) 20531.patch.3 text/plain 2284 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDE2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDEtMjMgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTMxCisKKyAgICAgICAg TWFrZSBhbHRlcm5hdGVGYW1pbHlOYW1lIGN1c3RvbWl6ZWQgZm9yIFdpbmRvd3MgYW5kIENocm9t aXVtLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmFsdGVybmF0ZUZhbWlseU5hbWUpOgorCiAyMDA5LTAxLTIzICBIb2xnZXIg RnJleXRoZXIgIDx6ZWNrZUBzZWxmaXNoLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxk IGZpeC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAJKHJldmlz aW9uIDQwMTM0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzksOCArMTM5LDEzIEBAIHN0YXRpYyBjb25zdCBBdG9taWNTdHJp bmcmIGFsdGVybmF0ZUZhbWkKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywg Y291cmllck5ldywgKCJDb3VyaWVyIE5ldyIpKTsKICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo ZmFtaWx5TmFtZSwgY291cmllcikpCiAgICAgICAgIHJldHVybiBjb3VyaWVyTmV3OworI2lmICFQ TEFURk9STShXSU5fT1MpCisgICAgLy8gT24gV2luZG93cywgQ291cmllciBOZXcgKHRydWV0eXBl IGZvbnQpIGlzIGFsd2F5cyBwcmVzZW50IGFuZAorICAgIC8vIENvdXJpZXIgaXMgYSBiaXRtYXAg Zm9udC4gU28sIHdlIGRvbid0IHdhbnQgdG8gbWFwIENvdXJpZXIgTmV3IHRvCisgICAgLy8gQ291 cmllci4KICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgY291cmllck5ldykp CiAgICAgICAgIHJldHVybiBjb3VyaWVyOworI2VuZGlmCiAKICAgICAvLyBBbGlhcyBUaW1lcyBh bmQgVGltZXMgTmV3IFJvbWFuLgogICAgIERFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5n LCB0aW1lcywgKCJUaW1lcyIpKTsKQEAgLTE1OCw2ICsxNjMsMjIgQEAgc3RhdGljIGNvbnN0IEF0 b21pY1N0cmluZyYgYWx0ZXJuYXRlRmFtaQogICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1p bHlOYW1lLCBoZWx2ZXRpY2EpKQogICAgICAgICByZXR1cm4gYXJpYWw7CiAKKyNpZiBQTEFURk9S TShXSU5fT1MpCisgICAgLy8gT24gV2luZG93cywgYml0bWFwIGZvbnRzIGFyZSBibG9ja2VkIGFs dG9nZXRoZXIgc28gdGhhdCB3ZSBoYXZlIHRvIAorICAgIC8vIGFsaWFzIE1TIFNhbnMgU2VyaWYg KGJpdG1hcCBmb250KSAtPiBNaWNyb3NvZnQgU2FucyBTZXJpZiAodHJ1ZXR5cGUgZm9udCkKKyAg ICBzdGF0aWMgQXRvbWljU3RyaW5nIG1zU2FucygiTVMgU2FucyBTZXJpZiIpOworICAgIERFRklO RV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBtc1NhbnMsICgiTVMgU2FucyBTZXJpZiIpKTsK KyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgbWljcm9zb2Z0U2FucywgKCJN aWNyb3NvZnQgU2FucyBTZXJpZiIpKTsKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5 TmFtZSwgbXNTYW5zKSkKKyAgICAgICAgcmV0dXJuIG1pY3Jvc29mdFNhbnM7CisKKyAgICAvLyBB bGlhcyBNUyBTZXJpZiAoYml0bWFwKSAtPiBUaW1lcyBOZXcgUm9tYW4gKHRydWV0eXBlIGZvbnQp LiBUaGVyZSdzIG5vIAorICAgIC8vICdNaWNyb3NvZnQgU2FucyBTZXJpZi1lcXVpdmFsZW50JyBm b3IgU2VyaWYuIAorICAgIHN0YXRpYyBBdG9taWNTdHJpbmcgbXNTZXJpZigiTVMgU2VyaWYiKTsK KyAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgbXNTZXJpZikpCisgICAgICAg IHJldHVybiB0aW1lc05ld1JvbWFuOworI2VuZGlmCisKICAgICByZXR1cm4gZW1wdHlBdG9tOwog fQogCg== 27486 2009-02-09 10:39:18 -0800 2009-02-09 11:11:57 -0800 patch for Chromium only (missed in the previous patch) 20531.pt2.patch.1 text/plain 3688 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDc4MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMDItMDkgIEp1bmdzaGlrIFNoaW4gPGpzaGluQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1MzEKKworICAgICAgICBD aHJvbWl1bS1wYXJ0IGZvbGxvdy11cCB0byB0aGUgcGF0Y2ggbGFuZGVkIGluIHI0MDYzNgorICAg ICAgICBmb3IgYnVnIDIwNTMxLgorICAgICAgICBSZW1vdmUgYSBzdGF0aWMgbWVtYmVyIGZ1bmN0 aW9uIGFsdGVybmF0ZUZhbWlseU5hbWUKKyAgICAgICAgZnJvbSBDaHJvbWl1bSdzIFdpbi9MaW51 eCBwb3J0cyBvZiBGb250Q2FjaGUuIEluIHI0MDYzNiwKKyAgICAgICAgYWx0ZXJuYXRlRmFtaWx5 TmFtZSB3YXMgY3VzdG9taXplZCB1c2luZyAjaWZkZWYgUExBVEZPUk0oV0lOX09TKS4KKyAgICAg ICAgU28sIHRoZXJlJ3Mgbm8gbW9yZSBuZWVkIGZvciB0aGUgc3RhdGljIG1lbWJlciBmdW5jdGlv biBwZXIKKyAgICAgICAgcGxhdGZvcm0uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9Gb250Q2FjaGVDaHJvbWl1bVdpbi5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwOgorCiAyMDA5LTAyLTA5ICBBZGFtIFJv YmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBXaW5kb3dzIGJ1aWxkIGZpeApJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVDaHJvbWl1bVdp bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9G b250Q2FjaGVDaHJvbWl1bVdpbi5jcHAJKHJldmlzaW9uIDQwNzgyKQorKysgV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVDaHJvbWl1bVdpbi5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQwMSw0NiArNDAxLDYgQEAgY29uc3QgU2ltcGxlRm9udERhdGEqIEZvbnRDYWNo ZTo6Z2V0Rm9udAogCiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgRm9udENhY2hlOjphbHRlcm5h dGVGYW1pbHlOYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFtZSkKLXsKLSAgICAvLyBO b3RlIHRoYXQgbWFwcGluZyB0byBDb3VyaWVyIGlzIHJlbW92ZWQgYmVjYXVzZSAKLSAgICAvLyBi ZWNhdXNlIGl0J3MgYSBiaXRtYXAgZm9udCBvbiBXaW5kb3dzLgotICAgIC8vIEFsaWFzIENvdXJp ZXIgLT4gQ291cmllciBOZXcKLSAgICBzdGF0aWMgQXRvbWljU3RyaW5nIGNvdXJpZXIoIkNvdXJp ZXIiKSwgY291cmllck5ldygiQ291cmllciBOZXciKTsKLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nh c2UoZmFtaWx5TmFtZSwgY291cmllcikpCi0gICAgICAgIHJldHVybiBjb3VyaWVyTmV3OwotCi0g ICAgLy8gQWxpYXMgVGltZXMgPC0+IFRpbWVzIE5ldyBSb21hbi4KLSAgICBzdGF0aWMgQXRvbWlj U3RyaW5nIHRpbWVzKCJUaW1lcyIpLCB0aW1lc05ld1JvbWFuKCJUaW1lcyBOZXcgUm9tYW4iKTsK LSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFtZSwgdGltZXMpKQotICAgICAgICBy ZXR1cm4gdGltZXNOZXdSb21hbjsKLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZmFtaWx5TmFt ZSwgdGltZXNOZXdSb21hbikpCi0gICAgICAgIHJldHVybiB0aW1lczsKLSAgICAKLSAgICAvLyBB bGlhcyBIZWx2ZXRpY2EgPC0+IEFyaWFsCi0gICAgc3RhdGljIEF0b21pY1N0cmluZyBhcmlhbCgi QXJpYWwiKSwgaGVsdmV0aWNhKCJIZWx2ZXRpY2EiKTsKLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nh c2UoZmFtaWx5TmFtZSwgaGVsdmV0aWNhKSkKLSAgICAgICAgcmV0dXJuIGFyaWFsOwotICAgIGlm IChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCBhcmlhbCkpCi0gICAgICAgIHJldHVybiBo ZWx2ZXRpY2E7Ci0KLSAgICAvLyBXZSBibG9jayBiaXRtYXAgZm9udHMgYWx0b2dldGhlciBzbyB0 aGF0IHdlIGhhdmUgdG8gCi0gICAgLy8gYWxpYXMgTVMgU2FucyBTZXJpZiAoYml0bWFwIGZvbnQp IC0+IE1pY3Jvc29mdCBTYW5zIFNlcmlmICh0cnVldHlwZSBmb250KQotICAgIHN0YXRpYyBBdG9t aWNTdHJpbmcgbXNTYW5zKCJNUyBTYW5zIFNlcmlmIik7Ci0gICAgc3RhdGljIEF0b21pY1N0cmlu ZyBtaWNyb3NvZnRTYW5zKCJNaWNyb3NvZnQgU2FucyBTZXJpZiIpOwotICAgIGlmIChlcXVhbEln bm9yaW5nQ2FzZShmYW1pbHlOYW1lLCBtc1NhbnMpKQotICAgICAgICByZXR1cm4gbWljcm9zb2Z0 U2FuczsKLQotICAgIC8vIEFsaWFzIE1TIFNlcmlmIChiaXRtYXApIC0+IFRpbWVzIE5ldyBSb21h biAodHJ1ZXR5cGUgZm9udCkuIFRoZXJlJ3Mgbm8gCi0gICAgLy8gJ01pY3Jvc29mdCBTYW5zIFNl cmlmLWVxdWl2YWxlbnQnIGZvciBTZXJpZi4gCi0gICAgc3RhdGljIEF0b21pY1N0cmluZyBtc1Nl cmlmKCJNUyBTZXJpZiIpOwotICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShmYW1pbHlOYW1lLCBt c1NlcmlmKSkKLSAgICAgICAgcmV0dXJuIHRpbWVzTmV3Um9tYW47Ci0KLSAgICAvLyBGSVhNRTog c2hvdWxkIHdlIG1hcCAnc3lzdGVtJyB0byBzb21ldGhpbmcgKCdUYWhvbWEnKSA/IAotICAgIHJl dHVybiBlbXB0eUF0b207Ci19Ci0KIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Z2V0U2lt aWxhckZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udCYgZm9udCkKIHsKICAgICByZXR1cm4gMDsK SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXgu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9u dENhY2hlTGludXguY3BwCShyZXZpc2lvbiA0MDc4MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGludXguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MSwx NiArOTEsNiBAQCBjb25zdCBTaW1wbGVGb250RGF0YSogRm9udENhY2hlOjpnZXRGb250CiAgICAg cmV0dXJuIHJldDsKIH0KIAotY29uc3QgQXRvbWljU3RyaW5nJiBGb250Q2FjaGU6OmFsdGVybmF0 ZUZhbWlseU5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHlOYW1lKQotewotICAgIG5vdElt cGxlbWVudGVkKCk7Ci0KLSAgICAvLyBUaGlzIGlzIGp1c3QgdG8gc3RvcCBHQ0MgZW1pdHRpbmcg YSB3YXJuaW5nIGFib3V0IHJldHVybmluZyBhIHJlZmVyZW5jZQotICAgIC8vIHRvIGEgdGVtcG9y YXJ5IHZhcmlhYmxlCi0gICAgc3RhdGljIEF0b21pY1N0cmluZyBhOwotICAgIHJldHVybiBhOwot fQotCiBGb250UGxhdGZvcm1EYXRhKiBGb250Q2FjaGU6OmdldFNpbWlsYXJGb250UGxhdGZvcm1E YXRhKGNvbnN0IEZvbnQmIGZvbnQpCiB7CiAgICAgcmV0dXJuIDA7Cg==