36362 2010-03-19 05:54:05 -0700 Web Inspector: editing shorthands does not always work. 2010-03-19 06:35:25 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman bweinstein joepeck rik timothy oldest_to_newest 201820 0 pfeldman 2010-03-19 05:54:05 -0700 Editing value markup (that is converted to an editable field) produces &nbsp; (0xA0) instead of space (0x20) character in the areas that are siblings to the markup spans. I.e. instead of "3px <span>5px</span>", we get "3px&nbsp;<span>...". Native code that is assigning textContent of such a value to style fails. Drive-by fixes in the patch are: - restored fallback for shorthand property getter - made enable/disable checkbox visible when unckecked regardless of the hover state. This allows distinguishing of the overriden values vs manually disabled ones. 201823 1 51147 pfeldman 2010-03-19 05:58:59 -0700 Created attachment 51147 [PATCH] Proposed fix. 201833 2 pfeldman 2010-03-19 06:35:25 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/InspectorDOMAgent.cpp M WebCore/inspector/InspectorDOMAgent.h M WebCore/inspector/front-end/StylesSidebarPane.js M WebCore/inspector/front-end/inspector.css Committed r56237 51147 2010-03-19 05:58:59 -0700 2010-03-19 06:18:14 -0700 [PATCH] Proposed fix. margin_edit text/plain 9790 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTc0MTk0NC4uNmNiODBlZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wMy0xOSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBlZGl0aW5nIHNob3J0aGFuZHMgZG9l cyBub3QgYWx3YXlzIHdvcmsuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM2MzYyCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdl bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmFwcGx5U3R5bGVU ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojpwb3B1bGF0ZU9iamVj dFdpdGhTdHlsZVByb3BlcnRpZXMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdl bnQ6OnNob3J0aGFuZFZhbHVlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdl bnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5 cGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczoKKyAgICAg ICAgKC5zZWN0aW9uIC5wcm9wZXJ0aWVzIGxpLmRpc2FibGVkIC5lbmFibGVkLWJ1dHRvbik6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3Iuc3RhcnRFZGl0aW5nLmVkaXRpbmdDb21taXR0ZWQpOgorCiAyMDEwLTAzLTE4ICBE YXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBh MWQ3ZDIxLi5iOGQ0OGQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01BZ2VudC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3Bw CkBAIC03OTQsMjUgKzc5NCwxOCBAQCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjphcHBseVN0eWxl VGV4dChsb25nIGNhbGxJZCwgbG9uZyBzdHlsZUlkLCBjb25zdCBTdHJpbmcmCiAgICAgQ1NTU3R5 bGVEZWNsYXJhdGlvbiogc3R5bGUgPSBpdC0+c2Vjb25kLmdldCgpOwogICAgIGludCBzdHlsZVRl eHRMZW5ndGggPSBzdHlsZVRleHQubGVuZ3RoKCk7CiAKLSAgICAvLyBDcmVhdGUgYSBuZXcgZWxl bWVudCB0byBwYXJzZSB0aGUgdXNlciBpbnB1dCBDU1MuCi0gICAgRXhjZXB0aW9uQ29kZSBlYyA9 IDA7Ci0gICAgUmVmUHRyPEVsZW1lbnQ+IHBhcnNlRWxlbWVudCA9IG1haW5GcmFtZURvY3VtZW50 KCktPmNyZWF0ZUVsZW1lbnQoInNwYW4iLCBlYyk7Ci0gICAgaWYgKCFlYykKLSAgICAgICAgcGFy c2VFbGVtZW50LT5zZXRBdHRyaWJ1dGUoInN0eWxlIiwgc3R5bGVUZXh0LCBlYyk7Ci0gICAgaWYg KGVjKSB7Ci0gICAgICAgIG1fZnJvbnRlbmQtPmRpZEFwcGx5U3R5bGVUZXh0KGNhbGxJZCwgZmFs c2UsIFNjcmlwdFZhbHVlOjp1bmRlZmluZWQoKSwgbV9mcm9udGVuZC0+bmV3U2NyaXB0QXJyYXko KSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgUmVmUHRyPENTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uPiB0ZW1wTXV0YWJsZVN0eWxlID0gQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246 OmNyZWF0ZSgpOworICAgIHRlbXBNdXRhYmxlU3R5bGUtPnBhcnNlRGVjbGFyYXRpb24oc3R5bGVU ZXh0KTsKKyAgICBDU1NTdHlsZURlY2xhcmF0aW9uKiB0ZW1wU3R5bGUgPSBzdGF0aWNfY2FzdDxD U1NTdHlsZURlY2xhcmF0aW9uKj4odGVtcE11dGFibGVTdHlsZS5nZXQoKSk7CiAKLSAgICBDU1NT dHlsZURlY2xhcmF0aW9uKiB0ZW1wU3R5bGUgPSBwYXJzZUVsZW1lbnQtPnN0eWxlKCk7Ci0gICAg aWYgKCh0ZW1wU3R5bGUgJiYgdGVtcFN0eWxlLT5sZW5ndGgoKSkgfHwgIXN0eWxlVGV4dExlbmd0 aCkgeworICAgIGlmICh0ZW1wU3R5bGUtPmxlbmd0aCgpIHx8ICFzdHlsZVRleHRMZW5ndGgpIHsK ICAgICAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgICAgIC8vIFRoZSBpbnB1dCB3YXMg cGFyc2FibGUgb3IgdGhlIHVzZXIgZGVsZXRlZCBldmVyeXRoaW5nLCBzbyByZW1vdmUgdGhlCiAg ICAgICAgIC8vIG9yaWdpbmFsIHByb3BlcnR5IGZyb20gdGhlIHJlYWwgc3R5bGUgZGVjbGFyYXRp b24uIElmIHRoaXMgcmVwcmVzZW50cwogICAgICAgICAvLyBhIHNob3J0aGFuZCByZW1vdmUgYWxs IHRoZSBsb25naGFuZCBwcm9wZXJ0aWVzLgogICAgICAgICBpZiAoc3R5bGUtPmdldFByb3BlcnR5 U2hvcnRoYW5kKHByb3BlcnR5TmFtZSkuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBWZWN0b3I8 U3RyaW5nPiBsb25naGFuZFByb3BzID0gbG9uZ2hhbmRQcm9wZXJ0aWVzKHN0eWxlLCBwcm9wZXJ0 eU5hbWUpOwotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxvbmdoYW5kUHJv cHMuc2l6ZSgpOyArK2kpCisgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyAhZWMgJiYg aSA8IGxvbmdoYW5kUHJvcHMuc2l6ZSgpOyArK2kpCiAgICAgICAgICAgICAgICAgc3R5bGUtPnJl bW92ZVByb3BlcnR5KGxvbmdoYW5kUHJvcHNbaV0sIGVjKTsKICAgICAgICAgfSBlbHNlCiAgICAg ICAgICAgICBzdHlsZS0+cmVtb3ZlUHJvcGVydHkocHJvcGVydHlOYW1lLCBlYyk7CkBAIC04NDAs OSArODMzLDggQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6YXBwbHlTdHlsZVRleHQobG9uZyBj YWxsSWQsIGxvbmcgc3R5bGVJZCwgY29uc3QgU3RyaW5nJgogICAgIEhhc2hTZXQ8U3RyaW5nPiBm b3VuZFNob3J0aGFuZHM7CiAgICAgVmVjdG9yPFN0cmluZz4gY2hhbmdlZFByb3BlcnRpZXM7CiAK LSAgICBWZWN0b3I8U3RyaW5nPiB1bmlxdWVQcm9wZXJ0aWVzID0gdW5pcXVlU3R5bGVQcm9wZXJ0 aWVzKHRlbXBTdHlsZSk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHVuaXF1ZVByb3Bl cnRpZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgU3RyaW5nIG5hbWUgPSB1bmlxdWVQcm9wZXJ0 aWVzW2ldOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCB0ZW1wU3R5bGUtPmxlbmd0aCgp OyArK2kpIHsKKyAgICAgICAgU3RyaW5nIG5hbWUgPSB0ZW1wU3R5bGUtPml0ZW0oaSk7CiAgICAg ICAgIFN0cmluZyBzaG9ydGhhbmQgPSB0ZW1wU3R5bGUtPmdldFByb3BlcnR5U2hvcnRoYW5kKG5h bWUpOwogCiAgICAgICAgIGlmICghc2hvcnRoYW5kLmlzRW1wdHkoKSAmJiBmb3VuZFNob3J0aGFu ZHMuY29udGFpbnMoc2hvcnRoYW5kKSkKQEAgLTg1MSw3ICs4NDMsNyBAQCB2b2lkIEluc3BlY3Rv ckRPTUFnZW50OjphcHBseVN0eWxlVGV4dChsb25nIGNhbGxJZCwgbG9uZyBzdHlsZUlkLCBjb25z dCBTdHJpbmcmCiAgICAgICAgIFN0cmluZyB2YWx1ZTsKICAgICAgICAgU3RyaW5nIHByaW9yaXR5 OwogICAgICAgICBpZiAoIXNob3J0aGFuZC5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgIHZhbHVl ID0gdGVtcFN0eWxlLT5nZXRQcm9wZXJ0eVZhbHVlKHNob3J0aGFuZCk7CisgICAgICAgICAgICB2 YWx1ZSA9IHNob3J0aGFuZFZhbHVlKHRlbXBTdHlsZSwgc2hvcnRoYW5kKTsKICAgICAgICAgICAg IHByaW9yaXR5ID0gc2hvcnRoYW5kUHJpb3JpdHkodGVtcFN0eWxlLCBzaG9ydGhhbmQpOwogICAg ICAgICAgICAgZm91bmRTaG9ydGhhbmRzLmFkZChzaG9ydGhhbmQpOwogICAgICAgICAgICAgbmFt ZSA9IHNob3J0aGFuZDsKQEAgLTEwNjIsNyArMTA1NCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdl bnQ6OnBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyhDU1NTdHlsZURlY2xhcmF0aW9u KiBzCiAgICAgICAgIHByb3BlcnR5LnNldCgic2hvcnRoYW5kIiwgc2hvcnRoYW5kKTsKICAgICAg ICAgaWYgKCFzaG9ydGhhbmQuaXNFbXB0eSgpICYmICFmb3VuZFNob3J0aGFuZHMuY29udGFpbnMo c2hvcnRoYW5kKSkgewogICAgICAgICAgICAgZm91bmRTaG9ydGhhbmRzLmFkZChzaG9ydGhhbmQp OwotICAgICAgICAgICAgc2hvcnRoYW5kVmFsdWVzLnNldChzaG9ydGhhbmQsIHN0eWxlLT5nZXRQ cm9wZXJ0eVZhbHVlKHNob3J0aGFuZCkpOworICAgICAgICAgICAgc2hvcnRoYW5kVmFsdWVzLnNl dChzaG9ydGhhbmQsIHNob3J0aGFuZFZhbHVlKHN0eWxlLCBzaG9ydGhhbmQpKTsKICAgICAgICAg fQogICAgICAgICBwcm9wZXJ0eS5zZXQoInZhbHVlIiwgc3R5bGUtPmdldFByb3BlcnR5VmFsdWUo bmFtZSkpOwogICAgICAgICBwcm9wZXJ0aWVzLnNldChpLCBwcm9wZXJ0eSk7CkBAIC0xMTE3LDIx ICsxMTA5LDYgQEAgU2NyaXB0T2JqZWN0IEluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVjdEZv clJ1bGUoQ1NTU3R5bGVSdWxlKiBydWxlKQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLVZlY3Rv cjxTdHJpbmc+IEluc3BlY3RvckRPTUFnZW50Ojp1bmlxdWVTdHlsZVByb3BlcnRpZXMoQ1NTU3R5 bGVEZWNsYXJhdGlvbiogc3R5bGUpCi17Ci0gICAgVmVjdG9yPFN0cmluZz4gcHJvcGVydGllczsK LSAgICBIYXNoU2V0PFN0cmluZz4gZm91bmRQcm9wZXJ0aWVzOwotCi0gICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IHN0eWxlLT5sZW5ndGgoKTsgKytpKSB7Ci0gICAgICAgIFN0cmluZyBwcm9w ZXJ0eSA9IHN0eWxlLT5pdGVtKGkpOwotICAgICAgICBpZiAoZm91bmRQcm9wZXJ0aWVzLmNvbnRh aW5zKHByb3BlcnR5KSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBmb3VuZFByb3Bl cnRpZXMuYWRkKHByb3BlcnR5KTsKLSAgICAgICAgcHJvcGVydGllcy5hcHBlbmQocHJvcGVydHkp OwotICAgIH0KLSAgICByZXR1cm4gcHJvcGVydGllczsKLX0KLQogVmVjdG9yPFN0cmluZz4gSW5z cGVjdG9yRE9NQWdlbnQ6OmxvbmdoYW5kUHJvcGVydGllcyhDU1NTdHlsZURlY2xhcmF0aW9uKiBz dHlsZSwgY29uc3QgU3RyaW5nJiBzaG9ydGhhbmRQcm9wZXJ0eSkKIHsKICAgICBWZWN0b3I8U3Ry aW5nPiBwcm9wZXJ0aWVzOwpAQCAtMTE0OCw2ICsxMTI1LDI5IEBAIFZlY3RvcjxTdHJpbmc+IElu c3BlY3RvckRPTUFnZW50Ojpsb25naGFuZFByb3BlcnRpZXMoQ1NTU3R5bGVEZWNsYXJhdGlvbiog c3R5bGUsCiAgICAgcmV0dXJuIHByb3BlcnRpZXM7CiB9CiAKK1N0cmluZyBJbnNwZWN0b3JET01B Z2VudDo6c2hvcnRoYW5kVmFsdWUoQ1NTU3R5bGVEZWNsYXJhdGlvbiogc3R5bGUsIGNvbnN0IFN0 cmluZyYgc2hvcnRoYW5kUHJvcGVydHkpCit7CisgICAgU3RyaW5nIHZhbHVlID0gc3R5bGUtPmdl dFByb3BlcnR5VmFsdWUoc2hvcnRoYW5kUHJvcGVydHkpOworICAgIGlmICh2YWx1ZS5pc0VtcHR5 KCkpIHsKKyAgICAgICAgLy8gU29tZSBzaG9ydGhhbmRzIChsaWtlIGJvcmRlcikgcmV0dXJuIGEg bnVsbCB2YWx1ZSwgc28gY29tcHV0ZSBhIHNob3J0aGFuZCB2YWx1ZS4KKyAgICAgICAgLy8gRklY TUU6IHJlbW92ZSB0aGlzIHdoZW4gaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU4MjMgaXMgZml4ZWQuCisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdHls ZS0+bGVuZ3RoKCk7ICsraSkgeworICAgICAgICAgICAgU3RyaW5nIGluZGl2aWR1YWxQcm9wZXJ0 eSA9IHN0eWxlLT5pdGVtKGkpOworICAgICAgICAgICAgaWYgKHN0eWxlLT5nZXRQcm9wZXJ0eVNo b3J0aGFuZChpbmRpdmlkdWFsUHJvcGVydHkpICE9IHNob3J0aGFuZFByb3BlcnR5KQorICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgaWYgKHN0eWxlLT5pc1Byb3BlcnR5SW1w bGljaXQoaW5kaXZpZHVhbFByb3BlcnR5KSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgICAgIFN0cmluZyBpbmRpdmlkdWFsVmFsdWUgPSBzdHlsZS0+Z2V0UHJvcGVydHlWYWx1 ZShpbmRpdmlkdWFsUHJvcGVydHkpOworICAgICAgICAgICAgaWYgKGluZGl2aWR1YWxWYWx1ZSA9 PSAiaW5pdGlhbCIpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpZiAo dmFsdWUubGVuZ3RoKCkpCisgICAgICAgICAgICAgICAgdmFsdWUuYXBwZW5kKCIgIik7CisgICAg ICAgICAgICB2YWx1ZS5hcHBlbmQoaW5kaXZpZHVhbFZhbHVlKTsKKyAgICAgICAgfQorICAgIH0K KyAgICByZXR1cm4gdmFsdWU7Cit9CisKIFN0cmluZyBJbnNwZWN0b3JET01BZ2VudDo6c2hvcnRo YW5kUHJpb3JpdHkoQ1NTU3R5bGVEZWNsYXJhdGlvbiogc3R5bGUsIGNvbnN0IFN0cmluZyYgc2hv cnRoYW5kUHJvcGVydHkpCiB7CiAgICAgU3RyaW5nIHByaW9yaXR5ID0gc3R5bGUtPmdldFByb3Bl cnR5UHJpb3JpdHkoc2hvcnRoYW5kUHJvcGVydHkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRP TUFnZW50LmgKaW5kZXggYWU5ZjVlMS4uZDBkOTgzZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuaAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5oCkBAIC0xNjEsOCArMTYxLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICB2b2lkIHBvcHVsYXRlT2JqZWN0V2l0aFN0eWxlUHJvcGVydGllcyhDU1NTdHlsZURlY2xh cmF0aW9uKiwgU2NyaXB0T2JqZWN0JiByZXN1bHQpOwogICAgICAgICBTY3JpcHRPYmplY3QgYnVp bGRPYmplY3RGb3JSdWxlKENTU1N0eWxlUnVsZSopOwogICAgICAgICBTY3JpcHRPYmplY3QgYnVp bGRPYmplY3RGb3JTdHlsZVNoZWV0KENTU1N0eWxlU2hlZXQqKTsKLSAgICAgICAgVmVjdG9yPFN0 cmluZz4gdW5pcXVlU3R5bGVQcm9wZXJ0aWVzKENTU1N0eWxlRGVjbGFyYXRpb24qKTsKICAgICAg ICAgVmVjdG9yPFN0cmluZz4gbG9uZ2hhbmRQcm9wZXJ0aWVzKENTU1N0eWxlRGVjbGFyYXRpb24q LCBjb25zdCBTdHJpbmcmIHNob3J0aGFuZFByb3BlcnR5KTsKKyAgICAgICAgU3RyaW5nIHNob3J0 aGFuZFZhbHVlKENTU1N0eWxlRGVjbGFyYXRpb24qLCBjb25zdCBTdHJpbmcmIHNob3J0aGFuZFBy b3BlcnR5KTsKICAgICAgICAgU3RyaW5nIHNob3J0aGFuZFByaW9yaXR5KENTU1N0eWxlRGVjbGFy YXRpb24qLCBjb25zdCBTdHJpbmcmIHNob3J0aGFuZFByb3BlcnR5KTsKICAgICAgICAgYm9vbCBy dWxlQWZmZWN0c05vZGUoQ1NTU3R5bGVSdWxlKiwgTm9kZSopOwogICAgICAgICBTY3JpcHRBcnJh eSB0b0FycmF5KGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBkYXRhKTsKZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA1YjIwODRkLi41MmRm NDQxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJh clBhbmUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzCkBAIC0xMzgwLDcgKzEzODAsOCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRy ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBzZWN0aW9uID0gdGhp cy50cmVlT3V0bGluZS5zZWN0aW9uOwogICAgICAgICB2YXIgZWxlbWVudHNQYW5lbCA9IFdlYklu c3BlY3Rvci5wYW5lbHMuZWxlbWVudHM7Ci0gICAgICAgIHZhciBzdHlsZVRleHRMZW5ndGggPSBz dHlsZVRleHQudHJpbSgpLmxlbmd0aDsKKyAgICAgICAgc3R5bGVUZXh0ID0gc3R5bGVUZXh0LnJl cGxhY2UoL1xzL2csICIgIikudHJpbSgpOyAvLyByZXBsYWNlICZuYnNwOyB3aXRoIHdoaXRlc3Bh Y2UuCisgICAgICAgIHZhciBzdHlsZVRleHRMZW5ndGggPSBzdHlsZVRleHQubGVuZ3RoOwogICAg ICAgICBpZiAoIXN0eWxlVGV4dExlbmd0aCAmJiB1cGRhdGVJbnRlcmZhY2UpIHsKICAgICAgICAg ICAgIGlmICh0aGlzLl9uZXdQcm9wZXJ0eSkgewogICAgICAgICAgICAgICAgIC8vIFRoZSB1c2Vy IGRlbGV0ZWQgZXZlcnl0aGluZywgc28gcmVtb3ZlIHRoZSB0cmVlIGVsZW1lbnQgYW5kIHVwZGF0 ZS4KQEAgLTE0MjYsNyArMTQyNyw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVs ZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgaWYgKHVwZGF0ZUludGVyZmFjZSkKICAg ICAgICAgICAgICAgICBzZWxmLnVwZGF0ZUFsbCh0cnVlKTsKICAgICAgICAgfQotICAgICAgICBJ bnNwZWN0b3JCYWNrZW5kLmFwcGx5U3R5bGVUZXh0KFdlYkluc3BlY3Rvci5DYWxsYmFjay53cmFw KGNhbGxiYWNrKSwgdGhpcy5zdHlsZS5pZCwgc3R5bGVUZXh0LnRyaW0oKSwgdGhpcy5uYW1lKTsK KyAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5hcHBseVN0eWxlVGV4dChXZWJJbnNwZWN0b3IuQ2Fs bGJhY2sud3JhcChjYWxsYmFjayksIHRoaXMuc3R5bGUuaWQsIHN0eWxlVGV4dCwgdGhpcy5uYW1l KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuY3NzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MK aW5kZXggN2Y5NDY5MS4uNGM3M2ZjYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5jc3MKQEAgLTE1NzIsNiArMTU3MiwxMCBAQCBsaS5lZGl0aW5nIC5zd2F0Y2gsIGxp LmVkaXRpbmcgLmVuYWJsZWQtYnV0dG9uLCAgbGkuZWRpdGluZy1zdWItcGFydCAuZGVsZXRlLWJ1 dAogICAgIGRpc3BsYXk6IGJsb2NrOwogfQogCisuc2VjdGlvbiAucHJvcGVydGllcyBsaS5kaXNh YmxlZCAuZW5hYmxlZC1idXR0b24geworICAgIGRpc3BsYXk6IGJsb2NrOworfQorCiAuc2VjdGlv biAucHJvcGVydGllcyAubmFtZSwgLmV2ZW50LXByb3BlcnRpZXMgLm5hbWUgewogICAgIGNvbG9y OiByZ2IoMTM2LCAxOSwgMTQ1KTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9pbnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVj dG9yLmpzCmluZGV4IDFkMmM0NmQuLmZjNjhmMDMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcwpAQCAtMTg2NCw3ICsxODY0LDYgQEAgV2ViSW5zcGVjdG9yLnN0YXJ0 RWRpdGluZyA9IGZ1bmN0aW9uKGVsZW1lbnQsIGNvbW1pdHRlZENhbGxiYWNrLCBjYW5jZWxsZWRD YWxsYmEKIAogICAgIGZ1bmN0aW9uIGVkaXRpbmdDb21taXR0ZWQoKSB7CiAgICAgICAgIGNsZWFu VXBBZnRlckVkaXRpbmcuY2FsbCh0aGlzKTsKLQogICAgICAgICBpZiAoY29tbWl0dGVkQ2FsbGJh Y2spCiAgICAgICAgICAgICBjb21taXR0ZWRDYWxsYmFjayh0aGlzLCBnZXRDb250ZW50KHRoaXMp LCBvbGRUZXh0LCBjb250ZXh0LCBtb3ZlRGlyZWN0aW9uKTsKICAgICB9Cg==