61601 2011-05-26 21:37:05 -0700 Implement CSSPropertyOutlineStyle handler in CSSStyleApplyProperty 2011-06-09 23:19:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned dglazkov eric macpherson webkit.review.bot oldest_to_newest 411124 0 macpherson 2011-05-26 21:37:05 -0700 Implement CSSPropertyOutlineStyle handler in CSSStyleApplyProperty 411133 1 95108 macpherson 2011-05-26 21:50:15 -0700 Created attachment 95108 Patch 411142 2 95108 eric 2011-05-26 21:56:37 -0700 Comment on attachment 95108 Patch I worry I've pushed a little too hard on the bool -> enum thing. Bools can make sense when answering isFoo() quesitons or setIsFoo(). But they don't make sense when calling bar(foo, true). In the latter case, a enum is *strongly* preferred over a bool as it adds clarity. I don't see this bool being used in any bar(foo, bool) cases, and I wonder if we want to go through the trouble of making it an enum? I guess I'm mostly confused and don't fully understand what this patch is doing. 411147 3 macpherson 2011-05-26 22:08:24 -0700 Yeah, it's an odd patch. Let me explain. The motivation was not to eliminate the bool. It's an odd situation because of the way outline style is defined as an outline of border style. This leads to a situation where RenderStyle::setOutlineStyle is the only setter on RenderStyle to take two parameters, which means that it doesn't fit the ApplyPropertyDefault pattern in CSSStyleApplyProperty very well. Splitting it up into two separate setters makes it fit that pattern a lot more cleanly, and avoids defining a new ApplyProperty class just for outline-style. So that's the rationale behing the change. I'm also not completely convinced it's the right way to go - it seems like a special case either way. Another alternative might be to stop defining OutLineValue in terms of BorderValue and EBorderStyle. Let me know what you think, I'd love a second opinion, especially if there is an obviously better approach that I haven't considered. 418411 4 macpherson 2011-06-09 17:15:58 -0700 Ping. 418509 5 95108 eric 2011-06-09 22:40:39 -0700 Comment on attachment 95108 Patch OK. 418531 6 95108 webkit.review.bot 2011-06-09 23:19:34 -0700 Comment on attachment 95108 Patch Clearing flags on attachment: 95108 Committed r88525: <http://trac.webkit.org/changeset/88525> 418532 7 webkit.review.bot 2011-06-09 23:19:38 -0700 All reviewed patches have been landed. Closing bug. 95108 2011-05-26 21:50:15 -0700 2011-06-09 23:19:34 -0700 Patch bug-61601-20110527145012.patch text/plain 9121 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NDY2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDUtMjYgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgQ1NTUHJvcGVydHlPdXRsaW5l U3R5bGUgaGFuZGxlciBpbiBDU1NTdHlsZUFwcGx5UHJvcGVydHkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNjAxCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLiBObyBuZXcgZnVuY3Rpb25hbGl0eSBhZGRlZCAvIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dHMuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEVCb3JkZXJTdHlsZSk6Cisg ICAgICAgIFN1cHBvcnQgQ1NTVmFsdWVBdXRvIGFzIHJlcXVpcmVkIGJ5IG91dGxpbmUtc3R5bGUg cHJvcGVydHkuCisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3Ig T3V0bGluZUlzQXV0byk6CisgICAgICAgIEFkZCBjYXN0IHRvIG5ldyBPdXRsaW5lSXNBdXRvIGVu dW0uCisgICAgICAgICogY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6Cisg ICAgICAgIEluaXRpYWxpemUgaGFuZGxlciBmb3IgQ1NTUHJvcGVydHlPdXRsaW5lU3R5bGUuCisg ICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NT U3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eSk6CisgICAgICAgIFJlbW92ZSBvbGQgaGFuZGxl ciBmb3IgQ1NTUHJvcGVydHlPdXRsaW5lU3R5bGUuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L091dGxpbmVWYWx1ZS5oOgorICAgICAgICBVc2UgbmV3IE91dGxpbmVJc0F1dG8gZW51bSBpbnN0 ZWFkIG9mIGJvb2wuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6Cisg ICAgICAgIFNwbGl0IGV4aXN0aW5nIHR3by1wYXJhbWV0ZXIgc2V0dGVyIHNldE91dGxpbmVTdHls ZSBpbnRvIHNlcGFyYXRlIHNldHRlcnMgZm9yIHN0eWxlIGFuZCBhdXRvIHByb3BlcnRpZXMuCisg ICAgICAgIFVzZSBuZXcgT3V0bGluZUlzQXV0byBlbnVtIHR5cGUuCisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6CisgICAgICAgIERlZmluZSBuZXcgZW51 bSBPdXRsaW5lSXNBdXRvLgorCiAyMDExLTA1LTI2ICBBbm5pZSBTdWxsaXZhbiAgPHN1bGxpdmFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgJKHJl dmlzaW9uIDg3NDUzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFw cGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtODcsOSArODcsMTggQEAgdGVtcGxhdGU8PiBpbmxp bmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTUwogCiB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRp dmVWYWx1ZTo6b3BlcmF0b3IgRUJvcmRlclN0eWxlKCkgY29uc3QKIHsKKyAgICBpZiAobV92YWx1 ZS5pZGVudCA9PSBDU1NWYWx1ZUF1dG8pIC8vIFZhbGlkIGZvciBDU1Mgb3V0bGluZS1zdHlsZQor ICAgICAgICByZXR1cm4gRE9UVEVEOwogICAgIHJldHVybiAoRUJvcmRlclN0eWxlKShtX3ZhbHVl LmlkZW50IC0gQ1NTVmFsdWVOb25lKTsKIH0KIAordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0 aXZlVmFsdWU6Om9wZXJhdG9yIE91dGxpbmVJc0F1dG8oKSBjb25zdAoreworICAgIGlmIChtX3Zh bHVlLmlkZW50ID09IENTU1ZhbHVlQXV0bykKKyAgICAgICAgcmV0dXJuIEFVVE9fT047CisgICAg cmV0dXJuIEFVVE9fT0ZGOworfQorCiB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1 ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoQ29tcG9zaXRlT3BlcmF0b3IgZSkKICAgICA6IG1fdHlwZShD U1NfSURFTlQpCiAgICAgLCBtX2hhc0NhY2hlZENTU1RleHQoZmFsc2UpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkocmV2aXNpb24gODc0NTMp CisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTQ5LDggKzU0OSwxMCBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0 eWxlQXBwbHlQcm9wCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VGV4 dE9yaWVudGF0aW9uLCBuZXcgQXBwbHlQcm9wZXJ0eUZvbnQ8VGV4dE9yaWVudGF0aW9uPigmRm9u dERlc2NyaXB0aW9uOjp0ZXh0T3JpZW50YXRpb24sICZGb250RGVzY3JpcHRpb246OnNldFRleHRP cmllbnRhdGlvbiwgUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0T3JpZW50YXRpb24oKSkpOwogICAg IHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRXZWlnaHQsIG5ldyBBcHBseVByb3Bl cnR5Rm9udFdlaWdodCgpKTsKIAorICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU91 dGxpbmVTdHlsZSwgbmV3IEFwcGx5UHJvcGVydHlFeHBhbmRpbmc8RXhwYW5kVmFsdWU+KG5ldyBB cHBseVByb3BlcnR5RGVmYXVsdDxPdXRsaW5lSXNBdXRvPigmUmVuZGVyU3R5bGU6Om91dGxpbmVT dHlsZUlzQXV0bywgJlJlbmRlclN0eWxlOjpzZXRPdXRsaW5lU3R5bGVJc0F1dG8sICZSZW5kZXJT dHlsZTo6aW5pdGlhbE91dGxpbmVTdHlsZUlzQXV0byksIG5ldyBBcHBseVByb3BlcnR5RGVmYXVs dDxFQm9yZGVyU3R5bGU+KCZSZW5kZXJTdHlsZTo6b3V0bGluZVN0eWxlLCAmUmVuZGVyU3R5bGU6 OnNldE91dGxpbmVTdHlsZSwgJlJlbmRlclN0eWxlOjppbml0aWFsQm9yZGVyU3R5bGUpKSk7CiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5T3V0bGluZUNvbG9yLCBuZXcgQXBwbHlQ cm9wZXJ0eUNvbG9yPEluaGVyaXRGcm9tUGFyZW50PigmUmVuZGVyU3R5bGU6Om91dGxpbmVDb2xv ciwgJlJlbmRlclN0eWxlOjpzZXRPdXRsaW5lQ29sb3IsICZSZW5kZXJTdHlsZTo6Y29sb3IpKTsK IAorCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5T3ZlcmZsb3dYLCBuZXcgQXBw bHlQcm9wZXJ0eURlZmF1bHQ8RU92ZXJmbG93PigmUmVuZGVyU3R5bGU6Om92ZXJmbG93WCwgJlJl bmRlclN0eWxlOjpzZXRPdmVyZmxvd1gsICZSZW5kZXJTdHlsZTo6aW5pdGlhbE92ZXJmbG93WCkp OwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU92ZXJmbG93WSwgbmV3IEFwcGx5 UHJvcGVydHlEZWZhdWx0PEVPdmVyZmxvdz4oJlJlbmRlclN0eWxlOjpvdmVyZmxvd1ksICZSZW5k ZXJTdHlsZTo6c2V0T3ZlcmZsb3dZLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxPdmVyZmxvd1kpKTsK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlPdmVyZmxvdywgbmV3IEFwcGx5UHJv cGVydHlFeHBhbmRpbmc8RXhwYW5kVmFsdWU+KHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU92 ZXJmbG93WCksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU92ZXJmbG93WSkpKTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDg3NDUzKQor KysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zNjYwLDE1ICszNjYwLDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3Bl cnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJDb2xsYXBzZToKICAgICAgICAgSEFO RExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShib3JkZXJDb2xsYXBzZSwgQm9y ZGVyQ29sbGFwc2UpCiAgICAgICAgIHJldHVybjsKLSAgICBjYXNlIENTU1Byb3BlcnR5T3V0bGlu ZVN0eWxlOgotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9XSVRIX1ZBTFVFKG91 dGxpbmVTdHlsZSwgT3V0bGluZVN0eWxlLCBCb3JkZXJTdHlsZSkKLSAgICAgICAgaWYgKHByaW1p dGl2ZVZhbHVlKSB7Ci0gICAgICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkg PT0gQ1NTVmFsdWVBdXRvKQotICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNldE91dGxpbmVTdHls ZShET1RURUQsIHRydWUpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIG1fc3R5 bGUtPnNldE91dGxpbmVTdHlsZSgqcHJpbWl0aXZlVmFsdWUpOwotICAgICAgICB9Ci0gICAgICAg IHJldHVybjsKICAgICBjYXNlIENTU1Byb3BlcnR5Q2FwdGlvblNpZGU6CiAgICAgICAgIEhBTkRM RV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkUoY2FwdGlvblNpZGUsIENhcHRpb25T aWRlKQogICAgICAgICByZXR1cm47CkBAIC01NDQ3LDYgKzU0MzgsNyBAQCB2b2lkIENTU1N0eWxl U2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRl eHRPcmllbnRhdGlvbjoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Rm9udFNtb290aGluZzoK ICAgICBjYXNlIENTU1Byb3BlcnR5Rm9udFdlaWdodDoKKyAgICBjYXNlIENTU1Byb3BlcnR5T3V0 bGluZVN0eWxlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlPdXRsaW5lV2lkdGg6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdENvbHVtblJ1bGVXaWR0aDoKICAgICBjYXNlIENTU1Byb3BlcnR5T3V0 bGluZUNvbG9yOgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL091dGxpbmVW YWx1ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9PdXRs aW5lVmFsdWUuaAkocmV2aXNpb24gODc0NTMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvT3V0bGluZVZhbHVlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcgQEAgZnJp ZW5kIGNsYXNzIFJlbmRlclN0eWxlOwogcHVibGljOgogICAgIE91dGxpbmVWYWx1ZSgpCiAgICAg ICAgIDogbV9vZmZzZXQoMCkKLSAgICAgICAgLCBtX2lzQXV0byhmYWxzZSkKKyAgICAgICAgLCBt X2lzQXV0byhBVVRPX09GRikKICAgICB7CiAgICAgfQogICAgIApAQCAtNDksMTEgKzQ5LDExIEBA IHB1YmxpYzoKICAgICB9CiAgICAgCiAgICAgaW50IG9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1f b2Zmc2V0OyB9Ci0gICAgYm9vbCBpc0F1dG8oKSBjb25zdCB7IHJldHVybiBtX2lzQXV0bzsgfQor ICAgIE91dGxpbmVJc0F1dG8gaXNBdXRvKCkgY29uc3QgeyByZXR1cm4gbV9pc0F1dG87IH0KIAog cHJpdmF0ZToKICAgICBpbnQgbV9vZmZzZXQ7Ci0gICAgYm9vbCBtX2lzQXV0bzsKKyAgICBPdXRs aW5lSXNBdXRvIG1faXNBdXRvOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9u IDg3NDUzKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTQ1Myw3ICs0NTMsNyBAQCBwdWJsaWM6CiAgICAgfQogICAgIGJv b2wgaGFzT3V0bGluZSgpIGNvbnN0IHsgcmV0dXJuIG91dGxpbmVXaWR0aCgpID4gMCAmJiBvdXRs aW5lU3R5bGUoKSA+IEJISURERU47IH0KICAgICBFQm9yZGVyU3R5bGUgb3V0bGluZVN0eWxlKCkg Y29uc3QgeyByZXR1cm4gbV9iYWNrZ3JvdW5kLT5vdXRsaW5lKCkuc3R5bGUoKTsgfQotICAgIGJv b2wgb3V0bGluZVN0eWxlSXNBdXRvKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrZ3JvdW5kLT5vdXRs aW5lKCkuaXNBdXRvKCk7IH0KKyAgICBPdXRsaW5lSXNBdXRvIG91dGxpbmVTdHlsZUlzQXV0bygp IGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PE91dGxpbmVJc0F1dG8+KG1fYmFja2dyb3VuZC0+ b3V0bGluZSgpLmlzQXV0bygpKTsgfQogICAgIAogICAgIEVPdmVyZmxvdyBvdmVyZmxvd1goKSBj b25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFT3ZlcmZsb3c+KG5vbmluaGVyaXRlZF9mbGFncy5f b3ZlcmZsb3dYKTsgfQogICAgIEVPdmVyZmxvdyBvdmVyZmxvd1koKSBjb25zdCB7IHJldHVybiBz dGF0aWNfY2FzdDxFT3ZlcmZsb3c+KG5vbmluaGVyaXRlZF9mbGFncy5fb3ZlcmZsb3dZKTsgfQpA QCAtODg0LDE0ICs4ODQsMTAgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Qm9yZGVyQm90dG9tV2lk dGgodW5zaWduZWQgc2hvcnQgdikgeyBTRVRfVkFSKHN1cnJvdW5kLCBib3JkZXIubV9ib3R0b20u bV93aWR0aCwgdikgfQogICAgIHZvaWQgc2V0Qm9yZGVyQm90dG9tU3R5bGUoRUJvcmRlclN0eWxl IHYpIHsgU0VUX1ZBUihzdXJyb3VuZCwgYm9yZGVyLm1fYm90dG9tLm1fc3R5bGUsIHYpIH0KICAg ICB2b2lkIHNldEJvcmRlckJvdHRvbUNvbG9yKGNvbnN0IENvbG9yJiB2KSB7IFNFVF9WQVIoc3Vy cm91bmQsIGJvcmRlci5tX2JvdHRvbS5tX2NvbG9yLCB2KSB9Ci0gICAgdm9pZCBzZXRPdXRsaW5l V2lkdGgodW5zaWduZWQgc2hvcnQgdikgeyBTRVRfVkFSKG1fYmFja2dyb3VuZCwgbV9vdXRsaW5l Lm1fd2lkdGgsIHYpIH0KLQotICAgIHZvaWQgc2V0T3V0bGluZVN0eWxlKEVCb3JkZXJTdHlsZSB2 LCBib29sIGlzQXV0byA9IGZhbHNlKQotICAgIHsKLSAgICAgICAgU0VUX1ZBUihtX2JhY2tncm91 bmQsIG1fb3V0bGluZS5tX3N0eWxlLCB2KQotICAgICAgICBTRVRfVkFSKG1fYmFja2dyb3VuZCwg bV9vdXRsaW5lLm1faXNBdXRvLCBpc0F1dG8pCi0gICAgfQogCisgICAgdm9pZCBzZXRPdXRsaW5l V2lkdGgodW5zaWduZWQgc2hvcnQgdikgeyBTRVRfVkFSKG1fYmFja2dyb3VuZCwgbV9vdXRsaW5l Lm1fd2lkdGgsIHYpIH0KKyAgICB2b2lkIHNldE91dGxpbmVTdHlsZUlzQXV0byhPdXRsaW5lSXNB dXRvIGlzQXV0bykgeyBTRVRfVkFSKG1fYmFja2dyb3VuZCwgbV9vdXRsaW5lLm1faXNBdXRvLCBp c0F1dG8pIH0KKyAgICB2b2lkIHNldE91dGxpbmVTdHlsZShFQm9yZGVyU3R5bGUgdikgeyBTRVRf VkFSKG1fYmFja2dyb3VuZCwgbV9vdXRsaW5lLm1fc3R5bGUsIHYpIH0KICAgICB2b2lkIHNldE91 dGxpbmVDb2xvcihjb25zdCBDb2xvciYgdikgeyBTRVRfVkFSKG1fYmFja2dyb3VuZCwgbV9vdXRs aW5lLm1fY29sb3IsIHYpIH0KIAogICAgIHZvaWQgc2V0T3ZlcmZsb3dYKEVPdmVyZmxvdyB2KSB7 IG5vbmluaGVyaXRlZF9mbGFncy5fb3ZlcmZsb3dYID0gdjsgfQpAQCAtMTIxNyw2ICsxMjEzLDcg QEAgcHVibGljOgogICAgIC8vIEluaXRpYWwgdmFsdWVzIGZvciBhbGwgdGhlIHByb3BlcnRpZXMK ICAgICBzdGF0aWMgRUJvcmRlckNvbGxhcHNlIGluaXRpYWxCb3JkZXJDb2xsYXBzZSgpIHsgcmV0 dXJuIEJTRVBBUkFURTsgfQogICAgIHN0YXRpYyBFQm9yZGVyU3R5bGUgaW5pdGlhbEJvcmRlclN0 eWxlKCkgeyByZXR1cm4gQk5PTkU7IH0KKyAgICBzdGF0aWMgT3V0bGluZUlzQXV0byBpbml0aWFs T3V0bGluZVN0eWxlSXNBdXRvKCkgeyByZXR1cm4gQVVUT19PRkY7IH0KICAgICBzdGF0aWMgTmlu ZVBpZWNlSW1hZ2UgaW5pdGlhbE5pbmVQaWVjZUltYWdlKCkgeyByZXR1cm4gTmluZVBpZWNlSW1h Z2UoKTsgfQogICAgIHN0YXRpYyBMZW5ndGhTaXplIGluaXRpYWxCb3JkZXJSYWRpdXMoKSB7IHJl dHVybiBMZW5ndGhTaXplKExlbmd0aCgwLCBGaXhlZCksIExlbmd0aCgwLCBGaXhlZCkpOyB9CiAg ICAgc3RhdGljIEVDYXB0aW9uU2lkZSBpbml0aWFsQ2FwdGlvblNpZGUoKSB7IHJldHVybiBDQVBU T1A7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNv bnN0YW50cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZUNvbnN0YW50cy5oCShyZXZpc2lvbiA4NzQ1MykKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCSh3b3JraW5nIGNvcHkpCkBA IC04OCw2ICs4OCw4IEBAIGVudW0gRUJvcmRlclN0eWxlIHsgQk5PTkUsIEJISURERU4sIElOU0UK IAogZW51bSBFQm9yZGVyUHJlY2VkZW5jZSB7IEJPRkYsIEJUQUJMRSwgQkNPTEdST1VQLCBCQ09M LCBCUk9XR1JPVVAsIEJST1csIEJDRUxMIH07CiAKK2VudW0gT3V0bGluZUlzQXV0byB7IEFVVE9f T0ZGID0gMCwgQVVUT19PTiB9OworCiBlbnVtIEVQb3NpdGlvbiB7CiAgICAgU3RhdGljUG9zaXRp b24sIFJlbGF0aXZlUG9zaXRpb24sIEFic29sdXRlUG9zaXRpb24sIEZpeGVkUG9zaXRpb24KIH07 Cg==