125923 2013-12-18 05:10:15 -0800 Make more computed style helpers return values by PassRef. 2013-12-18 07:02:38 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue esprehn+autocc glenn gyuyoung.kim macpherson menard oldest_to_newest 960904 0 kling 2013-12-18 05:10:15 -0800 Make more computed style helpers return values by PassRef. 960905 1 219527 kling 2013-12-18 05:10:43 -0800 Created attachment 219527 Patch 960928 2 219527 commit-queue 2013-12-18 07:02:34 -0800 Comment on attachment 219527 Patch Clearing flags on attachment: 219527 Committed r160765: <http://trac.webkit.org/changeset/160765> 960929 3 commit-queue 2013-12-18 07:02:38 -0800 All reviewed patches have been landed. Closing bug. 219527 2013-12-18 05:10:43 -0800 2013-12-18 07:02:33 -0800 Patch bug-125923.diff text/plain 10436 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyNjZlZjc5Li44ZGQyZjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTMtMTItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIE1ha2UgbW9yZSBjb21wdXRlZCBzdHlsZSBoZWxwZXJzIHJldHVybiB2YWx1ZXMgYnkgUGFz c1JlZi4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEyNTkyMz4KKworICAgICAgICBU aWdodGVuIHlldCBhbm90aGVyIGhhbmRmdWwgb2YgQ1NTIGNvbXB1dGVkIHN0eWxlIGhlbHBlciBm dW5jdGlvbnMKKyAgICAgICAgdG8gcmV0dXJuIHRoZWlyIENTU1ZhbHVlcyBieSBQYXNzUmVmIHdo ZXJlIHdlIG5ldmVyIHJldHVybiBudWxsLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisyMDEzLTEyLTE4ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4K KwogICAgICAgICBVc2UgcmFuZ2UgZm9yIHN5bnRheCBpbiBGcmFtZSBhbmQgRnJhbWVWaWV3Lgog ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI1OTIyPgogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4IDIxMzA4ZTgu LjI0YzA2NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwCkBAIC01NjIsNyArNTYyLDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NT UHJpbWl0aXZlVmFsdWU+IHZhbHVlRm9yTmluZVBpZWNlSW1hZ2VRdWFkKGNvbnN0IExlbmd0aEJv eCYKICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUocXVhZC5yZWxlYXNlKCkp OwogfQogCi1zdGF0aWMgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gdmFsdWVGb3JOaW5lUGllY2VJbWFn ZVJlcGVhdChjb25zdCBOaW5lUGllY2VJbWFnZSYgaW1hZ2UpCitzdGF0aWMgUGFzc1JlZjxDU1NW YWx1ZT4gdmFsdWVGb3JOaW5lUGllY2VJbWFnZVJlcGVhdChjb25zdCBOaW5lUGllY2VJbWFnZSYg aW1hZ2UpCiB7CiAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBob3Jpem9udGFsUmVwZWF0 OwogICAgIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gdmVydGljYWxSZXBlYXQ7CkBAIC0xMjgw LDcgKzEyODAsNyBAQCBzdGF0aWMgUGFzc1JlZjxDU1NWYWx1ZUxpc3Q+IGdldFRpbWluZ0Z1bmN0 aW9uVmFsdWUoY29uc3QgQW5pbWF0aW9uTGlzdCogYW5pbUxpcwogICAgIHJldHVybiBsaXN0Owog fQogCi1zdGF0aWMgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gY3JlYXRlTGluZUJveENvbnRhaW5WYWx1 ZSh1bnNpZ25lZCBsaW5lQm94Q29udGFpbikKK3N0YXRpYyBQYXNzUmVmPENTU1ZhbHVlPiBjcmVh dGVMaW5lQm94Q29udGFpblZhbHVlKHVuc2lnbmVkIGxpbmVCb3hDb250YWluKQogewogICAgIGlm ICghbGluZUJveENvbnRhaW4pCiAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJ ZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb25lKTsKQEAgLTEzOTYsMTQgKzEzOTYsMTQgQEAgc3Rh dGljIENTU1ZhbHVlSUQgaWRlbnRpZmllckZvckZhbWlseShjb25zdCBBdG9taWNTdHJpbmcmIGZh bWlseSkKICAgICByZXR1cm4gQ1NTVmFsdWVJbnZhbGlkOwogfQogCi1zdGF0aWMgUGFzc1JlZlB0 cjxDU1NQcmltaXRpdmVWYWx1ZT4gdmFsdWVGb3JGYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiBm YW1pbHkpCitzdGF0aWMgUGFzc1JlZjxDU1NQcmltaXRpdmVWYWx1ZT4gdmFsdWVGb3JGYW1pbHko Y29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCiB7CiAgICAgaWYgKENTU1ZhbHVlSUQgZmFtaWx5 SWRlbnRpZmllciA9IGlkZW50aWZpZXJGb3JGYW1pbHkoZmFtaWx5KSkKICAgICAgICAgcmV0dXJu IGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShmYW1pbHlJZGVudGlmaWVyKTsK ICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoZmFtaWx5LnN0cmluZygpLCBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORyk7CiB9CiAKLXN0YXRpYyBQYXNzUmVmUHRyPENT U1ZhbHVlPiByZW5kZXJUZXh0RGVjb3JhdGlvbkZsYWdzVG9DU1NWYWx1ZShpbnQgdGV4dERlY29y YXRpb24pCitzdGF0aWMgUGFzc1JlZjxDU1NWYWx1ZT4gcmVuZGVyVGV4dERlY29yYXRpb25GbGFn c1RvQ1NTVmFsdWUoaW50IHRleHREZWNvcmF0aW9uKQogewogICAgIC8vIEJsaW5rIHZhbHVlIGlz IGlnbm9yZWQuCiAgICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gbGlzdCA9IENTU1ZhbHVlTGlzdDo6 Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKQEAgLTE0MjAsMTEgKzE0MjAsMTEgQEAgc3RhdGljIFBh c3NSZWZQdHI8Q1NTVmFsdWU+IHJlbmRlclRleHREZWNvcmF0aW9uRmxhZ3NUb0NTU1ZhbHVlKGlu dCB0ZXh0RGVjb3JhdGkKIAogICAgIGlmICghbGlzdC0+bGVuZ3RoKCkpCiAgICAgICAgIHJldHVy biBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb25lKTsKLSAg ICByZXR1cm4gbGlzdC5yZWxlYXNlKCk7CisgICAgcmV0dXJuIGxpc3QucmVsZWFzZU5vbk51bGwo KTsKIH0KIAogI2lmIEVOQUJMRShDU1MzX1RFWFRfREVDT1JBVElPTikKLXN0YXRpYyBQYXNzUmVm UHRyPENTU1ZhbHVlPiByZW5kZXJUZXh0RGVjb3JhdGlvblN0eWxlRmxhZ3NUb0NTU1ZhbHVlKFRl eHREZWNvcmF0aW9uU3R5bGUgdGV4dERlY29yYXRpb25TdHlsZSkKK3N0YXRpYyBQYXNzUmVmPENT U1ZhbHVlPiByZW5kZXJUZXh0RGVjb3JhdGlvblN0eWxlRmxhZ3NUb0NTU1ZhbHVlKFRleHREZWNv cmF0aW9uU3R5bGUgdGV4dERlY29yYXRpb25TdHlsZSkKIHsKICAgICBzd2l0Y2ggKHRleHREZWNv cmF0aW9uU3R5bGUpIHsKICAgICBjYXNlIFRleHREZWNvcmF0aW9uU3R5bGVTb2xpZDoKQEAgLTE0 NDMsNyArMTQ0Myw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ZhbHVlPiByZW5kZXJUZXh0RGVj b3JhdGlvblN0eWxlRmxhZ3NUb0NTU1ZhbHVlKFRleHREZWNvcmF0CiAgICAgcmV0dXJuIGNzc1Zh bHVlUG9vbCgpLmNyZWF0ZUV4cGxpY2l0SW5pdGlhbFZhbHVlKCk7CiB9CiAKLXN0YXRpYyBQYXNz UmVmUHRyPENTU1ZhbHVlPiByZW5kZXJUZXh0RGVjb3JhdGlvblNraXBGbGFnc1RvQ1NTVmFsdWUo VGV4dERlY29yYXRpb25Ta2lwIHRleHREZWNvcmF0aW9uU2tpcCkKK3N0YXRpYyBQYXNzUmVmPENT U1ZhbHVlPiByZW5kZXJUZXh0RGVjb3JhdGlvblNraXBGbGFnc1RvQ1NTVmFsdWUoVGV4dERlY29y YXRpb25Ta2lwIHRleHREZWNvcmF0aW9uU2tpcCkKIHsKICAgICBzd2l0Y2ggKHRleHREZWNvcmF0 aW9uU2tpcCkgewogICAgIGNhc2UgVGV4dERlY29yYXRpb25Ta2lwTm9uZToKQEAgLTE0NTcsNyAr MTQ1Nyw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ZhbHVlPiByZW5kZXJUZXh0RGVjb3JhdGlv blNraXBGbGFnc1RvQ1NTVmFsdWUoVGV4dERlY29yYXRpCiB9CiAjZW5kaWYgLy8gQ1NTM19URVhU X0RFQ09SQVRJT04KIAotc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGZpbGxSZXBlYXRUb0NT U1ZhbHVlKEVGaWxsUmVwZWF0IHhSZXBlYXQsIEVGaWxsUmVwZWF0IHlSZXBlYXQpCitzdGF0aWMg UGFzc1JlZjxDU1NWYWx1ZT4gZmlsbFJlcGVhdFRvQ1NTVmFsdWUoRUZpbGxSZXBlYXQgeFJlcGVh dCwgRUZpbGxSZXBlYXQgeVJlcGVhdCkKIHsKICAgICAvLyBGb3IgYmFja3dhcmRzIGNvbXBhdGli aWxpdHksIGlmIGJvdGggdmFsdWVzIGFyZSBlcXVhbCwganVzdCByZXR1cm4gb25lIG9mIHRoZW0u IEFuZAogICAgIC8vIGlmIHRoZSB0d28gdmFsdWVzIGFyZSBlcXVpdmFsZW50IHRvIHJlcGVhdC14 IG9yIHJlcGVhdC15LCBqdXN0IHJldHVybiB0aGUgc2hvcnRoYW5kLgpAQCAtMTQ2OCwxMCArMTQ2 OCwxMCBAQCBzdGF0aWMgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gZmlsbFJlcGVhdFRvQ1NTVmFsdWUo RUZpbGxSZXBlYXQgeFJlcGVhdCwgRUZpbGxSZXBlYQogICAgIGlmICh4UmVwZWF0ID09IE5vUmVw ZWF0RmlsbCAmJiB5UmVwZWF0ID09IFJlcGVhdEZpbGwpCiAgICAgICAgIHJldHVybiBjc3NWYWx1 ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVSZXBlYXRZKTsKIAotICAgIFJl ZlB0cjxDU1NWYWx1ZUxpc3Q+IGxpc3QgPSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZVNwYWNlU2VwYXJh dGVkKCk7Ci0gICAgbGlzdC0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHhSZXBl YXQpKTsKLSAgICBsaXN0LT5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoeVJlcGVh dCkpOwotICAgIHJldHVybiBsaXN0LnJlbGVhc2UoKTsKKyAgICBhdXRvIGxpc3QgPSBDU1NWYWx1 ZUxpc3Q6OmNyZWF0ZVNwYWNlU2VwYXJhdGVkKCk7CisgICAgbGlzdC5nZXQoKS5hcHBlbmQoY3Nz VmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoeFJlcGVhdCkpOworICAgIGxpc3QuZ2V0KCkuYXBwZW5k KGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHlSZXBlYXQpKTsKKyAgICByZXR1cm4gc3RkOjpt b3ZlKGxpc3QpOwogfQogCiBzdGF0aWMgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gZmlsbFNvdXJjZVR5 cGVUb0NTU1ZhbHVlKEVNYXNrU291cmNlVHlwZSB0eXBlKQpAQCAtMTQ4Nyw3ICsxNDg3LDcgQEAg c3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGZpbGxTb3VyY2VUeXBlVG9DU1NWYWx1ZShFTWFz a1NvdXJjZVR5cGUgdHlwZSkKIAogICAgIHJldHVybiAwOwogfQotc3RhdGljIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IGZpbGxTaXplVG9DU1NWYWx1ZShjb25zdCBGaWxsU2l6ZSYgZmlsbFNpemUsIGNv bnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKK3N0YXRpYyBQYXNzUmVmPENTU1ZhbHVlPiBmaWxsU2l6 ZVRvQ1NTVmFsdWUoY29uc3QgRmlsbFNpemUmIGZpbGxTaXplLCBjb25zdCBSZW5kZXJTdHlsZSog c3R5bGUpCiB7CiAgICAgaWYgKGZpbGxTaXplLnR5cGUgPT0gQ29udGFpbikKICAgICAgICAgcmV0 dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUNvbnRhaW4p OwpAQCAtMTQ5OCwzNSArMTQ5OCwzNSBAQCBzdGF0aWMgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gZmls bFNpemVUb0NTU1ZhbHVlKGNvbnN0IEZpbGxTaXplJiBmaWxsU2l6ZSwgY29uc3QgUgogICAgIGlm IChmaWxsU2l6ZS5zaXplLmhlaWdodCgpLmlzQXV0bygpKQogICAgICAgICByZXR1cm4gem9vbUFk anVzdGVkUGl4ZWxWYWx1ZUZvckxlbmd0aChmaWxsU2l6ZS5zaXplLndpZHRoKCksIHN0eWxlKTsK IAotICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IGxpc3QgPSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZVNw YWNlU2VwYXJhdGVkKCk7Ci0gICAgbGlzdC0+YXBwZW5kKHpvb21BZGp1c3RlZFBpeGVsVmFsdWVG b3JMZW5ndGgoZmlsbFNpemUuc2l6ZS53aWR0aCgpLCBzdHlsZSkpOwotICAgIGxpc3QtPmFwcGVu ZCh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlRm9yTGVuZ3RoKGZpbGxTaXplLnNpemUuaGVpZ2h0KCks IHN0eWxlKSk7Ci0gICAgcmV0dXJuIGxpc3QucmVsZWFzZSgpOworICAgIGF1dG8gbGlzdCA9IENT U1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKKyAgICBsaXN0LmdldCgpLmFwcGVu ZCh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlRm9yTGVuZ3RoKGZpbGxTaXplLnNpemUud2lkdGgoKSwg c3R5bGUpKTsKKyAgICBsaXN0LmdldCgpLmFwcGVuZCh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlRm9y TGVuZ3RoKGZpbGxTaXplLnNpemUuaGVpZ2h0KCksIHN0eWxlKSk7CisgICAgcmV0dXJuIHN0ZDo6 bW92ZShsaXN0KTsKIH0KIAotc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGFsdFRleHRUb0NT U1ZhbHVlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKK3N0YXRpYyBQYXNzUmVmPENTU1ZhbHVl PiBhbHRUZXh0VG9DU1NWYWx1ZShjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUpCiB7CiAgICAgcmV0 dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5jb250ZW50QWx0VGV4dCgpLCBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORyk7CiB9CiAgICAgCi1zdGF0aWMgUGFzc1JlZlB0 cjxDU1NWYWx1ZT4gY29udGVudFRvQ1NTVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlKQor c3RhdGljIFBhc3NSZWY8Q1NTVmFsdWVMaXN0PiBjb250ZW50VG9DU1NWYWx1ZShjb25zdCBSZW5k ZXJTdHlsZSogc3R5bGUpCiB7Ci0gICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gbGlzdCA9IENTU1Zh bHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKKyAgICBhdXRvIGxpc3QgPSBDU1NWYWx1 ZUxpc3Q6OmNyZWF0ZVNwYWNlU2VwYXJhdGVkKCk7CiAgICAgZm9yIChjb25zdCBDb250ZW50RGF0 YSogY29udGVudERhdGEgPSBzdHlsZS0+Y29udGVudERhdGEoKTsgY29udGVudERhdGE7IGNvbnRl bnREYXRhID0gY29udGVudERhdGEtPm5leHQoKSkgewogICAgICAgICBpZiAoY29udGVudERhdGEt PmlzQ291bnRlcigpKSB7CiAgICAgICAgICAgICBjb25zdCBDb3VudGVyQ29udGVudCogY291bnRl ciA9IHN0YXRpY19jYXN0PGNvbnN0IENvdW50ZXJDb250ZW50RGF0YSo+KGNvbnRlbnREYXRhKS0+ Y291bnRlcigpOwogICAgICAgICAgICAgQVNTRVJUKGNvdW50ZXIpOwotICAgICAgICAgICAgbGlz dC0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGNvdW50ZXItPmlkZW50aWZpZXIo KSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19DT1VOVEVSX05BTUUpKTsKKyAgICAgICAgICAgIGxp c3QuZ2V0KCkuYXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGNvdW50ZXItPmlkZW50 aWZpZXIoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19DT1VOVEVSX05BTUUpKTsKICAgICAgICAg fSBlbHNlIGlmIChjb250ZW50RGF0YS0+aXNJbWFnZSgpKSB7CiAgICAgICAgICAgICBjb25zdCBT dHlsZUltYWdlKiBpbWFnZSA9IHN0YXRpY19jYXN0PGNvbnN0IEltYWdlQ29udGVudERhdGEqPihj b250ZW50RGF0YSktPmltYWdlKCk7CiAgICAgICAgICAgICBBU1NFUlQoaW1hZ2UpOwotICAgICAg ICAgICAgbGlzdC0+YXBwZW5kKGltYWdlLT5jc3NWYWx1ZSgpKTsKKyAgICAgICAgICAgIGxpc3Qu Z2V0KCkuYXBwZW5kKGltYWdlLT5jc3NWYWx1ZSgpKTsKICAgICAgICAgfSBlbHNlIGlmIChjb250 ZW50RGF0YS0+aXNUZXh0KCkpCi0gICAgICAgICAgICBsaXN0LT5hcHBlbmQoY3NzVmFsdWVQb29s KCkuY3JlYXRlVmFsdWUoc3RhdGljX2Nhc3Q8Y29uc3QgVGV4dENvbnRlbnREYXRhKj4oY29udGVu dERhdGEpLT50ZXh0KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5HKSk7CisgICAgICAg ICAgICBsaXN0LmdldCgpLmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdGF0aWNf Y2FzdDxjb25zdCBUZXh0Q29udGVudERhdGEqPihjb250ZW50RGF0YSktPnRleHQoKSwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19TVFJJTkcpKTsKICAgICB9CiAgICAgaWYgKHN0eWxlLT5oYXNGbG93 RnJvbSgpKQotICAgICAgICBsaXN0LT5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUo c3R5bGUtPnJlZ2lvblRocmVhZCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORykpOwot ICAgIHJldHVybiBsaXN0LnJlbGVhc2UoKTsKKyAgICAgICAgbGlzdC5nZXQoKS5hcHBlbmQoY3Nz VmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPnJlZ2lvblRocmVhZCgpLCBDU1NQcmltaXRp dmVWYWx1ZTo6Q1NTX1NUUklORykpOworICAgIHJldHVybiBsaXN0OwogfQogCiBzdGF0aWMgUGFz c1JlZlB0cjxDU1NWYWx1ZT4gY291bnRlclRvQ1NTVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqIHN0 eWxlLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpCkBAIC0xNTUzLDE1ICsxNTUzLDE1IEBAIHN0 YXRpYyB2b2lkIGxvZ1VuaW1wbGVtZW50ZWRQcm9wZXJ0eUlEKENTU1Byb3BlcnR5SUQgcHJvcGVy dHlJRCkKICAgICBMT0dfRVJST1IoIldlYktpdCBkb2VzIG5vdCB5ZXQgaW1wbGVtZW50IGdldENv bXB1dGVkU3R5bGUgZm9yICclcycuIiwgZ2V0UHJvcGVydHlOYW1lKHByb3BlcnR5SUQpKTsKIH0K IAotc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWVMaXN0PiBmb250RmFtaWx5RnJvbVN0eWxlKFJl bmRlclN0eWxlKiBzdHlsZSkKLSAgICB7Ci0gICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gbGlzdCA9 IENTU1ZhbHVlTGlzdDo6Y3JlYXRlQ29tbWFTZXBhcmF0ZWQoKTsKK3N0YXRpYyBQYXNzUmVmPENT U1ZhbHVlTGlzdD4gZm9udEZhbWlseUZyb21TdHlsZShSZW5kZXJTdHlsZSogc3R5bGUpCit7Cisg ICAgYXV0byBsaXN0ID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVDb21tYVNlcGFyYXRlZCgpOwogICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdHlsZS0+Zm9udCgpLmZhbWlseUNvdW50KCk7ICsr aSkKLSAgICAgICAgbGlzdC0+YXBwZW5kKHZhbHVlRm9yRmFtaWx5KHN0eWxlLT5mb250KCkuZmFt aWx5QXQoaSkpKTsKLSAgICByZXR1cm4gbGlzdC5yZWxlYXNlKCk7CisgICAgICAgIGxpc3QuZ2V0 KCkuYXBwZW5kKHZhbHVlRm9yRmFtaWx5KHN0eWxlLT5mb250KCkuZmFtaWx5QXQoaSkpKTsKKyAg ICByZXR1cm4gbGlzdDsKIH0KIAotc3RhdGljIFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+ IGxpbmVIZWlnaHRGcm9tU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJWaWV3KiByZW5k ZXJWaWV3KQorc3RhdGljIFBhc3NSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+IGxpbmVIZWlnaHRGcm9t U3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJWaWV3KiByZW5kZXJWaWV3KQogewogICAg IExlbmd0aCBsZW5ndGggPSBzdHlsZS0+bGluZUhlaWdodCgpOwogICAgIGlmIChsZW5ndGguaXNO ZWdhdGl2ZSgpKQpAQCAtMTU3NSwyNiArMTU3NSwyNiBAQCBzdGF0aWMgUGFzc1JlZlB0cjxDU1NQ cmltaXRpdmVWYWx1ZT4gbGluZUhlaWdodEZyb21TdHlsZShSZW5kZXJTdHlsZSogc3R5bGUsIFJl bgogICAgIHJldHVybiB6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKGZsb2F0VmFsdWVGb3JMZW5ndGgo bGVuZ3RoLCAwLCByZW5kZXJWaWV3KSwgc3R5bGUpOwogfQogCi1zdGF0aWMgUGFzc1JlZlB0cjxD U1NQcmltaXRpdmVWYWx1ZT4gZm9udFNpemVGcm9tU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlKQor c3RhdGljIFBhc3NSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+IGZvbnRTaXplRnJvbVN0eWxlKFJlbmRl clN0eWxlKiBzdHlsZSkKIHsKICAgICByZXR1cm4gem9vbUFkanVzdGVkUGl4ZWxWYWx1ZShzdHls ZS0+Zm9udERlc2NyaXB0aW9uKCkuY29tcHV0ZWRQaXhlbFNpemUoKSwgc3R5bGUpOwogfQogCi1z dGF0aWMgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZm9udFN0eWxlRnJvbVN0eWxlKFJl bmRlclN0eWxlKiBzdHlsZSkKK3N0YXRpYyBQYXNzUmVmPENTU1ByaW1pdGl2ZVZhbHVlPiBmb250 U3R5bGVGcm9tU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlKQogewogICAgIGlmIChzdHlsZS0+Zm9u dERlc2NyaXB0aW9uKCkuaXRhbGljKCkpCiAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5j cmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVJdGFsaWMpOwogICAgIHJldHVybiBjc3NWYWx1 ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb3JtYWwpOwogfQogCi1zdGF0 aWMgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZm9udFZhcmlhbnRGcm9tU3R5bGUoUmVu ZGVyU3R5bGUqIHN0eWxlKQorc3RhdGljIFBhc3NSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+IGZvbnRW YXJpYW50RnJvbVN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSkKIHsKICAgICBpZiAoc3R5bGUtPmZv bnREZXNjcmlwdGlvbigpLnNtYWxsQ2FwcygpKQogICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29s KCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlU21hbGxDYXBzKTsKICAgICByZXR1cm4g Y3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKTsKIH0K IAotc3RhdGljIFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGZvbnRXZWlnaHRGcm9tU3R5 bGUoUmVuZGVyU3R5bGUqIHN0eWxlKQorc3RhdGljIFBhc3NSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+ IGZvbnRXZWlnaHRGcm9tU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlKQogewogICAgIHN3aXRjaCAo c3R5bGUtPmZvbnREZXNjcmlwdGlvbigpLndlaWdodCgpKSB7CiAgICAgY2FzZSBGb250V2VpZ2h0 MTAwOgo=