39057 2010-05-13 05:23:19 -0700 Web Inspector: A disabled style property cannot be deleted 2010-05-13 12:24:46 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov pfeldman bweinstein joepeck keishi pfeldman pmuellr rik timothy yurys oldest_to_newest 225235 0 apavlov 2010-05-13 05:23:19 -0700 1. In some CSS rule (with 2 or more properties) in the Styles sidebar pane, disable a property 2. Delete the disabled property by clearing its edit-box, as usual 3. Disable another property in the same rule The property deleted in step 2 re-appears in a disabled state. The requirement of 2 or more properties in step 1 is not mandatory, it's there merely to manifest the issue in an easy way. 225353 1 55991 pfeldman 2010-05-13 09:57:45 -0700 Created attachment 55991 [PATCH] Proposed fix. 225366 2 55991 yurys 2010-05-13 10:26:48 -0700 Comment on attachment 55991 [PATCH] Proposed fix. LayoutTests/inspector/styles-disable-then-delete.html:37 + testController.runAfterPendingDispatches(frontend_deleteContainerStyle.bind(this, testController)); Can you pass __result as a parameter as well instead of creating a global __result? Also it's not clear what 'bind(this,' means in this context, should it be .bind(null, ? 225376 3 55996 pfeldman 2010-05-13 10:49:15 -0700 Created attachment 55996 [PATCH] Comments addressed. 225436 4 pfeldman 2010-05-13 12:24:27 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... C LayoutTests/inspector/styles-disable-then-enable.html => LayoutTests/inspector/styles-disable-then-delete.html M LayoutTests/ChangeLog M LayoutTests/inspector/elements-tests.js M LayoutTests/inspector/styles-disable-inherited.html A LayoutTests/inspector/styles-disable-then-delete-expected.txt M LayoutTests/inspector/styles-disable-then-enable.html M WebCore/ChangeLog M WebCore/inspector/InspectorDOMAgent.cpp M WebCore/inspector/front-end/TestController.js Committed r59381 55991 2010-05-13 09:57:45 -0700 2010-05-13 10:49:15 -0700 [PATCH] Proposed fix. disable_delete text/plain 7859 pfeldman ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkMWZmZTQ3Li44NmRhOGM0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUt MTMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQSBkaXNh YmxlZCBzdHlsZSBwcm9wZXJ0eSBjYW5ub3QgYmUgZGVsZXRlZC4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkwNTcKKworICAgICAgICAqIGluc3Bl Y3Rvci9lbGVtZW50cy10ZXN0cy5qczoKKyAgICAgICAgKGZyb250ZW5kX2dldFNlbGVjdGVkRWxl bWVudFN0eWxlcyk6CisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4tZGVs ZXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy1kaXNh YmxlLXRoZW4tZGVsZXRlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMt ZGlzYWJsZS10aGVuLWVuYWJsZS5odG1sOgorCiAyMDEwLTA1LTEzICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5v cm9uaGEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdHMu anMgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdHMuanMKaW5kZXggYTAyMjAy ZS4uOGZiNDgwZiAxMDA3NTUKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRl c3RzLmpzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0cy5qcwpAQCAt NTQsNyArNTQsNyBAQCBmdW5jdGlvbiBmcm9udGVuZF9kdW1wU2VsZWN0ZWRFbGVtZW50U3R5bGVz KHRlc3RDb250cm9sbGVyKQogICAgIHRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoZnJvbnRlbmRf Z2V0U2VsZWN0ZWRFbGVtZW50U3R5bGVzKGZhbHNlKSk7CiB9CiAKLWZ1bmN0aW9uIGZyb250ZW5k X2dldFNlbGVjdGVkRWxlbWVudFN0eWxlcyhleGNsdWRlQ29tcHV0ZWQpCitmdW5jdGlvbiBmcm9u dGVuZF9nZXRTZWxlY3RlZEVsZW1lbnRTdHlsZXMoZXhjbHVkZUNvbXB1dGVkLCBleGNsdWRlTWF0 Y2hlZCkKIHsKICAgICB2YXIgcmVzdWx0ID0gW107CiAgICAgdmFyIHN0eWxlU2VjdGlvbnMgPSBX ZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLnNpZGViYXJQYW5lcy5zdHlsZXMuc2VjdGlvbnM7 CkBAIC02NSw2ICs2NSw4IEBAIGZ1bmN0aW9uIGZyb250ZW5kX2dldFNlbGVjdGVkRWxlbWVudFN0 eWxlcyhleGNsdWRlQ29tcHV0ZWQpCiAgICAgICAgICAgICB2YXIgc2VjdGlvbiA9IHNlY3Rpb25z W2ldOwogICAgICAgICAgICAgaWYgKHNlY3Rpb24uY29tcHV0ZWRTdHlsZSAmJiBleGNsdWRlQ29t cHV0ZWQpCiAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpZiAoc2VjdGlv bi5ydWxlICYmIGV4Y2x1ZGVNYXRjaGVkKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICAgICAgaWYgKHNlY3Rpb24uZWxlbWVudC5wcmV2aW91c1NpYmxpbmcgJiYgc2VjdGlvbi5l bGVtZW50LnByZXZpb3VzU2libGluZy5jbGFzc05hbWUgPT09ICJzdHlsZXMtc2lkZWJhci1zZXBh cmF0b3IiKQogICAgICAgICAgICAgICAgIHJlc3VsdC5wdXNoKCI9PT09PT09PSAiICsgc2VjdGlv bi5lbGVtZW50LnByZXZpb3VzU2libGluZy50ZXh0Q29udGVudCArICIgPT09PT09PT0iKTsKICAg ICAgICAgICAgIHJlc3VsdC5wdXNoKChzZWN0aW9uLmV4cGFuZGVkID8gIltleHBhbmRlZF0gIiA6 ICJbY29sbGFwc2VkXSAiKSArIHNlY3Rpb24udGl0bGVFbGVtZW50LnRleHRDb250ZW50ICsgIiAo IiArIHNlY3Rpb24uc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50ICsgIikiKTsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWRlbGV0ZS1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1kZWxl dGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmYyODU0 OWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzLWRpc2Fi bGUtdGhlbi1kZWxldGUtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKK1Rlc3RzIHRoYXQg cmVtb3ZhbCBvZiBwcm9wZXJ0eSBmb2xsb3dpbmcgaXRzIGRpc2FibGluZyB3b3Jrcy4KKworQmVm b3JlIGRpc2FibGUKK1tleHBhbmRlZF0gZWxlbWVudC5zdHlsZSB7IChlbGVtZW504oCZcyDigJxz dHlsZeKAnSBhdHRyaWJ1dGUpCitmb250LXdlaWdodDogYm9sZDsKKworCitBZnRlciBkaXNhYmxl CitbZXhwYW5kZWRdIGVsZW1lbnQuc3R5bGUgeyAoZWxlbWVudOKAmXMg4oCcc3R5bGXigJ0gYXR0 cmlidXRlKQorLy0tIG92ZXJsb2FkZWQgLS0vIC8tLSBkaXNhYmxlZCAtLS8gZm9udC13ZWlnaHQ6 IGJvbGQ7CisKKworQWZ0ZXIgZGVsZXRlCitbZXhwYW5kZWRdIGVsZW1lbnQuc3R5bGUgeyAoZWxl bWVudOKAmXMg4oCcc3R5bGXigJ0gYXR0cmlidXRlKQorCisKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4tZGVsZXRlLmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1kZWxldGUuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jZGVhOWZkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4tZGVsZXRlLmh0bWwKQEAgLTAs MCArMSw4MSBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9odHRwL3Rlc3RzL2lu c3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iZWxlbWVu dHMtdGVzdHMuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKworZnVuY3Rpb24gZG9pdCgpCit7Cisg ICAgZnVuY3Rpb24gY2FsbGJhY2socmVzdWx0KQorICAgIHsKKyAgICAgICAgZHVtcEFycmF5KHJl c3VsdCk7CisgICAgICAgIG5vdGlmeURvbmUoKTsKKyAgICB9CisgICAgZXZhbHVhdGVJbldlYklu c3BlY3RvcigiZnJvbnRlbmRfcnVuVGVzdCIsIGNhbGxiYWNrKTsKK30KKworLy8gRnJvbnRlbmQg ZnVuY3Rpb25zLgorCitmdW5jdGlvbiBmcm9udGVuZF9ydW5UZXN0KHRlc3RDb250cm9sbGVyKQor eworICAgIHRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICBmcm9udGVuZF9leHBh bmRET01TdWJ0cmVlQW5kUnVuKHRlc3RDb250cm9sbGVyLCBudWxsLCBmcm9udGVuZF9zZWxlY3RD b250YWluZXJFbGVtZW50Q29udGludWF0aW9uKTsKK30KKworZnVuY3Rpb24gZnJvbnRlbmRfc2Vs ZWN0Q29udGFpbmVyRWxlbWVudENvbnRpbnVhdGlvbih0ZXN0Q29udHJvbGxlcikKK3sKKyAgICBm cm9udGVuZF9zZWxlY3RFbGVtZW50QW5kUnVuKHRlc3RDb250cm9sbGVyLCAiY29udGFpbmVyIiwg ZnJvbnRlbmRfZGlzYWJsZUNvbnRhaW5lclN0eWxlKTsKK30KKworZnVuY3Rpb24gZnJvbnRlbmRf ZGlzYWJsZUNvbnRhaW5lclN0eWxlKHRlc3RDb250cm9sbGVyKQoreworICAgIHZhciB0cmVlSXRl bSA9IGZyb250ZW5kX2dldEVsZW1lbnRTdHlsZVByb3BlcnR5VHJlZUl0ZW0oImZvbnQtd2VpZ2h0 Iik7CisgICAgd2luZG93Ll9fcmVzdWx0ID0gWyJCZWZvcmUgZGlzYWJsZSJdOworICAgIHdpbmRv dy5fX3Jlc3VsdCA9IHdpbmRvdy5fX3Jlc3VsdC5jb25jYXQoZnJvbnRlbmRfZ2V0U2VsZWN0ZWRF bGVtZW50U3R5bGVzKHRydWUsIHRydWUpKTsKKworICAgIHRyZWVJdGVtLnRvZ2dsZUVuYWJsZWQo eyB0YXJnZXQ6IHsgY2hlY2tlZDogZmFsc2UgfSB9KTsKKyAgICB0ZXN0Q29udHJvbGxlci5ydW5B ZnRlclBlbmRpbmdEaXNwYXRjaGVzKGZyb250ZW5kX2RlbGV0ZUNvbnRhaW5lclN0eWxlLmJpbmQo dGhpcywgdGVzdENvbnRyb2xsZXIpKTsKK30KKworZnVuY3Rpb24gZnJvbnRlbmRfZGVsZXRlQ29u dGFpbmVyU3R5bGUodGVzdENvbnRyb2xsZXIpCit7CisgICAgdmFyIHRyZWVJdGVtID0gZnJvbnRl bmRfZ2V0RWxlbWVudFN0eWxlUHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQiKTsKKyAgICB3 aW5kb3cuX19yZXN1bHQucHVzaCgiQWZ0ZXIgZGlzYWJsZSIpOworICAgIHdpbmRvdy5fX3Jlc3Vs dCA9IHdpbmRvdy5fX3Jlc3VsdC5jb25jYXQoZnJvbnRlbmRfZ2V0U2VsZWN0ZWRFbGVtZW50U3R5 bGVzKHRydWUsIHRydWUpKTsKKworICAgIHRyZWVJdGVtLmFwcGx5U3R5bGVUZXh0KCIiLCB0cnVl KTsKKyAgICB0ZXN0Q29udHJvbGxlci5ydW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKGZyb250ZW5k X3Jlc2VsZWN0Tm9kZUFuZER1bXBSZXN1bHRzLmJpbmQodGhpcywgdGVzdENvbnRyb2xsZXIpKTsK K30KKworZnVuY3Rpb24gZnJvbnRlbmRfcmVzZWxlY3ROb2RlQW5kRHVtcFJlc3VsdHModGVzdENv bnRyb2xsZXIpCit7CisgICAgZnVuY3Rpb24gY29udGludWF0aW9uKCkKKyAgICB7CisgICAgICAg IGZyb250ZW5kX3NlbGVjdEVsZW1lbnRBbmRSdW4odGVzdENvbnRyb2xsZXIsICJjb250YWluZXIi LCBmcm9udGVuZF9kdW1wUmVzdWx0cyk7CisgICAgfQorICAgIGZyb250ZW5kX3NlbGVjdEVsZW1l bnRBbmRSdW4odGVzdENvbnRyb2xsZXIsICJvdGhlciIsIGNvbnRpbnVhdGlvbik7Cit9CisKK2Z1 bmN0aW9uIGZyb250ZW5kX2R1bXBSZXN1bHRzKHRlc3RDb250cm9sbGVyKQoreworICAgIHZhciB0 cmVlSXRlbSA9IGZyb250ZW5kX2dldEVsZW1lbnRTdHlsZVByb3BlcnR5VHJlZUl0ZW0oImZvbnQt d2VpZ2h0Iik7CisgICAgd2luZG93Ll9fcmVzdWx0LnB1c2goIkFmdGVyIGRlbGV0ZSIpOworICAg IHdpbmRvdy5fX3Jlc3VsdCA9IHdpbmRvdy5fX3Jlc3VsdC5jb25jYXQoZnJvbnRlbmRfZ2V0U2Vs ZWN0ZWRFbGVtZW50U3R5bGVzKHRydWUsIHRydWUpKTsKKyAgICB0ZXN0Q29udHJvbGxlci5ub3Rp ZnlEb25lKHdpbmRvdy5fX3Jlc3VsdCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKworPGJvZHkg b25sb2FkPSJvbmxvYWQoKSI+Cis8cD4KK1Rlc3RzIHRoYXQgcmVtb3ZhbCBvZiBwcm9wZXJ0eSBm b2xsb3dpbmcgaXRzIGRpc2FibGluZyB3b3Jrcy4KKzwvcD4KKworPGRpdiBpZD0iY29udGFpbmVy IiBzdHlsZT0iZm9udC13ZWlnaHQ6Ym9sZCI+Cis8L2Rpdj4KKworPGRpdiBpZD0ib3RoZXIiPgor PC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWVuYWJsZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4tZW5hYmxlLmh0bWwKaW5kZXggZTU1NjQzYy4uZWM3NDhi NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4t ZW5hYmxlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy1kaXNhYmxlLXRo ZW4tZW5hYmxlLmh0bWwKQEAgLTQ1LDggKzQ1LDYgQEAgZnVuY3Rpb24gZnJvbnRlbmRfZW5hYmxl Q29udGFpbmVyU3R5bGUodGVzdENvbnRyb2xsZXIpCiAKICAgICB0cmVlSXRlbS50b2dnbGVFbmFi bGVkKHsgdGFyZ2V0OiB7IGNoZWNrZWQ6IHRydWUgfSB9KTsKICAgICB0ZXN0Q29udHJvbGxlci5y dW5BZnRlclBlbmRpbmdEaXNwYXRjaGVzKGZyb250ZW5kX2R1bXBSZXN1bHRzLmJpbmQodGhpcywg dGVzdENvbnRyb2xsZXIpKTsKLQotICAgIHRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUocmVzdWx0 KTsKIH0KIAogZnVuY3Rpb24gZnJvbnRlbmRfZHVtcFJlc3VsdHModGVzdENvbnRyb2xsZXIpCmRp ZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGI1 MDY5OTAuLjI2NWNjNzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDUtMTMgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQSBkaXNhYmxlZCBzdHlsZSBwcm9wZXJ0 eSBjYW5ub3QgYmUgZGVsZXRlZC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzkwNTcKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JET01B Z2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6YXBwbHlTdHls ZVRleHQpOgorCiAyMDEwLTA1LTEzICBDaGFuZyBTaHUgIDxjaGFuZy5zaHVAbm9raWEuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCmluZGV4IGVjMTNlZTkuLjExNjQ3MzYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKQEAgLTkwNiw2ICs5MDYsMTEg QEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6YXBwbHlTdHlsZVRleHQobG9uZyBjYWxsSWQsIGxv bmcgc3R5bGVJZCwgY29uc3QgU3RyaW5nJgogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAg Ly8gUmVtb3ZlIGRpc2FibGVkIHByb3BlcnR5IGVudHJ5IGZvciBwcm9wZXJ0eSB3aXRoIGdpdmVu IG5hbWUuIAorICAgIElkVG9EaXNhYmxlZFN0eWxlTWFwOjppdGVyYXRvciBkaXNhYmxlZEl0ID0g Y3NzU3RvcmUoKS0+aWRUb0Rpc2FibGVkU3R5bGUuZmluZChzdHlsZUlkKTsKKyAgICBpZiAoZGlz YWJsZWRJdCAhPSBjc3NTdG9yZSgpLT5pZFRvRGlzYWJsZWRTdHlsZS5lbmQoKSkKKyAgICAgICAg ZGlzYWJsZWRJdC0+c2Vjb25kLnJlbW92ZShwcm9wZXJ0eU5hbWUpOworCiAgICAgQ1NTU3R5bGVE ZWNsYXJhdGlvbiogc3R5bGUgPSBpdC0+c2Vjb25kLmdldCgpOwogICAgIGludCBzdHlsZVRleHRM ZW5ndGggPSBzdHlsZVRleHQubGVuZ3RoKCk7CiAKQEAgLTk3Myw2ICs5NzgsOSBAQCB2b2lkIElu c3BlY3RvckRPTUFnZW50OjphcHBseVN0eWxlVGV4dChsb25nIGNhbGxJZCwgbG9uZyBzdHlsZUlk LCBjb25zdCBTdHJpbmcmCiAgICAgICAgIC8vIFNldCB0aGUgcHJvcGVydHkgb24gdGhlIHJlYWwg c3R5bGUgZGVjbGFyYXRpb24uCiAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgICAg ICBzdHlsZS0+c2V0UHJvcGVydHkobmFtZSwgdmFsdWUsIHByaW9yaXR5LCBlYyk7CisgICAgICAg IC8vIFJlbW92ZSBkaXNhYmxlZCBwcm9wZXJ0eSBlbnRyeSBmb3IgcHJvcGVydHkgd2l0aCB0aGlz IG5hbWUuIAorICAgICAgICBpZiAoZGlzYWJsZWRJdCAhPSBjc3NTdG9yZSgpLT5pZFRvRGlzYWJs ZWRTdHlsZS5lbmQoKSkKKyAgICAgICAgICAgIGRpc2FibGVkSXQtPnNlY29uZC5yZW1vdmUobmFt ZSk7CiAgICAgICAgIGNoYW5nZWRQcm9wZXJ0aWVzLmFwcGVuZChuYW1lKTsKICAgICB9CiAgICAg bV9mcm9udGVuZC0+ZGlkQXBwbHlTdHlsZVRleHQoY2FsbElkLCB0cnVlLCBidWlsZE9iamVjdEZv clN0eWxlKHN0eWxlLCB0cnVlKSwgdG9BcnJheShjaGFuZ2VkUHJvcGVydGllcykpOwo= 55996 2010-05-13 10:49:15 -0700 2010-05-13 12:24:46 -0700 [PATCH] Comments addressed. disable_delete text/plain 11560 pfeldman ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3NDFhNGFjLi43ZjA4NGVmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUt MTMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQSBkaXNh YmxlZCBzdHlsZSBwcm9wZXJ0eSBjYW5ub3QgYmUgZGVsZXRlZC4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkwNTcKKworICAgICAgICAqIGluc3Bl Y3Rvci9lbGVtZW50cy10ZXN0cy5qczoKKyAgICAgICAgKGZyb250ZW5kX2dldFNlbGVjdGVkRWxl bWVudFN0eWxlcyk6CisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy1kaXNhYmxlLXRoZW4tZGVs ZXRlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL3N0eWxlcy1kaXNh YmxlLXRoZW4tZGVsZXRlLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMt ZGlzYWJsZS10aGVuLWVuYWJsZS5odG1sOgorCiAyMDEwLTA1LTEzICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3Jv bmhhLgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdHMu anMgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdHMuanMKaW5kZXggYTAyMjAy ZS4uOGZiNDgwZiAxMDA3NTUKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRl c3RzLmpzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0cy5qcwpAQCAt NTQsNyArNTQsNyBAQCBmdW5jdGlvbiBmcm9udGVuZF9kdW1wU2VsZWN0ZWRFbGVtZW50U3R5bGVz KHRlc3RDb250cm9sbGVyKQogICAgIHRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoZnJvbnRlbmRf Z2V0U2VsZWN0ZWRFbGVtZW50U3R5bGVzKGZhbHNlKSk7CiB9CiAKLWZ1bmN0aW9uIGZyb250ZW5k X2dldFNlbGVjdGVkRWxlbWVudFN0eWxlcyhleGNsdWRlQ29tcHV0ZWQpCitmdW5jdGlvbiBmcm9u dGVuZF9nZXRTZWxlY3RlZEVsZW1lbnRTdHlsZXMoZXhjbHVkZUNvbXB1dGVkLCBleGNsdWRlTWF0 Y2hlZCkKIHsKICAgICB2YXIgcmVzdWx0ID0gW107CiAgICAgdmFyIHN0eWxlU2VjdGlvbnMgPSBX ZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1lbnRzLnNpZGViYXJQYW5lcy5zdHlsZXMuc2VjdGlvbnM7 CkBAIC02NSw2ICs2NSw4IEBAIGZ1bmN0aW9uIGZyb250ZW5kX2dldFNlbGVjdGVkRWxlbWVudFN0 eWxlcyhleGNsdWRlQ29tcHV0ZWQpCiAgICAgICAgICAgICB2YXIgc2VjdGlvbiA9IHNlY3Rpb25z W2ldOwogICAgICAgICAgICAgaWYgKHNlY3Rpb24uY29tcHV0ZWRTdHlsZSAmJiBleGNsdWRlQ29t cHV0ZWQpCiAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBpZiAoc2VjdGlv bi5ydWxlICYmIGV4Y2x1ZGVNYXRjaGVkKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAg ICAgICAgICAgaWYgKHNlY3Rpb24uZWxlbWVudC5wcmV2aW91c1NpYmxpbmcgJiYgc2VjdGlvbi5l bGVtZW50LnByZXZpb3VzU2libGluZy5jbGFzc05hbWUgPT09ICJzdHlsZXMtc2lkZWJhci1zZXBh cmF0b3IiKQogICAgICAgICAgICAgICAgIHJlc3VsdC5wdXNoKCI9PT09PT09PSAiICsgc2VjdGlv bi5lbGVtZW50LnByZXZpb3VzU2libGluZy50ZXh0Q29udGVudCArICIgPT09PT09PT0iKTsKICAg ICAgICAgICAgIHJlc3VsdC5wdXNoKChzZWN0aW9uLmV4cGFuZGVkID8gIltleHBhbmRlZF0gIiA6 ICJbY29sbGFwc2VkXSAiKSArIHNlY3Rpb24udGl0bGVFbGVtZW50LnRleHRDb250ZW50ICsgIiAo IiArIHNlY3Rpb24uc3VidGl0bGVFbGVtZW50LnRleHRDb250ZW50ICsgIikiKTsKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJsZS1pbmhlcml0ZWQuaHRtbCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJsZS1pbmhlcml0ZWQuaHRtbAppbmRl eCBmOWRmYzdmLi44YjZlZDUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5 bGVzLWRpc2FibGUtaW5oZXJpdGVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0 eWxlcy1kaXNhYmxlLWluaGVyaXRlZC5odG1sCkBAIC0zMCw4ICszMCw4IEBAIGZ1bmN0aW9uIGZy b250ZW5kX3NlbGVjdE5lc3RlZEVsZW1lbnQodGVzdENvbnRyb2xsZXIpCiBmdW5jdGlvbiBmcm9u dGVuZF9kdW1wTmVzdGVkU3R5bGUodGVzdENvbnRyb2xsZXIpCiB7CiAgICAgdmFyIHRyZWVJdGVt ID0gZnJvbnRlbmRfZ2V0RWxlbWVudFN0eWxlUHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQi KTsKLSAgICB3aW5kb3cuX19yZXN1bHQgPSBbIkJlZm9yZSBkaXNhYmxlIl07Ci0gICAgd2luZG93 Ll9fcmVzdWx0ID0gd2luZG93Ll9fcmVzdWx0LmNvbmNhdChmcm9udGVuZF9nZXRTZWxlY3RlZEVs ZW1lbnRTdHlsZXModHJ1ZSkpOworICAgIHRlc3RDb250cm9sbGVyLnJlc3VsdHMucHVzaCgiQmVm b3JlIGRpc2FibGUiKTsKKyAgICB0ZXN0Q29udHJvbGxlci5yZXN1bHRzID0gdGVzdENvbnRyb2xs ZXIucmVzdWx0cy5jb25jYXQoZnJvbnRlbmRfZ2V0U2VsZWN0ZWRFbGVtZW50U3R5bGVzKHRydWUp KTsKIAogICAgIGZyb250ZW5kX3NlbGVjdEVsZW1lbnRBbmRSdW4odGVzdENvbnRyb2xsZXIsICJj b250YWluZXIiLCBmcm9udGVuZF9kaXNhYmxlQ29udGFpbmVyU3R5bGUpOwogfQpAQCAtNDcsOCAr NDcsOCBAQCBmdW5jdGlvbiBmcm9udGVuZF9kdW1wUmVzdWx0cyh0ZXN0Q29udHJvbGxlcikKIHsK ICAgICBmdW5jdGlvbiByZXBvcnRSZXN1bHRzKCkKICAgICB7Ci0gICAgICAgIHdpbmRvdy5fX3Jl c3VsdC5wdXNoKCJBZnRlciBkaXNhYmxlOiIpOwotICAgICAgICB3aW5kb3cuX19yZXN1bHQgPSB3 aW5kb3cuX19yZXN1bHQuY29uY2F0KGZyb250ZW5kX2dldFNlbGVjdGVkRWxlbWVudFN0eWxlcyh0 cnVlKSk7CisgICAgICAgIHRlc3RDb250cm9sbGVyLnJlc3VsdHMucHVzaCgiQWZ0ZXIgZGlzYWJs ZToiKTsKKyAgICAgICAgdGVzdENvbnRyb2xsZXIucmVzdWx0cyA9IHRlc3RDb250cm9sbGVyLnJl c3VsdHMuY29uY2F0KGZyb250ZW5kX2dldFNlbGVjdGVkRWxlbWVudFN0eWxlcyh0cnVlKSk7CiAg ICAgICAgIHRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUod2luZG93Ll9fcmVzdWx0KTsKICAgICB9 CiAgICAgZnJvbnRlbmRfc2VsZWN0RWxlbWVudEFuZFJ1bih0ZXN0Q29udHJvbGxlciwgIm5lc3Rl ZCIsIHJlcG9ydFJlc3VsdHMpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0 eWxlcy1kaXNhYmxlLXRoZW4tZGVsZXRlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWRlbGV0ZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjI4NTQ5ZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWRlbGV0ZS1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxNyBAQAorVGVzdHMgdGhhdCByZW1vdmFsIG9mIHByb3BlcnR5IGZvbGxvd2lu ZyBpdHMgZGlzYWJsaW5nIHdvcmtzLgorCitCZWZvcmUgZGlzYWJsZQorW2V4cGFuZGVkXSBlbGVt ZW50LnN0eWxlIHsgKGVsZW1lbnTigJlzIOKAnHN0eWxl4oCdIGF0dHJpYnV0ZSkKK2ZvbnQtd2Vp Z2h0OiBib2xkOworCisKK0FmdGVyIGRpc2FibGUKK1tleHBhbmRlZF0gZWxlbWVudC5zdHlsZSB7 IChlbGVtZW504oCZcyDigJxzdHlsZeKAnSBhdHRyaWJ1dGUpCisvLS0gb3ZlcmxvYWRlZCAtLS8g Ly0tIGRpc2FibGVkIC0tLyBmb250LXdlaWdodDogYm9sZDsKKworCitBZnRlciBkZWxldGUKK1tl eHBhbmRlZF0gZWxlbWVudC5zdHlsZSB7IChlbGVtZW504oCZcyDigJxzdHlsZeKAnSBhdHRyaWJ1 dGUpCisKKworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzLWRpc2Fi bGUtdGhlbi1kZWxldGUuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJs ZS10aGVuLWRlbGV0ZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUy MTQzYjMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzLWRp c2FibGUtdGhlbi1kZWxldGUuaHRtbApAQCAtMCwwICsxLDgxIEBACis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdCBzcmM9Ii4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzIj48 L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJlbGVtZW50cy10ZXN0cy5qcyI+PC9zY3JpcHQ+Cis8c2Ny aXB0PgorCitmdW5jdGlvbiBkb2l0KCkKK3sKKyAgICBmdW5jdGlvbiBjYWxsYmFjayhyZXN1bHQp CisgICAgeworICAgICAgICBkdW1wQXJyYXkocmVzdWx0KTsKKyAgICAgICAgbm90aWZ5RG9uZSgp OworICAgIH0KKyAgICBldmFsdWF0ZUluV2ViSW5zcGVjdG9yKCJmcm9udGVuZF9ydW5UZXN0Iiwg Y2FsbGJhY2spOworfQorCisvLyBGcm9udGVuZCBmdW5jdGlvbnMuCisKK2Z1bmN0aW9uIGZyb250 ZW5kX3J1blRlc3QodGVzdENvbnRyb2xsZXIpCit7CisgICAgdGVzdENvbnRyb2xsZXIud2FpdFVu dGlsRG9uZSgpOworICAgIGZyb250ZW5kX2V4cGFuZERPTVN1YnRyZWVBbmRSdW4odGVzdENvbnRy b2xsZXIsIG51bGwsIGZyb250ZW5kX3NlbGVjdENvbnRhaW5lckVsZW1lbnRDb250aW51YXRpb24p OworfQorCitmdW5jdGlvbiBmcm9udGVuZF9zZWxlY3RDb250YWluZXJFbGVtZW50Q29udGludWF0 aW9uKHRlc3RDb250cm9sbGVyKQoreworICAgIGZyb250ZW5kX3NlbGVjdEVsZW1lbnRBbmRSdW4o dGVzdENvbnRyb2xsZXIsICJjb250YWluZXIiLCBmcm9udGVuZF9kaXNhYmxlQ29udGFpbmVyU3R5 bGUpOworfQorCitmdW5jdGlvbiBmcm9udGVuZF9kaXNhYmxlQ29udGFpbmVyU3R5bGUodGVzdENv bnRyb2xsZXIpCit7CisgICAgdmFyIHRyZWVJdGVtID0gZnJvbnRlbmRfZ2V0RWxlbWVudFN0eWxl UHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQiKTsKKyAgICB0ZXN0Q29udHJvbGxlci5yZXN1 bHRzLnB1c2goIkJlZm9yZSBkaXNhYmxlIik7CisgICAgdGVzdENvbnRyb2xsZXIucmVzdWx0cyA9 IHRlc3RDb250cm9sbGVyLnJlc3VsdHMuY29uY2F0KGZyb250ZW5kX2dldFNlbGVjdGVkRWxlbWVu dFN0eWxlcyh0cnVlLCB0cnVlKSk7CisKKyAgICB0cmVlSXRlbS50b2dnbGVFbmFibGVkKHsgdGFy Z2V0OiB7IGNoZWNrZWQ6IGZhbHNlIH0gfSk7CisgICAgdGVzdENvbnRyb2xsZXIucnVuQWZ0ZXJQ ZW5kaW5nRGlzcGF0Y2hlcyhmcm9udGVuZF9kZWxldGVDb250YWluZXJTdHlsZS5iaW5kKHRoaXMs IHRlc3RDb250cm9sbGVyKSk7Cit9CisKK2Z1bmN0aW9uIGZyb250ZW5kX2RlbGV0ZUNvbnRhaW5l clN0eWxlKHRlc3RDb250cm9sbGVyKQoreworICAgIHZhciB0cmVlSXRlbSA9IGZyb250ZW5kX2dl dEVsZW1lbnRTdHlsZVByb3BlcnR5VHJlZUl0ZW0oImZvbnQtd2VpZ2h0Iik7CisgICAgdGVzdENv bnRyb2xsZXIucmVzdWx0cy5wdXNoKCJBZnRlciBkaXNhYmxlIik7CisgICAgdGVzdENvbnRyb2xs ZXIucmVzdWx0cyA9IHRlc3RDb250cm9sbGVyLnJlc3VsdHMuY29uY2F0KGZyb250ZW5kX2dldFNl bGVjdGVkRWxlbWVudFN0eWxlcyh0cnVlLCB0cnVlKSk7CisKKyAgICB0cmVlSXRlbS5hcHBseVN0 eWxlVGV4dCgiIiwgdHJ1ZSk7CisgICAgdGVzdENvbnRyb2xsZXIucnVuQWZ0ZXJQZW5kaW5nRGlz cGF0Y2hlcyhmcm9udGVuZF9yZXNlbGVjdE5vZGVBbmREdW1wUmVzdWx0cy5iaW5kKHRoaXMsIHRl c3RDb250cm9sbGVyKSk7Cit9CisKK2Z1bmN0aW9uIGZyb250ZW5kX3Jlc2VsZWN0Tm9kZUFuZER1 bXBSZXN1bHRzKHRlc3RDb250cm9sbGVyKQoreworICAgIGZ1bmN0aW9uIGNvbnRpbnVhdGlvbigp CisgICAgeworICAgICAgICBmcm9udGVuZF9zZWxlY3RFbGVtZW50QW5kUnVuKHRlc3RDb250cm9s bGVyLCAiY29udGFpbmVyIiwgZnJvbnRlbmRfZHVtcFJlc3VsdHMpOworICAgIH0KKyAgICBmcm9u dGVuZF9zZWxlY3RFbGVtZW50QW5kUnVuKHRlc3RDb250cm9sbGVyLCAib3RoZXIiLCBjb250aW51 YXRpb24pOworfQorCitmdW5jdGlvbiBmcm9udGVuZF9kdW1wUmVzdWx0cyh0ZXN0Q29udHJvbGxl cikKK3sKKyAgICB2YXIgdHJlZUl0ZW0gPSBmcm9udGVuZF9nZXRFbGVtZW50U3R5bGVQcm9wZXJ0 eVRyZWVJdGVtKCJmb250LXdlaWdodCIpOworICAgIHRlc3RDb250cm9sbGVyLnJlc3VsdHMucHVz aCgiQWZ0ZXIgZGVsZXRlIik7CisgICAgdGVzdENvbnRyb2xsZXIucmVzdWx0cyA9IHRlc3RDb250 cm9sbGVyLnJlc3VsdHMuY29uY2F0KGZyb250ZW5kX2dldFNlbGVjdGVkRWxlbWVudFN0eWxlcyh0 cnVlLCB0cnVlKSk7CisgICAgdGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworfQorPC9zY3Jp cHQ+Cis8L2hlYWQ+CisKKzxib2R5IG9ubG9hZD0ib25sb2FkKCkiPgorPHA+CitUZXN0cyB0aGF0 IHJlbW92YWwgb2YgcHJvcGVydHkgZm9sbG93aW5nIGl0cyBkaXNhYmxpbmcgd29ya3MuCis8L3A+ CisKKzxkaXYgaWQ9ImNvbnRhaW5lciIgc3R5bGU9ImZvbnQtd2VpZ2h0OmJvbGQiPgorPC9kaXY+ CisKKzxkaXYgaWQ9Im90aGVyIj4KKzwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzLWRpc2FibGUtdGhlbi1lbmFibGUuaHRt bCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWVuYWJsZS5odG1s CmluZGV4IGU1NTY0M2MuLjcwMTkzMzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9zdHlsZXMtZGlzYWJsZS10aGVuLWVuYWJsZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zdHlsZXMtZGlzYWJsZS10aGVuLWVuYWJsZS5odG1sCkBAIC0zMCw4ICszMCw4IEBAIGZ1 bmN0aW9uIGZyb250ZW5kX3NlbGVjdENvbnRhaW5lckVsZW1lbnRDb250aW51YXRpb24odGVzdENv bnRyb2xsZXIpCiBmdW5jdGlvbiBmcm9udGVuZF9kaXNhYmxlQ29udGFpbmVyU3R5bGUodGVzdENv bnRyb2xsZXIpCiB7CiAgICAgdmFyIHRyZWVJdGVtID0gZnJvbnRlbmRfZ2V0RWxlbWVudFN0eWxl UHJvcGVydHlUcmVlSXRlbSgiZm9udC13ZWlnaHQiKTsKLSAgICB3aW5kb3cuX19yZXN1bHQgPSBb IkJlZm9yZSBkaXNhYmxlIl07Ci0gICAgZnJvbnRlbmRfZHVtcFN0eWxlVHJlZUl0ZW0odHJlZUl0 ZW0sIHdpbmRvdy5fX3Jlc3VsdCwgIiIpOworICAgIHRlc3RDb250cm9sbGVyLnJlc3VsdHMucHVz aCgiQmVmb3JlIGRpc2FibGUiKTsKKyAgICBmcm9udGVuZF9kdW1wU3R5bGVUcmVlSXRlbSh0cmVl SXRlbSwgdGVzdENvbnRyb2xsZXIucmVzdWx0cywgIiIpOwogCiAgICAgdHJlZUl0ZW0udG9nZ2xl RW5hYmxlZCh7IHRhcmdldDogeyBjaGVja2VkOiBmYWxzZSB9IH0pOwogICAgIHRlc3RDb250cm9s bGVyLnJ1bkFmdGVyUGVuZGluZ0Rpc3BhdGNoZXMoZnJvbnRlbmRfZW5hYmxlQ29udGFpbmVyU3R5 bGUuYmluZCh0aGlzLCB0ZXN0Q29udHJvbGxlcikpOwpAQCAtNDAsMjEgKzQwLDE5IEBAIGZ1bmN0 aW9uIGZyb250ZW5kX2Rpc2FibGVDb250YWluZXJTdHlsZSh0ZXN0Q29udHJvbGxlcikKIGZ1bmN0 aW9uIGZyb250ZW5kX2VuYWJsZUNvbnRhaW5lclN0eWxlKHRlc3RDb250cm9sbGVyKQogewogICAg IHZhciB0cmVlSXRlbSA9IGZyb250ZW5kX2dldEVsZW1lbnRTdHlsZVByb3BlcnR5VHJlZUl0ZW0o ImZvbnQtd2VpZ2h0Iik7Ci0gICAgd2luZG93Ll9fcmVzdWx0LnB1c2goIkFmdGVyIGRpc2FibGUi KTsKLSAgICBmcm9udGVuZF9kdW1wU3R5bGVUcmVlSXRlbSh0cmVlSXRlbSwgd2luZG93Ll9fcmVz dWx0LCAiIik7CisgICAgdGVzdENvbnRyb2xsZXIucmVzdWx0cy5wdXNoKCJBZnRlciBkaXNhYmxl Iik7CisgICAgZnJvbnRlbmRfZHVtcFN0eWxlVHJlZUl0ZW0odHJlZUl0ZW0sIHRlc3RDb250cm9s bGVyLnJlc3VsdHMsICIiKTsKIAogICAgIHRyZWVJdGVtLnRvZ2dsZUVuYWJsZWQoeyB0YXJnZXQ6 IHsgY2hlY2tlZDogdHJ1ZSB9IH0pOwogICAgIHRlc3RDb250cm9sbGVyLnJ1bkFmdGVyUGVuZGlu Z0Rpc3BhdGNoZXMoZnJvbnRlbmRfZHVtcFJlc3VsdHMuYmluZCh0aGlzLCB0ZXN0Q29udHJvbGxl cikpOwotCi0gICAgdGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZShyZXN1bHQpOwogfQogCiBmdW5j dGlvbiBmcm9udGVuZF9kdW1wUmVzdWx0cyh0ZXN0Q29udHJvbGxlcikKIHsKICAgICB2YXIgdHJl ZUl0ZW0gPSBmcm9udGVuZF9nZXRFbGVtZW50U3R5bGVQcm9wZXJ0eVRyZWVJdGVtKCJmb250LXdl aWdodCIpOwotICAgIHdpbmRvdy5fX3Jlc3VsdC5wdXNoKCJBZnRlciBlbmFibGUiKTsKLSAgICBm cm9udGVuZF9kdW1wU3R5bGVUcmVlSXRlbSh0cmVlSXRlbSwgd2luZG93Ll9fcmVzdWx0LCAiIik7 Ci0gICAgdGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSh3aW5kb3cuX19yZXN1bHQpOworICAgIHRl c3RDb250cm9sbGVyLnJlc3VsdHMucHVzaCgiQWZ0ZXIgZW5hYmxlIik7CisgICAgZnJvbnRlbmRf ZHVtcFN0eWxlVHJlZUl0ZW0odHJlZUl0ZW0sIHRlc3RDb250cm9sbGVyLnJlc3VsdHMsICIiKTsK KyAgICB0ZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKHRlc3RDb250cm9sbGVyLnJlc3VsdHMpOwog fQogPC9zY3JpcHQ+CiA8L2hlYWQ+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDgzM2Q3ODMuLjYzZDkwYzAgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTAtMDUtMTMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog QSBkaXNhYmxlZCBzdHlsZSBwcm9wZXJ0eSBjYW5ub3QgYmUgZGVsZXRlZC4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkwNTcKKworICAgICAgICAq IGluc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JET01BZ2VudDo6YXBwbHlTdHlsZVRleHQpOgorCiAyMDEwLTA1LTEzICBKb3NlcGggUGVj b3Jhcm8gIDxqb2VwZWNrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwg RmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50 LmNwcCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBlYzEz ZWU5Li4xMTY0NzM2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01B Z2VudC5jcHAKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBA IC05MDYsNiArOTA2LDExIEBAIHZvaWQgSW5zcGVjdG9yRE9NQWdlbnQ6OmFwcGx5U3R5bGVUZXh0 KGxvbmcgY2FsbElkLCBsb25nIHN0eWxlSWQsIGNvbnN0IFN0cmluZyYKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAorICAgIC8vIFJlbW92ZSBkaXNhYmxlZCBwcm9wZXJ0eSBlbnRyeSBmb3IgcHJv cGVydHkgd2l0aCBnaXZlbiBuYW1lLiAKKyAgICBJZFRvRGlzYWJsZWRTdHlsZU1hcDo6aXRlcmF0 b3IgZGlzYWJsZWRJdCA9IGNzc1N0b3JlKCktPmlkVG9EaXNhYmxlZFN0eWxlLmZpbmQoc3R5bGVJ ZCk7CisgICAgaWYgKGRpc2FibGVkSXQgIT0gY3NzU3RvcmUoKS0+aWRUb0Rpc2FibGVkU3R5bGUu ZW5kKCkpCisgICAgICAgIGRpc2FibGVkSXQtPnNlY29uZC5yZW1vdmUocHJvcGVydHlOYW1lKTsK KwogICAgIENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlID0gaXQtPnNlY29uZC5nZXQoKTsKICAg ICBpbnQgc3R5bGVUZXh0TGVuZ3RoID0gc3R5bGVUZXh0Lmxlbmd0aCgpOwogCkBAIC05NzMsNiAr OTc4LDkgQEAgdm9pZCBJbnNwZWN0b3JET01BZ2VudDo6YXBwbHlTdHlsZVRleHQobG9uZyBjYWxs SWQsIGxvbmcgc3R5bGVJZCwgY29uc3QgU3RyaW5nJgogICAgICAgICAvLyBTZXQgdGhlIHByb3Bl cnR5IG9uIHRoZSByZWFsIHN0eWxlIGRlY2xhcmF0aW9uLgogICAgICAgICBFeGNlcHRpb25Db2Rl IGVjID0gMDsKICAgICAgICAgc3R5bGUtPnNldFByb3BlcnR5KG5hbWUsIHZhbHVlLCBwcmlvcml0 eSwgZWMpOworICAgICAgICAvLyBSZW1vdmUgZGlzYWJsZWQgcHJvcGVydHkgZW50cnkgZm9yIHBy b3BlcnR5IHdpdGggdGhpcyBuYW1lLiAKKyAgICAgICAgaWYgKGRpc2FibGVkSXQgIT0gY3NzU3Rv cmUoKS0+aWRUb0Rpc2FibGVkU3R5bGUuZW5kKCkpCisgICAgICAgICAgICBkaXNhYmxlZEl0LT5z ZWNvbmQucmVtb3ZlKG5hbWUpOwogICAgICAgICBjaGFuZ2VkUHJvcGVydGllcy5hcHBlbmQobmFt ZSk7CiAgICAgfQogICAgIG1fZnJvbnRlbmQtPmRpZEFwcGx5U3R5bGVUZXh0KGNhbGxJZCwgdHJ1 ZSwgYnVpbGRPYmplY3RGb3JTdHlsZShzdHlsZSwgdHJ1ZSksIHRvQXJyYXkoY2hhbmdlZFByb3Bl cnRpZXMpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXN0Q29u dHJvbGxlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXN0Q29udHJvbGxlci5q cwppbmRleCBiMjYzMGFlLi4zYmZlMjhjIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGVzdENvbnRyb2xsZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Rlc3RDb250cm9sbGVyLmpzCkBAIC0zMiw2ICszMiw3IEBAIFdlYkluc3BlY3Rvci5UZXN0 Q29udHJvbGxlciA9IGZ1bmN0aW9uKGNhbGxJZCkKIHsKICAgICB0aGlzLl9jYWxsSWQgPSBjYWxs SWQ7CiAgICAgdGhpcy5fd2FpdFVudGlsRG9uZSA9IGZhbHNlOworICAgIHRoaXMucmVzdWx0cyA9 IFtdOwogfQogCiBXZWJJbnNwZWN0b3IuVGVzdENvbnRyb2xsZXIucHJvdG90eXBlID0gewpAQCAt NDIsNiArNDMsOCBAQCBXZWJJbnNwZWN0b3IuVGVzdENvbnRyb2xsZXIucHJvdG90eXBlID0gewog CiAgICAgbm90aWZ5RG9uZTogZnVuY3Rpb24ocmVzdWx0KQogICAgIHsKKyAgICAgICAgaWYgKHR5 cGVvZiByZXN1bHQgPT09ICJ1bmRlZmluZWQiICYmIHRoaXMucmVzdWx0cy5sZW5ndGgpCisgICAg ICAgICAgICByZXN1bHQgPSB0aGlzLnJlc3VsdHM7CiAgICAgICAgIHZhciBtZXNzYWdlID0gdHlw ZW9mIHJlc3VsdCA9PT0gInVuZGVmaW5lZCIgPyAiXCI8dW5kZWZpbmVkPlwiIiA6IEpTT04uc3Ry aW5naWZ5KHJlc3VsdCk7CiAgICAgICAgIEluc3BlY3RvckJhY2tlbmQuZGlkRXZhbHVhdGVGb3JU ZXN0SW5Gcm9udGVuZCh0aGlzLl9jYWxsSWQsIG1lc3NhZ2UpOwogICAgIH0sCg==