65164 2011-07-25 22:29:34 -0700 Handle CSS Properties that can be either auto or a primitive value in CSSStyleApplyProperty 2011-07-26 17:14:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson dglazkov macpherson webkit.review.bot oldest_to_newest 442112 0 macpherson 2011-07-25 22:29:34 -0700 Handle CSS Properties that can be either auto or a primitive value in CSSStyleApplyProperty 442113 1 101971 macpherson 2011-07-25 22:34:06 -0700 Created attachment 101971 Patch 442631 2 101971 webkit.review.bot 2011-07-26 17:14:48 -0700 Comment on attachment 101971 Patch Clearing flags on attachment: 101971 Committed r91800: <http://trac.webkit.org/changeset/91800> 442632 3 webkit.review.bot 2011-07-26 17:14:52 -0700 All reviewed patches have been landed. Closing bug. 101971 2011-07-25 22:34:06 -0700 2011-07-26 17:14:48 -0700 Patch bug-65164-20110726153404.patch text/plain 11437 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxNzQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDctMjUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBIYW5kbGUgQ1NT IFByb3BlcnRpZXMgdGhhdCBjYW4gYmUgZWl0aGVyIGF1dG8gb3IgYSBwcmltaXRpdmUgdmFsdWUg aW4gQ1NTU3R5bGVBcHBseVByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NTE2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAvIHJlZmFjdG9yaW5nIG9ubHkuCisKKyAgICAg ICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oOgorICAgICAgICBBZGQgY2FzdHMg dG8vZnJvbSB2YXJpb3VzIG51bWVyaWMgdHlwZXMuCisgICAgICAgIChXZWJDb3JlOjpDU1NQcmlt aXRpdmVWYWx1ZTo6b3BlcmF0b3Igc2hvcnQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0 aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1p dGl2ZVZhbHVlOjpvcGVyYXRvciB1bnNpZ25lZCBzaG9ydCk6CisgICAgICAgIChXZWJDb3JlOjpD U1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgaW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1By aW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBmbG9hdCk6CisgICAgICAgICogY3NzL0NTU1N0eWxlQXBw bHlQcm9wZXJ0eS5jcHA6CisgICAgICAgIEFkZCBjbGFzcyB0byBoYW5kbGUgcHJvcGVydGllcyB0 aGF0IHNldCBhbiAiYXV0byIgYm9vbGVhbiBvbiBSZW5kZXJTdHlsZS4KKyAgICAgICAgKFdlYkNv cmU6OkFwcGx5UHJvcGVydHlBdXRvOjpBcHBseVByb3BlcnR5QXV0byk6CisgICAgICAgIChXZWJD b3JlOjpBcHBseVByb3BlcnR5QXV0bzo6YXBwbHlJbmhlcml0VmFsdWUpOgorICAgICAgICAoV2Vi Q29yZTo6QXBwbHlQcm9wZXJ0eUF1dG86OmFwcGx5SW5pdGlhbFZhbHVlKToKKyAgICAgICAgKFdl YkNvcmU6OkFwcGx5UHJvcGVydHlBdXRvOjphcHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6 OkFwcGx5UHJvcGVydHlBdXRvOjpoYXNBdXRvKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlBdXRvOjpzZXRBdXRvKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBwbHlQcm9w ZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHA6CisgICAgICAgIFJlbW92ZSBleGlzdGluZyBpbXBsZW1lbnRhdGlvbnMuCisgICAg ICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKwogMjAxMS0w Ny0yNSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0NN QUtFXSBTcGxpdCBKU0MgcmVsYXRlZCBmaWxlcyBmcm9tIFdlYkNvcmUvQ01ha2VMaXN0cy50eHQK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3Mu aAkocmV2aXNpb24gOTE3MjUpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWVNYXBwaW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw4IEBACiAjaW5jbHVkZSAi VGhlbWVUeXBlcy5oIgogI2luY2x1ZGUgIlVuaWNvZGVCaWRpLmgiCiAKKyNpbmNsdWRlIDx3dGYv TWF0aEV4dHJhcy5oPgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHRlbXBsYXRlPD4gaW5saW5l IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShzaG9ydCBpKQpAQCAtNTcsMTIg KzU5LDYwIEBAIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1MKIHRlbXBs YXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBzaG9ydCgpIGNvbnN0CiB7 CiAgICAgaWYgKG1fdHlwZSA9PSBDU1NfTlVNQkVSKQotICAgICAgICByZXR1cm4gc3RhdGljX2Nh c3Q8c2hvcnQ+KG1fdmFsdWUubnVtKTsKKyAgICAgICAgcmV0dXJuIGNsYW1wVG88c2hvcnQ+KG1f dmFsdWUubnVtKTsKKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiAwOwor fQorCit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFs dWUodW5zaWduZWQgc2hvcnQgaSkKKyAgICA6IG1fdHlwZShDU1NfTlVNQkVSKQorICAgICwgbV9o YXNDYWNoZWRDU1NUZXh0KGZhbHNlKQoreworICAgIG1fdmFsdWUubnVtID0gc3RhdGljX2Nhc3Q8 ZG91YmxlPihpKTsKK30KKwordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9w ZXJhdG9yIHVuc2lnbmVkIHNob3J0KCkgY29uc3QKK3sKKyAgICBpZiAobV90eXBlID09IENTU19O VU1CRVIpCisgICAgICAgIHJldHVybiBjbGFtcFRvPHVuc2lnbmVkIHNob3J0PihtX3ZhbHVlLm51 bSk7CiAKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gMDsKIH0KIAordGVt cGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKGludCBp KQorICAgIDogbV90eXBlKENTU19OVU1CRVIpCisgICAgLCBtX2hhc0NhY2hlZENTU1RleHQoZmFs c2UpCit7CisgICAgbV92YWx1ZS5udW0gPSBzdGF0aWNfY2FzdDxkb3VibGU+KGkpOworfQorCit0 ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgaW50KCkgY29uc3QK K3sKKyAgICBpZiAobV90eXBlID09IENTU19OVU1CRVIpCisgICAgICAgIHJldHVybiBjbGFtcFRv PGludD4obV92YWx1ZS5udW0pOworCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0 dXJuIDA7Cit9CisKK3RlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmlt aXRpdmVWYWx1ZShmbG9hdCBpKQorICAgIDogbV90eXBlKENTU19OVU1CRVIpCisgICAgLCBtX2hh c0NhY2hlZENTU1RleHQoZmFsc2UpCit7CisgICAgbV92YWx1ZS5udW0gPSBzdGF0aWNfY2FzdDxk b3VibGU+KGkpOworfQorCit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3Bl cmF0b3IgZmxvYXQoKSBjb25zdAoreworICAgIGlmIChtX3R5cGUgPT0gQ1NTX05VTUJFUikKKyAg ICAgICAgcmV0dXJuIGNsYW1wVG88ZmxvYXQ+KG1fdmFsdWUubnVtKTsKKworICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgIHJldHVybiAwLjBmOworfQorCiB0ZW1wbGF0ZTw+IGlubGluZSBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoRUJvcmRlclN0eWxlIGUpCiAgICAg OiBtX3R5cGUoQ1NTX0lERU5UKQogICAgICwgbV9oYXNDYWNoZWRDU1NUZXh0KGZhbHNlKQpJbmRl eDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAJKHJldmlz aW9uIDkxNzI1KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE0Miw2ICsxNDIsNjIgQEAgcHJvdGVjdGVkOgogICAgIH0K IH07CiAKK2VudW0gQXV0b1ZhbHVlVHlwZSB7TnVtYmVyID0gMCwgQ29tcHV0ZUxlbmd0aH07Cit0 ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgQXV0b1ZhbHVlVHlwZSB2YWx1ZVR5cGUgPSBOdW1iZXIsIGlu dCBhdXRvSWRlbnRpdHkgPSBDU1NWYWx1ZUF1dG8+CitjbGFzcyBBcHBseVByb3BlcnR5QXV0byA6 IHB1YmxpYyBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8VD4geworcHVibGljOgorICAgIHR5cGVk ZWYgYm9vbCAoUmVuZGVyU3R5bGU6OipIYXNBdXRvRnVuY3Rpb24pKCkgY29uc3Q7CisgICAgdHlw ZWRlZiB2b2lkIChSZW5kZXJTdHlsZTo6KlNldEF1dG9GdW5jdGlvbikoKTsKKworICAgIEFwcGx5 UHJvcGVydHlBdXRvKHR5cGVuYW1lIEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxUPjo6R2V0dGVy RnVuY3Rpb24gZ2V0dGVyLCB0eXBlbmFtZSBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8VD46OlNl dHRlckZ1bmN0aW9uIHNldHRlciwgSGFzQXV0b0Z1bmN0aW9uIGhhc0F1dG8sIFNldEF1dG9GdW5j dGlvbiBzZXRBdXRvKQorICAgICAgICA6IEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxUPihnZXR0 ZXIsIHNldHRlciwgMCkKKyAgICAgICAgLCBtX2hhc0F1dG8oaGFzQXV0bykKKyAgICAgICAgLCBt X3NldEF1dG8oc2V0QXV0bykKKyAgICB7CisgICAgfQorCitwcm90ZWN0ZWQ6CisgICAgdmlydHVh bCB2b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yKSBjb25z dAorICAgIHsKKyAgICAgICAgaWYgKGhhc0F1dG8oc2VsZWN0b3ItPnBhcmVudFN0eWxlKCkpKQor ICAgICAgICAgICAgc2V0QXV0byhzZWxlY3Rvci0+c3R5bGUoKSk7CisgICAgICAgIGVsc2UKKyAg ICAgICAgICAgIEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxUPjo6c2V0VmFsdWUoc2VsZWN0b3It PnN0eWxlKCksIEFwcGx5UHJvcGVydHlEZWZhdWx0QmFzZTxUPjo6dmFsdWUoc2VsZWN0b3ItPnBh cmVudFN0eWxlKCkpKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgYXBwbHlJbml0aWFsVmFs dWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IpIGNvbnN0CisgICAgeworICAgICAgICBzZXRB dXRvKHNlbGVjdG9yLT5zdHlsZSgpKTsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgYXBwbHlW YWx1ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKSBjb25zdAor ICAgIHsKKyAgICAgICAgaWYgKCF2YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9 IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUpOworICAgICAgICBpZiAocHJp bWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gYXV0b0lkZW50aXR5KQorICAgICAgICAgICAgc2V0 QXV0byhzZWxlY3Rvci0+c3R5bGUoKSk7CisgICAgICAgIGVsc2UgaWYgKHZhbHVlVHlwZSA9PSBO dW1iZXIpCisgICAgICAgICAgICBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8VD46OnNldFZhbHVl KHNlbGVjdG9yLT5zdHlsZSgpLCAqcHJpbWl0aXZlVmFsdWUpOworICAgICAgICBlbHNlIGlmICh2 YWx1ZVR5cGUgPT0gQ29tcHV0ZUxlbmd0aCkKKyAgICAgICAgICAgIEFwcGx5UHJvcGVydHlEZWZh dWx0QmFzZTxUPjo6c2V0VmFsdWUoc2VsZWN0b3ItPnN0eWxlKCksIHByaW1pdGl2ZVZhbHVlLT5j b21wdXRlTGVuZ3RoPFQ+KHNlbGVjdG9yLT5zdHlsZSgpLCBzZWxlY3Rvci0+cm9vdEVsZW1lbnRT dHlsZSgpLCBzZWxlY3Rvci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpKSk7CisgICAgfQorCisg ICAgYm9vbCBoYXNBdXRvKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKKyAgICB7CisgICAgICAg IHJldHVybiAoc3R5bGUtPiptX2hhc0F1dG8pKCk7CisgICAgfQorCisgICAgdm9pZCBzZXRBdXRv KFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKKyAgICB7CisgICAgICAgIChzdHlsZS0+Km1fc2V0 QXV0bykoKTsKKyAgICB9CisKKyAgICBIYXNBdXRvRnVuY3Rpb24gbV9oYXNBdXRvOworICAgIFNl dEF1dG9GdW5jdGlvbiBtX3NldEF1dG87Cit9OworCiBlbnVtIENvbG9ySW5oZXJpdCB7Tm9Jbmhl cml0RnJvbVBhcmVudCA9IDAsIEluaGVyaXRGcm9tUGFyZW50fTsKIHRlbXBsYXRlIDxDb2xvcklu aGVyaXQgaW5oZXJpdENvbG9yRnJvbVBhcmVudD4KIGNsYXNzIEFwcGx5UHJvcGVydHlDb2xvciA6 IHB1YmxpYyBBcHBseVByb3BlcnR5QmFzZSB7CkBAIC04MDYsNiArODYyLDExIEBAIENTU1N0eWxl QXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3AKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIo Q1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm1PcmlnaW5ZLCBuZXcgQXBwbHlQcm9wZXJ0eUxlbmd0 aDw+KCZSZW5kZXJTdHlsZTo6dHJhbnNmb3JtT3JpZ2luWSwgJlJlbmRlclN0eWxlOjpzZXRUcmFu c2Zvcm1PcmlnaW5ZLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxUcmFuc2Zvcm1PcmlnaW5ZKSk7CiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VHJhbnNmb3JtT3JpZ2luWiwg bmV3IEFwcGx5UHJvcGVydHlDb21wdXRlTGVuZ3RoPGZsb2F0PigmUmVuZGVyU3R5bGU6OnRyYW5z Zm9ybU9yaWdpblosICZSZW5kZXJTdHlsZTo6c2V0VHJhbnNmb3JtT3JpZ2luWiwgJlJlbmRlclN0 eWxlOjppbml0aWFsVHJhbnNmb3JtT3JpZ2luWikpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihD U1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybU9yaWdpbiwgbmV3IEFwcGx5UHJvcGVydHlFeHBhbmRp bmc8U3VwcHJlc3NWYWx1ZT4ocHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VHJhbnNm b3JtT3JpZ2luWCksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybU9y aWdpblkpLCBwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm1PcmlnaW5a KSkpOworCisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQ291 bnQsIG5ldyBBcHBseVByb3BlcnR5QXV0bzx1bnNpZ25lZCBzaG9ydD4oJlJlbmRlclN0eWxlOjpj b2x1bW5Db3VudCwgJlJlbmRlclN0eWxlOjpzZXRDb2x1bW5Db3VudCwgJlJlbmRlclN0eWxlOjpo YXNBdXRvQ29sdW1uQ291bnQsICZSZW5kZXJTdHlsZTo6c2V0SGFzQXV0b0NvbHVtbkNvdW50KSk7 CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Q29sdW1uR2FwLCBuZXcg QXBwbHlQcm9wZXJ0eUF1dG88ZmxvYXQsIENvbXB1dGVMZW5ndGgsIENTU1ZhbHVlTm9ybWFsPigm UmVuZGVyU3R5bGU6OmNvbHVtbkdhcCwgJlJlbmRlclN0eWxlOjpzZXRDb2x1bW5HYXAsICZSZW5k ZXJTdHlsZTo6aGFzTm9ybWFsQ29sdW1uR2FwLCAmUmVuZGVyU3R5bGU6OnNldEhhc05vcm1hbENv bHVtbkdhcCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdENvbHVt bldpZHRoLCBuZXcgQXBwbHlQcm9wZXJ0eUF1dG88ZmxvYXQsIENvbXB1dGVMZW5ndGg+KCZSZW5k ZXJTdHlsZTo6Y29sdW1uV2lkdGgsICZSZW5kZXJTdHlsZTo6c2V0Q29sdW1uV2lkdGgsICZSZW5k ZXJTdHlsZTo6aGFzQXV0b0NvbHVtbldpZHRoLCAmUmVuZGVyU3R5bGU6OnNldEhhc0F1dG9Db2x1 bW5XaWR0aCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVpJbmRleCwgbmV3 IEFwcGx5UHJvcGVydHlBdXRvPGludD4oJlJlbmRlclN0eWxlOjp6SW5kZXgsICZSZW5kZXJTdHls ZTo6c2V0WkluZGV4LCAmUmVuZGVyU3R5bGU6Omhhc0F1dG9aSW5kZXgsICZSZW5kZXJTdHlsZTo6 c2V0SGFzQXV0b1pJbmRleCkpOwogfQogCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDkxNzI1KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTAxLDIyICszOTAxLDYgQEAg dm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVpJbmRleDogewotICAgICAgICBpZiAoaXNJ bmhlcml0KSB7Ci0gICAgICAgICAgICBpZiAobV9wYXJlbnRTdHlsZS0+aGFzQXV0b1pJbmRleCgp KQotICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldEhhc0F1dG9aSW5kZXgoKTsKLSAgICAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgICAgICBtX3N0eWxlLT5zZXRaSW5kZXgobV9wYXJlbnRTdHls ZS0+ekluZGV4KCkpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9IGVsc2UgaWYgKGlz SW5pdGlhbCB8fCBwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pIHsK LSAgICAgICAgICAgIG1fc3R5bGUtPnNldEhhc0F1dG9aSW5kZXgoKTsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQotICAgICAgICAKLSAgICAgICAgLy8gRklYTUU6IFNob3VsZCBjbGFt cCBhbGwgc29ydHMgb2Ygb3RoZXIgaW50ZWdlciBwcm9wZXJ0aWVzIHRvby4KLSAgICAgICAgbV9z dHlsZS0+c2V0WkluZGV4KGNsYW1wVG9JbnRlZ2VyKHByaW1pdGl2ZVZhbHVlLT5nZXREb3VibGVW YWx1ZSgpKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdp ZG93czoKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRSh3 aWRvd3MsIFdpZG93cykKICAgICAgICAgcmV0dXJuOwpAQCAtNDU3MSw1MyArNDU1NSwxMSBAQCB2 b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIGVsc2UKICAg ICAgICAgICAgIG1fc3R5bGUtPnNldEJveFNpemluZyhCT1JERVJfQk9YKTsKICAgICAgICAgcmV0 dXJuOwotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5Db3VudDogewotICAgICAgICBp ZiAoaXNJbmhlcml0KSB7Ci0gICAgICAgICAgICBpZiAobV9wYXJlbnRTdHlsZS0+aGFzQXV0b0Nv bHVtbkNvdW50KCkpCi0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0SGFzQXV0b0NvbHVtbkNv dW50KCk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Q29s dW1uQ291bnQobV9wYXJlbnRTdHlsZS0+Y29sdW1uQ291bnQoKSk7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0gZWxzZSBpZiAoaXNJbml0aWFsIHx8IHByaW1pdGl2ZVZhbHVlLT5nZXRJ ZGVudCgpID09IENTU1ZhbHVlQXV0bykgewotICAgICAgICAgICAgbV9zdHlsZS0+c2V0SGFzQXV0 b0NvbHVtbkNvdW50KCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAg bV9zdHlsZS0+c2V0Q29sdW1uQ291bnQoc3RhdGljX2Nhc3Q8dW5zaWduZWQgc2hvcnQ+KHByaW1p dGl2ZVZhbHVlLT5nZXREb3VibGVWYWx1ZSgpKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0g ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkdhcDogewotICAgICAgICBpZiAoaXNJbmhl cml0KSB7Ci0gICAgICAgICAgICBpZiAobV9wYXJlbnRTdHlsZS0+aGFzTm9ybWFsQ29sdW1uR2Fw KCkpCi0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0SGFzTm9ybWFsQ29sdW1uR2FwKCk7Ci0g ICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgbV9zdHlsZS0+c2V0Q29sdW1uR2FwKG1f cGFyZW50U3R5bGUtPmNvbHVtbkdhcCgpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fSBlbHNlIGlmIChpc0luaXRpYWwgfHwgcHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NT VmFsdWVOb3JtYWwpIHsKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEhhc05vcm1hbENvbHVtbkdh cCgpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIG1fc3R5bGUtPnNl dENvbHVtbkdhcChwcmltaXRpdmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aDxmbG9hdD4oc3R5bGUoKSwg bV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblNwYW46IHsKICAgICAgICAgSEFORExF X0lOSEVSSVRfQU5EX0lOSVRJQUwoY29sdW1uU3BhbiwgQ29sdW1uU3BhbikKICAgICAgICAgbV9z dHlsZS0+c2V0Q29sdW1uU3BhbihwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1 ZUFsbCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dENvbHVtbldpZHRoOiB7Ci0gICAgICAgIGlmIChpc0luaGVyaXQpIHsKLSAgICAgICAgICAgIGlm IChtX3BhcmVudFN0eWxlLT5oYXNBdXRvQ29sdW1uV2lkdGgoKSkKLSAgICAgICAgICAgICAgICBt X3N0eWxlLT5zZXRIYXNBdXRvQ29sdW1uV2lkdGgoKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgICAgICBtX3N0eWxlLT5zZXRDb2x1bW5XaWR0aChtX3BhcmVudFN0eWxlLT5jb2x1bW5X aWR0aCgpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfSBlbHNlIGlmIChpc0luaXRp YWwgfHwgcHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRvKSB7Ci0gICAg ICAgICAgICBtX3N0eWxlLT5zZXRIYXNBdXRvQ29sdW1uV2lkdGgoKTsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQotICAgICAgICBtX3N0eWxlLT5zZXRDb2x1bW5XaWR0aChwcmltaXRp dmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aDxmbG9hdD4oc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxl LCB6b29tRmFjdG9yKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdENvbHVtblJ1bGVTdHlsZToKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lO SVRJQUxfQU5EX1BSSU1JVElWRV9XSVRIX1ZBTFVFKGNvbHVtblJ1bGVTdHlsZSwgQ29sdW1uUnVs ZVN0eWxlLCBCb3JkZXJTdHlsZSkKICAgICAgICAgcmV0dXJuOwpAQCAtNTMxMiw2ICs1MjU0LDEw IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0UGVyc3BlY3RpdmVPcmlnaW5ZOgogICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRQZXJzcGVjdGl2ZU9yaWdpbjoKICAgICBjYXNlIENTU1Byb3BlcnR5Q3Vyc29yOgorICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5Db3VudDoKKyAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0Q29sdW1uR2FwOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5XaWR0aDoK KyAgICBjYXNlIENTU1Byb3BlcnR5WkluZGV4OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICAgICAgcmV0dXJuOwogI2lmIEVOQUJMRShTVkcpCg==