73391 2011-11-29 20:39:33 -0800 Implement remaining border-image and webkit-maskbox-image properties in CSSStyleApplyProperty. 2011-12-06 16:27:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson kling koivisto macpherson webkit.review.bot oldest_to_newest 511340 0 macpherson 2011-11-29 20:39:33 -0800 Implement remaining border-image and webkit-maskbox-image properties in CSSStyleApplyProperty. 511341 1 117110 macpherson 2011-11-29 20:41:45 -0800 Created attachment 117110 Patch 513497 2 117110 morrita 2011-12-01 22:28:44 -0800 Comment on attachment 117110 Patch Looks a straight forward refactoring. 516347 3 117110 webkit.review.bot 2011-12-06 16:27:16 -0800 Comment on attachment 117110 Patch Clearing flags on attachment: 117110 Committed r102188: <http://trac.webkit.org/changeset/102188> 516348 4 webkit.review.bot 2011-12-06 16:27:20 -0800 All reviewed patches have been landed. Closing bug. 117110 2011-11-29 20:41:45 -0800 2011-12-06 16:27:16 -0800 Patch bug-73391-20111130154142.patch text/plain 12300 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTQ0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDExLTExLTI5ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IHJlbWFpbmluZyBib3JkZXItaW1hZ2UgYW5kIHdlYmtpdC1tYXNrYm94LWltYWdlIHByb3BlcnRp ZXMgaW4gQ1NTU3R5bGVBcHBseVByb3BlcnR5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMzOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgLyByZWZhY29yaW5nIG9ubHkuCisKKyAg ICAgICAgKiBjc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjpnZXRWYWx1ZSk6CisgICAgICAgIChX ZWJDb3JlOjpBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjo6c2V0VmFsdWUpOgorICAg ICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI6OmFwcGx5SW5o ZXJpdFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1v ZGlmaWVyOjphcHBseUluaXRpYWxWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3Bl cnR5Qm9yZGVySW1hZ2VNb2RpZmllcjo6YXBwbHlWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpB cHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjo6Y3JlYXRlSGFuZGxlcik6CisgICAgICAg IChXZWJDb3JlOjpDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6 CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eSk6CisgICAgICAgICogY3NzL0NTU1N0eWxl U2VsZWN0b3IuaDoKKwogMjAxMS0xMS0yOCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgSW1wbGVtZW50IFtTdXBwbGVtZW50YWxdIElETCBhbmQgc3VwcG9y dCBpdCBpbiBydW4tYmluZGluZ3MtdGVzdHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZUFwcGx5UHJvcGVydHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCShyZXZpc2lvbiAxMDE0MjcpCisrKyBTb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjMw LDYgKzYzMCw4MCBAQCBwdWJsaWM6CiAgICAgfQogfTsKIAorZW51bSBCb3JkZXJJbWFnZU1vZGlm aWVyVHlwZSB7IE91dHNldCwgUmVwZWF0LCBTbGljZSwgV2lkdGggfTsKK3RlbXBsYXRlIDxCb3Jk ZXJJbWFnZVR5cGUgdHlwZSwgQm9yZGVySW1hZ2VNb2RpZmllclR5cGUgbW9kaWZpZXI+CitjbGFz cyBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllciB7Citwcml2YXRlOgorICAgIHN0YXRp YyBpbmxpbmUgY29uc3QgTmluZVBpZWNlSW1hZ2UmIGdldFZhbHVlKFJlbmRlclN0eWxlKiBzdHls ZSkgeyByZXR1cm4gdHlwZSA9PSBJbWFnZSA/IHN0eWxlLT5ib3JkZXJJbWFnZSgpIDogc3R5bGUt Pm1hc2tCb3hJbWFnZSgpOyB9CisgICAgc3RhdGljIGlubGluZSB2b2lkIHNldFZhbHVlKFJlbmRl clN0eWxlKiBzdHlsZSwgY29uc3QgTmluZVBpZWNlSW1hZ2UmIHZhbHVlKSB7IHJldHVybiB0eXBl ID09IEltYWdlID8gc3R5bGUtPnNldEJvcmRlckltYWdlKHZhbHVlKSA6IHN0eWxlLT5zZXRNYXNr Qm94SW1hZ2UodmFsdWUpOyB9CitwdWJsaWM6CisgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0 VmFsdWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IpCisgICAgeworICAgICAgICBOaW5lUGll Y2VJbWFnZSBpbWFnZShnZXRWYWx1ZShzZWxlY3Rvci0+c3R5bGUoKSkpOworICAgICAgICBzd2l0 Y2ggKG1vZGlmaWVyKSB7CisgICAgICAgIGNhc2UgT3V0c2V0OgorICAgICAgICAgICAgaW1hZ2Uu Y29weU91dHNldEZyb20oZ2V0VmFsdWUoc2VsZWN0b3ItPnBhcmVudFN0eWxlKCkpKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFJlcGVhdDoKKyAgICAgICAgICAgIGltYWdlLmNv cHlSZXBlYXRGcm9tKGdldFZhbHVlKHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpKSk7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgY2FzZSBTbGljZToKKyAgICAgICAgICAgIGltYWdlLmNvcHlJ bWFnZVNsaWNlc0Zyb20oZ2V0VmFsdWUoc2VsZWN0b3ItPnBhcmVudFN0eWxlKCkpKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdpZHRoOgorICAgICAgICAgICAgaW1hZ2UuY29w eUJvcmRlclNsaWNlc0Zyb20oZ2V0VmFsdWUoc2VsZWN0b3ItPnBhcmVudFN0eWxlKCkpKTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIHNldFZhbHVlKHNlbGVjdG9yLT5z dHlsZSgpLCBpbWFnZSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsVmFs dWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IpCisgICAgeworICAgICAgICBOaW5lUGllY2VJ bWFnZSBpbWFnZShnZXRWYWx1ZShzZWxlY3Rvci0+c3R5bGUoKSkpOworICAgICAgICBzd2l0Y2gg KG1vZGlmaWVyKSB7CisgICAgICAgIGNhc2UgT3V0c2V0OgorICAgICAgICAgICAgaW1hZ2Uuc2V0 T3V0c2V0KExlbmd0aEJveCgpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFJl cGVhdDoKKyAgICAgICAgICAgIGltYWdlLnNldEhvcml6b250YWxSdWxlKFN0cmV0Y2hJbWFnZVJ1 bGUpOworICAgICAgICAgICAgaW1hZ2Uuc2V0VmVydGljYWxSdWxlKFN0cmV0Y2hJbWFnZVJ1bGUp OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgU2xpY2U6CisgICAgICAgICAgICAv LyBNYXNrcyBoYXZlIGEgZGlmZmVyZW50IGluaXRpYWwgdmFsdWUgZm9yIHNsaWNlcy4gUHJlc2Vy dmUgdGhlIHZhbHVlIG9mIDAgZm9yIGJhY2t3YXJkcyBjb21wYXRpYmlsaXR5LgorICAgICAgICAg ICAgaW1hZ2Uuc2V0SW1hZ2VTbGljZXModHlwZSA9PSBJbWFnZSA/IExlbmd0aEJveChMZW5ndGgo MTAwLCBQZXJjZW50KSwgTGVuZ3RoKDEwMCwgUGVyY2VudCksIExlbmd0aCgxMDAsIFBlcmNlbnQp LCBMZW5ndGgoMTAwLCBQZXJjZW50KSkgOiBMZW5ndGhCb3goKSk7CisgICAgICAgICAgICBpbWFn ZS5zZXRGaWxsKGZhbHNlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdpZHRo OgorICAgICAgICAgICAgLy8gTWFza3MgaGF2ZSBhIGRpZmZlcmVudCBpbml0aWFsIHZhbHVlIGZv ciB3aWR0aHMuIFRoZXkgdXNlIGFuICdhdXRvJyB2YWx1ZSByYXRoZXIgdGhhbiB0cnlpbmcgdG8g Zml0IHRvIHRoZSBib3JkZXIuCisgICAgICAgICAgICBpbWFnZS5zZXRCb3JkZXJTbGljZXModHlw ZSA9PSBJbWFnZSA/IExlbmd0aEJveChMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVs YXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUpKSA6IExlbmd0 aEJveCgpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIHNldFZhbHVl KHNlbGVjdG9yLT5zdHlsZSgpLCBpbWFnZSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgYXBw bHlWYWx1ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKQorICAg IHsKKyAgICAgICAgTmluZVBpZWNlSW1hZ2UgaW1hZ2UoZ2V0VmFsdWUoc2VsZWN0b3ItPnN0eWxl KCkpKTsKKyAgICAgICAgc3dpdGNoIChtb2RpZmllcikgeworICAgICAgICBjYXNlIE91dHNldDoK KyAgICAgICAgICAgIGltYWdlLnNldE91dHNldChzZWxlY3Rvci0+bWFwTmluZVBpZWNlSW1hZ2VR dWFkKHZhbHVlKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBSZXBlYXQ6Cisg ICAgICAgICAgICBzZWxlY3Rvci0+bWFwTmluZVBpZWNlSW1hZ2VSZXBlYXQodmFsdWUsIGltYWdl KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFNsaWNlOgorICAgICAgICAgICAg c2VsZWN0b3ItPm1hcE5pbmVQaWVjZUltYWdlU2xpY2UodmFsdWUsIGltYWdlKTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlIFdpZHRoOgorICAgICAgICAgICAgaW1hZ2Uuc2V0Qm9y ZGVyU2xpY2VzKHNlbGVjdG9yLT5tYXBOaW5lUGllY2VJbWFnZVF1YWQodmFsdWUpKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIHNldFZhbHVlKHNlbGVjdG9yLT5zdHls ZSgpLCBpbWFnZSk7CisgICAgfQorCisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVI YW5kbGVyKCkgeyByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFw cGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7IH0KK307CisKIGVudW0gQ291bnRlckJlaGF2 aW9yIHtJbmNyZW1lbnQgPSAwLCBSZXNldH07CiB0ZW1wbGF0ZSA8Q291bnRlckJlaGF2aW9yIGNv dW50ZXJCZWhhdmlvcj4KIGNsYXNzIEFwcGx5UHJvcGVydHlDb3VudGVyIHsKQEAgLTEyMjYsNiAr MTMwMCwxNSBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wCiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Qm9yZGVySW1hZ2UsIEFwcGx5UHJv cGVydHlCb3JkZXJJbWFnZTxJbWFnZSwgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJJbWFnZSwgJlJl bmRlclN0eWxlOjpib3JkZXJJbWFnZSwgJlJlbmRlclN0eWxlOjpzZXRCb3JkZXJJbWFnZSwgJkNT U1N0eWxlU2VsZWN0b3I6Om1hcE5pbmVQaWVjZUltYWdlPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAg ICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2UsIEFwcGx5 UHJvcGVydHlCb3JkZXJJbWFnZTxNYXNrLCBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZSwg JlJlbmRlclN0eWxlOjptYXNrQm94SW1hZ2UsICZSZW5kZXJTdHlsZTo6c2V0TWFza0JveEltYWdl LCAmQ1NTU3R5bGVTZWxlY3Rvcjo6bWFwTmluZVBpZWNlSW1hZ2U+OjpjcmVhdGVIYW5kbGVyKCkp OwogCisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVySW1hZ2VPdXRzZXQs IEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyPEltYWdlLCBPdXRzZXQ+OjpjcmVhdGVI YW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hc2tC b3hJbWFnZU91dHNldCwgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI8TWFzaywgT3V0 c2V0Pjo6Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlCb3JkZXJJbWFnZVJlcGVhdCwgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI8SW1h Z2UsIFJlcGVhdD46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENT U1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlUmVwZWF0LCBBcHBseVByb3BlcnR5Qm9yZGVySW1h Z2VNb2RpZmllcjxNYXNrLCBSZXBlYXQ+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckltYWdlU2xpY2UsIEFwcGx5UHJvcGVydHlCb3Jk ZXJJbWFnZU1vZGlmaWVyPEltYWdlLCBTbGljZT46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlU2xpY2UsIEFwcGx5 UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyPE1hc2ssIFNsaWNlPjo6Y3JlYXRlSGFuZGxlcigp KTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJJbWFnZVdpZHRoLCBB cHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjxJbWFnZSwgV2lkdGg+OjpjcmVhdGVIYW5k bGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJ bWFnZVdpZHRoLCBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjxNYXNrLCBXaWR0aD46 OmNyZWF0ZUhhbmRsZXIoKSk7CisKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlC b3JkZXJUb3BMZWZ0UmFkaXVzLCBBcHBseVByb3BlcnR5Qm9yZGVyUmFkaXVzPCZSZW5kZXJTdHls ZTo6Ym9yZGVyVG9wTGVmdFJhZGl1cywgJlJlbmRlclN0eWxlOjpzZXRCb3JkZXJUb3BMZWZ0UmFk aXVzLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxCb3JkZXJSYWRpdXM+OjpjcmVhdGVIYW5kbGVyKCkp OwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlclRvcFJpZ2h0UmFkaXVz LCBBcHBseVByb3BlcnR5Qm9yZGVyUmFkaXVzPCZSZW5kZXJTdHlsZTo6Ym9yZGVyVG9wUmlnaHRS YWRpdXMsICZSZW5kZXJTdHlsZTo6c2V0Qm9yZGVyVG9wUmlnaHRSYWRpdXMsICZSZW5kZXJTdHls ZTo6aW5pdGlhbEJvcmRlclJhZGl1cz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVy dHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tTGVmdFJhZGl1cywgQXBwbHlQcm9wZXJ0 eUJvcmRlclJhZGl1czwmUmVuZGVyU3R5bGU6OmJvcmRlckJvdHRvbUxlZnRSYWRpdXMsICZSZW5k ZXJTdHlsZTo6c2V0Qm9yZGVyQm90dG9tTGVmdFJhZGl1cywgJlJlbmRlclN0eWxlOjppbml0aWFs Qm9yZGVyUmFkaXVzPjo6Y3JlYXRlSGFuZGxlcigpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDEwMTQyNykKKysrIFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEzNCw3OCArMzEz NCw2IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0QXBwZWFyYW5jZToKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5E X0lOSVRJQUxfQU5EX1BSSU1JVElWRShhcHBlYXJhbmNlLCBBcHBlYXJhbmNlKQogICAgICAgICBy ZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckltYWdlT3V0c2V0OgotICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VPdXRzZXQ6IHsKLSAgICAgICAgYm9vbCBpc0Jv cmRlckltYWdlID0gaWQgPT0gQ1NTUHJvcGVydHlCb3JkZXJJbWFnZU91dHNldDsKLSAgICAgICAg TmluZVBpZWNlSW1hZ2UgaW1hZ2UoaXNCb3JkZXJJbWFnZSA/IG1fc3R5bGUtPmJvcmRlckltYWdl KCkgOiBtX3N0eWxlLT5tYXNrQm94SW1hZ2UoKSk7Ci0gICAgICAgIGlmIChpc0luaGVyaXQpCi0g ICAgICAgICAgICBpbWFnZS5jb3B5T3V0c2V0RnJvbShpc0JvcmRlckltYWdlID8gbV9wYXJlbnRT dHlsZS0+Ym9yZGVySW1hZ2UoKSA6IG1fcGFyZW50U3R5bGUtPm1hc2tCb3hJbWFnZSgpKTsKLSAg ICAgICAgZWxzZSBpZiAoaXNJbml0aWFsKQotICAgICAgICAgICAgaW1hZ2Uuc2V0T3V0c2V0KExl bmd0aEJveCgpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgaW1hZ2Uuc2V0T3V0c2V0KG1h cE5pbmVQaWVjZUltYWdlUXVhZCh2YWx1ZSkpOwotCi0gICAgICAgIGlmIChpc0JvcmRlckltYWdl KQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVySW1hZ2UoaW1hZ2UpOwotICAgICAgICBl bHNlCi0gICAgICAgICAgICBtX3N0eWxlLT5zZXRNYXNrQm94SW1hZ2UoaW1hZ2UpOwotICAgICAg ICByZXR1cm47Ci0gICAgfQotICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbWFnZVJlcGVhdDoK LSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlUmVwZWF0OiB7Ci0gICAgICAg IGJvb2wgaXNCb3JkZXJJbWFnZSA9IGlkID09IENTU1Byb3BlcnR5Qm9yZGVySW1hZ2VSZXBlYXQ7 Ci0gICAgICAgIE5pbmVQaWVjZUltYWdlIGltYWdlKGlzQm9yZGVySW1hZ2UgPyBtX3N0eWxlLT5i b3JkZXJJbWFnZSgpIDogbV9zdHlsZS0+bWFza0JveEltYWdlKCkpOwotICAgICAgICBpZiAoaXNJ bmhlcml0KQotICAgICAgICAgICAgaW1hZ2UuY29weVJlcGVhdEZyb20oaXNCb3JkZXJJbWFnZSA/ IG1fcGFyZW50U3R5bGUtPmJvcmRlckltYWdlKCkgOiBtX3BhcmVudFN0eWxlLT5tYXNrQm94SW1h Z2UoKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkgewotICAgICAgICAgICAgaW1hZ2Uu c2V0SG9yaXpvbnRhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7Ci0gICAgICAgICAgICBpbWFnZS5z ZXRWZXJ0aWNhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7Ci0gICAgICAgIH0gZWxzZQotICAgICAg ICAgICAgbWFwTmluZVBpZWNlSW1hZ2VSZXBlYXQodmFsdWUsIGltYWdlKTsKLQotICAgICAgICBp ZiAoaXNCb3JkZXJJbWFnZSkKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldEJvcmRlckltYWdlKGlt YWdlKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0TWFza0JveEltYWdl KGltYWdlKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBjYXNlIENTU1Byb3BlcnR5Qm9y ZGVySW1hZ2VTbGljZToKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlU2xp Y2U6IHsKLSAgICAgICAgYm9vbCBpc0JvcmRlckltYWdlID0gaWQgPT0gQ1NTUHJvcGVydHlCb3Jk ZXJJbWFnZVNsaWNlOwotICAgICAgICBOaW5lUGllY2VJbWFnZSBpbWFnZShpc0JvcmRlckltYWdl ID8gbV9zdHlsZS0+Ym9yZGVySW1hZ2UoKSA6IG1fc3R5bGUtPm1hc2tCb3hJbWFnZSgpKTsKLSAg ICAgICAgaWYgKGlzSW5oZXJpdCkKLSAgICAgICAgICAgIGltYWdlLmNvcHlJbWFnZVNsaWNlc0Zy b20oaXNCb3JkZXJJbWFnZSA/IG1fcGFyZW50U3R5bGUtPmJvcmRlckltYWdlKCkgOiBtX3BhcmVu dFN0eWxlLT5tYXNrQm94SW1hZ2UoKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkgewot ICAgICAgICAgICAgLy8gTWFza3MgaGF2ZSBhIGRpZmZlcmVudCBpbml0aWFsIHZhbHVlIGZvciBz bGljZXMuIFByZXNlcnZlIHRoZSB2YWx1ZSBvZiAwIGZvciBiYWNrd2FyZHMgY29tcGF0aWJpbGl0 eS4KLSAgICAgICAgICAgIGltYWdlLnNldEltYWdlU2xpY2VzKGlzQm9yZGVySW1hZ2UgPyBMZW5n dGhCb3goTGVuZ3RoKDEwMCwgUGVyY2VudCksIExlbmd0aCgxMDAsIFBlcmNlbnQpLCBMZW5ndGgo MTAwLCBQZXJjZW50KSwgTGVuZ3RoKDEwMCwgUGVyY2VudCkpIDogTGVuZ3RoQm94KCkpOwotICAg ICAgICAgICAgaW1hZ2Uuc2V0RmlsbChmYWxzZSk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAg ICAgbWFwTmluZVBpZWNlSW1hZ2VTbGljZSh2YWx1ZSwgaW1hZ2UpOwotCi0gICAgICAgIGlmIChp c0JvcmRlckltYWdlKQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm9yZGVySW1hZ2UoaW1hZ2Up OwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3N0eWxlLT5zZXRNYXNrQm94SW1hZ2UoaW1h Z2UpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJ bWFnZVdpZHRoOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VXaWR0aDog ewotICAgICAgICBib29sIGlzQm9yZGVySW1hZ2UgPSBpZCA9PSBDU1NQcm9wZXJ0eUJvcmRlcklt YWdlV2lkdGg7Ci0gICAgICAgIE5pbmVQaWVjZUltYWdlIGltYWdlKGlzQm9yZGVySW1hZ2UgPyBt X3N0eWxlLT5ib3JkZXJJbWFnZSgpIDogbV9zdHlsZS0+bWFza0JveEltYWdlKCkpOwotICAgICAg ICBpZiAoaXNJbmhlcml0KQotICAgICAgICAgICAgaW1hZ2UuY29weUJvcmRlclNsaWNlc0Zyb20o aXNCb3JkZXJJbWFnZSA/IG1fcGFyZW50U3R5bGUtPmJvcmRlckltYWdlKCkgOiBtX3BhcmVudFN0 eWxlLT5tYXNrQm94SW1hZ2UoKSk7Ci0gICAgICAgIGVsc2UgaWYgKGlzSW5pdGlhbCkgewotICAg ICAgICAgICAgLy8gTWFza3MgaGF2ZSBhIGRpZmZlcmVudCBpbml0aWFsIHZhbHVlIGZvciBzbGlj ZXMuIFRoZXkgdXNlIGFuICdhdXRvJyB2YWx1ZSByYXRoZXIgdGhhbiB0cnlpbmcgdG8gZml0IHRv IHRoZSBib3JkZXIuCi0gICAgICAgICAgICBpbWFnZS5zZXRCb3JkZXJTbGljZXMoaXNCb3JkZXJJ bWFnZSA/IExlbmd0aEJveChMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUp LCBMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUpKSA6IExlbmd0aEJveCgp KTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBpbWFnZS5zZXRCb3JkZXJTbGljZXMobWFw TmluZVBpZWNlSW1hZ2VRdWFkKHZhbHVlKSk7Ci0KLSAgICAgICAgaWYgKGlzQm9yZGVySW1hZ2Up Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRCb3JkZXJJbWFnZShpbWFnZSk7Ci0gICAgICAgIGVs c2UKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldE1hc2tCb3hJbWFnZShpbWFnZSk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUltYWdlUmVuZGVyaW5nOgogICAg ICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKGltYWdlUmVuZGVy aW5nLCBJbWFnZVJlbmRlcmluZyk7CiAgICAgICAgIHJldHVybjsKQEAgLTM4MjAsNiArMzc0OCwx NCBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBD U1NQcm9wZXJ0eUJvcmRlckltYWdlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJJ bWFnZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlOgorICAgIGNhc2Ug Q1NTUHJvcGVydHlCb3JkZXJJbWFnZU91dHNldDoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 TWFza0JveEltYWdlT3V0c2V0OgorICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbWFnZVJlcGVh dDoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlUmVwZWF0OgorICAgIGNh c2UgQ1NTUHJvcGVydHlCb3JkZXJJbWFnZVNsaWNlOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRNYXNrQm94SW1hZ2VTbGljZToKKyAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW1hZ2VXaWR0 aDoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlV2lkdGg6CiAgICAgY2Fz ZSBDU1NQcm9wZXJ0eUJvcmRlclRvcDoKICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyUmlnaHQ6 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJvdHRvbToKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3Nz L0NTU1N0eWxlU2VsZWN0b3IuaAkocmV2aXNpb24gMTAxNDI3KQorKysgU291cmNlL1dlYkNvcmUv Y3NzL0NTU1N0eWxlU2VsZWN0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMzI3LDExICszMjcsMTIg QEAgcHJpdmF0ZToKICAgICB2b2lkIG1hcEFuaW1hdGlvblByb3BlcnR5KEFuaW1hdGlvbiosIENT U1ZhbHVlKik7CiAgICAgdm9pZCBtYXBBbmltYXRpb25UaW1pbmdGdW5jdGlvbihBbmltYXRpb24q LCBDU1NWYWx1ZSopOwogCitwdWJsaWM6CiAgICAgdm9pZCBtYXBOaW5lUGllY2VJbWFnZShDU1NQ cm9wZXJ0eUlELCBDU1NWYWx1ZSosIE5pbmVQaWVjZUltYWdlJik7CiAgICAgdm9pZCBtYXBOaW5l UGllY2VJbWFnZVNsaWNlKENTU1ZhbHVlKiwgTmluZVBpZWNlSW1hZ2UmKTsKICAgICBMZW5ndGhC b3ggbWFwTmluZVBpZWNlSW1hZ2VRdWFkKENTU1ZhbHVlKik7CiAgICAgdm9pZCBtYXBOaW5lUGll Y2VJbWFnZVJlcGVhdChDU1NWYWx1ZSosIE5pbmVQaWVjZUltYWdlJik7Ci0KK3ByaXZhdGU6CiAg ICAgYm9vbCBjYW5TaGFyZVN0eWxlV2l0aENvbnRyb2woU3R5bGVkRWxlbWVudCopIGNvbnN0Owog CiAgICAgdm9pZCBhcHBseVByb3BlcnR5KGludCBpZCwgQ1NTVmFsdWUqKTsK