65517 2011-08-01 23:16:20 -0700 Implement CSSPropertyWebkitTextCombine, CSSPropertyWebkitTextEmphasisPosition and CSSPropertyWebkitTextEmphasisStyle in CSSStyleApplyProperty. 2011-08-02 16:15:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64782 1 macpherson macpherson darin dglazkov macpherson simon.fraser webkit.review.bot oldest_to_newest 445117 0 macpherson 2011-08-01 23:16:20 -0700 Implement CSSPropertyWebkitTextCombine, CSSPropertyWebkitTextEmphasisPosition and CSSPropertyWebkitTextEmphasisStyle in CSSStyleApplyProperty. 445118 1 102616 macpherson 2011-08-01 23:19:18 -0700 Created attachment 102616 Patch 445588 2 102616 webkit.review.bot 2011-08-02 16:15:43 -0700 Comment on attachment 102616 Patch Clearing flags on attachment: 102616 Committed r92243: <http://trac.webkit.org/changeset/92243> 445589 3 webkit.review.bot 2011-08-02 16:15:48 -0700 All reviewed patches have been landed. Closing bug. 102616 2011-08-01 23:19:18 -0700 2011-08-02 16:15:43 -0700 Patch bug-65517-20110802161916.patch text/plain 9338 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMTY2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDgtMDEgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbXBsZW1lbnQg Q1NTUHJvcGVydHlXZWJraXRUZXh0Q29tYmluZSwgQ1NTUHJvcGVydHlXZWJraXRUZXh0RW1waGFz aXNQb3NpdGlvbiBhbmQgQ1NTUHJvcGVydHlXZWJraXRUZXh0RW1waGFzaXNTdHlsZSBpbiBDU1NT dHlsZUFwcGx5UHJvcGVydHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NTUxNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gSnVzdCByZWZhY3RvcmluZyBhbmQgbW92aW5nIGNvZGUg YXJvdW5kLgorCisgICAgICAgICogY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6CisgICAg ICAgIEFkZGVkIGNsYXNzIEFwcGx5UHJvcGVydHlUZXh0RW1waGFzaXNTdHlsZSB0byBoYW5kbGUg dGhlIHNwZWNpYWwgVGV4dEVtcGhhc2lzU3R5bGUgbG9naWMuCisgICAgICAgIChXZWJDb3JlOjpB cHBseVByb3BlcnR5VGV4dEVtcGhhc2lzU3R5bGU6OmFwcGx5SW5oZXJpdFZhbHVlKToKKyAgICAg ICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlUZXh0RW1waGFzaXNTdHlsZTo6YXBwbHlJbml0aWFs VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eVRleHRFbXBoYXNpc1N0eWxl OjphcHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6 Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgQWRkZWQgaW5pdGlhbGl6YXRpb25zIGZv ciBDU1NQcm9wZXJ0eVdlYmtpdFRleHRDb21iaW5lLCBDU1NQcm9wZXJ0eVdlYmtpdFRleHRFbXBo YXNpc1Bvc2l0aW9uLCBDU1NQcm9wZXJ0eVdlYmtpdFRleHRFbXBoYXNpc1N0eWxlLgorICAgICAg ICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxl U2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBSZW1vdmUgZXhpc3RpbmcgaW1wbGVt ZW50YXRpb25zLgorCiAyMDExLTA4LTAxICBMdWtlIE1hY3BoZXJzb24gICA8bWFjcGhlcnNvbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgRG9uJ3Qgc2V0IG1fZm9udERpcnR5IHdoZW4gc2V0dGlu ZyB6b29tIHVubGVzcyB6b29tIGhhcyBhY3R1YWxseSBjaGFuZ2VkCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkocmV2aXNpb24gOTIxNjQpCisr KyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjg1LDYgKzY4NSw2OCBAQCBwcml2YXRlOgogICAgIH0KIH07CiAKK2NsYXNzIEFw cGx5UHJvcGVydHlUZXh0RW1waGFzaXNTdHlsZSA6IHB1YmxpYyBBcHBseVByb3BlcnR5QmFzZSB7 Citwcml2YXRlOgorICAgIHZpcnR1YWwgdm9pZCBhcHBseUluaGVyaXRWYWx1ZShDU1NTdHlsZVNl bGVjdG9yKiBzZWxlY3RvcikgY29uc3QKKyAgICB7CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgp LT5zZXRUZXh0RW1waGFzaXNGaWxsKHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpLT50ZXh0RW1waGFz aXNGaWxsKCkpOworICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzTWFy ayhzZWxlY3Rvci0+cGFyZW50U3R5bGUoKS0+dGV4dEVtcGhhc2lzTWFyaygpKTsKKyAgICAgICAg c2VsZWN0b3ItPnN0eWxlKCktPnNldFRleHRFbXBoYXNpc0N1c3RvbU1hcmsoc2VsZWN0b3ItPnBh cmVudFN0eWxlKCktPnRleHRFbXBoYXNpc0N1c3RvbU1hcmsoKSk7CisgICAgfQorCisgICAgdmly dHVhbCB2b2lkIGFwcGx5SW5pdGlhbFZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yKSBj b25zdAorICAgIHsKKyAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldFRleHRFbXBoYXNpc0Zp bGwoUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0RW1waGFzaXNGaWxsKCkpOworICAgICAgICBzZWxl Y3Rvci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzTWFyayhSZW5kZXJTdHlsZTo6aW5pdGlhbFRl eHRFbXBoYXNpc01hcmsoKSk7CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRUZXh0RW1w aGFzaXNDdXN0b21NYXJrKFJlbmRlclN0eWxlOjppbml0aWFsVGV4dEVtcGhhc2lzQ3VzdG9tTWFy aygpKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgYXBwbHlWYWx1ZShDU1NTdHlsZVNlbGVj dG9yKiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKSBjb25zdAorICAgIHsKKyAgICAgICAgaWYg KHZhbHVlLT5pc1ZhbHVlTGlzdCgpKSB7CisgICAgICAgICAgICBDU1NWYWx1ZUxpc3QqIGxpc3Qg PSBzdGF0aWNfY2FzdDxDU1NWYWx1ZUxpc3QqPih2YWx1ZSk7CisgICAgICAgICAgICBBU1NFUlQo bGlzdC0+bGVuZ3RoKCkgPT0gMik7CisgICAgICAgICAgICBpZiAobGlzdC0+bGVuZ3RoKCkgIT0g MikKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgMjsgKytpKSB7CisgICAgICAgICAgICAgICAgQ1NTVmFsdWUqIGl0ZW0gPSBsaXN0 LT5pdGVtV2l0aG91dEJvdW5kc0NoZWNrKGkpOworICAgICAgICAgICAgICAgIGlmICghaXRlbS0+ aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAg ICAgICAgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiB2YWx1ZSA9IHN0YXRpY19jYXN0PENTU1By aW1pdGl2ZVZhbHVlKj4oaXRlbSk7CisgICAgICAgICAgICAgICAgaWYgKHZhbHVlLT5nZXRJZGVu dCgpID09IENTU1ZhbHVlRmlsbGVkIHx8IHZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlT3Bl bikKKyAgICAgICAgICAgICAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldFRleHRFbXBoYXNp c0ZpbGwoKnZhbHVlKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAg IHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNNYXJrKCp2YWx1ZSk7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzQ3Vz dG9tTWFyayhudWxsQXRvbSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAg ICAgICBpZiAoIXZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IHN0YXRpY19jYXN0 PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUpOworCisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1 ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5HKSB7Cisg ICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzRmlsbChUZXh0RW1w aGFzaXNGaWxsRmlsbGVkKTsKKyAgICAgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRUZXh0 RW1waGFzaXNNYXJrKFRleHRFbXBoYXNpc01hcmtDdXN0b20pOworICAgICAgICAgICAgc2VsZWN0 b3ItPnN0eWxlKCktPnNldFRleHRFbXBoYXNpc0N1c3RvbU1hcmsocHJpbWl0aXZlVmFsdWUtPmdl dFN0cmluZ1ZhbHVlKCkpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAg ICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldFRleHRFbXBoYXNpc0N1c3RvbU1hcmsobnVsbEF0b20p OworCisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUZp bGxlZCB8fCBwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU9wZW4pIHsKKyAg ICAgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNGaWxsKCpwcmltaXRp dmVWYWx1ZSk7CisgICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lz TWFyayhUZXh0RW1waGFzaXNNYXJrQXV0byk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0VGV4dEVtcGhhc2lzRmlsbChUZXh0RW1waGFzaXNGaWxs RmlsbGVkKTsKKyAgICAgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRUZXh0RW1waGFzaXNN YXJrKCpwcmltaXRpdmVWYWx1ZSk7CisgICAgICAgIH0KKworICAgIH0KK307CisKIGNvbnN0IENT U1N0eWxlQXBwbHlQcm9wZXJ0eSYgQ1NTU3R5bGVBcHBseVByb3BlcnR5OjpzaGFyZWRDU1NTdHls ZUFwcGx5UHJvcGVydHkoKQogewogICAgIERFRklORV9TVEFUSUNfTE9DQUwoQ1NTU3R5bGVBcHBs eVByb3BlcnR5LCBjc3NTdHlsZUFwcGx5UHJvcGVydHlJbnN0YW5jZSwgKCkpOwpAQCAtODY4LDYg KzkzMCwxMSBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wCiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQ291bnQsIG5ldyBBcHBs eVByb3BlcnR5QXV0bzx1bnNpZ25lZCBzaG9ydD4oJlJlbmRlclN0eWxlOjpjb2x1bW5Db3VudCwg JlJlbmRlclN0eWxlOjpzZXRDb2x1bW5Db3VudCwgJlJlbmRlclN0eWxlOjpoYXNBdXRvQ29sdW1u Q291bnQsICZSZW5kZXJTdHlsZTo6c2V0SGFzQXV0b0NvbHVtbkNvdW50KSk7CiAgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Q29sdW1uR2FwLCBuZXcgQXBwbHlQcm9wZXJ0 eUF1dG88ZmxvYXQsIENvbXB1dGVMZW5ndGgsIENTU1ZhbHVlTm9ybWFsPigmUmVuZGVyU3R5bGU6 OmNvbHVtbkdhcCwgJlJlbmRlclN0eWxlOjpzZXRDb2x1bW5HYXAsICZSZW5kZXJTdHlsZTo6aGFz Tm9ybWFsQ29sdW1uR2FwLCAmUmVuZGVyU3R5bGU6OnNldEhhc05vcm1hbENvbHVtbkdhcCkpOwog ICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbldpZHRoLCBuZXcg QXBwbHlQcm9wZXJ0eUF1dG88ZmxvYXQsIENvbXB1dGVMZW5ndGg+KCZSZW5kZXJTdHlsZTo6Y29s dW1uV2lkdGgsICZSZW5kZXJTdHlsZTo6c2V0Q29sdW1uV2lkdGgsICZSZW5kZXJTdHlsZTo6aGFz QXV0b0NvbHVtbldpZHRoLCAmUmVuZGVyU3R5bGU6OnNldEhhc0F1dG9Db2x1bW5XaWR0aCkpOwor CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VGV4dENvbWJpbmUsIG5l dyBBcHBseVByb3BlcnR5RGVmYXVsdDxUZXh0Q29tYmluZT4oJlJlbmRlclN0eWxlOjp0ZXh0Q29t YmluZSwgJlJlbmRlclN0eWxlOjpzZXRUZXh0Q29tYmluZSwgJlJlbmRlclN0eWxlOjppbml0aWFs VGV4dENvbWJpbmUpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRU ZXh0RW1waGFzaXNQb3NpdGlvbiwgbmV3IEFwcGx5UHJvcGVydHlEZWZhdWx0PFRleHRFbXBoYXNp c1Bvc2l0aW9uPigmUmVuZGVyU3R5bGU6OnRleHRFbXBoYXNpc1Bvc2l0aW9uLCAmUmVuZGVyU3R5 bGU6OnNldFRleHRFbXBoYXNpc1Bvc2l0aW9uLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0RW1w aGFzaXNQb3NpdGlvbikpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtp dFRleHRFbXBoYXNpc1N0eWxlLCBuZXcgQXBwbHlQcm9wZXJ0eVRleHRFbXBoYXNpc1N0eWxlKCkp OworCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5WkluZGV4LCBuZXcgQXBwbHlQ cm9wZXJ0eUF1dG88aW50PigmUmVuZGVyU3R5bGU6OnpJbmRleCwgJlJlbmRlclN0eWxlOjpzZXRa SW5kZXgsICZSZW5kZXJTdHlsZTo6aGFzQXV0b1pJbmRleCwgJlJlbmRlclN0eWxlOjpzZXRIYXNB dXRvWkluZGV4KSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAJKHJldmlzaW9uIDkyMTY0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MDU5LDYyICs1MDU5LDYgQEAgdm9pZCBDU1NT dHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRDb21iaW5lOgotICAgICAgICBIQU5ETEVf SU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKHRleHRDb21iaW5lLCBUZXh0Q29tYmlu ZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRFbXBo YXNpc1Bvc2l0aW9uOgotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJ TUlUSVZFKHRleHRFbXBoYXNpc1Bvc2l0aW9uLCBUZXh0RW1waGFzaXNQb3NpdGlvbikKLSAgICAg ICAgcmV0dXJuOwotCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRFbXBoYXNpc1N0eWxl OgotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTCh0ZXh0RW1waGFzaXNGaWxsLCBU ZXh0RW1waGFzaXNGaWxsKQotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTCh0ZXh0 RW1waGFzaXNNYXJrLCBUZXh0RW1waGFzaXNNYXJrKQotICAgICAgICBIQU5ETEVfSU5IRVJJVF9B TkRfSU5JVElBTCh0ZXh0RW1waGFzaXNDdXN0b21NYXJrLCBUZXh0RW1waGFzaXNDdXN0b21NYXJr KQotICAgICAgICBpZiAoaXNJbmhlcml0IHx8IGlzSW5pdGlhbCkKLSAgICAgICAgICAgIHJldHVy bjsKLQotICAgICAgICBpZiAodmFsdWUtPmlzVmFsdWVMaXN0KCkpIHsKLSAgICAgICAgICAgIENT U1ZhbHVlTGlzdCogbGlzdCA9IHN0YXRpY19jYXN0PENTU1ZhbHVlTGlzdCo+KHZhbHVlKTsKLSAg ICAgICAgICAgIEFTU0VSVChsaXN0LT5sZW5ndGgoKSA9PSAyKTsKLSAgICAgICAgICAgIGlmIChs aXN0LT5sZW5ndGgoKSAhPSAyKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCAyOyArK2kpIHsKLSAgICAgICAgICAgICAgICBDU1NW YWx1ZSogaXRlbSA9IGxpc3QtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaSk7Ci0gICAgICAgICAg ICAgICAgaWYgKCFpdGVtLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCi0gICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwotCi0gICAgICAgICAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHZhbHVlID0g c3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPihpdGVtKTsKLSAgICAgICAgICAgICAgICBp ZiAodmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVGaWxsZWQgfHwgdmFsdWUtPmdldElkZW50 KCkgPT0gQ1NTVmFsdWVPcGVuKQotICAgICAgICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRUZXh0 RW1waGFzaXNGaWxsKCp2YWx1ZSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICBtX3N0eWxlLT5zZXRUZXh0RW1waGFzaXNNYXJrKCp2YWx1ZSk7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRUZXh0RW1waGFzaXNDdXN0b21NYXJrKG51bGxB dG9tKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGlmICghcHJp bWl0aXZlVmFsdWUpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKHByaW1pdGl2 ZVZhbHVlLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19TVFJJTkcp IHsKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldFRleHRFbXBoYXNpc0ZpbGwoVGV4dEVtcGhhc2lz RmlsbEZpbGxlZCk7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRUZXh0RW1waGFzaXNNYXJrKFRl eHRFbXBoYXNpc01hcmtDdXN0b20pOwotICAgICAgICAgICAgbV9zdHlsZS0+c2V0VGV4dEVtcGhh c2lzQ3VzdG9tTWFyayhwcmltaXRpdmVWYWx1ZS0+Z2V0U3RyaW5nVmFsdWUoKSk7Ci0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBtX3N0eWxlLT5zZXRUZXh0RW1waGFz aXNDdXN0b21NYXJrKG51bGxBdG9tKTsKLQotICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdl dElkZW50KCkgPT0gQ1NTVmFsdWVGaWxsZWQgfHwgcHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkg PT0gQ1NTVmFsdWVPcGVuKSB7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRUZXh0RW1waGFzaXNG aWxsKCpwcmltaXRpdmVWYWx1ZSk7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRUZXh0RW1waGFz aXNNYXJrKFRleHRFbXBoYXNpc01hcmtBdXRvKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIG1fc3R5bGUtPnNldFRleHRFbXBoYXNpc0ZpbGwoVGV4dEVtcGhhc2lzRmlsbEZpbGxlZCk7 Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRUZXh0RW1waGFzaXNNYXJrKCpwcmltaXRpdmVWYWx1 ZSk7Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm47CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdExpbmVCb3hDb250YWluOiB7CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFM KGxpbmVCb3hDb250YWluLCBMaW5lQm94Q29udGFpbikKICAgICAgICAgaWYgKHByaW1pdGl2ZVZh bHVlICYmIHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlTm9uZSkgewpAQCAt NTI1OCw2ICs1MjAyLDkgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGlu dAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5Db3VudDoKICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0Q29sdW1uR2FwOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5X aWR0aDoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dENvbWJpbmU6CisgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdFRleHRFbXBoYXNpc1Bvc2l0aW9uOgorICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRUZXh0RW1waGFzaXNTdHlsZToKICAgICBjYXNlIENTU1Byb3BlcnR5WkluZGV4Ogog ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuOwo=