95867 2012-09-05 10:30:59 -0700 Rename Font::m_fontList to avoid confusion 2012-10-01 15:18:19 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 95866 1 schenney schenney eric inferno mitz oldest_to_newest 712219 0 schenney 2012-09-05 10:30:59 -0700 We currently have Font::m_fontList which is a RefPtr<FontFallbackList>, while we also have FontFallbackList::m_fontList, which is the eponymous list of font fallbacks. 732030 1 166553 schenney 2012-10-01 15:01:29 -0700 Created attachment 166553 Patch 732032 2 166553 eric 2012-10-01 15:04:06 -0700 Comment on attachment 166553 Patch OK. 732040 3 schenney 2012-10-01 15:18:19 -0700 Committed r130082: <http://trac.webkit.org/changeset/130082> 166553 2012-10-01 15:01:29 -0700 2012-10-01 15:04:05 -0700 Patch bug-95867-20121001180048.patch text/plain 9176 schenney SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMDA4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTEwLTAxICBTdGVwaGVu IENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVuYW1lIEZvbnQ6 Om1fZm9udExpc3QgdG8gYXZvaWQgY29uZnVzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTg2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgUmVuYW1lcyBGb250OjptX2ZvbnRMaXN0IHRvIEZvbnQ6Om1f Zm9udEZhbGxiYWNrTGlzdCB0byBhdm9pZCBjb25mdXNpb24KKyAgICAgICB3aXRoIEZvbnRGYWxs YmFja0xpc3Q6Om1fZm9udExpc3QuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIGJlaGF2aW9y IGlzIGFic29sdXRlbHkgbm90IGRpZmZlcmVudC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0ZvbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6Rm9udCk6CisgICAgICAgIChX ZWJDb3JlOjpGb250OjpvcGVyYXRvcj0pOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6b3BlcmF0 b3I9PSk6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojp1cGRhdGUpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmZvbnRMaXN0KToK KyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmxvYWRpbmdDdXN0b21Gb250cyk6CisgICAgICAgIChG b250KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnByaW1hcnlGb250KToKKyAgICAgICAgKFdl YkNvcmU6OkZvbnQ6OmZvbnREYXRhQXQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6aXNGaXhl ZFBpdGNoKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmZvbnRTZWxlY3Rvcik6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udEZhc3RQYXRoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnQ6OmdseXBoRGF0YUFuZFBhZ2VGb3JDaGFyYWN0ZXIpOgorCiAyMDEyLTEwLTAxICBTdGVw aGVuIENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVmYWN0b3Ig V2ViQ29yZTo6Rm9udERhdGEgaGFuZGxpbmcgdG8gY2xhcmlmeSBwb2ludGVyIG93bmVyc2hpcApJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAJKHJldmlzaW9u IDEzMDA3NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC04Niw3ICs4Niw3IEBAIEZvbnQ6OkZvbnQoY29uc3QgRm9udERlc2Ny aXB0aW9uJiBmZCwgc2gKIH0KIAogRm9udDo6Rm9udChjb25zdCBGb250UGxhdGZvcm1EYXRhJiBm b250RGF0YSwgYm9vbCBpc1ByaW50ZXJGb250LCBGb250U21vb3RoaW5nTW9kZSBmb250U21vb3Ro aW5nTW9kZSkKLSAgICA6IG1fZm9udExpc3QoRm9udEZhbGxiYWNrTGlzdDo6Y3JlYXRlKCkpCisg ICAgOiBtX2ZvbnRGYWxsYmFja0xpc3QoRm9udEZhbGxiYWNrTGlzdDo6Y3JlYXRlKCkpCiAgICAg LCBtX2xldHRlclNwYWNpbmcoMCkKICAgICAsIG1fd29yZFNwYWNpbmcoMCkKICAgICAsIG1faXNQ bGF0Zm9ybUZvbnQodHJ1ZSkKQEAgLTk0LDEyICs5NCwxMiBAQCBGb250OjpGb250KGNvbnN0IEZv bnRQbGF0Zm9ybURhdGEmIGZvbnRECiAgICAgbV9mb250RGVzY3JpcHRpb24uc2V0VXNlUHJpbnRl ckZvbnQoaXNQcmludGVyRm9udCk7CiAgICAgbV9mb250RGVzY3JpcHRpb24uc2V0Rm9udFNtb290 aGluZyhmb250U21vb3RoaW5nTW9kZSk7CiAgICAgbV9uZWVkc1RyYW5zY29kaW5nID0gZm9udFRy YW5zY29kZXIoKS5uZWVkc1RyYW5zY29kaW5nKGZvbnREZXNjcmlwdGlvbigpKTsKLSAgICBtX2Zv bnRMaXN0LT5zZXRQbGF0Zm9ybUZvbnQoZm9udERhdGEpOworICAgIG1fZm9udEZhbGxiYWNrTGlz dC0+c2V0UGxhdGZvcm1Gb250KGZvbnREYXRhKTsKIH0KIAogRm9udDo6Rm9udChjb25zdCBGb250 JiBvdGhlcikKICAgICA6IG1fZm9udERlc2NyaXB0aW9uKG90aGVyLm1fZm9udERlc2NyaXB0aW9u KQotICAgICwgbV9mb250TGlzdChvdGhlci5tX2ZvbnRMaXN0KQorICAgICwgbV9mb250RmFsbGJh Y2tMaXN0KG90aGVyLm1fZm9udEZhbGxiYWNrTGlzdCkKICAgICAsIG1fbGV0dGVyU3BhY2luZyhv dGhlci5tX2xldHRlclNwYWNpbmcpCiAgICAgLCBtX3dvcmRTcGFjaW5nKG90aGVyLm1fd29yZFNw YWNpbmcpCiAgICAgLCBtX2lzUGxhdGZvcm1Gb250KG90aGVyLm1faXNQbGF0Zm9ybUZvbnQpCkBA IC0xMTAsNyArMTEwLDcgQEAgRm9udDo6Rm9udChjb25zdCBGb250JiBvdGhlcikKIEZvbnQmIEZv bnQ6Om9wZXJhdG9yPShjb25zdCBGb250JiBvdGhlcikKIHsKICAgICBtX2ZvbnREZXNjcmlwdGlv biA9IG90aGVyLm1fZm9udERlc2NyaXB0aW9uOwotICAgIG1fZm9udExpc3QgPSBvdGhlci5tX2Zv bnRMaXN0OworICAgIG1fZm9udEZhbGxiYWNrTGlzdCA9IG90aGVyLm1fZm9udEZhbGxiYWNrTGlz dDsKICAgICBtX2xldHRlclNwYWNpbmcgPSBvdGhlci5tX2xldHRlclNwYWNpbmc7CiAgICAgbV93 b3JkU3BhY2luZyA9IG90aGVyLm1fd29yZFNwYWNpbmc7CiAgICAgbV9pc1BsYXRmb3JtRm9udCA9 IG90aGVyLm1faXNQbGF0Zm9ybUZvbnQ7CkBAIC0xMjUsMTUgKzEyNSwxNSBAQCBib29sIEZvbnQ6 Om9wZXJhdG9yPT0oY29uc3QgRm9udCYgb3RoZXIpCiAgICAgaWYgKGxvYWRpbmdDdXN0b21Gb250 cygpIHx8IG90aGVyLmxvYWRpbmdDdXN0b21Gb250cygpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgCi0gICAgRm9udFNlbGVjdG9yKiBmaXJzdCA9IG1fZm9udExpc3QgPyBtX2ZvbnRMaXN0 LT5mb250U2VsZWN0b3IoKSA6IDA7Ci0gICAgRm9udFNlbGVjdG9yKiBzZWNvbmQgPSBvdGhlci5t X2ZvbnRMaXN0ID8gb3RoZXIubV9mb250TGlzdC0+Zm9udFNlbGVjdG9yKCkgOiAwOworICAgIEZv bnRTZWxlY3RvciogZmlyc3QgPSBtX2ZvbnRGYWxsYmFja0xpc3QgPyBtX2ZvbnRGYWxsYmFja0xp c3QtPmZvbnRTZWxlY3RvcigpIDogMDsKKyAgICBGb250U2VsZWN0b3IqIHNlY29uZCA9IG90aGVy Lm1fZm9udEZhbGxiYWNrTGlzdCA/IG90aGVyLm1fZm9udEZhbGxiYWNrTGlzdC0+Zm9udFNlbGVj dG9yKCkgOiAwOwogCiAgICAgcmV0dXJuIGZpcnN0ID09IHNlY29uZAotICAgICAgICAgICAmJiBt X2ZvbnREZXNjcmlwdGlvbiA9PSBvdGhlci5tX2ZvbnREZXNjcmlwdGlvbgotICAgICAgICAgICAm JiBtX2xldHRlclNwYWNpbmcgPT0gb3RoZXIubV9sZXR0ZXJTcGFjaW5nCi0gICAgICAgICAgICYm IG1fd29yZFNwYWNpbmcgPT0gb3RoZXIubV93b3JkU3BhY2luZwotICAgICAgICAgICAmJiAobV9m b250TGlzdCA/IG1fZm9udExpc3QtPmZvbnRTZWxlY3RvclZlcnNpb24oKSA6IDApID09IChvdGhl ci5tX2ZvbnRMaXN0ID8gb3RoZXIubV9mb250TGlzdC0+Zm9udFNlbGVjdG9yVmVyc2lvbigpIDog MCkKLSAgICAgICAgICAgJiYgKG1fZm9udExpc3QgPyBtX2ZvbnRMaXN0LT5nZW5lcmF0aW9uKCkg OiAwKSA9PSAob3RoZXIubV9mb250TGlzdCA/IG90aGVyLm1fZm9udExpc3QtPmdlbmVyYXRpb24o KSA6IDApOworICAgICAgICAmJiBtX2ZvbnREZXNjcmlwdGlvbiA9PSBvdGhlci5tX2ZvbnREZXNj cmlwdGlvbgorICAgICAgICAmJiBtX2xldHRlclNwYWNpbmcgPT0gb3RoZXIubV9sZXR0ZXJTcGFj aW5nCisgICAgICAgICYmIG1fd29yZFNwYWNpbmcgPT0gb3RoZXIubV93b3JkU3BhY2luZworICAg ICAgICAmJiAobV9mb250RmFsbGJhY2tMaXN0ID8gbV9mb250RmFsbGJhY2tMaXN0LT5mb250U2Vs ZWN0b3JWZXJzaW9uKCkgOiAwKSA9PSAob3RoZXIubV9mb250RmFsbGJhY2tMaXN0ID8gb3RoZXIu bV9mb250RmFsbGJhY2tMaXN0LT5mb250U2VsZWN0b3JWZXJzaW9uKCkgOiAwKQorICAgICAgICAm JiAobV9mb250RmFsbGJhY2tMaXN0ID8gbV9mb250RmFsbGJhY2tMaXN0LT5nZW5lcmF0aW9uKCkg OiAwKSA9PSAob3RoZXIubV9mb250RmFsbGJhY2tMaXN0ID8gb3RoZXIubV9mb250RmFsbGJhY2tM aXN0LT5nZW5lcmF0aW9uKCkgOiAwKTsKIH0KIAogdm9pZCBGb250Ojp1cGRhdGUoUGFzc1JlZlB0 cjxGb250U2VsZWN0b3I+IGZvbnRTZWxlY3RvcikgY29uc3QKQEAgLTE0Myw5ICsxNDMsOSBAQCB2 b2lkIEZvbnQ6OnVwZGF0ZShQYXNzUmVmUHRyPEZvbnRTZWxlY3RvCiAgICAgLy8gc3R5bGUgYW55 d2F5LiBPdGhlciBjb3BpZXMgYXJlIHRyYW5zaWVudCwgZS5nLiwgdGhlIHN0YXRlIGluIHRoZSBH cmFwaGljc0NvbnRleHQsIGFuZAogICAgIC8vIHdvbid0IHN0aWNrIGFyb3VuZCBsb25nIGVub3Vn aCB0byBnZXQgeW91IGluIHRyb3VibGUpLiBTdGlsbCwgdGhpcyBpcyBwcmV0dHkgZGlzZ3VzdGlu ZywKICAgICAvLyBhbmQgY291bGQgZXZlbnR1YWxseSBiZSByZWN0aWZpZWQgYnkgdXNpbmcgUmVm UHRycyBmb3IgRm9udHMgdGhlbXNlbHZlcy4KLSAgICBpZiAoIW1fZm9udExpc3QpCi0gICAgICAg IG1fZm9udExpc3QgPSBGb250RmFsbGJhY2tMaXN0OjpjcmVhdGUoKTsKLSAgICBtX2ZvbnRMaXN0 LT5pbnZhbGlkYXRlKGZvbnRTZWxlY3Rvcik7CisgICAgaWYgKCFtX2ZvbnRGYWxsYmFja0xpc3Qp CisgICAgICAgIG1fZm9udEZhbGxiYWNrTGlzdCA9IEZvbnRGYWxsYmFja0xpc3Q6OmNyZWF0ZSgp OworICAgIG1fZm9udEZhbGxiYWNrTGlzdC0+aW52YWxpZGF0ZShmb250U2VsZWN0b3IpOwogfQog CiB2b2lkIEZvbnQ6OmRyYXdUZXh0KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgVGV4 dFJ1biYgcnVuLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgaW50IGZyb20sIGludCB0bykgY29u c3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgJKHJldmlzaW9u IDEzMDA3OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAkod29y a2luZyBjb3B5KQpAQCAtMjYxLDEyICsyNjEsMTIgQEAgcHVibGljOgogICAgIHN0YXRpYyBTdHJp bmcgbm9ybWFsaXplU3BhY2VzKGNvbnN0IFVDaGFyKiwgdW5zaWduZWQgbGVuZ3RoKTsKIAogICAg IGJvb2wgbmVlZHNUcmFuc2NvZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fbmVlZHNUcmFuc2NvZGlu ZzsgfQotICAgIEZvbnRGYWxsYmFja0xpc3QqIGZvbnRMaXN0KCkgY29uc3QgeyByZXR1cm4gbV9m b250TGlzdC5nZXQoKTsgfQorICAgIEZvbnRGYWxsYmFja0xpc3QqIGZvbnRMaXN0KCkgY29uc3Qg eyByZXR1cm4gbV9mb250RmFsbGJhY2tMaXN0LmdldCgpOyB9CiAKIHByaXZhdGU6CiAgICAgYm9v bCBsb2FkaW5nQ3VzdG9tRm9udHMoKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJuIG1fZm9u dExpc3QgJiYgbV9mb250TGlzdC0+bG9hZGluZ0N1c3RvbUZvbnRzKCk7CisgICAgICAgIHJldHVy biBtX2ZvbnRGYWxsYmFja0xpc3QgJiYgbV9mb250RmFsbGJhY2tMaXN0LT5sb2FkaW5nQ3VzdG9t Rm9udHMoKTsKICAgICB9CiAKICNpZiBQTEFURk9STShRVCkKQEAgLTI3NCw3ICsyNzQsNyBAQCBw cml2YXRlOgogI2VuZGlmCiAKICAgICBGb250RGVzY3JpcHRpb24gbV9mb250RGVzY3JpcHRpb247 Ci0gICAgbXV0YWJsZSBSZWZQdHI8Rm9udEZhbGxiYWNrTGlzdD4gbV9mb250TGlzdDsKKyAgICBt dXRhYmxlIFJlZlB0cjxGb250RmFsbGJhY2tMaXN0PiBtX2ZvbnRGYWxsYmFja0xpc3Q7CiAgICAg c2hvcnQgbV9sZXR0ZXJTcGFjaW5nOwogICAgIHNob3J0IG1fd29yZFNwYWNpbmc7CiAgICAgYm9v bCBtX2lzUGxhdGZvcm1Gb250OwpAQCAtMjg3LDI1ICsyODcsMjUgQEAgaW5saW5lIEZvbnQ6On5G b250KCkKIAogaW5saW5lIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBGb250OjpwcmltYXJ5Rm9udCgp IGNvbnN0CiB7Ci0gICAgQVNTRVJUKG1fZm9udExpc3QpOwotICAgIHJldHVybiBtX2ZvbnRMaXN0 LT5wcmltYXJ5U2ltcGxlRm9udERhdGEodGhpcyk7CisgICAgQVNTRVJUKG1fZm9udEZhbGxiYWNr TGlzdCk7CisgICAgcmV0dXJuIG1fZm9udEZhbGxiYWNrTGlzdC0+cHJpbWFyeVNpbXBsZUZvbnRE YXRhKHRoaXMpOwogfQogCiBpbmxpbmUgY29uc3QgRm9udERhdGEqIEZvbnQ6OmZvbnREYXRhQXQo dW5zaWduZWQgaW5kZXgpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKG1fZm9udExpc3QpOwotICAgIHJl dHVybiBtX2ZvbnRMaXN0LT5mb250RGF0YUF0KHRoaXMsIGluZGV4KTsKKyAgICBBU1NFUlQobV9m b250RmFsbGJhY2tMaXN0KTsKKyAgICByZXR1cm4gbV9mb250RmFsbGJhY2tMaXN0LT5mb250RGF0 YUF0KHRoaXMsIGluZGV4KTsKIH0KIAogaW5saW5lIGJvb2wgRm9udDo6aXNGaXhlZFBpdGNoKCkg Y29uc3QKIHsKLSAgICBBU1NFUlQobV9mb250TGlzdCk7Ci0gICAgcmV0dXJuIG1fZm9udExpc3Qt PmlzRml4ZWRQaXRjaCh0aGlzKTsKKyAgICBBU1NFUlQobV9mb250RmFsbGJhY2tMaXN0KTsKKyAg ICByZXR1cm4gbV9mb250RmFsbGJhY2tMaXN0LT5pc0ZpeGVkUGl0Y2godGhpcyk7CiB9CiAKIGlu bGluZSBGb250U2VsZWN0b3IqIEZvbnQ6OmZvbnRTZWxlY3RvcigpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIG1fZm9udExpc3QgPyBtX2ZvbnRMaXN0LT5mb250U2VsZWN0b3IoKSA6IDA7CisgICAgcmV0 dXJuIG1fZm9udEZhbGxiYWNrTGlzdCA/IG1fZm9udEZhbGxiYWNrTGlzdC0+Zm9udFNlbGVjdG9y KCkgOiAwOwogfQogCiBpbmxpbmUgZmxvYXQgRm9udDo6dGFiV2lkdGgoY29uc3QgU2ltcGxlRm9u dERhdGEmIGZvbnREYXRhLCB1bnNpZ25lZCB0YWJTaXplLCBmbG9hdCBwb3NpdGlvbikgY29uc3QK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRGYXN0UGF0aC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udEZhc3RQ YXRoLmNwcAkocmV2aXNpb24gMTMwMDc5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udEZhc3RQYXRoLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjgsMTMgKzY4LDEzIEBA IHN0ZDo6cGFpcjxHbHlwaERhdGEsIEdseXBoUGFnZSo+IEZvbnQ6OmcKIAogICAgIHVuc2lnbmVk IHBhZ2VOdW1iZXIgPSAoYyAvIEdseXBoUGFnZTo6c2l6ZSk7CiAKLSAgICBHbHlwaFBhZ2VUcmVl Tm9kZSogbm9kZSA9IHBhZ2VOdW1iZXIgPyBtX2ZvbnRMaXN0LT5tX3BhZ2VzLmdldChwYWdlTnVt YmVyKSA6IG1fZm9udExpc3QtPm1fcGFnZVplcm87CisgICAgR2x5cGhQYWdlVHJlZU5vZGUqIG5v ZGUgPSBwYWdlTnVtYmVyID8gbV9mb250RmFsbGJhY2tMaXN0LT5tX3BhZ2VzLmdldChwYWdlTnVt YmVyKSA6IG1fZm9udEZhbGxiYWNrTGlzdC0+bV9wYWdlWmVybzsKICAgICBpZiAoIW5vZGUpIHsK ICAgICAgICAgbm9kZSA9IEdseXBoUGFnZVRyZWVOb2RlOjpnZXRSb290Q2hpbGQoZm9udERhdGFB dCgwKSwgcGFnZU51bWJlcik7CiAgICAgICAgIGlmIChwYWdlTnVtYmVyKQotICAgICAgICAgICAg bV9mb250TGlzdC0+bV9wYWdlcy5zZXQocGFnZU51bWJlciwgbm9kZSk7CisgICAgICAgICAgICBt X2ZvbnRGYWxsYmFja0xpc3QtPm1fcGFnZXMuc2V0KHBhZ2VOdW1iZXIsIG5vZGUpOwogICAgICAg ICBlbHNlCi0gICAgICAgICAgICBtX2ZvbnRMaXN0LT5tX3BhZ2VaZXJvID0gbm9kZTsKKyAgICAg ICAgICAgIG1fZm9udEZhbGxiYWNrTGlzdC0+bV9wYWdlWmVybyA9IG5vZGU7CiAgICAgfQogCiAg ICAgR2x5cGhQYWdlKiBwYWdlID0gMDsKQEAgLTEzOSw5ICsxMzksOSBAQCBzdGQ6OnBhaXI8R2x5 cGhEYXRhLCBHbHlwaFBhZ2UqPiBGb250OjpnCiAgICAgICAgICAgICAvLyBQcm9jZWVkIHdpdGgg dGhlIGZhbGxiYWNrIGxpc3QuCiAgICAgICAgICAgICBub2RlID0gbm9kZS0+Z2V0Q2hpbGQoZm9u dERhdGFBdChub2RlLT5sZXZlbCgpKSwgcGFnZU51bWJlcik7CiAgICAgICAgICAgICBpZiAocGFn ZU51bWJlcikKLSAgICAgICAgICAgICAgICBtX2ZvbnRMaXN0LT5tX3BhZ2VzLnNldChwYWdlTnVt YmVyLCBub2RlKTsKKyAgICAgICAgICAgICAgICBtX2ZvbnRGYWxsYmFja0xpc3QtPm1fcGFnZXMu c2V0KHBhZ2VOdW1iZXIsIG5vZGUpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg IG1fZm9udExpc3QtPm1fcGFnZVplcm8gPSBub2RlOworICAgICAgICAgICAgICAgIG1fZm9udEZh bGxiYWNrTGlzdC0+bV9wYWdlWmVybyA9IG5vZGU7CiAgICAgICAgIH0KICAgICB9CiAgICAgaWYg KHZhcmlhbnQgIT0gTm9ybWFsVmFyaWFudCkgewpAQCAtMTc2LDkgKzE3Niw5IEBAIHN0ZDo6cGFp cjxHbHlwaERhdGEsIEdseXBoUGFnZSo+IEZvbnQ6OmcKICAgICAgICAgICAgIC8vIFByb2NlZWQg d2l0aCB0aGUgZmFsbGJhY2sgbGlzdC4KICAgICAgICAgICAgIG5vZGUgPSBub2RlLT5nZXRDaGls ZChmb250RGF0YUF0KG5vZGUtPmxldmVsKCkpLCBwYWdlTnVtYmVyKTsKICAgICAgICAgICAgIGlm IChwYWdlTnVtYmVyKQotICAgICAgICAgICAgICAgIG1fZm9udExpc3QtPm1fcGFnZXMuc2V0KHBh Z2VOdW1iZXIsIG5vZGUpOworICAgICAgICAgICAgICAgIG1fZm9udEZhbGxiYWNrTGlzdC0+bV9w YWdlcy5zZXQocGFnZU51bWJlciwgbm9kZSk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgbV9mb250TGlzdC0+bV9wYWdlWmVybyA9IG5vZGU7CisgICAgICAgICAgICAgICAgbV9m b250RmFsbGJhY2tMaXN0LT5tX3BhZ2VaZXJvID0gbm9kZTsKICAgICAgICAgfQogICAgIH0KIAo=