54397 2011-02-14 09:28:43 -0800 Web Inspector: Support external CSS stylesheet freeflow text editing 2011-03-29 11:01:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov abarth apavlov bweinstein eric joepeck keishi loislo paulirish peter pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 350704 0 apavlov 2011-02-14 09:28:43 -0800 Users ask for an ability to edit the external CSS textual content (rather than structured rules). 366080 1 85489 apavlov 2011-03-11 10:23:26 -0800 Created attachment 85489 [PATCH] Preliminary solution 375410 2 87343 apavlov 2011-03-29 09:15:54 -0700 Created attachment 87343 [PATCH] Suggested complete solution 375448 3 87343 yurys 2011-03-29 09:49:02 -0700 Comment on attachment 87343 [PATCH] Suggested complete solution View in context: https://bugs.webkit.org/attachment.cgi?id=87343&action=review > Source/WebCore/inspector/front-end/ResourceView.js:148 > + canEditScriptSource: function() Please move this methods into a CSS-specific SourceFrameDelegate, otherwise looks good. 375453 4 87352 apavlov 2011-03-29 10:01:06 -0700 Created attachment 87352 [PATCH] Comment addressed 375456 5 87352 yurys 2011-03-29 10:04:14 -0700 Comment on attachment 87352 [PATCH] Comment addressed View in context: https://bugs.webkit.org/attachment.cgi?id=87352&action=review > Source/WebCore/inspector/front-end/ResourceView.js:172 > + this.styleSheet = styleSheet; styleSheet should be private, please fix before landing. 375497 6 apavlov 2011-03-29 10:36:27 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M Source/WebCore/ChangeLog M Source/WebCore/inspector/front-end/ResourceView.js M Source/WebCore/inspector/front-end/ResourcesPanel.js M Source/WebCore/inspector/front-end/SourceFrame.js Committed r82274 375540 7 webkit.review.bot 2011-03-29 11:01:16 -0700 http://trac.webkit.org/changeset/82274 might have broken Leopard Intel Debug (Tests) 85489 2011-03-11 10:23:26 -0800 2011-03-29 09:15:54 -0700 [PATCH] Preliminary solution editstylesheet.patch text/plain 8456 apavlov Y29tbWl0IDI5MjhhMGNkM2FhMGJlY2JjNDBhZDRjZDJmNzFmNzAxMzEzNjFjZDAKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUaHUgRmViIDI0 IDE0OjQ5OjQ5IDIwMTEgKzAzMDAKCiAgICBXSVAgLSBlZGl0IHN0eWxlc2hlZXQKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggNTc3OTY2MS4uNmQ5NTg4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDEx LTAzLTExICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog U3VwcG9ydCBleHRlcm5hbCBDU1Mgc3R5bGVzaGVldCBmcmVlZmxvdyB0ZXh0IGVkaXRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzk3CisKKyAg ICAgICAgVGhpcyBpcyBhbiBpbml0aWFsIHN0YWIgdGhhdCByZWxpZXMgb24gdGhlIGN1cnJlbnQg c3RhdGUgb2YgU291cmNlRnJhbWUvVGV4dFZpZXdlciBhbmQgaXMgc3ViamVjdCB0byBjaGFuZ2Uu CisgICAgICAgIExpdmUgcGFnZSB1cGRhdGUgKGFzIHRoZSB1c2VyIHR5cGVzKSBpcyBub3QgaW1w bGVtZW50ZWQgYXQgdGhlIG1vbWVudCAtLSBDdHJsL0NtZC1TIHNob3VsZCBiZSBoaXQuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUuX3N0eWxlU2hlZXRDaGFuZ2VkLmNh bGxiYWNrKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5f c3R5bGVTaGVldENoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwu cHJvdG90eXBlLl9vblJldmVydCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVl dC5wcm90b3R5cGUuc2V0VGV4dCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNv dXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZv clJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5j YW5FZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2UuaGFuZGxl U3R5bGVTaGVldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZv clJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5lZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBl Ll9zYXZlU3R5bGVTaGVldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5faXNTdHlsZXNoZWV0KToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fYXBwbHlEaWZmTWFya3VwKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9jb250 ZW50Q2hhbmdlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qczoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY3JlYXRlVGV4dFZpZXdlcik6CisK KzIwMTEtMDMtMTEgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwog ICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGhvdmVyIG92ZXIgZWxlbWVudHMgaW4gRWxlbWVudHMgcGFuZWwgZG9lcyBub3QgaGln aGxpZ2h0IG5vZGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0NTU1N0eWxlTW9kZWwuanMKaW5kZXggMGU3Y2Q0OS4uNjI4ZWZlYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DU1NTdHlsZU1vZGVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ1NTU3R5bGVNb2RlbC5qcwpAQCAtMTYz LDggKzE2MywxMCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGhyZWYsIGNvbnRlbnQpCiAgICAgICAgIHsKICAgICAg ICAgICAgIHZhciByZXNvdXJjZSA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTChocmVmKTsK LSAgICAgICAgICAgIGlmIChyZXNvdXJjZSAmJiByZXNvdXJjZS50eXBlID09PSBXZWJJbnNwZWN0 b3IuUmVzb3VyY2UuVHlwZS5TdHlsZXNoZWV0KQorICAgICAgICAgICAgaWYgKHJlc291cmNlICYm IHJlc291cmNlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlN0eWxlc2hlZXQp IHsKICAgICAgICAgICAgICAgICByZXNvdXJjZS5zZXRDb250ZW50KGNvbnRlbnQsIHRoaXMuX29u UmV2ZXJ0LmJpbmQodGhpcywgc3R5bGVTaGVldElkKSk7CisgICAgICAgICAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoInN0eWxlc2hlZXQgY2hhbmdlZCIpOworICAgICAgICAg ICAgfQogICAgICAgICB9CiAgICAgICAgIENTU0FnZW50LmdldFN0eWxlU2hlZXRUZXh0KHN0eWxl U2hlZXRJZCwgY2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAgfSwKQEAgLTE3NCw3ICsxNzYsNiBA QCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZ1bmN0 aW9uIGNhbGxiYWNrKHN1Y2Nlc3MpCiAgICAgICAgIHsKICAgICAgICAgICAgIHRoaXMuX3N0eWxl U2hlZXRDaGFuZ2VkKHN0eWxlU2hlZXRJZCwgdHJ1ZSk7Ci0gICAgICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycygic3R5bGVzaGVldCBjaGFuZ2VkIik7CiAgICAgICAgIH0KICAg ICAgICAgQ1NTQWdlbnQuc2V0U3R5bGVTaGVldFRleHQoc3R5bGVTaGVldElkLCBjb250ZW50VG9S ZXZlcnRUbywgY2FsbGJhY2suYmluZCh0aGlzKSk7CiAgICAgfQpAQCAtNTU5LDE0ICs1NjAsMTIg QEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlU2hlZXQucHJvdG90eXBlID0gewogCiAgICAgc2V0VGV4 dDogZnVuY3Rpb24obmV3VGV4dCwgdXNlckNhbGxiYWNrKQogICAgIHsKLSAgICAgICAgZnVuY3Rp b24gY2FsbGJhY2soc3R5bGVTaGVldFBheWxvYWQpCisgICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNr KHN1Y2Nlc3MpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGlmICghc3R5bGVTaGVldFBheWxvYWQp Ci0gICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKG51bGwpOwotICAgICAgICAgICAgZWxzZSB7 Ci0gICAgICAgICAgICAgICAgdXNlckNhbGxiYWNrKG5ldyBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVT aGVldChzdHlsZVNoZWV0UGF5bG9hZCkpOworICAgICAgICAgICAgaWYgKHVzZXJDYWxsYmFjaykK KyAgICAgICAgICAgICAgICB1c2VyQ2FsbGJhY2soc3VjY2Vzcyk7CisgICAgICAgICAgICBpZiAo c3VjY2VzcykKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwuX3N0eWxlU2hl ZXRDaGFuZ2VkKHRoaXMuaWQsIHRydWUpOwotICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAg ICAgICAgQ1NTQWdlbnQuc2V0U3R5bGVTaGVldFRleHQodGhpcy5pZCwgbmV3VGV4dCwgY2FsbGJh Y2suYmluZCh0aGlzKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUmVzb3VyY2VWaWV3LmpzCmluZGV4IDgzY2Y5OWQ1Li4zNmI2MGNhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwpAQCAtMTQz LDYgKzE0Myw1MCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNl c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGNhbGxiYWNrKG1pbWVUeXBlLCBuZXcg V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lQ29udGVudCh0ZXh0LCBzb3VyY2VNYXBwaW5nLCBbXSkp OwogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3Jlc291cmNlLnJlcXVlc3RDb250ZW50KGNvbnRl bnRMb2FkZWQuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIGNhbkVkaXRTY3JpcHRTb3VyY2U6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9pc1N0eWxlc2hlZXQoKTsK KyAgICB9LAorCisgICAgZWRpdFNjcmlwdFNvdXJjZTogZnVuY3Rpb24obmV3VGV4dCkKKyAgICB7 CisgICAgICAgIGlmICghdGhpcy5faXNTdHlsZXNoZWV0KCkpCisgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgZnVuY3Rpb24gaGFuZGxlU3R5bGVTaGVldChuZXdUZXh0LCByZW1haW5pbmdT aGVldElkcywgc3R5bGVTaGVldCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKHN0eWxlU2hl ZXQgJiYgc3R5bGVTaGVldC5zb3VyY2VVUkwgPT09IHRoaXMuX3Jlc291cmNlLnVybCkgeworICAg ICAgICAgICAgICAgIHRoaXMuc3R5bGVTaGVldCA9IHN0eWxlU2hlZXQ7CisgICAgICAgICAgICAg ICAgdGhpcy5fc2F2ZVN0eWxlU2hlZXQobmV3VGV4dCk7CisgICAgICAgICAgICB9CisKKyAgICAg ICAgICAgIHZhciBuZXh0SWQgPSByZW1haW5pbmdTaGVldElkcyA/IHJlbWFpbmluZ1NoZWV0SWRz LnNoaWZ0KCkgOiBudWxsOworICAgICAgICAgICAgaWYgKG5leHRJZCkKKyAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5jcmVhdGVGb3JJZChuZXh0SWQsIGhhbmRsZVN0 eWxlU2hlZXQuYmluZCh0aGlzLCBuZXdUZXh0LCByZW1haW5pbmdTaGVldElkcykpOworICAgICAg ICB9CisKKyAgICAgICAgaWYgKHRoaXMuc3R5bGVTaGVldCkKKyAgICAgICAgICAgIHRoaXMuX3Nh dmVTdHlsZVNoZWV0KG5ld3RleHQpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBDU1NBZ2Vu dC5nZXRBbGxTdHlsZXMoaGFuZGxlU3R5bGVTaGVldC5iaW5kKHRoaXMsIG5ld1RleHQpKTsKKyAg ICB9LAorCisgICAgX3NhdmVTdHlsZVNoZWV0OiBmdW5jdGlvbihuZXdUZXh0KQorICAgIHsKKyAg ICAgICAgZnVuY3Rpb24gY2FsbGJhY2soc3VjY2VzcykKKyAgICAgICAgeworICAgICAgICAgICAg aWYgKCFzdWNjZXNzKQorICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKCJGYWlsZWQgdG8gc2F2 ZSBzdHlsZXNoZWV0Iik7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLnN0eWxlU2hlZXQuc2V0 VGV4dChuZXdUZXh0LCBjYWxsYmFjay5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgX2lzU3R5 bGVzaGVldDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNl LnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlN0eWxlc2hlZXQ7CiAgICAgfQog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qcwppbmRleCAzMmRjYzk5Li5lZGQ1NjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTM4Miw4ICsz ODIsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgIH0s CiAKICAgICBfYXBwbHlEaWZmTWFya3VwOiBmdW5jdGlvbih2aWV3LCBiYXNlQ29udGVudCwgbmV3 Q29udGVudCkgewotICAgICAgICB2YXIgb2xkTGluZXMgPSBiYXNlQ29udGVudC5zcGxpdCgiXG4i KTsKLSAgICAgICAgdmFyIG5ld0xpbmVzID0gbmV3Q29udGVudC5zcGxpdCgiXG4iKTsKKyAgICAg ICAgdmFyIG9sZExpbmVzID0gYmFzZUNvbnRlbnQuc3BsaXQoL1xyP1xuLyk7CisgICAgICAgIHZh ciBuZXdMaW5lcyA9IG5ld0NvbnRlbnQuc3BsaXQoL1xyP1xuLyk7CiAKICAgICAgICAgdmFyIGRp ZmYgPSBBcnJheS5kaWZmKG9sZExpbmVzLCBuZXdMaW5lcyk7CiAKQEAgLTEwNzYsNyArMTA3Niw3 IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog ICAgICAgICBpZiAob2xkVmlldykgewogICAgICAgICAgICAgdmFyIG5ld1ZpZXcgPSBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VWaWV3LnJlY3JlYXRlUmVzb3VyY2VWaWV3KHRoaXMuX3Jlc291cmNlKTsK ICAgICAgICAgICAgIGlmIChvbGRWaWV3ID09PSB0aGlzLl9zdG9yYWdlUGFuZWwudmlzaWJsZVZp ZXcpCi0gICAgICAgICAgICAgICAgdGhpcy5fc3RvcmFnZVBhbmVsLnZpc2libGVWaWV3ID0gbmV3 VmlldzsKKyAgICAgICAgICAgICAgICB0aGlzLl9zdG9yYWdlUGFuZWwuX3Nob3dSZXNvdXJjZVZp ZXcodGhpcy5fcmVzb3VyY2UpOwogICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKaW5kZXggMGIxZmNlOC4uMDhkZDc1 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5n cy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpz CkBAIC0zMCw3ICszMCw4IEBACiAKIAogdmFyIFByZWZlcmVuY2VzID0gewotICAgIGNhbkVkaXRT Y3JpcHRTb3VyY2U6IGZhbHNlLAorICAgIGNhbkVkaXRTY3JpcHRTb3VyY2U6IHRydWUsCisgICAg c291cmNlRWRpdG9yRW5hYmxlZDogdHJ1ZSwKICAgICBtYXhJbmxpbmVUZXh0Q2hpbGRMZW5ndGg6 IDgwLAogICAgIG1pbkNvbnNvbGVIZWlnaHQ6IDc1LAogICAgIG1pblNpZGViYXJXaWR0aDogMTAw LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VG cmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUu anMKaW5kZXggMTE1N2IwMy4uN2MzYTAzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC0yMDQsOSArMjA0LDEyIEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBlbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5fY29udGV4dE1lbnUuYmluZCh0aGlz KSwgdHJ1ZSk7CiAgICAgICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93 biIsIHRoaXMuX21vdXNlRG93bi5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICAgICAgICAgIGVsZW1l bnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fbW91c2VNb3ZlLmJpbmQodGhp cyksIHRydWUpOwotICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkYmxjbGlj ayIsIHRoaXMuX2RvdWJsZUNsaWNrLmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICAgICAgZWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0aGlzKSwg dHJ1ZSk7CiAgICAgICAgIH0KKworICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUuY2FuRWRpdFNj cmlwdFNvdXJjZSgpKQorICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkYmxj bGljayIsIHRoaXMuX2RvdWJsZUNsaWNrLmJpbmQodGhpcyksIHRydWUpOworCiAgICAgICAgIHRo aXMuZWxlbWVudC5hcHBlbmRDaGlsZChlbGVtZW50KTsKIAogICAgICAgICB0aGlzLl90ZXh0Vmll d2VyLmJlZ2luVXBkYXRlcygpOwo= 87343 2011-03-29 09:15:54 -0700 2011-03-29 10:01:06 -0700 [PATCH] Suggested complete solution editstylesheet.patch text/plain 5969 apavlov Y29tbWl0IDdlNWIyMmJlMjIxYzliMmY1ZGZiY2MyNDZiZDhmNWIzYTEyNGJjNDQKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUaHUgRmViIDI0 IDE0OjQ5OjQ5IDIwMTEgKzAzMDAKCiAgICBXSVAgLSBlZGl0IHN0eWxlc2hlZXQKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggY2I2OWNkYi4uMWY2YmI1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEx LTAzLTE0ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog U3VwcG9ydCBleHRlcm5hbCBDU1Mgc3R5bGVzaGVldCBmcmVlZmxvdyB0ZXh0IGVkaXRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzk3CisKKyAg ICAgICAgSW4gdGhpcyBpbXBsZW1lbnRhdGlvbiwgQ3RybC9DbWQtUyBjb21taXRzIHRoZSBjdXJy ZW50IGNoYW5nZXMgaW50byB0aGUgbW9kZWwuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0NTU1N0eWxlTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVNb2Rl bC5wcm90b3R5cGUuX3N0eWxlU2hlZXRDaGFuZ2VkLmNhbGxiYWNrKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5DU1NTdHlsZU1vZGVsLnByb3RvdHlwZS5fc3R5bGVTaGVldENoYW5nZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlTW9kZWwucHJvdG90eXBlLl9vblJldmVydCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5wcm90b3R5cGUuc2V0VGV4dCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlw ZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxl Z2F0ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5jYW5FZGl0U2NyaXB0U291cmNlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwu cHJvdG90eXBlLmVkaXRTY3JpcHRTb3VyY2UuaGFuZGxlU3R5bGVTaGVldCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlw ZS5lZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9zYXZlU3R5bGVTaGVldCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsLnBy b3RvdHlwZS5faXNTdHlsZXNoZWV0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnBy b3RvdHlwZS5fYXBwbHlEaWZmTWFya3VwKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVJl c291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9jb250ZW50Q2hhbmdlZCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2NyZWF0ZVRleHRWaWV3ZXIpOgorCiAyMDExLTAzLTI5 ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKaW5kZXggODNjZjk5ZDUuLmUwNzVhNjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3Lmpz CkBAIC0xNDMsNiArMTQzLDU3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9y UmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgY2FsbGJhY2sobWltZVR5 cGUsIG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVDb250ZW50KHRleHQsIHNvdXJjZU1hcHBp bmcsIFtdKSk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fcmVzb3VyY2UucmVxdWVzdENvbnRl bnQoY29udGVudExvYWRlZC5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgY2FuRWRpdFNjcmlw dFNvdXJjZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2lzU3R5bGVz aGVldCgpOworICAgIH0sCisKKyAgICBlZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbihuZXdUZXh0 KQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl9pc1N0eWxlc2hlZXQoKSkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICBmdW5jdGlvbiBoYW5kbGVTdHlsZVNoZWV0KG5ld1RleHQsIHN0 eWxlU2hlZXQpCisgICAgICAgIHsKKyAgICAgICAgICAgIHRoaXMuc3R5bGVTaGVldCA9IHN0eWxl U2hlZXQ7CisgICAgICAgICAgICB0aGlzLl9zYXZlU3R5bGVTaGVldChuZXdUZXh0KTsKKyAgICAg ICAgfQorCisgICAgICAgIGZ1bmN0aW9uIGhhbmRsZUluZm9zKG5ld1RleHQsIGVycm9yLCBpbmZv cykKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKGVycm9yKQorICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgaW5mb3MubGVuZ3RoOyArK2kp IHsKKyAgICAgICAgICAgICAgICB2YXIgaW5mbyA9IGluZm9zW2ldOworICAgICAgICAgICAgICAg IGlmIChpbmZvLnNvdXJjZVVSTCA9PT0gdGhpcy5fcmVzb3VyY2UudXJsKSB7CisgICAgICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5DU1NTdHlsZVNoZWV0LmNyZWF0ZUZvcklkKGluZm8uc3R5 bGVTaGVldElkLCBoYW5kbGVTdHlsZVNoZWV0LmJpbmQodGhpcywgbmV3VGV4dCkpOworICAgICAg ICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKworICAgICAgICBpZiAodGhpcy5zdHlsZVNoZWV0KQorICAgICAgICAgICAgdGhp cy5fc2F2ZVN0eWxlU2hlZXQobmV3VGV4dCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIENT U0FnZW50LmdldEFsbFN0eWxlU2hlZXRzKGhhbmRsZUluZm9zLmJpbmQodGhpcywgbmV3VGV4dCkp OworICAgIH0sCisKKyAgICBfc2F2ZVN0eWxlU2hlZXQ6IGZ1bmN0aW9uKG5ld1RleHQpCisgICAg eworICAgICAgICBmdW5jdGlvbiBjYWxsYmFjayhzdWNjZXNzKQorICAgICAgICB7CisgICAgICAg ICAgICBpZiAoIXN1Y2Nlc3MpCisgICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcigiRmFpbGVk IHRvIHNhdmUgbW9kaWZpZWQgc3R5bGVzaGVldCAlcyIsIHRoaXMuX3Jlc291cmNlLnVybCk7Cisg ICAgICAgIH0KKworICAgICAgICB0aGlzLnN0eWxlU2hlZXQuc2V0VGV4dChuZXdUZXh0LCBjYWxs YmFjay5iaW5kKHRoaXMpKTsKKyAgICB9LAorCisgICAgX2lzU3R5bGVzaGVldDogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5UeXBlLlN0eWxlc2hlZXQ7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCA4 ZjFjYjI5Li5jMzI0OGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTQxOSw4ICs0MTksOCBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICBfYXBwbHlEaWZm TWFya3VwOiBmdW5jdGlvbih2aWV3LCBiYXNlQ29udGVudCwgbmV3Q29udGVudCkgewotICAgICAg ICB2YXIgb2xkTGluZXMgPSBiYXNlQ29udGVudC5zcGxpdCgiXG4iKTsKLSAgICAgICAgdmFyIG5l d0xpbmVzID0gbmV3Q29udGVudC5zcGxpdCgiXG4iKTsKKyAgICAgICAgdmFyIG9sZExpbmVzID0g YmFzZUNvbnRlbnQuc3BsaXQoL1xyP1xuLyk7CisgICAgICAgIHZhciBuZXdMaW5lcyA9IG5ld0Nv bnRlbnQuc3BsaXQoL1xyP1xuLyk7CiAKICAgICAgICAgdmFyIGRpZmYgPSBBcnJheS5kaWZmKG9s ZExpbmVzLCBuZXdMaW5lcyk7CiAKQEAgLTExMTEsNyArMTExMSw3IEBAIFdlYkluc3BlY3Rvci5G cmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAob2xkVmll dykgewogICAgICAgICAgICAgdmFyIG5ld1ZpZXcgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2VWaWV3 LnJlY3JlYXRlUmVzb3VyY2VWaWV3KHRoaXMuX3Jlc291cmNlKTsKICAgICAgICAgICAgIGlmIChv bGRWaWV3ID09PSB0aGlzLl9zdG9yYWdlUGFuZWwudmlzaWJsZVZpZXcpCi0gICAgICAgICAgICAg ICAgdGhpcy5fc3RvcmFnZVBhbmVsLnZpc2libGVWaWV3ID0gbmV3VmlldzsKKyAgICAgICAgICAg ICAgICB0aGlzLl9zdG9yYWdlUGFuZWwuX3Nob3dSZXNvdXJjZVZpZXcodGhpcy5fcmVzb3VyY2Up OwogICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggMDZkNzM1Mi4uNzQ4MmYzNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC0y MDEsOSArMjAxLDEyIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNvbnRleHRtZW51IiwgdGhpcy5f Y29udGV4dE1lbnUuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgICAgICAgICBlbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21vdXNlRG93bi5iaW5kKHRoaXMpLCB0cnVl KTsKICAgICAgICAgICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhp cy5fbW91c2VNb3ZlLmJpbmQodGhpcyksIHRydWUpOwotICAgICAgICAgICAgZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RvdWJsZUNsaWNrLmJpbmQodGhpcyksIHRy dWUpOwogICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlz Ll9zY3JvbGwuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgICAgIH0KKworICAgICAgICBpZiAodGhp cy5fZGVsZWdhdGUuY2FuRWRpdFNjcmlwdFNvdXJjZSgpKQorICAgICAgICAgICAgZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX2RvdWJsZUNsaWNrLmJpbmQodGhpcyks IHRydWUpOworCiAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChlbGVtZW50KTsKIAog ICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLmJlZ2luVXBkYXRlcygpOwo= 87352 2011-03-29 10:01:06 -0700 2011-03-29 10:04:14 -0700 [PATCH] Comment addressed editstylesheet.patch text/plain 7111 apavlov Y29tbWl0IGY3MDI4N2EzYWEwOWE3NDc3MDU5MDMyYzVlN2FmNTQxNjRhN2I1NDEKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBUaHUgRmViIDI0 IDE0OjQ5OjQ5IDIwMTEgKzAzMDAKCiAgICBXSVAgLSBlZGl0IHN0eWxlc2hlZXQKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggY2I2OWNkYi4uMDAzMWY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEx LTAzLTI5ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog U3VwcG9ydCBleHRlcm5hbCBDU1Mgc3R5bGVzaGVldCBmcmVlZmxvdyB0ZXh0IGVkaXRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzk3CisKKyAg ICAgICAgSW4gdGhpcyBpbXBsZW1lbnRhdGlvbiwgQ3RybC9DbWQtUyBjb21taXRzIHRoZSBjdXJy ZW50IGNoYW5nZXMgaW50byB0aGUgbW9kZWwuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVZpZXcu Y3JlYXRlUmVzb3VyY2VWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTb3VyY2VGcmFt ZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1Nv dXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuY2FuRWRpdFNjcmlw dFNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU291cmNlRnJhbWVEZWxlZ2F0ZUZv clJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5lZGl0U2NyaXB0U291cmNlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DU1NTb3VyY2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90 eXBlLmVkaXRTY3JpcHRTb3VyY2UuaGFuZGxlSW5mb3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNTU1NvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuX3NhdmVT dHlsZVNoZWV0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVs LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fYXBw bHlEaWZmTWFya3VwKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVs ZW1lbnQucHJvdG90eXBlLl9jb250ZW50Q2hhbmdlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUuX2NyZWF0ZVRleHRWaWV3ZXIpOgorCisyMDExLTAzLTI5ICBBbGV4YW5kZXIg UGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2 ZWwgRmVsZG1hbi4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBGaXggaGFuZGxpbmcgb2YgdGhl IENTU0FnZW50LnNldFN0eWxlU2hlZXRUZXh0KCkgcmVzdWx0cyBpbiBDU1NTdHlsZU1vZGVsLmpz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3 LmpzCmluZGV4IDgzY2Y5OWQ1Li42M2JhNzViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwpAQCAtNDUsMTUgKzQ1LDIwIEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rv ci5WaWV3LnByb3RvdHlwZTsKIAogV2ViSW5zcGVjdG9yLlJlc291cmNlVmlldy5jcmVhdGVSZXNv dXJjZVZpZXcgPSBmdW5jdGlvbihyZXNvdXJjZSkKIHsKKyAgICBmdW5jdGlvbiBzb3VyY2VGcmFt ZUZvckRlbGVnYXRlQW5kVVJMKGRlbGVnYXRlLCB1cmwpCisgICAgeworICAgICAgICB2YXIgdmll dyA9IG5ldyBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUoZGVsZWdhdGUsIHVybCk7CisgICAgICAg IHZpZXcucmVzb3VyY2UgPSByZXNvdXJjZTsKKyAgICAgICAgcmV0dXJuIHZpZXc7CisgICAgfQor CiAgICAgc3dpdGNoIChyZXNvdXJjZS5jYXRlZ29yeSkgewogICAgIGNhc2UgV2ViSW5zcGVjdG9y LnJlc291cmNlQ2F0ZWdvcmllcy5kb2N1bWVudHM6Ci0gICAgY2FzZSBXZWJJbnNwZWN0b3IucmVz b3VyY2VDYXRlZ29yaWVzLnN0eWxlc2hlZXRzOgogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291 cmNlQ2F0ZWdvcmllcy5zY3JpcHRzOgogICAgIGNhc2UgV2ViSW5zcGVjdG9yLnJlc291cmNlQ2F0 ZWdvcmllcy54aHI6Ci0gICAgICAgIHZhciBkZWxlZ2F0ZSA9IG5ldyBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsKHJlc291cmNlKTsKLSAgICAgICAgdmFy IHZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lKGRlbGVnYXRlLCByZXNvdXJjZS51 cmwpOwotICAgICAgICB2aWV3LnJlc291cmNlID0gcmVzb3VyY2U7Ci0gICAgICAgIHJldHVybiB2 aWV3OworICAgICAgICByZXR1cm4gc291cmNlRnJhbWVGb3JEZWxlZ2F0ZUFuZFVSTChuZXcgV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5lbChyZXNvdXJjZSks IHJlc291cmNlLnVybCk7CisgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVz LnN0eWxlc2hlZXRzOgorICAgICAgICByZXR1cm4gc291cmNlRnJhbWVGb3JEZWxlZ2F0ZUFuZFVS TChuZXcgV2ViSW5zcGVjdG9yLkNTU1NvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5l bChyZXNvdXJjZSksIHJlc291cmNlLnVybCk7CiAgICAgY2FzZSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VDYXRlZ29yaWVzLmltYWdlczoKICAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuSW1h Z2VWaWV3KHJlc291cmNlKTsKICAgICBjYXNlIFdlYkluc3BlY3Rvci5yZXNvdXJjZUNhdGVnb3Jp ZXMuZm9udHM6CkBAIC0xNDcsMyArMTUyLDU2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURl bGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogfQogCiBXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18g PSBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZS5wcm90b3R5cGU7CisKKworV2ViSW5z cGVjdG9yLkNTU1NvdXJjZUZyYW1lRGVsZWdhdGVGb3JSZXNvdXJjZXNQYW5lbCA9IGZ1bmN0aW9u KHJlc291cmNlKQoreworICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yUmVz b3VyY2VzUGFuZWwuY2FsbCh0aGlzLCByZXNvdXJjZSk7Cit9CisKK1dlYkluc3BlY3Rvci5DU1NT b3VyY2VGcmFtZURlbGVnYXRlRm9yUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0geworICAgIGNh bkVkaXRTY3JpcHRTb3VyY2U6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0cnVl OworICAgIH0sCisKKyAgICBlZGl0U2NyaXB0U291cmNlOiBmdW5jdGlvbihuZXdUZXh0KQorICAg IHsKKyAgICAgICAgZnVuY3Rpb24gaGFuZGxlU3R5bGVTaGVldChuZXdUZXh0LCBzdHlsZVNoZWV0 KQorICAgICAgICB7CisgICAgICAgICAgICB0aGlzLnN0eWxlU2hlZXQgPSBzdHlsZVNoZWV0Owor ICAgICAgICAgICAgdGhpcy5fc2F2ZVN0eWxlU2hlZXQobmV3VGV4dCk7CisgICAgICAgIH0KKwor ICAgICAgICBmdW5jdGlvbiBoYW5kbGVJbmZvcyhuZXdUZXh0LCBlcnJvciwgaW5mb3MpCisgICAg ICAgIHsKKyAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGluZm9zLmxlbmd0aDsgKytpKSB7CisgICAg ICAgICAgICAgICAgdmFyIGluZm8gPSBpbmZvc1tpXTsKKyAgICAgICAgICAgICAgICBpZiAoaW5m by5zb3VyY2VVUkwgPT09IHRoaXMuX3Jlc291cmNlLnVybCkgeworICAgICAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVTaGVldC5jcmVhdGVGb3JJZChpbmZvLnN0eWxlU2hlZXRJ ZCwgaGFuZGxlU3R5bGVTaGVldC5iaW5kKHRoaXMsIG5ld1RleHQpKTsKKyAgICAgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9 CisKKyAgICAgICAgaWYgKHRoaXMuc3R5bGVTaGVldCkKKyAgICAgICAgICAgIHRoaXMuX3NhdmVT dHlsZVNoZWV0KG5ld1RleHQpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBDU1NBZ2VudC5n ZXRBbGxTdHlsZVNoZWV0cyhoYW5kbGVJbmZvcy5iaW5kKHRoaXMsIG5ld1RleHQpKTsKKyAgICB9 LAorCisgICAgX3NhdmVTdHlsZVNoZWV0OiBmdW5jdGlvbihuZXdUZXh0KQorICAgIHsKKyAgICAg ICAgZnVuY3Rpb24gY2FsbGJhY2soc3VjY2VzcykKKyAgICAgICAgeworICAgICAgICAgICAgaWYg KCFzdWNjZXNzKQorICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIkZhaWxlZCB0byBzYXZl IG1vZGlmaWVkIHN0eWxlc2hlZXQgJXMiLCB0aGlzLl9yZXNvdXJjZS51cmwpOworICAgICAgICB9 CisKKyAgICAgICAgdGhpcy5zdHlsZVNoZWV0LnNldFRleHQobmV3VGV4dCwgY2FsbGJhY2suYmlu ZCh0aGlzKSk7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuQ1NTU291cmNlRnJhbWVEZWxlZ2F0 ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWVEZWxlZ2F0ZUZvclJlc291cmNlc1BhbmVsLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4 IDhmMWNiMjkuLmMzMjQ4YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNDE5LDggKzQxOSw4IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIF9hcHBseURp ZmZNYXJrdXA6IGZ1bmN0aW9uKHZpZXcsIGJhc2VDb250ZW50LCBuZXdDb250ZW50KSB7Ci0gICAg ICAgIHZhciBvbGRMaW5lcyA9IGJhc2VDb250ZW50LnNwbGl0KCJcbiIpOwotICAgICAgICB2YXIg bmV3TGluZXMgPSBuZXdDb250ZW50LnNwbGl0KCJcbiIpOworICAgICAgICB2YXIgb2xkTGluZXMg PSBiYXNlQ29udGVudC5zcGxpdCgvXHI/XG4vKTsKKyAgICAgICAgdmFyIG5ld0xpbmVzID0gbmV3 Q29udGVudC5zcGxpdCgvXHI/XG4vKTsKIAogICAgICAgICB2YXIgZGlmZiA9IEFycmF5LmRpZmYo b2xkTGluZXMsIG5ld0xpbmVzKTsKIApAQCAtMTExMSw3ICsxMTExLDcgQEAgV2ViSW5zcGVjdG9y LkZyYW1lUmVzb3VyY2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChvbGRW aWV3KSB7CiAgICAgICAgICAgICB2YXIgbmV3VmlldyA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZVZp ZXcucmVjcmVhdGVSZXNvdXJjZVZpZXcodGhpcy5fcmVzb3VyY2UpOwogICAgICAgICAgICAgaWYg KG9sZFZpZXcgPT09IHRoaXMuX3N0b3JhZ2VQYW5lbC52aXNpYmxlVmlldykKLSAgICAgICAgICAg ICAgICB0aGlzLl9zdG9yYWdlUGFuZWwudmlzaWJsZVZpZXcgPSBuZXdWaWV3OworICAgICAgICAg ICAgICAgIHRoaXMuX3N0b3JhZ2VQYW5lbC5fc2hvd1Jlc291cmNlVmlldyh0aGlzLl9yZXNvdXJj ZSk7CiAgICAgICAgIH0KICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCAwNmQ3MzUyLi43NDgyZjM0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAg LTIwMSw5ICsyMDEsMTIgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlz Ll9jb250ZXh0TWVudS5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICAgICAgICAgIGVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fbW91c2VEb3duLmJpbmQodGhpcyksIHRy dWUpOwogICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW1vdmUiLCB0 aGlzLl9tb3VzZU1vdmUuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgICAgICAgICBlbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fZG91YmxlQ2xpY2suYmluZCh0aGlzKSwg dHJ1ZSk7CiAgICAgICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRo aXMuX3Njcm9sbC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICAgICAgfQorCisgICAgICAgIGlmICh0 aGlzLl9kZWxlZ2F0ZS5jYW5FZGl0U2NyaXB0U291cmNlKCkpCisgICAgICAgICAgICBlbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fZG91YmxlQ2xpY2suYmluZCh0aGlz KSwgdHJ1ZSk7CisKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKGVsZW1lbnQpOwog CiAgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIuYmVnaW5VcGRhdGVzKCk7Cg==