65090 2011-07-24 19:01:21 -0700 Small cleanup of m_fontDirty tracking in CSSStyleSelector 2011-07-24 22:10:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson dglazkov macpherson tkent webkit.review.bot oldest_to_newest 441531 0 macpherson 2011-07-24 19:01:21 -0700 Small cleanup of m_fontDirty tracking in CSSStyleSelector 441532 1 101845 macpherson 2011-07-24 19:07:06 -0700 Created attachment 101845 Patch 441540 2 101845 darin 2011-07-24 20:13:08 -0700 Comment on attachment 101845 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101845&action=review Please consider doing this without the name change. > Source/WebCore/ChangeLog:8 > + 1) Use exising setFontDescription helper where appropriate. Typo: existing > Source/WebCore/css/CSSStyleSelector.cpp:1997 > -void CSSStyleSelector::updateFont() > +void CSSStyleSelector::updateFontIfDirty() I don’t think we need the name change. It’s great to move the check into the function, even without changing the function name to make that explicit. 441553 3 101848 macpherson 2011-07-24 21:12:30 -0700 Created attachment 101848 Patch for landing 441556 4 101848 webkit.review.bot 2011-07-24 22:10:47 -0700 Comment on attachment 101848 Patch for landing Clearing flags on attachment: 101848 Committed r91657: <http://trac.webkit.org/changeset/91657> 441557 5 webkit.review.bot 2011-07-24 22:10:51 -0700 All reviewed patches have been landed. Closing bug. 101845 2011-07-24 19:07:06 -0700 2011-07-24 21:12:23 -0700 Patch bug-65090-20110725120703.patch text/plain 9056 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNjUyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDctMjQgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBTbWFsbCBjbGVh bnVwIG9mIG1fZm9udERpcnR5IHRyYWNraW5nIGluIENTU1N0eWxlU2VsZWN0b3IKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MDkwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMSkgVXNlIGV4aXNpbmcgc2V0 Rm9udERlc2NyaXB0aW9uIGhlbHBlciB3aGVyZSBhcHByb3ByaWF0ZS4KKyAgICAgICAgMikgTW92 ZSBhbHdheXMgdXNlZCBtX2ZvbnREaXJ0eSBjaGVjayBpbnRvIHVwZGF0ZUZvbnQoKQorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyAvIGNsZWFudXAgb25seS4KKworICAgICAgICAqIGNzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OnN0eWxl Rm9yRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZv cktleWZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OnBzZXVkb1N0 eWxlRm9yRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpzdHls ZUZvclBhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6dXBkYXRlRm9u dElmRGlydHkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9w ZXJ0eSk6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuaDoKKwogMjAxMS0wNy0yNCAg UGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggQXRv bWljU3RyaW5nIHZzLiBTdHJpbmcgdXNhZ2UgaW4gSlNDIGJpbmRpbmcKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDkxNjUwKQorKysgU291cmNl L1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAx LDggKzE1MDEsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yCiAg ICAgYXBwbHlEZWNsYXJhdGlvbnM8dHJ1ZT4odHJ1ZSwgZmlyc3RVQVJ1bGUsIGxhc3RVQVJ1bGUp OwogICAgIAogICAgIC8vIElmIG91ciBmb250IGdvdCBkaXJ0aWVkLCBnbyBhaGVhZCBhbmQgdXBk YXRlIGl0IG5vdy4KLSAgICBpZiAobV9mb250RGlydHkpCi0gICAgICAgIHVwZGF0ZUZvbnQoKTsK KyAgICB1cGRhdGVGb250SWZEaXJ0eSgpOwogCiAgICAgLy8gTGluZS1oZWlnaHQgaXMgc2V0IHdo ZW4gd2UgYXJlIHN1cmUgd2UgZGVjaWRlZCBvbiB0aGUgZm9udC1zaXplCiAgICAgaWYgKG1fbGlu ZUhlaWdodFZhbHVlKQpAQCAtMTUyNSw5ICsxNTI0LDggQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHls ZT4gQ1NTU3R5bGVTZWxlY3RvcgogICAgIEFTU0VSVCghbV9mb250RGlydHkpOwogICAgIC8vIElm IG91ciBmb250IGdvdCBkaXJ0aWVkIGJ5IG9uZSBvZiB0aGUgbm9uLWVzc2VudGlhbCBmb250IHBy b3BzLCAKICAgICAvLyBnbyBhaGVhZCBhbmQgdXBkYXRlIGl0IGEgc2Vjb25kIHRpbWUuCi0gICAg aWYgKG1fZm9udERpcnR5KQotICAgICAgICB1cGRhdGVGb250KCk7Ci0gICAgCisgICAgdXBkYXRl Rm9udElmRGlydHkoKTsKKwogICAgIC8vIENsZWFuIHVwIG91ciBzdHlsZSBvYmplY3QncyBkaXNw bGF5IGFuZCB0ZXh0IGRlY29yYXRpb25zIChhbW9uZyBvdGhlciBmaXh1cHMpLgogICAgIGFkanVz dFJlbmRlclN0eWxlKHN0eWxlKCksIG1fcGFyZW50U3R5bGUsIGUpOwogCkBAIC0xNTY4LDggKzE1 NjYsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yCiAgICAgICAg IGFwcGx5RGVjbGFyYXRpb25zPHRydWU+KGZhbHNlLCAwLCBtX21hdGNoZWREZWNscy5zaXplKCkg LSAxKTsKIAogICAgIC8vIElmIG91ciBmb250IGdvdCBkaXJ0aWVkLCBnbyBhaGVhZCBhbmQgdXBk YXRlIGl0IG5vdy4KLSAgICBpZiAobV9mb250RGlydHkpCi0gICAgICAgIHVwZGF0ZUZvbnQoKTsK KyAgICB1cGRhdGVGb250SWZEaXJ0eSgpOwogCiAgICAgLy8gTGluZS1oZWlnaHQgaXMgc2V0IHdo ZW4gd2UgYXJlIHN1cmUgd2UgZGVjaWRlZCBvbiB0aGUgZm9udC1zaXplCiAgICAgaWYgKG1fbGlu ZUhlaWdodFZhbHVlKQpAQCAtMTU4MSw4ICsxNTc4LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHls ZT4gQ1NTU3R5bGVTZWxlY3RvcgogCiAgICAgLy8gSWYgb3VyIGZvbnQgZ290IGRpcnRpZWQgYnkg b25lIG9mIHRoZSBub24tZXNzZW50aWFsIGZvbnQgcHJvcHMsCiAgICAgLy8gZ28gYWhlYWQgYW5k IHVwZGF0ZSBpdCBhIHNlY29uZCB0aW1lLgotICAgIGlmIChtX2ZvbnREaXJ0eSkKLSAgICAgICAg dXBkYXRlRm9udCgpOworICAgIHVwZGF0ZUZvbnRJZkRpcnR5KCk7CiAKICAgICAvLyBTdGFydCBs b2FkaW5nIGltYWdlcyByZWZlcmVuY2VkIGJ5IHRoaXMgc3R5bGUuCiAgICAgbG9hZFBlbmRpbmdJ bWFnZXMoKTsKQEAgLTE3MTEsOCArMTcwNyw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IENT U1N0eWxlU2VsZWN0b3IKICAgICBhcHBseURlY2xhcmF0aW9uczx0cnVlPih0cnVlLCBmaXJzdFVB UnVsZSwgbGFzdFVBUnVsZSk7CiAgICAgCiAgICAgLy8gSWYgb3VyIGZvbnQgZ290IGRpcnRpZWQs IGdvIGFoZWFkIGFuZCB1cGRhdGUgaXQgbm93LgotICAgIGlmIChtX2ZvbnREaXJ0eSkKLSAgICAg ICAgdXBkYXRlRm9udCgpOworICAgIHVwZGF0ZUZvbnRJZkRpcnR5KCk7CiAKICAgICAvLyBMaW5l LWhlaWdodCBpcyBzZXQgd2hlbiB3ZSBhcmUgc3VyZSB3ZSBkZWNpZGVkIG9uIHRoZSBmb250LXNp emUKICAgICBpZiAobV9saW5lSGVpZ2h0VmFsdWUpCkBAIC0xNzMxLDggKzE3MjYsNyBAQCBQYXNz UmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yCiAgICAgCiAgICAgLy8gSWYgb3Vy IGZvbnQgZ290IGRpcnRpZWQgYnkgb25lIG9mIHRoZSBub24tZXNzZW50aWFsIGZvbnQgcHJvcHMs IAogICAgIC8vIGdvIGFoZWFkIGFuZCB1cGRhdGUgaXQgYSBzZWNvbmQgdGltZS4KLSAgICBpZiAo bV9mb250RGlydHkpCi0gICAgICAgIHVwZGF0ZUZvbnQoKTsKKyAgICB1cGRhdGVGb250SWZEaXJ0 eSgpOwogCiAgICAgLy8gQ2xlYW4gdXAgb3VyIHN0eWxlIG9iamVjdCdzIGRpc3BsYXkgYW5kIHRl eHQgZGVjb3JhdGlvbnMgKGFtb25nIG90aGVyIGZpeHVwcykuCiAgICAgYWRqdXN0UmVuZGVyU3R5 bGUoc3R5bGUoKSwgcGFyZW50U3R5bGUsIDApOwpAQCAtMTc2NSw4ICsxNzU5LDcgQEAgUGFzc1Jl ZlB0cjxSZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3RvcgogICAgIGFwcGx5RGVjbGFyYXRpb25z PHRydWU+KGZhbHNlLCAwLCBtX21hdGNoZWREZWNscy5zaXplKCkgLSAxKTsKIAogICAgIC8vIElm IG91ciBmb250IGdvdCBkaXJ0aWVkLCBnbyBhaGVhZCBhbmQgdXBkYXRlIGl0IG5vdy4KLSAgICBp ZiAobV9mb250RGlydHkpCi0gICAgICAgIHVwZGF0ZUZvbnQoKTsKKyAgICB1cGRhdGVGb250SWZE aXJ0eSgpOwogCiAgICAgLy8gTGluZS1oZWlnaHQgaXMgc2V0IHdoZW4gd2UgYXJlIHN1cmUgd2Ug ZGVjaWRlZCBvbiB0aGUgZm9udC1zaXplCiAgICAgaWYgKG1fbGluZUhlaWdodFZhbHVlKQpAQCAt MjAwMSw4ICsxOTk0LDExIEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YWRqdXN0UmVuZGVyU3R5 bGUKICNlbmRpZgogfQogCi12b2lkIENTU1N0eWxlU2VsZWN0b3I6OnVwZGF0ZUZvbnQoKQordm9p ZCBDU1NTdHlsZVNlbGVjdG9yOjp1cGRhdGVGb250SWZEaXJ0eSgpCiB7CisgICAgaWYgKCFtX2Zv bnREaXJ0eSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgY2hlY2tGb3JUZXh0U2l6ZUFkanVzdCgp OwogICAgIGNoZWNrRm9yR2VuZXJpY0ZhbWlseUNoYW5nZShzdHlsZSgpLCBtX3BhcmVudFN0eWxl KTsKICAgICBjaGVja0Zvclpvb21DaGFuZ2Uoc3R5bGUoKSwgbV9wYXJlbnRTdHlsZSk7CkBAIC0z OTAxLDggKzM4OTcsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50 CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgc2V0Rm9udFNpemUoZm9udERlc2NyaXB0 aW9uLCBzaXplKTsKLSAgICAgICAgaWYgKG1fc3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihmb250 RGVzY3JpcHRpb24pKQotICAgICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOworICAgICAgICBz ZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIApAQCAtNDE1NSw4ICs0MTUwLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVBy b3BlcnR5KGludAogICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEdlbmVyaWNGYW1pbHko cGFyZW50Rm9udERlc2NyaXB0aW9uLmdlbmVyaWNGYW1pbHkoKSk7CiAgICAgICAgICAgICBmb250 RGVzY3JpcHRpb24uc2V0RmFtaWx5KHBhcmVudEZvbnREZXNjcmlwdGlvbi5maXJzdEZhbWlseSgp KTsKICAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRJc1NwZWNpZmllZEZvbnQocGFyZW50 Rm9udERlc2NyaXB0aW9uLmlzU3BlY2lmaWVkRm9udCgpKTsKLSAgICAgICAgICAgIGlmIChtX3N0 eWxlLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKSkKLSAgICAgICAgICAgICAg ICBtX2ZvbnREaXJ0eSA9IHRydWU7CisgICAgICAgICAgICBzZXRGb250RGVzY3JpcHRpb24oZm9u dERlc2NyaXB0aW9uKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfSBlbHNlIGlmIChp c0luaXRpYWwpIHsKICAgICAgICAgICAgIEZvbnREZXNjcmlwdGlvbiBpbml0aWFsRGVzYyA9IEZv bnREZXNjcmlwdGlvbigpOwpAQCAtNDE2OCw4ICs0MTYyLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVj dG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEdl bmVyaWNGYW1pbHkoaW5pdGlhbERlc2MuZ2VuZXJpY0ZhbWlseSgpKTsKICAgICAgICAgICAgIGlm ICghaW5pdGlhbERlc2MuZmlyc3RGYW1pbHkoKS5mYW1pbHlJc0VtcHR5KCkpCiAgICAgICAgICAg ICAgICAgZm9udERlc2NyaXB0aW9uLnNldEZhbWlseShpbml0aWFsRGVzYy5maXJzdEZhbWlseSgp KTsKLSAgICAgICAgICAgIGlmIChtX3N0eWxlLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2Ny aXB0aW9uKSkKLSAgICAgICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRydWU7CisgICAgICAgICAg ICBzZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogICAgICAgICAKQEAgLTQyNDUsOCArNDIzOCw3IEBAIHZvaWQgQ1NTU3R5 bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgICAgIGlmIChmb250RGVzY3Jp cHRpb24ua2V5d29yZFNpemUoKSAmJiBmb250RGVzY3JpcHRpb24udXNlRml4ZWREZWZhdWx0U2l6 ZSgpICE9IG9sZEZhbWlseVVzZWRGaXhlZERlZmF1bHRTaXplKQogICAgICAgICAgICAgICAgIHNl dEZvbnRTaXplKGZvbnREZXNjcmlwdGlvbiwgZm9udFNpemVGb3JLZXl3b3JkKG1fY2hlY2tlci5t X2RvY3VtZW50LCBDU1NWYWx1ZVh4U21hbGwgKyBmb250RGVzY3JpcHRpb24ua2V5d29yZFNpemUo KSAtIDEsICFvbGRGYW1pbHlVc2VkRml4ZWREZWZhdWx0U2l6ZSkpOwogCi0gICAgICAgICAgICBp ZiAobV9zdHlsZS0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbikpCi0gICAgICAg ICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOworICAgICAgICAgICAgc2V0Rm9udERlc2NyaXB0 aW9uKGZvbnREZXNjcmlwdGlvbik7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0K QEAgLTQzNDEsOCArNDMzMyw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0 eShpbnQKICAgICAgICAgICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBtX3Bh cmVudFN0eWxlLT5mb250RGVzY3JpcHRpb24oKTsKICAgICAgICAgICAgIG1fc3R5bGUtPnNldExp bmVIZWlnaHQobV9wYXJlbnRTdHlsZS0+bGluZUhlaWdodCgpKTsKICAgICAgICAgICAgIG1fbGlu ZUhlaWdodFZhbHVlID0gMDsKLSAgICAgICAgICAgIGlmIChtX3N0eWxlLT5zZXRGb250RGVzY3Jp cHRpb24oZm9udERlc2NyaXB0aW9uKSkKLSAgICAgICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRy dWU7CisgICAgICAgICAgICBzZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKICAg ICAgICAgfSBlbHNlIGlmIChpc0luaXRpYWwpIHsKICAgICAgICAgICAgIFNldHRpbmdzKiBzZXR0 aW5ncyA9IG1fY2hlY2tlci5tX2RvY3VtZW50LT5zZXR0aW5ncygpOwogICAgICAgICAgICAgQVNT RVJUKHNldHRpbmdzKTsgLy8gSWYgd2UncmUgZG9pbmcgc3R5bGUgcmVzb2x1dGlvbiwgdGhpcyBk b2N1bWVudCBzaG91bGQgYWx3YXlzIGJlIGluIGEgZnJhbWUgYW5kIHRodXMgaGF2ZSBzZXR0aW5n cwpAQCAtNDM2MSw4ICs0MzUyLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3Bl cnR5KGludAogICAgICAgICAgICAgc2V0Rm9udFNpemUoZm9udERlc2NyaXB0aW9uLCBmb250U2l6 ZUZvcktleXdvcmQobV9jaGVja2VyLm1fZG9jdW1lbnQsIENTU1ZhbHVlTWVkaXVtLCBmYWxzZSkp OwogICAgICAgICAgICAgbV9zdHlsZS0+c2V0TGluZUhlaWdodChSZW5kZXJTdHlsZTo6aW5pdGlh bExpbmVIZWlnaHQoKSk7CiAgICAgICAgICAgICBtX2xpbmVIZWlnaHRWYWx1ZSA9IDA7Ci0gICAg ICAgICAgICBpZiAobV9zdHlsZS0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbikp Ci0gICAgICAgICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOworICAgICAgICAgICAgc2V0Rm9u dERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7CiAgICAgICAgIH0gZWxzZSBpZiAocHJpbWl0 aXZlVmFsdWUpIHsKICAgICAgICAgICAgIG1fc3R5bGUtPnNldExpbmVIZWlnaHQoUmVuZGVyU3R5 bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCkpOwogICAgICAgICAgICAgbV9saW5lSGVpZ2h0VmFsdWUg PSAwOwpAQCAtNDM4Miw4ICs0MzcyLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVBy b3BlcnR5KGludAogICAgICAgICAgICAKICAgICAgICAgICAgICAgICAvLyBIYW5kbGUgdGhlIHpv b20gZmFjdG9yLgogICAgICAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNp emUoZ2V0Q29tcHV0ZWRTaXplRnJvbVNwZWNpZmllZFNpemUobV9jaGVja2VyLm1fZG9jdW1lbnQs IG1fc3R5bGUuZ2V0KCksIGZvbnREZXNjcmlwdGlvbi5pc0Fic29sdXRlU2l6ZSgpLCBmb250RGVz Y3JpcHRpb24uc3BlY2lmaWVkU2l6ZSgpLCB1c2VTVkdab29tUnVsZXMoKSkpOwotICAgICAgICAg ICAgICAgIGlmIChtX3N0eWxlLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKSkK LSAgICAgICAgICAgICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOworICAgICAgICAgICAgICAg IHNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwogICAgICAgICAgICAgfQogICAg ICAgICB9IGVsc2UgaWYgKHZhbHVlLT5pc0ZvbnRWYWx1ZSgpKSB7CiAgICAgICAgICAgICBGb250 VmFsdWUgKmZvbnQgPSBzdGF0aWNfY2FzdDxGb250VmFsdWUqPih2YWx1ZSk7CkBAIC01MTI3LDgg KzUxMTYsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAg ICAgICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPnNldFdyaXRpbmdNb2RlU2V0T25Eb2N1bWVu dEVsZW1lbnQodHJ1ZSk7CiAgICAgICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24g PSBtX3N0eWxlLT5mb250RGVzY3JpcHRpb24oKTsKICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNl dE9yaWVudGF0aW9uKG1fc3R5bGUtPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9u dGFsIDogVmVydGljYWwpOwotICAgICAgICBpZiAobV9zdHlsZS0+c2V0Rm9udERlc2NyaXB0aW9u KGZvbnREZXNjcmlwdGlvbikpCi0gICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRydWU7CisgICAg ICAgIHNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgJKHJldmlz aW9uIDkxNjUwKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAkod29y a2luZyBjb3B5KQpAQCAtMzExLDcgKzMxMSw3IEBAIHB1YmxpYzoKICAgICAgICAgc3RhdGljIFJl bmRlclN0eWxlKiBzX3N0eWxlTm90WWV0QXZhaWxhYmxlOwogCiAgICAgICAgIHZvaWQgbWF0Y2hV QVJ1bGVzKGludCYgZmlyc3RVQVJ1bGUsIGludCYgbGFzdFVBUnVsZSk7Ci0gICAgICAgIHZvaWQg dXBkYXRlRm9udCgpOworICAgICAgICB2b2lkIHVwZGF0ZUZvbnRJZkRpcnR5KCk7CiAgICAgICAg IHZvaWQgY2FjaGVCb3JkZXJBbmRCYWNrZ3JvdW5kKCk7CiAKICAgICAgICAgdm9pZCBtYXBGaWxs QXR0YWNobWVudChDU1NQcm9wZXJ0eUlELCBGaWxsTGF5ZXIqLCBDU1NWYWx1ZSopOwo= 101848 2011-07-24 21:12:30 -0700 2011-07-24 22:10:47 -0700 Patch for landing bug-65090-20110725141227.patch text/plain 8428 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNjU0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDctMjQgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBTbWFsbCBjbGVh bnVwIG9mIG1fZm9udERpcnR5IHRyYWNraW5nIGluIENTU1N0eWxlU2VsZWN0b3IKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY1MDkwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgMSkgVXNlIGV4aXN0aW5nIHNldEZv bnREZXNjcmlwdGlvbiBoZWxwZXIgd2hlcmUgYXBwcm9wcmlhdGUuCisgICAgICAgIDIpIE1vdmUg YWx3YXlzIHVzZWQgbV9mb250RGlydHkgY2hlY2sgaW50byB1cGRhdGVGb250KCkKKworICAgICAg ICBObyBuZXcgdGVzdHMgLyBjbGVhbnVwIG9ubHkuCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVT ZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZv ckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JL ZXlmcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpwc2V1ZG9TdHls ZUZvckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVG b3JQYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OnVwZGF0ZUZvbnRJ ZkRpcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVy dHkpOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmg6CisKIDIwMTEtMDctMjQgIEtl bnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFZhbGlkYXRpb24gbWVz c2FnZSBidWJibGUgcG9zaXRpb24gaXMgaW5jb3JyZWN0IGlmIHRoZSBjb250YWluaW5nIGJsb2Nr IGhhcyBwYWRkaW5ncy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9y LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHAJKHJldmlzaW9uIDkxNjU0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAxLDggKzE1MDEsNyBAQCBQYXNzUmVmUHRyPFJl bmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yCiAgICAgYXBwbHlEZWNsYXJhdGlvbnM8dHJ1ZT4o dHJ1ZSwgZmlyc3RVQVJ1bGUsIGxhc3RVQVJ1bGUpOwogICAgIAogICAgIC8vIElmIG91ciBmb250 IGdvdCBkaXJ0aWVkLCBnbyBhaGVhZCBhbmQgdXBkYXRlIGl0IG5vdy4KLSAgICBpZiAobV9mb250 RGlydHkpCi0gICAgICAgIHVwZGF0ZUZvbnQoKTsKKyAgICB1cGRhdGVGb250KCk7CiAKICAgICAv LyBMaW5lLWhlaWdodCBpcyBzZXQgd2hlbiB3ZSBhcmUgc3VyZSB3ZSBkZWNpZGVkIG9uIHRoZSBm b250LXNpemUKICAgICBpZiAobV9saW5lSGVpZ2h0VmFsdWUpCkBAIC0xNTI1LDkgKzE1MjQsOCBA QCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yCiAgICAgQVNTRVJUKCFt X2ZvbnREaXJ0eSk7CiAgICAgLy8gSWYgb3VyIGZvbnQgZ290IGRpcnRpZWQgYnkgb25lIG9mIHRo ZSBub24tZXNzZW50aWFsIGZvbnQgcHJvcHMsIAogICAgIC8vIGdvIGFoZWFkIGFuZCB1cGRhdGUg aXQgYSBzZWNvbmQgdGltZS4KLSAgICBpZiAobV9mb250RGlydHkpCi0gICAgICAgIHVwZGF0ZUZv bnQoKTsKLSAgICAKKyAgICB1cGRhdGVGb250KCk7CisKICAgICAvLyBDbGVhbiB1cCBvdXIgc3R5 bGUgb2JqZWN0J3MgZGlzcGxheSBhbmQgdGV4dCBkZWNvcmF0aW9ucyAoYW1vbmcgb3RoZXIgZml4 dXBzKS4KICAgICBhZGp1c3RSZW5kZXJTdHlsZShzdHlsZSgpLCBtX3BhcmVudFN0eWxlLCBlKTsK IApAQCAtMTU2OCw4ICsxNTY2LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gQ1NTU3R5bGVT ZWxlY3RvcgogICAgICAgICBhcHBseURlY2xhcmF0aW9uczx0cnVlPihmYWxzZSwgMCwgbV9tYXRj aGVkRGVjbHMuc2l6ZSgpIC0gMSk7CiAKICAgICAvLyBJZiBvdXIgZm9udCBnb3QgZGlydGllZCwg Z28gYWhlYWQgYW5kIHVwZGF0ZSBpdCBub3cuCi0gICAgaWYgKG1fZm9udERpcnR5KQotICAgICAg ICB1cGRhdGVGb250KCk7CisgICAgdXBkYXRlRm9udCgpOwogCiAgICAgLy8gTGluZS1oZWlnaHQg aXMgc2V0IHdoZW4gd2UgYXJlIHN1cmUgd2UgZGVjaWRlZCBvbiB0aGUgZm9udC1zaXplCiAgICAg aWYgKG1fbGluZUhlaWdodFZhbHVlKQpAQCAtMTU4MSw4ICsxNTc4LDcgQEAgUGFzc1JlZlB0cjxS ZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3RvcgogCiAgICAgLy8gSWYgb3VyIGZvbnQgZ290IGRp cnRpZWQgYnkgb25lIG9mIHRoZSBub24tZXNzZW50aWFsIGZvbnQgcHJvcHMsCiAgICAgLy8gZ28g YWhlYWQgYW5kIHVwZGF0ZSBpdCBhIHNlY29uZCB0aW1lLgotICAgIGlmIChtX2ZvbnREaXJ0eSkK LSAgICAgICAgdXBkYXRlRm9udCgpOworICAgIHVwZGF0ZUZvbnQoKTsKIAogICAgIC8vIFN0YXJ0 IGxvYWRpbmcgaW1hZ2VzIHJlZmVyZW5jZWQgYnkgdGhpcyBzdHlsZS4KICAgICBsb2FkUGVuZGlu Z0ltYWdlcygpOwpAQCAtMTcxMSw4ICsxNzA3LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4g Q1NTU3R5bGVTZWxlY3RvcgogICAgIGFwcGx5RGVjbGFyYXRpb25zPHRydWU+KHRydWUsIGZpcnN0 VUFSdWxlLCBsYXN0VUFSdWxlKTsKICAgICAKICAgICAvLyBJZiBvdXIgZm9udCBnb3QgZGlydGll ZCwgZ28gYWhlYWQgYW5kIHVwZGF0ZSBpdCBub3cuCi0gICAgaWYgKG1fZm9udERpcnR5KQotICAg ICAgICB1cGRhdGVGb250KCk7CisgICAgdXBkYXRlRm9udCgpOwogCiAgICAgLy8gTGluZS1oZWln aHQgaXMgc2V0IHdoZW4gd2UgYXJlIHN1cmUgd2UgZGVjaWRlZCBvbiB0aGUgZm9udC1zaXplCiAg ICAgaWYgKG1fbGluZUhlaWdodFZhbHVlKQpAQCAtMTczMSw4ICsxNzI2LDcgQEAgUGFzc1JlZlB0 cjxSZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3RvcgogICAgIAogICAgIC8vIElmIG91ciBmb250 IGdvdCBkaXJ0aWVkIGJ5IG9uZSBvZiB0aGUgbm9uLWVzc2VudGlhbCBmb250IHByb3BzLCAKICAg ICAvLyBnbyBhaGVhZCBhbmQgdXBkYXRlIGl0IGEgc2Vjb25kIHRpbWUuCi0gICAgaWYgKG1fZm9u dERpcnR5KQotICAgICAgICB1cGRhdGVGb250KCk7CisgICAgdXBkYXRlRm9udCgpOwogCiAgICAg Ly8gQ2xlYW4gdXAgb3VyIHN0eWxlIG9iamVjdCdzIGRpc3BsYXkgYW5kIHRleHQgZGVjb3JhdGlv bnMgKGFtb25nIG90aGVyIGZpeHVwcykuCiAgICAgYWRqdXN0UmVuZGVyU3R5bGUoc3R5bGUoKSwg cGFyZW50U3R5bGUsIDApOwpAQCAtMTc2NSw4ICsxNzU5LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJT dHlsZT4gQ1NTU3R5bGVTZWxlY3RvcgogICAgIGFwcGx5RGVjbGFyYXRpb25zPHRydWU+KGZhbHNl LCAwLCBtX21hdGNoZWREZWNscy5zaXplKCkgLSAxKTsKIAogICAgIC8vIElmIG91ciBmb250IGdv dCBkaXJ0aWVkLCBnbyBhaGVhZCBhbmQgdXBkYXRlIGl0IG5vdy4KLSAgICBpZiAobV9mb250RGly dHkpCi0gICAgICAgIHVwZGF0ZUZvbnQoKTsKKyAgICB1cGRhdGVGb250KCk7CiAKICAgICAvLyBM aW5lLWhlaWdodCBpcyBzZXQgd2hlbiB3ZSBhcmUgc3VyZSB3ZSBkZWNpZGVkIG9uIHRoZSBmb250 LXNpemUKICAgICBpZiAobV9saW5lSGVpZ2h0VmFsdWUpCkBAIC0yMDAzLDYgKzE5OTYsOSBAQCB2 b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFkanVzdFJlbmRlclN0eWxlCiAKIHZvaWQgQ1NTU3R5bGVT ZWxlY3Rvcjo6dXBkYXRlRm9udCgpCiB7CisgICAgaWYgKCFtX2ZvbnREaXJ0eSkKKyAgICAgICAg cmV0dXJuOworCiAgICAgY2hlY2tGb3JUZXh0U2l6ZUFkanVzdCgpOwogICAgIGNoZWNrRm9yR2Vu ZXJpY0ZhbWlseUNoYW5nZShzdHlsZSgpLCBtX3BhcmVudFN0eWxlKTsKICAgICBjaGVja0Zvclpv b21DaGFuZ2Uoc3R5bGUoKSwgbV9wYXJlbnRTdHlsZSk7CkBAIC0zOTAxLDggKzM4OTcsNyBAQCB2 b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgc2V0Rm9udFNpemUoZm9udERlc2NyaXB0aW9uLCBzaXplKTsKLSAgICAg ICAgaWYgKG1fc3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pKQotICAg ICAgICAgICAgbV9mb250RGlydHkgPSB0cnVlOworICAgICAgICBzZXRGb250RGVzY3JpcHRpb24o Zm9udERlc2NyaXB0aW9uKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDE1NSw4ICs0 MTUwLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAg ICAgICAgZm9udERlc2NyaXB0aW9uLnNldEdlbmVyaWNGYW1pbHkocGFyZW50Rm9udERlc2NyaXB0 aW9uLmdlbmVyaWNGYW1pbHkoKSk7CiAgICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0RmFt aWx5KHBhcmVudEZvbnREZXNjcmlwdGlvbi5maXJzdEZhbWlseSgpKTsKICAgICAgICAgICAgIGZv bnREZXNjcmlwdGlvbi5zZXRJc1NwZWNpZmllZEZvbnQocGFyZW50Rm9udERlc2NyaXB0aW9uLmlz U3BlY2lmaWVkRm9udCgpKTsKLSAgICAgICAgICAgIGlmIChtX3N0eWxlLT5zZXRGb250RGVzY3Jp cHRpb24oZm9udERlc2NyaXB0aW9uKSkKLSAgICAgICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRy dWU7CisgICAgICAgICAgICBzZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfSBlbHNlIGlmIChpc0luaXRpYWwpIHsKICAgICAg ICAgICAgIEZvbnREZXNjcmlwdGlvbiBpbml0aWFsRGVzYyA9IEZvbnREZXNjcmlwdGlvbigpOwpA QCAtNDE2OCw4ICs0MTYyLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5 KGludAogICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldEdlbmVyaWNGYW1pbHkoaW5pdGlh bERlc2MuZ2VuZXJpY0ZhbWlseSgpKTsKICAgICAgICAgICAgIGlmICghaW5pdGlhbERlc2MuZmly c3RGYW1pbHkoKS5mYW1pbHlJc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgZm9udERlc2NyaXB0 aW9uLnNldEZhbWlseShpbml0aWFsRGVzYy5maXJzdEZhbWlseSgpKTsKLSAgICAgICAgICAgIGlm IChtX3N0eWxlLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKSkKLSAgICAgICAg ICAgICAgICBtX2ZvbnREaXJ0eSA9IHRydWU7CisgICAgICAgICAgICBzZXRGb250RGVzY3JpcHRp b24oZm9udERlc2NyaXB0aW9uKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAg ICAgICAKQEAgLTQyNDUsOCArNDIzOCw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQ cm9wZXJ0eShpbnQKICAgICAgICAgICAgIGlmIChmb250RGVzY3JpcHRpb24ua2V5d29yZFNpemUo KSAmJiBmb250RGVzY3JpcHRpb24udXNlRml4ZWREZWZhdWx0U2l6ZSgpICE9IG9sZEZhbWlseVVz ZWRGaXhlZERlZmF1bHRTaXplKQogICAgICAgICAgICAgICAgIHNldEZvbnRTaXplKGZvbnREZXNj cmlwdGlvbiwgZm9udFNpemVGb3JLZXl3b3JkKG1fY2hlY2tlci5tX2RvY3VtZW50LCBDU1NWYWx1 ZVh4U21hbGwgKyBmb250RGVzY3JpcHRpb24ua2V5d29yZFNpemUoKSAtIDEsICFvbGRGYW1pbHlV c2VkRml4ZWREZWZhdWx0U2l6ZSkpOwogCi0gICAgICAgICAgICBpZiAobV9zdHlsZS0+c2V0Rm9u dERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbikpCi0gICAgICAgICAgICAgICAgbV9mb250RGly dHkgPSB0cnVlOworICAgICAgICAgICAgc2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlv bik7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTQzNDEsOCArNDMzMyw3 IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgICAg IEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBtX3BhcmVudFN0eWxlLT5mb250RGVz Y3JpcHRpb24oKTsKICAgICAgICAgICAgIG1fc3R5bGUtPnNldExpbmVIZWlnaHQobV9wYXJlbnRT dHlsZS0+bGluZUhlaWdodCgpKTsKICAgICAgICAgICAgIG1fbGluZUhlaWdodFZhbHVlID0gMDsK LSAgICAgICAgICAgIGlmIChtX3N0eWxlLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0 aW9uKSkKLSAgICAgICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRydWU7CisgICAgICAgICAgICBz ZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKICAgICAgICAgfSBlbHNlIGlmIChp c0luaXRpYWwpIHsKICAgICAgICAgICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fY2hlY2tlci5t X2RvY3VtZW50LT5zZXR0aW5ncygpOwogICAgICAgICAgICAgQVNTRVJUKHNldHRpbmdzKTsgLy8g SWYgd2UncmUgZG9pbmcgc3R5bGUgcmVzb2x1dGlvbiwgdGhpcyBkb2N1bWVudCBzaG91bGQgYWx3 YXlzIGJlIGluIGEgZnJhbWUgYW5kIHRodXMgaGF2ZSBzZXR0aW5ncwpAQCAtNDM2MSw4ICs0MzUy LDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICAg ICAgc2V0Rm9udFNpemUoZm9udERlc2NyaXB0aW9uLCBmb250U2l6ZUZvcktleXdvcmQobV9jaGVj a2VyLm1fZG9jdW1lbnQsIENTU1ZhbHVlTWVkaXVtLCBmYWxzZSkpOwogICAgICAgICAgICAgbV9z dHlsZS0+c2V0TGluZUhlaWdodChSZW5kZXJTdHlsZTo6aW5pdGlhbExpbmVIZWlnaHQoKSk7CiAg ICAgICAgICAgICBtX2xpbmVIZWlnaHRWYWx1ZSA9IDA7Ci0gICAgICAgICAgICBpZiAobV9zdHls ZS0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbikpCi0gICAgICAgICAgICAgICAg bV9mb250RGlydHkgPSB0cnVlOworICAgICAgICAgICAgc2V0Rm9udERlc2NyaXB0aW9uKGZvbnRE ZXNjcmlwdGlvbik7CiAgICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUpIHsKICAgICAg ICAgICAgIG1fc3R5bGUtPnNldExpbmVIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVp Z2h0KCkpOwogICAgICAgICAgICAgbV9saW5lSGVpZ2h0VmFsdWUgPSAwOwpAQCAtNDM4Miw4ICs0 MzcyLDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAg ICAgICAKICAgICAgICAgICAgICAgICAvLyBIYW5kbGUgdGhlIHpvb20gZmFjdG9yLgogICAgICAg ICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRDb21wdXRlZFNpemUoZ2V0Q29tcHV0ZWRTaXpl RnJvbVNwZWNpZmllZFNpemUobV9jaGVja2VyLm1fZG9jdW1lbnQsIG1fc3R5bGUuZ2V0KCksIGZv bnREZXNjcmlwdGlvbi5pc0Fic29sdXRlU2l6ZSgpLCBmb250RGVzY3JpcHRpb24uc3BlY2lmaWVk U2l6ZSgpLCB1c2VTVkdab29tUnVsZXMoKSkpOwotICAgICAgICAgICAgICAgIGlmIChtX3N0eWxl LT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKSkKLSAgICAgICAgICAgICAgICAg ICAgbV9mb250RGlydHkgPSB0cnVlOworICAgICAgICAgICAgICAgIHNldEZvbnREZXNjcmlwdGlv bihmb250RGVzY3JpcHRpb24pOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHZh bHVlLT5pc0ZvbnRWYWx1ZSgpKSB7CiAgICAgICAgICAgICBGb250VmFsdWUgKmZvbnQgPSBzdGF0 aWNfY2FzdDxGb250VmFsdWUqPih2YWx1ZSk7CkBAIC01MTIzLDggKzUxMTIsNyBAQCB2b2lkIENT U1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgICAgICBtX2VsZW1lbnQt PmRvY3VtZW50KCktPnNldFdyaXRpbmdNb2RlU2V0T25Eb2N1bWVudEVsZW1lbnQodHJ1ZSk7CiAg ICAgICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBtX3N0eWxlLT5mb250RGVz Y3JpcHRpb24oKTsKICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldE9yaWVudGF0aW9uKG1fc3R5 bGUtPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9udGFsIDogVmVydGljYWwpOwot ICAgICAgICBpZiAobV9zdHlsZS0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbikp Ci0gICAgICAgICAgICBtX2ZvbnREaXJ0eSA9IHRydWU7CisgICAgICAgIHNldEZvbnREZXNjcmlw dGlvbihmb250RGVzY3JpcHRpb24pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCg==