51679 2010-12-28 08:33:44 -0800 Web Inspector: A disabled style property should get enabled when edited 2011-01-12 09:50:22 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 327238 0 apavlov 2010-12-28 08:33:44 -0800 In the Styles sidebar, a changed disabled CSS property remains disabled, while Firebug enables it when the new value is applied. 327270 1 77562 apavlov 2010-12-28 11:07:17 -0800 Created attachment 77562 [PATCH] Suggested solution 327488 2 77562 pfeldman 2010-12-28 23:01:06 -0800 Comment on attachment 77562 [PATCH] Suggested solution View in context: https://bugs.webkit.org/attachment.cgi?id=77562&action=review > WebCore/inspector/front-end/CSSStyleModel.js:474 > + if (newProperty && this.disabled && !propertyText.match(/^\s*$/) && (!this.property || newProperty.propertyText !== this.property.propertyText)) { What is "this.property" and where does it get defined? 327525 3 apavlov 2010-12-29 02:35:25 -0800 (In reply to comment #2) > (From update of attachment 77562 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77562&action=review > > > WebCore/inspector/front-end/CSSStyleModel.js:474 > > + if (newProperty && this.disabled && !propertyText.match(/^\s*$/) && (!this.property || newProperty.propertyText !== this.property.propertyText)) { > > What is "this.property" and where does it get defined? It is the WebInspector.CSSProperty that lives in this WebInspector.StylePropertyTreeElement. 327526 4 77610 apavlov 2010-12-29 02:55:43 -0800 Created attachment 77610 [PATCH] propertyText change computation fixed 327527 5 77610 pfeldman 2010-12-29 02:59:18 -0800 Comment on attachment 77610 [PATCH] propertyText change computation fixed View in context: https://bugs.webkit.org/attachment.cgi?id=77610&action=review > WebCore/inspector/front-end/CSSStyleModel.js:475 > + if (newProperty && this.disabled && !propertyText.match(/^\s*$/) && textChanged) { No need to check for textChanged. 327534 6 apavlov 2010-12-29 03:54:41 -0800 Landed with the nit fixed. Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog A LayoutTests/inspector/styles-disable-then-change-expected.txt A LayoutTests/inspector/styles-disable-then-change.html M WebCore/ChangeLog M WebCore/inspector/front-end/CSSStyleModel.js Committed r74740 332166 7 77610 joepeck 2011-01-10 22:40:32 -0800 Comment on attachment 77610 [PATCH] propertyText change computation fixed View in context: https://bugs.webkit.org/attachment.cgi?id=77610&action=review > WebCore/inspector/front-end/CSSStyleModel.js:477 > + return; I have no objections to this patch, I was just curious why this branch early returns, and doesn't invoke the possible userCallback function like the other branches. I didn't investigate this deeply, but maybe that could use a comment? 332194 8 apavlov 2011-01-11 01:43:43 -0800 (In reply to comment #7) > (From update of attachment 77610 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77610&action=review > > > WebCore/inspector/front-end/CSSStyleModel.js:477 > > + return; > > I have no objections to this patch, I was just curious why this branch early returns, > and doesn't invoke the possible userCallback function like the other branches. > I didn't investigate this deeply, but maybe that could use a comment? Ugh, sorry for not commenting that, as it does looks strange to an untrained eye :) The point is that we need to run setPropertyText2+setDisabled(false) as an atomic operation, and hence the callback should be called only after setDisabled() returns (see enabledCallback()). 333124 9 joepeck 2011-01-12 09:50:22 -0800 > Ugh, sorry for not commenting that, as it does looks strange to an untrained eye :) > The point is that we need to run setPropertyText2+setDisabled(false) as an atomic > operation, and hence the callback should be called only after setDisabled() returns > (see enabledCallback()). I see. That makes perfect sense, and its really my fault for overlooking that. Thanks! 77562 2010-12-28 11:07:17 -0800 2010-12-29 02:55:43 -0800 [PATCH] Suggested solution enableprop.patch text/plain 6049 apavlov Y29tbWl0IDU0ZjllZTMwMGYwZDAyYTEzODY5OTUzYjZkZTgxN2UyMzdhZWRkZmUKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUdWUgRGVjIDI4 IDIxOjE2OjEyIDIwMTAgKzAzMDAKCiAgICBFbmFibGVQcm9wT25DaGFuZ2UKCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTUy YmZjZS4uMDdiNWMwOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEwLTEyLTI4ICBBbGV4YW5k ZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQSBkaXNhYmxlZCBzdHls ZSBwcm9wZXJ0eSBzaG91bGQgZ2V0IGVuYWJsZWQgd2hlbiBlZGl0ZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxNjc5CisKKyAgICAgICAgKiBpbnNw ZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBpbnNwZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UuaHRtbDogQWRkZWQu CisKIDIwMTAtMTItMjggIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIENocm9taXVtIHRlc3QgZXhwZWN0YXRpb25zIHVwZGF0ZS4gQ29hbGVz Y2UgV2ViR0wKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJs ZS10aGVuLWNoYW5nZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVz LWRpc2FibGUtdGhlbi1jaGFuZ2UtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNzU1Cmlu ZGV4IDAwMDAwMDAuLjRiNDQ5NmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MTggQEAKK1Rlc3RzIHRoYXQgY2hhbmdpbmcgYSBkaXNhYmxlZCBwcm9wZXJ0eSBlbmFibGVzIGl0 IGFzIHdlbGwuCisKK0JlZm9yZSBkaXNhYmxlCitbZXhwYW5kZWRdIGVsZW1lbnQuc3R5bGUgeyAo KQorZm9udC13ZWlnaHQ6IGJvbGQ7CisKKworQWZ0ZXIgZGlzYWJsZQorW2V4cGFuZGVkXSBlbGVt ZW50LnN0eWxlIHsgKCkKKy8tLSBvdmVybG9hZGVkIC0tLyAvLS0gZGlzYWJsZWQgLS0vIGZvbnQt d2VpZ2h0OiBib2xkOworCisKK0FmdGVyIGNoYW5nZQorW2V4cGFuZGVkXSBlbGVtZW50LnN0eWxl IHsgKCkKK2NvbG9yOiBncmVlbjsKKworCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWNoYW5nZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4tY2hhbmdlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA3NTUK aW5kZXggMDAwMDAwMC4uMjJmYmNkNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsNTggQEAK KzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5z cGVjdG9yLXRlc3QyLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJlbGVtZW50cy10ZXN0czIu anMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgZnVuY3Rp b24gc2VsZWN0Q29udGFpbmVyRWxlbWVudENvbnRpbnVhdGlvbigpCisgICAgeworICAgICAgICBJ bnNwZWN0b3JUZXN0LnNlbGVjdEVsZW1lbnRBbmRSdW4oImNvbnRhaW5lciIsIGRpc2FibGVDb250 YWluZXJTdHlsZSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gZGlzYWJsZUNvbnRhaW5lclN0eWxl KCkKKyAgICB7CisgICAgICAgIHZhciB0cmVlSXRlbSA9IEluc3BlY3RvclRlc3QuZ2V0RWxlbWVu dFN0eWxlUHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQiKTsKKyAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRSZXN1bHQoIkJlZm9yZSBkaXNhYmxlIik7CisgICAgICAgIEluc3BlY3RvclRlc3Qu YWRkUmVzdWx0cyhJbnNwZWN0b3JUZXN0LmdldFNlbGVjdGVkRWxlbWVudFN0eWxlcyh0cnVlLCB0 cnVlKSk7CisKKyAgICAgICAgdHJlZUl0ZW0udG9nZ2xlRW5hYmxlZCh7IHRhcmdldDogeyBjaGVj a2VkOiBmYWxzZSB9IH0pOworICAgICAgICBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUGVuZGluZ0Rp c3BhdGNoZXMoY2hhbmdlQ29udGFpbmVyU3R5bGUpOworICAgIH0KKworICAgIGZ1bmN0aW9uIGNo YW5nZUNvbnRhaW5lclN0eWxlKCkKKyAgICB7CisgICAgICAgIHZhciB0cmVlSXRlbSA9IEluc3Bl Y3RvclRlc3QuZ2V0RWxlbWVudFN0eWxlUHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQiKTsK KyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkFmdGVyIGRpc2FibGUiKTsKKyAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHRzKEluc3BlY3RvclRlc3QuZ2V0U2VsZWN0ZWRFbGVt ZW50U3R5bGVzKHRydWUsIHRydWUpKTsKKworICAgICAgICB0cmVlSXRlbS5hcHBseVN0eWxlVGV4 dCgiY29sb3I6IGdyZWVuIiwgdHJ1ZSk7CisgICAgICAgIEluc3BlY3RvclRlc3QucnVuQWZ0ZXJQ ZW5kaW5nRGlzcGF0Y2hlcyhkdW1wUmVzdWx0cyk7CisgICAgfQorCisgICAgZnVuY3Rpb24gZHVt cFJlc3VsdHMoKQorICAgIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkFmdGVy IGNoYW5nZSIpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdHMoSW5zcGVjdG9yVGVz dC5nZXRTZWxlY3RlZEVsZW1lbnRTdHlsZXModHJ1ZSwgdHJ1ZSkpOworICAgICAgICBJbnNwZWN0 b3JUZXN0LmNvbXBsZXRlVGVzdCgpOworICAgIH0KKworICAgIEluc3BlY3RvclRlc3QuZXhwYW5k RE9NU3VidHJlZUFuZFJ1bihudWxsLCBzZWxlY3RDb250YWluZXJFbGVtZW50Q29udGludWF0aW9u KTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8 cD4KK1Rlc3RzIHRoYXQgY2hhbmdpbmcgYSBkaXNhYmxlZCBwcm9wZXJ0eSBlbmFibGVzIGl0IGFz IHdlbGwuCis8L3A+CisKKzxkaXYgaWQ9ImNvbnRhaW5lciIgc3R5bGU9ImZvbnQtd2VpZ2h0OmJv bGQiPgorPC9kaXY+CisKKzxkaXYgaWQ9Im90aGVyIj4KKzwvZGl2PgorCis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGMwODdhZDYuLmQ1YmUyYjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTAtMTItMjggIEFsZXhhbmRl ciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBIGRpc2FibGVkIHN0eWxl IHByb3BlcnR5IHNob3VsZCBnZXQgZW5hYmxlZCB3aGVuIGVkaXRlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE2NzkKKworICAgICAgICBUZXN0OiBp bnNwZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UuaHRtbAorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNTU1Byb3BlcnR5LnByb3RvdHlwZS5zZXRUZXh0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D U1NQcm9wZXJ0eS5wcm90b3R5cGUuc2V0VGV4dC5jYWxsYmFjayk6CisKKzIwMTAtMTItMjggIEFs ZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdl ZCBieSBQYXZlbCBGZWxkbWFuLgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046 IENsaWNraW5nIGltYWdlIHJlc291cmNlIGluIHN0eWxlIHNpZGViYXIgZG9lc24ndCBhY3R1YWxs eSBnbyB0byByZXNvdXJjZSBhbnltb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D U1NTdHlsZU1vZGVsLmpzCmluZGV4IGU4ZDc1YjcuLjZjMWMwNDUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCkBAIC00NTYsMTkgKzQ1NiwzMSBAQCBX ZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucHJvdG90eXBlID0gewogICAgIC8vIFJlcGxhY2VzICJw cm9wZXJ0eU5hbWU6IHByb3BlcnR5VmFsdWUgWyFpbXBvcnRhbnRdOyIgaW4gdGhlIHN0eWxlc2hl ZXQgYnkgYW4gYXJiaXRyYXJ5IHByb3BlcnR5VGV4dC4KICAgICBzZXRUZXh0OiBmdW5jdGlvbihw cm9wZXJ0eVRleHQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2spCiAgICAgeworICAgICAgICBm dW5jdGlvbiBlbmFibGVkQ2FsbGJhY2soc3R5bGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlm IChzdHlsZSkKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hl ZXRDaGFuZ2VkKHN0eWxlLmlkLnN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UpOworICAgICAgICAg ICAgaWYgKHVzZXJDYWxsYmFjaykKKyAgICAgICAgICAgICAgICB1c2VyQ2FsbGJhY2soc3R5bGUp OworICAgICAgICB9CisKICAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soc3R5bGVQYXlsb2FkKQog ICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoc3R5bGVQYXlsb2FkKQorICAgICAgICAgICAgaWYg KHN0eWxlUGF5bG9hZCkgewogICAgICAgICAgICAgICAgIHRoaXMudGV4dCA9IHByb3BlcnR5VGV4 dDsKLQotICAgICAgICAgICAgaWYgKCF1c2VyQ2FsbGJhY2spCi0gICAgICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICAgICAgaWYgKCFzdHlsZVBheWxvYWQpCi0gICAgICAgICAgICAgICAgdXNl ckNhbGxiYWNrKG51bGwpOwotICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgdmFy IHN0eWxlID0gV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb24ucGFyc2VQYXlsb2FkKHN0 eWxlUGF5bG9hZCk7Ci0gICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKHN0eWxlKTsKLSAgICAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hlZXRDaGFuZ2VkKHN0eWxl LmlkLnN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UpOworCisgICAgICAgICAgICAgICAgdmFyIG5l d1Byb3BlcnR5ID0gc3R5bGUuYWxsUHJvcGVydGllc1t0aGlzLmluZGV4XTsKKyAgICAgICAgICAg ICAgICBpZiAobmV3UHJvcGVydHkgJiYgdGhpcy5kaXNhYmxlZCAmJiAhcHJvcGVydHlUZXh0Lm1h dGNoKC9eXHMqJC8pICYmICghdGhpcy5wcm9wZXJ0eSB8fCBuZXdQcm9wZXJ0eS5wcm9wZXJ0eVRl eHQgIT09IHRoaXMucHJvcGVydHkucHJvcGVydHlUZXh0KSkgeworICAgICAgICAgICAgICAgICAg ICBuZXdQcm9wZXJ0eS5zZXREaXNhYmxlZChmYWxzZSwgZW5hYmxlZENhbGxiYWNrKTsKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hlZXRDaGFuZ2VkKHN0eWxl LmlkLnN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UpOworICAgICAgICAgICAgICAgIGlmICh1c2Vy Q2FsbGJhY2spCisgICAgICAgICAgICAgICAgICAgIHVzZXJDYWxsYmFjayhzdHlsZSk7CisgICAg ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGlmICh1c2VyQ2FsbGJhY2spCisgICAg ICAgICAgICAgICAgICAgIHVzZXJDYWxsYmFjayhudWxsKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogCg== 77610 2010-12-29 02:55:43 -0800 2011-01-10 22:40:32 -0800 [PATCH] propertyText change computation fixed enableprop.patch text/plain 6174 apavlov Y29tbWl0IGE1YzdhNTI4MGViYjE1NDMzODAwZGM1NTNkZTA1NDM4NzI5ZmQwN2IKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUdWUgRGVjIDI4 IDIxOjE2OjEyIDIwMTAgKzAzMDAKCiAgICBFbmFibGVQcm9wT25DaGFuZ2UKCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNTUy YmZjZS4uMDdiNWMwOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEwLTEyLTI4ICBBbGV4YW5k ZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQSBkaXNhYmxlZCBzdHls ZSBwcm9wZXJ0eSBzaG91bGQgZ2V0IGVuYWJsZWQgd2hlbiBlZGl0ZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxNjc5CisKKyAgICAgICAgKiBpbnNw ZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBpbnNwZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UuaHRtbDogQWRkZWQu CisKIDIwMTAtMTItMjggIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIENocm9taXVtIHRlc3QgZXhwZWN0YXRpb25zIHVwZGF0ZS4gQ29hbGVz Y2UgV2ViR0wKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJs ZS10aGVuLWNoYW5nZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVz LWRpc2FibGUtdGhlbi1jaGFuZ2UtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNzU1Cmlu ZGV4IDAwMDAwMDAuLjRiNDQ5NmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MTggQEAKK1Rlc3RzIHRoYXQgY2hhbmdpbmcgYSBkaXNhYmxlZCBwcm9wZXJ0eSBlbmFibGVzIGl0 IGFzIHdlbGwuCisKK0JlZm9yZSBkaXNhYmxlCitbZXhwYW5kZWRdIGVsZW1lbnQuc3R5bGUgeyAo KQorZm9udC13ZWlnaHQ6IGJvbGQ7CisKKworQWZ0ZXIgZGlzYWJsZQorW2V4cGFuZGVkXSBlbGVt ZW50LnN0eWxlIHsgKCkKKy8tLSBvdmVybG9hZGVkIC0tLyAvLS0gZGlzYWJsZWQgLS0vIGZvbnQt d2VpZ2h0OiBib2xkOworCisKK0FmdGVyIGNoYW5nZQorW2V4cGFuZGVkXSBlbGVtZW50LnN0eWxl IHsgKCkKK2NvbG9yOiBncmVlbjsKKworCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWNoYW5nZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4tY2hhbmdlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA3NTUK aW5kZXggMDAwMDAwMC4uMjJmYmNkNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsNTggQEAK KzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5z cGVjdG9yLXRlc3QyLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJlbGVtZW50cy10ZXN0czIu anMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgZnVuY3Rp b24gc2VsZWN0Q29udGFpbmVyRWxlbWVudENvbnRpbnVhdGlvbigpCisgICAgeworICAgICAgICBJ bnNwZWN0b3JUZXN0LnNlbGVjdEVsZW1lbnRBbmRSdW4oImNvbnRhaW5lciIsIGRpc2FibGVDb250 YWluZXJTdHlsZSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gZGlzYWJsZUNvbnRhaW5lclN0eWxl KCkKKyAgICB7CisgICAgICAgIHZhciB0cmVlSXRlbSA9IEluc3BlY3RvclRlc3QuZ2V0RWxlbWVu dFN0eWxlUHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQiKTsKKyAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRSZXN1bHQoIkJlZm9yZSBkaXNhYmxlIik7CisgICAgICAgIEluc3BlY3RvclRlc3Qu YWRkUmVzdWx0cyhJbnNwZWN0b3JUZXN0LmdldFNlbGVjdGVkRWxlbWVudFN0eWxlcyh0cnVlLCB0 cnVlKSk7CisKKyAgICAgICAgdHJlZUl0ZW0udG9nZ2xlRW5hYmxlZCh7IHRhcmdldDogeyBjaGVj a2VkOiBmYWxzZSB9IH0pOworICAgICAgICBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUGVuZGluZ0Rp c3BhdGNoZXMoY2hhbmdlQ29udGFpbmVyU3R5bGUpOworICAgIH0KKworICAgIGZ1bmN0aW9uIGNo YW5nZUNvbnRhaW5lclN0eWxlKCkKKyAgICB7CisgICAgICAgIHZhciB0cmVlSXRlbSA9IEluc3Bl Y3RvclRlc3QuZ2V0RWxlbWVudFN0eWxlUHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQiKTsK KyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkFmdGVyIGRpc2FibGUiKTsKKyAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHRzKEluc3BlY3RvclRlc3QuZ2V0U2VsZWN0ZWRFbGVt ZW50U3R5bGVzKHRydWUsIHRydWUpKTsKKworICAgICAgICB0cmVlSXRlbS5hcHBseVN0eWxlVGV4 dCgiY29sb3I6IGdyZWVuIiwgdHJ1ZSk7CisgICAgICAgIEluc3BlY3RvclRlc3QucnVuQWZ0ZXJQ ZW5kaW5nRGlzcGF0Y2hlcyhkdW1wUmVzdWx0cyk7CisgICAgfQorCisgICAgZnVuY3Rpb24gZHVt cFJlc3VsdHMoKQorICAgIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkFmdGVy IGNoYW5nZSIpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdHMoSW5zcGVjdG9yVGVz dC5nZXRTZWxlY3RlZEVsZW1lbnRTdHlsZXModHJ1ZSwgdHJ1ZSkpOworICAgICAgICBJbnNwZWN0 b3JUZXN0LmNvbXBsZXRlVGVzdCgpOworICAgIH0KKworICAgIEluc3BlY3RvclRlc3QuZXhwYW5k RE9NU3VidHJlZUFuZFJ1bihudWxsLCBzZWxlY3RDb250YWluZXJFbGVtZW50Q29udGludWF0aW9u KTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8 cD4KK1Rlc3RzIHRoYXQgY2hhbmdpbmcgYSBkaXNhYmxlZCBwcm9wZXJ0eSBlbmFibGVzIGl0IGFz IHdlbGwuCis8L3A+CisKKzxkaXYgaWQ9ImNvbnRhaW5lciIgc3R5bGU9ImZvbnQtd2VpZ2h0OmJv bGQiPgorPC9kaXY+CisKKzxkaXYgaWQ9Im90aGVyIj4KKzwvZGl2PgorCis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGMwODdhZDYuLmQ1YmUyYjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTAtMTItMjggIEFsZXhhbmRl ciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBBIGRpc2FibGVkIHN0eWxl IHByb3BlcnR5IHNob3VsZCBnZXQgZW5hYmxlZCB3aGVuIGVkaXRlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE2NzkKKworICAgICAgICBUZXN0OiBp bnNwZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1jaGFuZ2UuaHRtbAorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNTU1Byb3BlcnR5LnByb3RvdHlwZS5zZXRUZXh0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D U1NQcm9wZXJ0eS5wcm90b3R5cGUuc2V0VGV4dC5jYWxsYmFjayk6CisKKzIwMTAtMTItMjggIEFs ZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwogICAgICAgICBSZXZpZXdl ZCBieSBQYXZlbCBGZWxkbWFuLgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJFR1JFU1NJT046 IENsaWNraW5nIGltYWdlIHJlc291cmNlIGluIHN0eWxlIHNpZGViYXIgZG9lc24ndCBhY3R1YWxs eSBnbyB0byByZXNvdXJjZSBhbnltb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D U1NTdHlsZU1vZGVsLmpzCmluZGV4IGU4ZDc1YjcuLmM0NTkwMzQgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCkBAIC00NTYsMTkgKzQ1NiwzMiBAQCBX ZWJJbnNwZWN0b3IuQ1NTUHJvcGVydHkucHJvdG90eXBlID0gewogICAgIC8vIFJlcGxhY2VzICJw cm9wZXJ0eU5hbWU6IHByb3BlcnR5VmFsdWUgWyFpbXBvcnRhbnRdOyIgaW4gdGhlIHN0eWxlc2hl ZXQgYnkgYW4gYXJiaXRyYXJ5IHByb3BlcnR5VGV4dC4KICAgICBzZXRUZXh0OiBmdW5jdGlvbihw cm9wZXJ0eVRleHQsIG1ham9yQ2hhbmdlLCB1c2VyQ2FsbGJhY2spCiAgICAgeworICAgICAgICBm dW5jdGlvbiBlbmFibGVkQ2FsbGJhY2soc3R5bGUpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlm IChzdHlsZSkKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hl ZXRDaGFuZ2VkKHN0eWxlLmlkLnN0eWxlU2hlZXRJZCwgbWFqb3JDaGFuZ2UpOworICAgICAgICAg ICAgaWYgKHVzZXJDYWxsYmFjaykKKyAgICAgICAgICAgICAgICB1c2VyQ2FsbGJhY2soc3R5bGUp OworICAgICAgICB9CisKICAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soc3R5bGVQYXlsb2FkKQog ICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoc3R5bGVQYXlsb2FkKQorICAgICAgICAgICAgaWYg KHN0eWxlUGF5bG9hZCkgeworICAgICAgICAgICAgICAgIHZhciBzdHlsZSA9IFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uLnBhcnNlUGF5bG9hZChzdHlsZVBheWxvYWQpOworICAgICAg ICAgICAgICAgIHZhciBuZXdQcm9wZXJ0eSA9IHN0eWxlLmFsbFByb3BlcnRpZXNbdGhpcy5pbmRl eF07CisgICAgICAgICAgICAgICAgdmFyIHRleHRDaGFuZ2VkID0gKCFuZXdQcm9wZXJ0eSB8fCBu ZXdQcm9wZXJ0eS5wcm9wZXJ0eVRleHQgIT09IHRoaXMucHJvcGVydHlUZXh0KTsKICAgICAgICAg ICAgICAgICB0aGlzLnRleHQgPSBwcm9wZXJ0eVRleHQ7CiAKLSAgICAgICAgICAgIGlmICghdXNl ckNhbGxiYWNrKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGlmICghc3R5 bGVQYXlsb2FkKQotICAgICAgICAgICAgICAgIHVzZXJDYWxsYmFjayhudWxsKTsKLSAgICAgICAg ICAgIGVsc2UgewotICAgICAgICAgICAgICAgIHZhciBzdHlsZSA9IFdlYkluc3BlY3Rvci5DU1NT dHlsZURlY2xhcmF0aW9uLnBhcnNlUGF5bG9hZChzdHlsZVBheWxvYWQpOwotICAgICAgICAgICAg ICAgIHVzZXJDYWxsYmFjayhzdHlsZSk7Ci0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNz c01vZGVsLl9zdHlsZVNoZWV0Q2hhbmdlZChzdHlsZS5pZC5zdHlsZVNoZWV0SWQsIG1ham9yQ2hh bmdlKTsKKyAgICAgICAgICAgICAgICBpZiAobmV3UHJvcGVydHkgJiYgdGhpcy5kaXNhYmxlZCAm JiAhcHJvcGVydHlUZXh0Lm1hdGNoKC9eXHMqJC8pICYmIHRleHRDaGFuZ2VkKSB7CisgICAgICAg ICAgICAgICAgICAgIG5ld1Byb3BlcnR5LnNldERpc2FibGVkKGZhbHNlLCBlbmFibGVkQ2FsbGJh Y2spOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfSBlbHNl CisgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5fc3R5bGVTaGVldENo YW5nZWQoc3R5bGUuaWQuc3R5bGVTaGVldElkLCBtYWpvckNoYW5nZSk7CisgICAgICAgICAgICAg ICAgaWYgKHVzZXJDYWxsYmFjaykKKyAgICAgICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKHN0 eWxlKTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgaWYgKHVzZXJDYWxs YmFjaykKKyAgICAgICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKG51bGwpOwogICAgICAgICAg ICAgfQogICAgICAgICB9CiAK