43465 2010-08-03 21:54:42 -0700 fontColorChangesComputedStyle, fontSizeChangesComputedStyle, and fontFaceChangesComputedStyle should be removed 2010-08-09 17:24:33 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 1 rniwa rniwa bdakin enrica justin.garcia oldest_to_newest 259864 0 rniwa 2010-08-03 21:54:42 -0700 Since StyleChange class removes the styles that are already present at the position, fontColorChangesComputedStyle, fontSizeChangesComputedStyle, and fontFaceChangesComputedStyle are redundant and should be removed. Note that fontColorChangesComputedStyle uses visited dependent information, and it's a potential security hole. 259870 1 63415 rniwa 2010-08-03 22:10:22 -0700 Created attachment 63415 Patch 259872 2 63415 justin.garcia 2010-08-03 22:22:07 -0700 Comment on attachment 63415 Patch r=me assuming you verified that that bug that Beth mentioned didn't regress. 259873 3 justin.garcia 2010-08-03 22:23:15 -0700 Ah, I just read your email, thanks Ryosuke! 259895 4 63421 rniwa 2010-08-03 23:52:20 -0700 Created attachment 63421 Patch 259899 5 rniwa 2010-08-03 23:56:28 -0700 (In reply to comment #3) > Ah, I just read your email, thanks Ryosuke! Justin, I just figured out that my change will cause redundant font tag to be added in the reproduction steps Beth sent me. Although this won't the bug Beth fixed to reappear, I added a fix for this problem which is basically to add a work-around for the 28282 just as we did for StyleChange. I also added a test case. Sorry for the trouble. I always realize problems with my patch after I posted it on bugzilla :( 262399 6 63421 justin.garcia 2010-08-09 16:35:58 -0700 Comment on attachment 63421 Patch Looks good, r=me 262405 7 rniwa 2010-08-09 16:50:57 -0700 (In reply to comment #6) > (From update of attachment 63421 [details]) > Looks good, r=me Thanks for the review again! 262427 8 rniwa 2010-08-09 17:24:33 -0700 Committed r65019: <http://trac.webkit.org/changeset/65019> 63415 2010-08-03 22:10:22 -0700 2010-08-03 23:52:16 -0700 Patch bug-43465-20100803221019.patch text/plain 4297 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDYyNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDgtMDMgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZm9u dENvbG9yQ2hhbmdlc0NvbXB1dGVkU3R5bGUsIGZvbnRTaXplQ2hhbmdlc0NvbXB1dGVkU3R5bGUs IGFuZCBmb250RmFjZUNoYW5nZXNDb21wdXRlZFN0eWxlIHNob3VsZCBiZSByZW1vdmVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQ2NQorCisgICAg ICAgIFJlbW92ZWQgZm9udENvbG9yQ2hhbmdlc0NvbXB1dGVkU3R5bGUsIGZvbnRTaXplQ2hhbmdl c0NvbXB1dGVkU3R5bGUsIGFuZCBmb250RmFjZUNoYW5nZXNDb21wdXRlZFN0eWxlCisgICAgICAg IGJlY2F1c2UgU3R5bGVDaGFuZ2UncyBhcHBseUZvbnRDb2xvciwgYXBwbHlGb250RmFjZSwgYW5k IGFwcGx5Rm9udFNpemUgYWxsIHJldHVybiBmYWxzZQorICAgICAgICBpZiB0aGVyZSB3YXMgbm8g ZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZSBuZXcgZm9udCBjb2xvciwgZm9udCBzaXplLCBmb250IGZh Y2UgYW5kIHRoYXQgb2YgdGhlIGNvbXB1dGVkIHN0eWxlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyBhZGRlZCBzaW5jZSB0aGlzIGlzIGEgY2xlYW4gdXAuCisKKyAgICAgICAgKiBlZGl0aW5nL0Fw cGx5U3R5bGVDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5U3R5bGVDb21tYW5k OjphZGRJbmxpbmVTdHlsZUlmTmVlZGVkKToKKwogMjAxMC0wOC0wMyAgR2F2aW4gQmFycmFjbG91 Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4IGZvbGxvd2lu ZyByNjQ2MjQuCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5jcHAJKHJldmlz aW9uIDY0NDk4KQorKysgV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTgwOCwzMyArMTgwOCw2IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6 OmFkZEJsb2NrU3R5bGUoY28KICAgICBzZXROb2RlQXR0cmlidXRlKGJsb2NrLCBzdHlsZUF0dHIs IGNzc1RleHQpOwogfQogCi1zdGF0aWMgYm9vbCBmb250Q29sb3JDaGFuZ2VzQ29tcHV0ZWRTdHls ZShjb25zdCBDb2xvciYgY29tcHV0ZWRTdHlsZUNvbG9yLCBTdHlsZUNoYW5nZSBzdHlsZUNoYW5n ZSkKLXsKLSAgICBpZiAoc3R5bGVDaGFuZ2UuYXBwbHlGb250Q29sb3IoKSkgewotICAgICAgICBp ZiAoQ29sb3Ioc3R5bGVDaGFuZ2UuZm9udENvbG9yKCkpICE9IGNvbXB1dGVkU3R5bGVDb2xvcikK LSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0K LXN0YXRpYyBib29sIGZvbnRTaXplQ2hhbmdlc0NvbXB1dGVkU3R5bGUoUmVuZGVyU3R5bGUqIGNv bXB1dGVkU3R5bGUsIFN0eWxlQ2hhbmdlIHN0eWxlQ2hhbmdlKQotewotICAgIGlmIChzdHlsZUNo YW5nZS5hcHBseUZvbnRTaXplKCkpIHsKLSAgICAgICAgaWYgKHN0eWxlQ2hhbmdlLmZvbnRTaXpl KCkudG9JbnQoKSAhPSBjb21wdXRlZFN0eWxlLT5mb250U2l6ZSgpKQotICAgICAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLX0KLQotc3RhdGljIGJvb2wgZm9u dEZhY2VDaGFuZ2VzQ29tcHV0ZWRTdHlsZShSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZSwgU3R5 bGVDaGFuZ2Ugc3R5bGVDaGFuZ2UpCi17Ci0gICAgaWYgKHN0eWxlQ2hhbmdlLmFwcGx5Rm9udEZh Y2UoKSkgewotICAgICAgICBpZiAoY29tcHV0ZWRTdHlsZS0+Zm9udERlc2NyaXB0aW9uKCkuZmFt aWx5KCkuZmFtaWx5KCkuc3RyaW5nKCkgIT0gc3R5bGVDaGFuZ2UuZm9udEZhY2UoKSkKLSAgICAg ICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KIHZvaWQg QXBwbHlTdHlsZUNvbW1hbmQ6OmFkZElubGluZVN0eWxlSWZOZWVkZWQoQ1NTTXV0YWJsZVN0eWxl RGVjbGFyYXRpb24gKnN0eWxlLCBOb2RlICpzdGFydE5vZGUsIE5vZGUgKmVuZE5vZGUpCiB7CiAg ICAgaWYgKG1fcmVtb3ZlT25seSkKQEAgLTE4NDIsMjcgKzE4MTUsMTggQEAgdm9pZCBBcHBseVN0 eWxlQ29tbWFuZDo6YWRkSW5saW5lU3R5bGVJZgogCiAgICAgU3R5bGVDaGFuZ2Ugc3R5bGVDaGFu Z2Uoc3R5bGUsIFBvc2l0aW9uKHN0YXJ0Tm9kZSwgMCkpOwogCi0gICAgLy8KICAgICAvLyBGb250 IHRhZ3MgbmVlZCB0byBnbyBvdXRzaWRlIG9mIENTUyBzbyB0aGF0IENTUyBmb250IHNpemVzIG92 ZXJyaWRlIGxlYWdjeSBmb250IHNpemVzLgotICAgIC8vCiAgICAgaWYgKHN0eWxlQ2hhbmdlLmFw cGx5Rm9udENvbG9yKCkgfHwgc3R5bGVDaGFuZ2UuYXBwbHlGb250RmFjZSgpIHx8IHN0eWxlQ2hh bmdlLmFwcGx5Rm9udFNpemUoKSkgewogICAgICAgICBSZWZQdHI8RWxlbWVudD4gZm9udEVsZW1l bnQgPSBjcmVhdGVGb250RWxlbWVudChkb2N1bWVudCgpKTsKLSAgICAgICAgUmVuZGVyU3R5bGUq IGNvbXB1dGVkU3R5bGUgPSBzdGFydE5vZGUtPmNvbXB1dGVkU3R5bGUoKTsKIAotICAgICAgICAv LyBXZSBvbmx5IHdhbnQgdG8gaW5zZXJ0IGEgZm9udCBlbGVtZW50IGlmIGl0IHdpbGwgZW5kIHVw IGNoYW5naW5nIHRoZSBzdHlsZSBvZiB0aGUKLSAgICAgICAgLy8gdGV4dCBzb21laG93LiBPdGhl cndpc2UgaXQgd2lsbCBiZSBhIGdhcmJhZ2Ugbm9kZSB0aGF0IHdpbGwgY3JlYXRlIHByb2JsZW1z IGZvciB1cwotICAgICAgICAvLyBtb3N0IG5vdGFibHkgd2hlbiB3ZSBhcHBseSBhIGJsb2NrcXVv dGUgc3R5bGUgZm9yIGEgbWVzc2FnZSByZXBseS4KLSAgICAgICAgaWYgKGZvbnRDb2xvckNoYW5n ZXNDb21wdXRlZFN0eWxlKGNvbXB1dGVkU3R5bGUtPmNvbG9yKCksIHN0eWxlQ2hhbmdlKQotICAg ICAgICAgICAgICAgIHx8IGZvbnRGYWNlQ2hhbmdlc0NvbXB1dGVkU3R5bGUoY29tcHV0ZWRTdHls ZSwgc3R5bGVDaGFuZ2UpCi0gICAgICAgICAgICAgICAgfHwgZm9udFNpemVDaGFuZ2VzQ29tcHV0 ZWRTdHlsZShjb21wdXRlZFN0eWxlLCBzdHlsZUNoYW5nZSkpIHsKLSAgICAgICAgICAgIGlmIChz dHlsZUNoYW5nZS5hcHBseUZvbnRDb2xvcigpKQotICAgICAgICAgICAgICAgIGZvbnRFbGVtZW50 LT5zZXRBdHRyaWJ1dGUoY29sb3JBdHRyLCBzdHlsZUNoYW5nZS5mb250Q29sb3IoKSk7Ci0gICAg ICAgICAgICBpZiAoc3R5bGVDaGFuZ2UuYXBwbHlGb250RmFjZSgpKQotICAgICAgICAgICAgICAg IGZvbnRFbGVtZW50LT5zZXRBdHRyaWJ1dGUoZmFjZUF0dHIsIHN0eWxlQ2hhbmdlLmZvbnRGYWNl KCkpOwotICAgICAgICAgICAgaWYgKHN0eWxlQ2hhbmdlLmFwcGx5Rm9udFNpemUoKSkKLSAgICAg ICAgICAgICAgICBmb250RWxlbWVudC0+c2V0QXR0cmlidXRlKHNpemVBdHRyLCBzdHlsZUNoYW5n ZS5mb250U2l6ZSgpKTsKLSAgICAgICAgICAgIHN1cnJvdW5kTm9kZVJhbmdlV2l0aEVsZW1lbnQo c3RhcnROb2RlLCBlbmROb2RlLCBmb250RWxlbWVudC5nZXQoKSk7Ci0gICAgICAgIH0KKyAgICAg ICAgaWYgKHN0eWxlQ2hhbmdlLmFwcGx5Rm9udENvbG9yKCkpCisgICAgICAgICAgICBmb250RWxl bWVudC0+c2V0QXR0cmlidXRlKGNvbG9yQXR0ciwgc3R5bGVDaGFuZ2UuZm9udENvbG9yKCkpOwor ICAgICAgICBpZiAoc3R5bGVDaGFuZ2UuYXBwbHlGb250RmFjZSgpKQorICAgICAgICAgICAgZm9u dEVsZW1lbnQtPnNldEF0dHJpYnV0ZShmYWNlQXR0ciwgc3R5bGVDaGFuZ2UuZm9udEZhY2UoKSk7 CisgICAgICAgIGlmIChzdHlsZUNoYW5nZS5hcHBseUZvbnRTaXplKCkpCisgICAgICAgICAgICBm b250RWxlbWVudC0+c2V0QXR0cmlidXRlKHNpemVBdHRyLCBzdHlsZUNoYW5nZS5mb250U2l6ZSgp KTsKKworICAgICAgICBzdXJyb3VuZE5vZGVSYW5nZVdpdGhFbGVtZW50KHN0YXJ0Tm9kZSwgZW5k Tm9kZSwgZm9udEVsZW1lbnQuZ2V0KCkpOwogICAgIH0KIAogICAgIGlmIChzdHlsZUNoYW5nZS5j c3NTdHlsZSgpLmxlbmd0aCgpKSB7Cg== 63421 2010-08-03 23:52:20 -0700 2010-08-09 16:35:58 -0700 Patch bug-43465-20100803235218.patch text/plain 9441 rniwa SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDYzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDgtMDMgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZm9u dENvbG9yQ2hhbmdlc0NvbXB1dGVkU3R5bGUsIGZvbnRTaXplQ2hhbmdlc0NvbXB1dGVkU3R5bGUs IGFuZCBmb250RmFjZUNoYW5nZXNDb21wdXRlZFN0eWxlIHNob3VsZCBiZSByZW1vdmVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzQ2NQorCisgICAg ICAgIFJlbW92ZWQgZm9udENvbG9yQ2hhbmdlc0NvbXB1dGVkU3R5bGUsIGZvbnRTaXplQ2hhbmdl c0NvbXB1dGVkU3R5bGUsIGFuZCBmb250RmFjZUNoYW5nZXNDb21wdXRlZFN0eWxlCisgICAgICAg IGJlY2F1c2UgU3R5bGVDaGFuZ2UncyBhcHBseUZvbnRDb2xvciwgYXBwbHlGb250RmFjZSwgYW5k IGFwcGx5Rm9udFNpemUgYWxsIHJldHVybiBmYWxzZQorICAgICAgICBpZiB0aGVyZSB3YXMgbm8g ZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZSBuZXcgZm9udCBjb2xvciwgZm9udCBzaXplLCBmb250IGZh Y2UgYW5kIHRoYXQgb2YgdGhlIGNvbXB1dGVkIHN0eWxlLgorCisgICAgICAgIEFsc28gYWRkZWQg YSB3b3JrLWFyb3VuZCBmb3IgdGhlIGJ1ZyAyODI4MiBpbiBnZXRQcm9wZXJ0aWVzTm90SW5Db21w dXRlZFN0eWxlIHdpdGggYSB0ZXN0IHNvIHRoYXQKKyAgICAgICAgdGhlIGFib3ZlIGNoYW5nZSB3 aWxsIG5vdCBhZGQgYSByZWR1bmRhbnQgZm9udCBvciBzcGFuIGVsZW1lbnQuCisKKyAgICAgICAg VGVzdDogZWRpdGluZy9zdHlsZS9mb3JlLWNvbG9yLWJ5LW5hbWUuaHRtbAorCisgICAgICAgICog ZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRSR0JB Rm9udENvbG9yKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZUNoYW5nZTo6ZXh0cmFj dFRleHRTdHlsZXMpOiBDYWxscyBnZXRSR0JBRm9udENvbG9yLgorICAgICAgICAoV2ViQ29yZTo6 Z2V0UHJvcGVydGllc05vdEluQ29tcHV0ZWRTdHlsZSk6IFJlbW92ZXMgY29sb3IgcHJvcGVydHkg bWFudWFsbHkgYnkgY2hlY2tpbmcgdGhlIFJHQkEgdmFsdWVzLgorICAgICAgICAoV2ViQ29yZTo6 QXBwbHlTdHlsZUNvbW1hbmQ6OmFkZElubGluZVN0eWxlSWZOZWVkZWQpOiBTZWUgYWJvdmUuCisK IDIwMTAtMDgtMDMgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgog CiAgICAgICAgIEJ1aWxkIGZpeCBmb2xsb3dpbmcgcjY0NjI0LgpJbmRleDogV2ViQ29yZS9lZGl0 aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcv QXBwbHlTdHlsZUNvbW1hbmQuY3BwCShyZXZpc2lvbiA2NDQ5OCkKKysrIFdlYkNvcmUvZWRpdGlu Zy9BcHBseVN0eWxlQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDI2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAorc3Rh dGljIFJHQkEzMiBnZXRSR0JBRm9udENvbG9yKENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlKQor eworICAgIFJlZlB0cjxDU1NWYWx1ZT4gY29sb3JWYWx1ZSA9IHN0eWxlLT5nZXRQcm9wZXJ0eUNT U1ZhbHVlKENTU1Byb3BlcnR5Q29sb3IpOworICAgIGlmICghY29sb3JWYWx1ZSkKKyAgICAgICAg cmV0dXJuIENvbG9yOjp0cmFuc3BhcmVudDsKKworICAgIEFTU0VSVChjb2xvclZhbHVlLT5pc1By aW1pdGl2ZVZhbHVlKCkpOworCisgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHByaW1pdGl2ZUNvbG9y ID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihjb2xvclZhbHVlLmdldCgpKTsKKyAg ICBSR0JBMzIgcmdiYSA9IDA7CisgICAgaWYgKHByaW1pdGl2ZUNvbG9yLT5wcmltaXRpdmVUeXBl KCkgIT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19SR0JDT0xPUikgeworICAgICAgICBDU1NQYXJz ZXI6OnBhcnNlQ29sb3IocmdiYSwgY29sb3JWYWx1ZS0+Y3NzVGV4dCgpKTsKKyAgICAgICAgLy8g TmVlZCB0byB0YWtlIGNhcmUgb2YgbmFtZWQgY29sb3Igc3VjaCBhcyBncmVlbiBhbmQgYmxhY2sK KyAgICAgICAgLy8gVGhpcyBjb2RlIHNob3VsZCBiZSByZW1vdmVkIGFmdGVyIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODI4MiBpcyBmaXhlZC4KKyAgICB9IGVsc2UK KyAgICAgICAgcmdiYSA9IHByaW1pdGl2ZUNvbG9yLT5nZXRSR0JBMzJWYWx1ZSgpOworCisgICAg cmV0dXJuIHJnYmE7Cit9CisKIGNsYXNzIFN0eWxlQ2hhbmdlIHsKIHB1YmxpYzoKICAgICBleHBs aWNpdCBTdHlsZUNoYW5nZShDU1NTdHlsZURlY2xhcmF0aW9uKiwgY29uc3QgUG9zaXRpb24mKTsK QEAgLTIwOSwxNyArMjI5LDggQEAgdm9pZCBTdHlsZUNoYW5nZTo6ZXh0cmFjdFRleHRTdHlsZXMo Q1NTTQogICAgICAgICBicmVhazsKICAgICB9CiAKLSAgICBpZiAoUmVmUHRyPENTU1ZhbHVlPiBj b2xvclZhbHVlID0gc3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlDb2xvcikp IHsKLSAgICAgICAgQVNTRVJUKGNvbG9yVmFsdWUtPmlzUHJpbWl0aXZlVmFsdWUoKSk7Ci0gICAg ICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVDb2xvciA9IHN0YXRpY19jYXN0PENTU1By aW1pdGl2ZVZhbHVlKj4oY29sb3JWYWx1ZS5nZXQoKSk7Ci0gICAgICAgIFJHQkEzMiByZ2JhID0g MDsKLSAgICAgICAgaWYgKHByaW1pdGl2ZUNvbG9yLT5wcmltaXRpdmVUeXBlKCkgIT0gQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19SR0JDT0xPUikgewotICAgICAgICAgICAgQ1NTUGFyc2VyOjpwYXJz ZUNvbG9yKHJnYmEsIGNvbG9yVmFsdWUtPmNzc1RleHQoKSk7Ci0gICAgICAgICAgICAvLyBOZWVk IHRvIHRha2UgY2FyZSBvZiBuYW1lZCBjb2xvciBzdWNoIGFzIGdyZWVuIGFuZCBibGFjawotICAg ICAgICAgICAgLy8gVGhpcyBjb2RlIHNob3VsZCBiZSByZW1vdmVkIGFmdGVyIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODI4MiBpcyBmaXhlZC4KLSAgICAgICAgfSBl bHNlCi0gICAgICAgICAgICByZ2JhID0gcHJpbWl0aXZlQ29sb3ItPmdldFJHQkEzMlZhbHVlKCk7 Ci0gICAgICAgIG1fYXBwbHlGb250Q29sb3IgPSBDb2xvcihyZ2JhKS5uYW1lKCk7CisgICAgaWYg KHN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5Q29sb3IpKSB7CisgICAgICAg IG1fYXBwbHlGb250Q29sb3IgPSBDb2xvcihnZXRSR0JBRm9udENvbG9yKHN0eWxlKSkubmFtZSgp OwogICAgICAgICBzdHlsZS0+cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlDb2xvcik7CiAgICAg fQogCkBAIC0zODIsNiArMzkzLDkgQEAgUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9u PiBnZXRQcgogICAgIGlmIChmb250V2VpZ2h0SXNCb2xkKHJlc3VsdC5nZXQoKSkgPT0gZm9udFdl aWdodElzQm9sZChjb21wdXRlZFN0eWxlKSkKICAgICAgICAgcmVzdWx0LT5yZW1vdmVQcm9wZXJ0 eShDU1NQcm9wZXJ0eUZvbnRXZWlnaHQpOwogCisgICAgaWYgKGdldFJHQkFGb250Q29sb3IocmVz dWx0LmdldCgpKSA9PSBnZXRSR0JBRm9udENvbG9yKGNvbXB1dGVkU3R5bGUpKQorICAgICAgICBy ZXN1bHQtPnJlbW92ZVByb3BlcnR5KENTU1Byb3BlcnR5Q29sb3IpOworCiAgICAgcmV0dXJuIHJl c3VsdDsKIH0KIApAQCAtMTgwOCwzMyArMTgyMiw2IEBAIHZvaWQgQXBwbHlTdHlsZUNvbW1hbmQ6 OmFkZEJsb2NrU3R5bGUoY28KICAgICBzZXROb2RlQXR0cmlidXRlKGJsb2NrLCBzdHlsZUF0dHIs IGNzc1RleHQpOwogfQogCi1zdGF0aWMgYm9vbCBmb250Q29sb3JDaGFuZ2VzQ29tcHV0ZWRTdHls ZShjb25zdCBDb2xvciYgY29tcHV0ZWRTdHlsZUNvbG9yLCBTdHlsZUNoYW5nZSBzdHlsZUNoYW5n ZSkKLXsKLSAgICBpZiAoc3R5bGVDaGFuZ2UuYXBwbHlGb250Q29sb3IoKSkgewotICAgICAgICBp ZiAoQ29sb3Ioc3R5bGVDaGFuZ2UuZm9udENvbG9yKCkpICE9IGNvbXB1dGVkU3R5bGVDb2xvcikK LSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0K LXN0YXRpYyBib29sIGZvbnRTaXplQ2hhbmdlc0NvbXB1dGVkU3R5bGUoUmVuZGVyU3R5bGUqIGNv bXB1dGVkU3R5bGUsIFN0eWxlQ2hhbmdlIHN0eWxlQ2hhbmdlKQotewotICAgIGlmIChzdHlsZUNo YW5nZS5hcHBseUZvbnRTaXplKCkpIHsKLSAgICAgICAgaWYgKHN0eWxlQ2hhbmdlLmZvbnRTaXpl KCkudG9JbnQoKSAhPSBjb21wdXRlZFN0eWxlLT5mb250U2l6ZSgpKQotICAgICAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLX0KLQotc3RhdGljIGJvb2wgZm9u dEZhY2VDaGFuZ2VzQ29tcHV0ZWRTdHlsZShSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZSwgU3R5 bGVDaGFuZ2Ugc3R5bGVDaGFuZ2UpCi17Ci0gICAgaWYgKHN0eWxlQ2hhbmdlLmFwcGx5Rm9udEZh Y2UoKSkgewotICAgICAgICBpZiAoY29tcHV0ZWRTdHlsZS0+Zm9udERlc2NyaXB0aW9uKCkuZmFt aWx5KCkuZmFtaWx5KCkuc3RyaW5nKCkgIT0gc3R5bGVDaGFuZ2UuZm9udEZhY2UoKSkKLSAgICAg ICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KIHZvaWQg QXBwbHlTdHlsZUNvbW1hbmQ6OmFkZElubGluZVN0eWxlSWZOZWVkZWQoQ1NTTXV0YWJsZVN0eWxl RGVjbGFyYXRpb24gKnN0eWxlLCBOb2RlICpzdGFydE5vZGUsIE5vZGUgKmVuZE5vZGUpCiB7CiAg ICAgaWYgKG1fcmVtb3ZlT25seSkKQEAgLTE4NDIsMjcgKzE4MjksMTggQEAgdm9pZCBBcHBseVN0 eWxlQ29tbWFuZDo6YWRkSW5saW5lU3R5bGVJZgogCiAgICAgU3R5bGVDaGFuZ2Ugc3R5bGVDaGFu Z2Uoc3R5bGUsIFBvc2l0aW9uKHN0YXJ0Tm9kZSwgMCkpOwogCi0gICAgLy8KICAgICAvLyBGb250 IHRhZ3MgbmVlZCB0byBnbyBvdXRzaWRlIG9mIENTUyBzbyB0aGF0IENTUyBmb250IHNpemVzIG92 ZXJyaWRlIGxlYWdjeSBmb250IHNpemVzLgotICAgIC8vCiAgICAgaWYgKHN0eWxlQ2hhbmdlLmFw cGx5Rm9udENvbG9yKCkgfHwgc3R5bGVDaGFuZ2UuYXBwbHlGb250RmFjZSgpIHx8IHN0eWxlQ2hh bmdlLmFwcGx5Rm9udFNpemUoKSkgewogICAgICAgICBSZWZQdHI8RWxlbWVudD4gZm9udEVsZW1l bnQgPSBjcmVhdGVGb250RWxlbWVudChkb2N1bWVudCgpKTsKLSAgICAgICAgUmVuZGVyU3R5bGUq IGNvbXB1dGVkU3R5bGUgPSBzdGFydE5vZGUtPmNvbXB1dGVkU3R5bGUoKTsKIAotICAgICAgICAv LyBXZSBvbmx5IHdhbnQgdG8gaW5zZXJ0IGEgZm9udCBlbGVtZW50IGlmIGl0IHdpbGwgZW5kIHVw IGNoYW5naW5nIHRoZSBzdHlsZSBvZiB0aGUKLSAgICAgICAgLy8gdGV4dCBzb21laG93LiBPdGhl cndpc2UgaXQgd2lsbCBiZSBhIGdhcmJhZ2Ugbm9kZSB0aGF0IHdpbGwgY3JlYXRlIHByb2JsZW1z IGZvciB1cwotICAgICAgICAvLyBtb3N0IG5vdGFibHkgd2hlbiB3ZSBhcHBseSBhIGJsb2NrcXVv dGUgc3R5bGUgZm9yIGEgbWVzc2FnZSByZXBseS4KLSAgICAgICAgaWYgKGZvbnRDb2xvckNoYW5n ZXNDb21wdXRlZFN0eWxlKGNvbXB1dGVkU3R5bGUtPmNvbG9yKCksIHN0eWxlQ2hhbmdlKQotICAg ICAgICAgICAgICAgIHx8IGZvbnRGYWNlQ2hhbmdlc0NvbXB1dGVkU3R5bGUoY29tcHV0ZWRTdHls ZSwgc3R5bGVDaGFuZ2UpCi0gICAgICAgICAgICAgICAgfHwgZm9udFNpemVDaGFuZ2VzQ29tcHV0 ZWRTdHlsZShjb21wdXRlZFN0eWxlLCBzdHlsZUNoYW5nZSkpIHsKLSAgICAgICAgICAgIGlmIChz dHlsZUNoYW5nZS5hcHBseUZvbnRDb2xvcigpKQotICAgICAgICAgICAgICAgIGZvbnRFbGVtZW50 LT5zZXRBdHRyaWJ1dGUoY29sb3JBdHRyLCBzdHlsZUNoYW5nZS5mb250Q29sb3IoKSk7Ci0gICAg ICAgICAgICBpZiAoc3R5bGVDaGFuZ2UuYXBwbHlGb250RmFjZSgpKQotICAgICAgICAgICAgICAg IGZvbnRFbGVtZW50LT5zZXRBdHRyaWJ1dGUoZmFjZUF0dHIsIHN0eWxlQ2hhbmdlLmZvbnRGYWNl KCkpOwotICAgICAgICAgICAgaWYgKHN0eWxlQ2hhbmdlLmFwcGx5Rm9udFNpemUoKSkKLSAgICAg ICAgICAgICAgICBmb250RWxlbWVudC0+c2V0QXR0cmlidXRlKHNpemVBdHRyLCBzdHlsZUNoYW5n ZS5mb250U2l6ZSgpKTsKLSAgICAgICAgICAgIHN1cnJvdW5kTm9kZVJhbmdlV2l0aEVsZW1lbnQo c3RhcnROb2RlLCBlbmROb2RlLCBmb250RWxlbWVudC5nZXQoKSk7Ci0gICAgICAgIH0KKyAgICAg ICAgaWYgKHN0eWxlQ2hhbmdlLmFwcGx5Rm9udENvbG9yKCkpCisgICAgICAgICAgICBmb250RWxl bWVudC0+c2V0QXR0cmlidXRlKGNvbG9yQXR0ciwgc3R5bGVDaGFuZ2UuZm9udENvbG9yKCkpOwor ICAgICAgICBpZiAoc3R5bGVDaGFuZ2UuYXBwbHlGb250RmFjZSgpKQorICAgICAgICAgICAgZm9u dEVsZW1lbnQtPnNldEF0dHJpYnV0ZShmYWNlQXR0ciwgc3R5bGVDaGFuZ2UuZm9udEZhY2UoKSk7 CisgICAgICAgIGlmIChzdHlsZUNoYW5nZS5hcHBseUZvbnRTaXplKCkpCisgICAgICAgICAgICBm b250RWxlbWVudC0+c2V0QXR0cmlidXRlKHNpemVBdHRyLCBzdHlsZUNoYW5nZS5mb250U2l6ZSgp KTsKKworICAgICAgICBzdXJyb3VuZE5vZGVSYW5nZVdpdGhFbGVtZW50KHN0YXJ0Tm9kZSwgZW5k Tm9kZSwgZm9udEVsZW1lbnQuZ2V0KCkpOwogICAgIH0KIAogICAgIGlmIChzdHlsZUNoYW5nZS5j c3NTdHlsZSgpLmxlbmd0aCgpKSB7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NDYzMCkKKysrIExheW91 dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEwLTA4 LTAzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGZvbnRDb2xvckNoYW5nZXNDb21wdXRlZFN0 eWxlLCBmb250U2l6ZUNoYW5nZXNDb21wdXRlZFN0eWxlLCBhbmQgZm9udEZhY2VDaGFuZ2VzQ29t cHV0ZWRTdHlsZSBzaG91bGQgYmUgcmVtb3ZlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM0NjUKKworICAgICAgICBBZGRlZCBhIHRlc3QgZm9yIGFw cGx5aW5nIGV4ZWNDb21tYW5kKCdmb3JlQ29sb3InKSBieSBjb2xvciBuYW1lLiBCZWNhdXNlIG9m IHRoZSBidWcgMjgyODIsIHdlIGhhdmUgdG8gbWFudWFsbHkKKyAgICAgICAgcHJvY2VzcyBjb2xv ciBwcm9wZXJ0eSBpbiBnZXRQcm9wZXJ0aWVzTm90SW5Db21wdXRlZFN0eWxlIHRvIGF2b2lkIGFk ZGluZyBhIHJlZHVuZGFudCBmb250IG9yIHNwYW4gZWxlbWVudC4KKworICAgICAgICAqIGVkaXRp bmcvc3R5bGUvZm9yZS1jb2xvci1ieS1uYW1lLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogZWRpdGluZy9zdHlsZS9mb3JlLWNvbG9yLWJ5LW5hbWUuaHRtbDogQWRkZWQuCisKIDIwMTAt MDgtMDMgIEFuZHJldyBXaWxzb24gIDxhdHdpbHNvbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg VW5yZXZpZXdlZCBjaHJvbWl1bSB0ZXN0IGV4cGVjdGF0aW9ucyBmaXh1cCBmb3Igb3JpZ2luLXF1 b3RhLmh0bWwuCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL3N0eWxlL2ZvcmUtY29sb3ItYnkt bmFtZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9zdHls ZS9mb3JlLWNvbG9yLWJ5LW5hbWUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvZWRpdGluZy9zdHlsZS9mb3JlLWNvbG9yLWJ5LW5hbWUtZXhwZWN0ZWQudHh0CShyZXZp c2lvbiAwKQpAQCAtMCwwICsxLDExIEBACisKKyJ3b3JsZCIgc2hvdWxkIGJlIHJlZDoKK3wgImhl bGxvICIKK3wgPGZvbnQ+Cit8ICAgY2xhc3M9IkFwcGxlLXN0eWxlLXNwYW4iCit8ICAgY29sb3I9 IiNGRjAwMDAiCit8ICAgIjwjc2VsZWN0aW9uLWFuY2hvcj53b3JsZDwjc2VsZWN0aW9uLWZvY3Vz PiIKKwordGhlcmUgc2hvdWxkIGJlIG5vIHNwYW4gb3IgZm9udCBlbGVtZW50czoKK3wgIjwjc2Vs ZWN0aW9uLWFuY2hvcj5oZWxsbyAiCit8ICJ3b3JsZDwjc2VsZWN0aW9uLWZvY3VzPiIKSW5kZXg6 IExheW91dFRlc3RzL2VkaXRpbmcvc3R5bGUvZm9yZS1jb2xvci1ieS1uYW1lLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9mb3JlLWNvbG9yLWJ5LW5hbWUuaHRt bAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvc3R5bGUvZm9yZS1jb2xvci1i eS1uYW1lLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjMgQEAKKzxodG1sPgorPGhlYWQ+ Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzIj48L3Njcmlw dD4KKzwvaGVhZD4KKzxib2R5PgorPGRpdiBpZD0idGVzdCIgY29udGVudGVkaXRhYmxlPmhlbGxv IHdvcmxkPC9kaXY+Cis8c2NyaXB0PgorCit3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRp b24odGVzdCwgMCk7Cit3aW5kb3cuZ2V0U2VsZWN0aW9uKCkubW9kaWZ5KCdtb3ZlJywgJ2Zvcndh cmQnLCAnd29yZCcpOword2luZG93LmdldFNlbGVjdGlvbigpLm1vZGlmeSgnbW92ZScsICdmb3J3 YXJkJywgJ2NoYXJhY3RlcicpOword2luZG93LmdldFNlbGVjdGlvbigpLm1vZGlmeSgnZXh0ZW5k JywgJ2ZvcndhcmQnLCAnd29yZCcpOworZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ2ZvcmVDb2xvcics IGZhbHNlLCAncmVkJyk7CitNYXJrdXAuZHVtcCgndGVzdCcsICcid29ybGQiIHNob3VsZCBiZSBy ZWQnKTsKKword2luZG93LmdldFNlbGVjdGlvbigpLnNlbGVjdEFsbENoaWxkcmVuKHRlc3QpOwor ZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ2ZvcmVDb2xvcicsIGZhbHNlLCAnYmxhY2snKTsKKworTWFy a3VwLmR1bXAoJ3Rlc3QnLCAndGhlcmUgc2hvdWxkIGJlIG5vIHNwYW4gb3IgZm9udCBlbGVtZW50 cycpOworCis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K