145331 2015-05-22 17:28:21 -0700 Web Inspector: DOMTree Keyboard Shortcut 'H' to toggle element visibility is not working 2015-08-04 11:28:53 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck adam.g.helm bburg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1097012 0 joepeck 2015-05-22 17:28:21 -0700 * SUMMARY DOMTree Keyboard Shortcut 'H' to toggle element visibility is not working. This regressed with r179286 which removed CSSProperty.value setters and related protocol methods. * TEST <div style="width: 100px; height: 100px; background: blue"></div> <div style="width: 100px; height: 100px; background: green"></div> * STEPS TO REPRODUCE 1. Inspect the top div on the test page 2. Input 'H' keyboard shortcut => expected element to hide, it did not * NOTES - Uncaught exception. CSSProperty.value setter doesn't exist. - Chrome/Blink does this in a clever way. Instead of toggling CSS properties, it adds a <style> to the page with a CSS class, and then toggles the class on the element. We can do the same. 1097013 1 webkit-bug-importer 2015-05-22 17:29:05 -0700 <rdar://problem/21085680> 1097014 2 253620 joepeck 2015-05-22 17:33:25 -0700 Created attachment 253620 [PATCH] Proposed Fix 1097015 3 253620 joepeck 2015-05-22 17:54:24 -0700 Comment on attachment 253620 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=253620&action=review > Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js:571 > + styleElement.textContent = ".__WebInspectorHideElement__, .__WebInspectorHideElement__::before, .__WebInspectorHideElement__::after { visibility: hidden !important; }"; I have a feeling the before/after parts may not be necessary... 1097016 4 253620 joepeck 2015-05-22 17:56:18 -0700 Comment on attachment 253620 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=253620&action=review >> Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js:571 >> + styleElement.textContent = ".__WebInspectorHideElement__, .__WebInspectorHideElement__::before, .__WebInspectorHideElement__::after { visibility: hidden !important; }"; > > I have a feeling the before/after parts may not be necessary... Oops it is not. Sorry, I was getting ahead of myself. New patch up soon. 1097017 5 253621 joepeck 2015-05-22 17:58:30 -0700 Created attachment 253621 [PATCH] Proposed Fix 1097019 6 253621 burg 2015-05-22 18:03:55 -0700 Comment on attachment 253621 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=253621&action=review r=me > Source/WebInspectorUI/ChangeLog:11 > + 1. inject a <style> on the page like ".WebInspectorHide { visiblity:hidden }" 'visibility' > Source/WebInspectorUI/ChangeLog:17 > + * UserInterface/Views/DOMTreeOutline.js: Might want to note that the old approach uses different CSS properties to achieve the same thing. 1097020 7 253622 joepeck 2015-05-22 18:24:12 -0700 Created attachment 253622 [PATCH] For Landing 1097029 8 253622 commit-queue 2015-05-22 19:13:02 -0700 Comment on attachment 253622 [PATCH] For Landing Clearing flags on attachment: 253622 Committed r184815: <http://trac.webkit.org/changeset/184815> 253620 2015-05-22 17:33:25 -0700 2015-05-22 17:58:30 -0700 [PATCH] Proposed Fix hide-fix.patch text/plain 4287 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQzZTM4ZWMuLjRhZTBmMmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA1LTIyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRE9NVHJl ZSBLZXlib2FyZCBTaG9ydGN1dCAnSCcgdG8gdG9nZ2xlIGVsZW1lbnQgdmlzaWJpbGl0eSBpcyBu b3Qgd29ya2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ1MzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2Ugbm8gbG9uZ2VyIGhhdmUgQ1NTUHJvcGVydHkudmFsdWUgc2V0dGVycy4gSW5zdGVhZCBv ZiBhdHRlbXB0aW5nCisgICAgICAgIHRvIHRvZ2dsZSBhbmQgY2xvYmJlciBpbmxpbmUgc3R5bGUg dmFsdWVzIG9uIHRoZSBlbGVtZW50IHdlOgorICAgICAgICAKKyAgICAgICAgICAxLiBpbmplY3Qg YSA8c3R5bGU+IG9uIHRoZSBwYWdlIGxpa2UgIi5XZWJJbnNwZWN0b3JIaWRlIHsgdmlzaWJsaXR5 OmhpZGRlbiB9IgorICAgICAgICAgIDIuIHRvZ2dsZSB0aGUgV2ViSW5zcGVjdG9ySGlkZSBjbGFz cyBvbiB0aGUgc2VsZWN0ZWQgZWxlbWVudAorCisgICAgICAgIFRoaXMgYXBwcm9hY2ggaXMgaW5z cGlyZWQgYnkgdGhlIG9yaWdpbmFsIFdlYktpdCBjaGFuZ2UgaW4gdGhlCisgICAgICAgIG9sZCBp bnNwZWN0b3IgZnJvbnRlbmQ6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xMTA2NDE+LgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5ET01UcmVlT3V0bGluZS5wcm90b3R5cGUuX2hpZGVFbGVtZW50LnJlc29sdmVk Tm9kZS5pbmplY3RTdHlsZUFuZFRvZ2dsZUNsYXNzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E T01UcmVlT3V0bGluZS5wcm90b3R5cGUuX2hpZGVFbGVtZW50LnJlc29sdmVkTm9kZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9oaWRlRWxlbWVudCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9oaWRlRWxl bWVudC50b2dnbGVQcm9wZXJ0aWVzKTogRGVsZXRlZC4KKwogMjAxNS0wNS0yMSAgSm9zZXBoIFBl Y29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEdp dmUgVG9vbGJhciBidXR0b25zIGFuIGFjdGl2ZSBzdHlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcwpp bmRleCBhNTc0OTc1Li5iZDZmNWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcwpAQCAtNTU2LDM5 ICs1NTYsMzAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lID0gY2xhc3MgRE9NVHJlZU91 dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZU91dGwKICAgICAgICAgaWYgKHNlbGVjdGVk Tm9kZS5ub2RlVHlwZSgpICE9PSBOb2RlLkVMRU1FTlRfTk9ERSkKICAgICAgICAgICAgIHJldHVy bjsKIAotICAgICAgICBpZiAodGhpcy5fdG9nZ2xlUGVuZGluZykKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgdGhpcy5fdG9nZ2xlUGVuZGluZyA9IHRydWU7Ci0KLSAgICAgICAgZnVuY3Rp b24gdG9nZ2xlUHJvcGVydGllcygpCisgICAgICAgIGZ1bmN0aW9uIHJlc29sdmVkTm9kZShvYmpl Y3QpCiAgICAgICAgIHsKLSAgICAgICAgICAgIG5vZGVTdHlsZXMucmVtb3ZlRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRE9NTm9kZVN0eWxlcy5FdmVudC5SZWZyZXNoZWQsIHRvZ2dsZVByb3Bl cnRpZXMsIHRoaXMpOworICAgICAgICAgICAgaWYgKCFvYmplY3QpCisgICAgICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgICAgICB2YXIgb3BhY2l0eVByb3BlcnR5ID0gbm9kZVN0eWxlcy5p bmxpbmVTdHlsZS5wcm9wZXJ0eUZvck5hbWUoIm9wYWNpdHkiKTsKLSAgICAgICAgICAgIG9wYWNp dHlQcm9wZXJ0eS52YWx1ZSA9ICIwIjsKLSAgICAgICAgICAgIG9wYWNpdHlQcm9wZXJ0eS5pbXBv cnRhbnQgPSB0cnVlOworICAgICAgICAgICAgZnVuY3Rpb24gaW5qZWN0U3R5bGVBbmRUb2dnbGVD bGFzcygpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFyIGhpZGVFbGVtZW50U3R5 bGVTaGVldElkT3JDbGFzc05hbWUgPSAiX19XZWJJbnNwZWN0b3JIaWRlRWxlbWVudF9fIjsKKyAg ICAgICAgICAgICAgICB2YXIgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo aGlkZUVsZW1lbnRTdHlsZVNoZWV0SWRPckNsYXNzTmFtZSk7CisgICAgICAgICAgICAgICAgaWYg KCFzdHlsZUVsZW1lbnQpIHsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGVFbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgic3R5bGUiKTsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGVF bGVtZW50LmlkID0gaGlkZUVsZW1lbnRTdHlsZVNoZWV0SWRPckNsYXNzTmFtZTsKKyAgICAgICAg ICAgICAgICAgICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gIi5fX1dlYkluc3BlY3Rvckhp ZGVFbGVtZW50X18sIC5fX1dlYkluc3BlY3RvckhpZGVFbGVtZW50X186OmJlZm9yZSwgLl9fV2Vi SW5zcGVjdG9ySGlkZUVsZW1lbnRfXzo6YWZ0ZXIgeyB2aXNpYmlsaXR5OiBoaWRkZW4gIWltcG9y dGFudDsgfSI7CisgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQo c3R5bGVFbGVtZW50KTsKKyAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHZhciBwb2lu dGVyRXZlbnRzUHJvcGVydHkgPSBub2RlU3R5bGVzLmlubGluZVN0eWxlLnByb3BlcnR5Rm9yTmFt ZSgicG9pbnRlci1ldmVudHMiKTsKLSAgICAgICAgICAgIHBvaW50ZXJFdmVudHNQcm9wZXJ0eS52 YWx1ZSA9ICJub25lIjsKLSAgICAgICAgICAgIHBvaW50ZXJFdmVudHNQcm9wZXJ0eS5pbXBvcnRh bnQgPSB0cnVlOwotCi0gICAgICAgICAgICBpZiAob3BhY2l0eVByb3BlcnR5LmVuYWJsZWQgJiYg cG9pbnRlckV2ZW50c1Byb3BlcnR5LmVuYWJsZWQpIHsKLSAgICAgICAgICAgICAgICBvcGFjaXR5 UHJvcGVydHkucmVtb3ZlKCk7Ci0gICAgICAgICAgICAgICAgcG9pbnRlckV2ZW50c1Byb3BlcnR5 LnJlbW92ZSgpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBvcGFjaXR5 UHJvcGVydHkuYWRkKCk7Ci0gICAgICAgICAgICAgICAgcG9pbnRlckV2ZW50c1Byb3BlcnR5LmFk ZCgpOworICAgICAgICAgICAgICAgIHRoaXMuY2xhc3NMaXN0LnRvZ2dsZShoaWRlRWxlbWVudFN0 eWxlU2hlZXRJZE9yQ2xhc3NOYW1lKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZGVs ZXRlIHRoaXMuX3RvZ2dsZVBlbmRpbmc7CisgICAgICAgICAgICBvYmplY3QuY2FsbEZ1bmN0aW9u KGluamVjdFN0eWxlQW5kVG9nZ2xlQ2xhc3MsIHVuZGVmaW5lZCwgZmFsc2UsIGZ1bmN0aW9uKCl7 fSk7CisgICAgICAgICAgICBvYmplY3QucmVsZWFzZSgpOwogICAgICAgICB9CiAKLSAgICAgICAg dmFyIG5vZGVTdHlsZXMgPSBXZWJJbnNwZWN0b3IuY3NzU3R5bGVNYW5hZ2VyLnN0eWxlc0Zvck5v ZGUoc2VsZWN0ZWROb2RlKTsKLSAgICAgICAgaWYgKG5vZGVTdHlsZXMubmVlZHNSZWZyZXNoKSB7 Ci0gICAgICAgICAgICBub2RlU3R5bGVzLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRP TU5vZGVTdHlsZXMuRXZlbnQuUmVmcmVzaGVkLCB0b2dnbGVQcm9wZXJ0aWVzLCB0aGlzKTsKLSAg ICAgICAgICAgIG5vZGVTdHlsZXMucmVmcmVzaCgpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAg ICAgIHRvZ2dsZVByb3BlcnRpZXMuY2FsbCh0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5yZXNvbHZlTm9kZShzZWxlY3RlZE5vZGUsICIiLCByZXNvbHZlZE5vZGUpOwog ICAgIH0KIH07CiAK 253621 2015-05-22 17:58:30 -0700 2015-05-22 18:03:55 -0700 [PATCH] Proposed Fix hide-fix-2.patch text/plain 4227 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQzZTM4ZWMuLjRhZTBmMmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA1LTIyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRE9NVHJl ZSBLZXlib2FyZCBTaG9ydGN1dCAnSCcgdG8gdG9nZ2xlIGVsZW1lbnQgdmlzaWJpbGl0eSBpcyBu b3Qgd29ya2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ1MzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2Ugbm8gbG9uZ2VyIGhhdmUgQ1NTUHJvcGVydHkudmFsdWUgc2V0dGVycy4gSW5zdGVhZCBv ZiBhdHRlbXB0aW5nCisgICAgICAgIHRvIHRvZ2dsZSBhbmQgY2xvYmJlciBpbmxpbmUgc3R5bGUg dmFsdWVzIG9uIHRoZSBlbGVtZW50IHdlOgorICAgICAgICAKKyAgICAgICAgICAxLiBpbmplY3Qg YSA8c3R5bGU+IG9uIHRoZSBwYWdlIGxpa2UgIi5XZWJJbnNwZWN0b3JIaWRlIHsgdmlzaWJsaXR5 OmhpZGRlbiB9IgorICAgICAgICAgIDIuIHRvZ2dsZSB0aGUgV2ViSW5zcGVjdG9ySGlkZSBjbGFz cyBvbiB0aGUgc2VsZWN0ZWQgZWxlbWVudAorCisgICAgICAgIFRoaXMgYXBwcm9hY2ggaXMgaW5z cGlyZWQgYnkgdGhlIG9yaWdpbmFsIFdlYktpdCBjaGFuZ2UgaW4gdGhlCisgICAgICAgIG9sZCBp bnNwZWN0b3IgZnJvbnRlbmQ6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xMTA2NDE+LgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5ET01UcmVlT3V0bGluZS5wcm90b3R5cGUuX2hpZGVFbGVtZW50LnJlc29sdmVk Tm9kZS5pbmplY3RTdHlsZUFuZFRvZ2dsZUNsYXNzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E T01UcmVlT3V0bGluZS5wcm90b3R5cGUuX2hpZGVFbGVtZW50LnJlc29sdmVkTm9kZSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9oaWRlRWxlbWVudCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9oaWRlRWxl bWVudC50b2dnbGVQcm9wZXJ0aWVzKTogRGVsZXRlZC4KKwogMjAxNS0wNS0yMSAgSm9zZXBoIFBl Y29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEdp dmUgVG9vbGJhciBidXR0b25zIGFuIGFjdGl2ZSBzdHlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcwpp bmRleCBhNTc0OTc1Li5mNjJlNjYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcwpAQCAtNTU2LDM5 ICs1NTYsMzAgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVPdXRsaW5lID0gY2xhc3MgRE9NVHJlZU91 dGxpbmUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVHJlZU91dGwKICAgICAgICAgaWYgKHNlbGVjdGVk Tm9kZS5ub2RlVHlwZSgpICE9PSBOb2RlLkVMRU1FTlRfTk9ERSkKICAgICAgICAgICAgIHJldHVy bjsKIAotICAgICAgICBpZiAodGhpcy5fdG9nZ2xlUGVuZGluZykKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgdGhpcy5fdG9nZ2xlUGVuZGluZyA9IHRydWU7Ci0KLSAgICAgICAgZnVuY3Rp b24gdG9nZ2xlUHJvcGVydGllcygpCisgICAgICAgIGZ1bmN0aW9uIHJlc29sdmVkTm9kZShvYmpl Y3QpCiAgICAgICAgIHsKLSAgICAgICAgICAgIG5vZGVTdHlsZXMucmVtb3ZlRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRE9NTm9kZVN0eWxlcy5FdmVudC5SZWZyZXNoZWQsIHRvZ2dsZVByb3Bl cnRpZXMsIHRoaXMpOworICAgICAgICAgICAgaWYgKCFvYmplY3QpCisgICAgICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgICAgICB2YXIgb3BhY2l0eVByb3BlcnR5ID0gbm9kZVN0eWxlcy5p bmxpbmVTdHlsZS5wcm9wZXJ0eUZvck5hbWUoIm9wYWNpdHkiKTsKLSAgICAgICAgICAgIG9wYWNp dHlQcm9wZXJ0eS52YWx1ZSA9ICIwIjsKLSAgICAgICAgICAgIG9wYWNpdHlQcm9wZXJ0eS5pbXBv cnRhbnQgPSB0cnVlOworICAgICAgICAgICAgZnVuY3Rpb24gaW5qZWN0U3R5bGVBbmRUb2dnbGVD bGFzcygpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFyIGhpZGVFbGVtZW50U3R5 bGVTaGVldElkT3JDbGFzc05hbWUgPSAiX19XZWJJbnNwZWN0b3JIaWRlRWxlbWVudF9fIjsKKyAg ICAgICAgICAgICAgICB2YXIgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo aGlkZUVsZW1lbnRTdHlsZVNoZWV0SWRPckNsYXNzTmFtZSk7CisgICAgICAgICAgICAgICAgaWYg KCFzdHlsZUVsZW1lbnQpIHsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGVFbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgic3R5bGUiKTsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGVF bGVtZW50LmlkID0gaGlkZUVsZW1lbnRTdHlsZVNoZWV0SWRPckNsYXNzTmFtZTsKKyAgICAgICAg ICAgICAgICAgICAgc3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gIi4iICsgaGlkZUVsZW1lbnRT dHlsZVNoZWV0SWRPckNsYXNzTmFtZSArICIgeyB2aXNpYmlsaXR5OiBoaWRkZW4gIWltcG9ydGFu dDsgfSI7CisgICAgICAgICAgICAgICAgICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5 bGVFbGVtZW50KTsKKyAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHZhciBwb2ludGVy RXZlbnRzUHJvcGVydHkgPSBub2RlU3R5bGVzLmlubGluZVN0eWxlLnByb3BlcnR5Rm9yTmFtZSgi cG9pbnRlci1ldmVudHMiKTsKLSAgICAgICAgICAgIHBvaW50ZXJFdmVudHNQcm9wZXJ0eS52YWx1 ZSA9ICJub25lIjsKLSAgICAgICAgICAgIHBvaW50ZXJFdmVudHNQcm9wZXJ0eS5pbXBvcnRhbnQg PSB0cnVlOwotCi0gICAgICAgICAgICBpZiAob3BhY2l0eVByb3BlcnR5LmVuYWJsZWQgJiYgcG9p bnRlckV2ZW50c1Byb3BlcnR5LmVuYWJsZWQpIHsKLSAgICAgICAgICAgICAgICBvcGFjaXR5UHJv cGVydHkucmVtb3ZlKCk7Ci0gICAgICAgICAgICAgICAgcG9pbnRlckV2ZW50c1Byb3BlcnR5LnJl bW92ZSgpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBvcGFjaXR5UHJv cGVydHkuYWRkKCk7Ci0gICAgICAgICAgICAgICAgcG9pbnRlckV2ZW50c1Byb3BlcnR5LmFkZCgp OworICAgICAgICAgICAgICAgIHRoaXMuY2xhc3NMaXN0LnRvZ2dsZShoaWRlRWxlbWVudFN0eWxl U2hlZXRJZE9yQ2xhc3NOYW1lKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZGVsZXRl IHRoaXMuX3RvZ2dsZVBlbmRpbmc7CisgICAgICAgICAgICBvYmplY3QuY2FsbEZ1bmN0aW9uKGlu amVjdFN0eWxlQW5kVG9nZ2xlQ2xhc3MsIHVuZGVmaW5lZCwgZmFsc2UsIGZ1bmN0aW9uKCl7fSk7 CisgICAgICAgICAgICBvYmplY3QucmVsZWFzZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgdmFy IG5vZGVTdHlsZXMgPSBXZWJJbnNwZWN0b3IuY3NzU3R5bGVNYW5hZ2VyLnN0eWxlc0Zvck5vZGUo c2VsZWN0ZWROb2RlKTsKLSAgICAgICAgaWYgKG5vZGVTdHlsZXMubmVlZHNSZWZyZXNoKSB7Ci0g ICAgICAgICAgICBub2RlU3R5bGVzLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTU5v ZGVTdHlsZXMuRXZlbnQuUmVmcmVzaGVkLCB0b2dnbGVQcm9wZXJ0aWVzLCB0aGlzKTsKLSAgICAg ICAgICAgIG5vZGVTdHlsZXMucmVmcmVzaCgpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAg IHRvZ2dsZVByb3BlcnRpZXMuY2FsbCh0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlJlbW90 ZU9iamVjdC5yZXNvbHZlTm9kZShzZWxlY3RlZE5vZGUsICIiLCByZXNvbHZlZE5vZGUpOwogICAg IH0KIH07CiAK 253622 2015-05-22 18:24:12 -0700 2015-05-22 19:13:02 -0700 [PATCH] For Landing hide-for-landing.patch text/plain 4380 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQzZTM4ZWMuLmE0MTVhZDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE1LTA1LTIyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRE9NVHJl ZSBLZXlib2FyZCBTaG9ydGN1dCAnSCcgdG8gdG9nZ2xlIGVsZW1lbnQgdmlzaWJpbGl0eSBpcyBu b3Qgd29ya2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ1MzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJpYW4gQnVyZy4KKworICAgICAgICBX ZSBubyBsb25nZXIgaGF2ZSBDU1NQcm9wZXJ0eS52YWx1ZSBzZXR0ZXJzLiBJbnN0ZWFkIG9mIGF0 dGVtcHRpbmcKKyAgICAgICAgdG8gdG9nZ2xlIGFuZCBjbG9iYmVyIGlubGluZSBzdHlsZSB2YWx1 ZXMgb24gdGhlIGVsZW1lbnQgd2U6CisgICAgICAgIAorICAgICAgICAgIDEuIGluamVjdCBhIDxz dHlsZT4gb24gdGhlIHBhZ2UgbGlrZSAiLldlYkluc3BlY3RvckhpZGUgeyB2aXNpYmlsaXR5Omhp ZGRlbiB9IgorICAgICAgICAgIDIuIHRvZ2dsZSB0aGUgV2ViSW5zcGVjdG9ySGlkZSBjbGFzcyBv biB0aGUgc2VsZWN0ZWQgZWxlbWVudAorCisgICAgICAgIFRoaXMgYXBwcm9hY2ggaXMgaW5zcGly ZWQgYnkgdGhlIG9yaWdpbmFsIFdlYktpdCBjaGFuZ2UgaW4gdGhlCisgICAgICAgIG9sZCBpbnNw ZWN0b3IgZnJvbnRlbmQ6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xMTA2NDE+LgorCisgICAgICAg IFRoZSBvbGQgYXBwcm9hY2ggdG9nZ2xlZCBhIGZldyBwcm9wZXJ0aWVzIChvcGFjaXR5IGFuZCBw b2ludGVyIGV2ZW50cykKKyAgICAgICAgd2hpbGUgdGhlIG5ldyBhcHByb2FjaCB1c2VzIHZpc2li aWxpdHksIG1hdGNoaW5nIG90aGVyIGJyb3dzZXJzLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVl T3V0bGluZS5wcm90b3R5cGUuX2hpZGVFbGVtZW50LnJlc29sdmVkTm9kZS5pbmplY3RTdHlsZUFu ZFRvZ2dsZUNsYXNzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlT3V0bGluZS5wcm90 b3R5cGUuX2hpZGVFbGVtZW50LnJlc29sdmVkTm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9oaWRlRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRE9NVHJlZU91dGxpbmUucHJvdG90eXBlLl9oaWRlRWxlbWVudC50b2dnbGVQcm9wZXJ0 aWVzKTogRGVsZXRlZC4KKwogMjAxNS0wNS0yMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEdpdmUgVG9vbGJhciBidXR0b25z IGFuIGFjdGl2ZSBzdHlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcwppbmRleCBhNTc0OTc1Li5mNjJl NjYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9ET01UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9ET01UcmVlT3V0bGluZS5qcwpAQCAtNTU2LDM5ICs1NTYsMzAgQEAgV2ViSW5z cGVjdG9yLkRPTVRyZWVPdXRsaW5lID0gY2xhc3MgRE9NVHJlZU91dGxpbmUgZXh0ZW5kcyBXZWJJ bnNwZWN0b3IuVHJlZU91dGwKICAgICAgICAgaWYgKHNlbGVjdGVkTm9kZS5ub2RlVHlwZSgpICE9 PSBOb2RlLkVMRU1FTlRfTk9ERSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAo dGhpcy5fdG9nZ2xlUGVuZGluZykKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5f dG9nZ2xlUGVuZGluZyA9IHRydWU7Ci0KLSAgICAgICAgZnVuY3Rpb24gdG9nZ2xlUHJvcGVydGll cygpCisgICAgICAgIGZ1bmN0aW9uIHJlc29sdmVkTm9kZShvYmplY3QpCiAgICAgICAgIHsKLSAg ICAgICAgICAgIG5vZGVTdHlsZXMucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRE9N Tm9kZVN0eWxlcy5FdmVudC5SZWZyZXNoZWQsIHRvZ2dsZVByb3BlcnRpZXMsIHRoaXMpOworICAg ICAgICAgICAgaWYgKCFvYmplY3QpCisgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAg ICAgICB2YXIgb3BhY2l0eVByb3BlcnR5ID0gbm9kZVN0eWxlcy5pbmxpbmVTdHlsZS5wcm9wZXJ0 eUZvck5hbWUoIm9wYWNpdHkiKTsKLSAgICAgICAgICAgIG9wYWNpdHlQcm9wZXJ0eS52YWx1ZSA9 ICIwIjsKLSAgICAgICAgICAgIG9wYWNpdHlQcm9wZXJ0eS5pbXBvcnRhbnQgPSB0cnVlOworICAg ICAgICAgICAgZnVuY3Rpb24gaW5qZWN0U3R5bGVBbmRUb2dnbGVDbGFzcygpCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgdmFyIGhpZGVFbGVtZW50U3R5bGVTaGVldElkT3JDbGFzc05h bWUgPSAiX19XZWJJbnNwZWN0b3JIaWRlRWxlbWVudF9fIjsKKyAgICAgICAgICAgICAgICB2YXIg c3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaGlkZUVsZW1lbnRTdHlsZVNo ZWV0SWRPckNsYXNzTmFtZSk7CisgICAgICAgICAgICAgICAgaWYgKCFzdHlsZUVsZW1lbnQpIHsK KyAgICAgICAgICAgICAgICAgICAgc3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgic3R5bGUiKTsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGVFbGVtZW50LmlkID0gaGlkZUVs ZW1lbnRTdHlsZVNoZWV0SWRPckNsYXNzTmFtZTsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGVF bGVtZW50LnRleHRDb250ZW50ID0gIi4iICsgaGlkZUVsZW1lbnRTdHlsZVNoZWV0SWRPckNsYXNz TmFtZSArICIgeyB2aXNpYmlsaXR5OiBoaWRkZW4gIWltcG9ydGFudDsgfSI7CisgICAgICAgICAg ICAgICAgICAgIGRvY3VtZW50LmhlYWQuYXBwZW5kQ2hpbGQoc3R5bGVFbGVtZW50KTsKKyAgICAg ICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHZhciBwb2ludGVyRXZlbnRzUHJvcGVydHkgPSBu b2RlU3R5bGVzLmlubGluZVN0eWxlLnByb3BlcnR5Rm9yTmFtZSgicG9pbnRlci1ldmVudHMiKTsK LSAgICAgICAgICAgIHBvaW50ZXJFdmVudHNQcm9wZXJ0eS52YWx1ZSA9ICJub25lIjsKLSAgICAg ICAgICAgIHBvaW50ZXJFdmVudHNQcm9wZXJ0eS5pbXBvcnRhbnQgPSB0cnVlOwotCi0gICAgICAg ICAgICBpZiAob3BhY2l0eVByb3BlcnR5LmVuYWJsZWQgJiYgcG9pbnRlckV2ZW50c1Byb3BlcnR5 LmVuYWJsZWQpIHsKLSAgICAgICAgICAgICAgICBvcGFjaXR5UHJvcGVydHkucmVtb3ZlKCk7Ci0g ICAgICAgICAgICAgICAgcG9pbnRlckV2ZW50c1Byb3BlcnR5LnJlbW92ZSgpOwotICAgICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBvcGFjaXR5UHJvcGVydHkuYWRkKCk7Ci0gICAg ICAgICAgICAgICAgcG9pbnRlckV2ZW50c1Byb3BlcnR5LmFkZCgpOworICAgICAgICAgICAgICAg IHRoaXMuY2xhc3NMaXN0LnRvZ2dsZShoaWRlRWxlbWVudFN0eWxlU2hlZXRJZE9yQ2xhc3NOYW1l KTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3RvZ2dsZVBlbmRp bmc7CisgICAgICAgICAgICBvYmplY3QuY2FsbEZ1bmN0aW9uKGluamVjdFN0eWxlQW5kVG9nZ2xl Q2xhc3MsIHVuZGVmaW5lZCwgZmFsc2UsIGZ1bmN0aW9uKCl7fSk7CisgICAgICAgICAgICBvYmpl Y3QucmVsZWFzZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIG5vZGVTdHlsZXMgPSBXZWJJ bnNwZWN0b3IuY3NzU3R5bGVNYW5hZ2VyLnN0eWxlc0Zvck5vZGUoc2VsZWN0ZWROb2RlKTsKLSAg ICAgICAgaWYgKG5vZGVTdHlsZXMubmVlZHNSZWZyZXNoKSB7Ci0gICAgICAgICAgICBub2RlU3R5 bGVzLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHlsZXMuRXZlbnQuUmVm cmVzaGVkLCB0b2dnbGVQcm9wZXJ0aWVzLCB0aGlzKTsKLSAgICAgICAgICAgIG5vZGVTdHlsZXMu cmVmcmVzaCgpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHRvZ2dsZVByb3BlcnRpZXMu Y2FsbCh0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlJlbW90ZU9iamVjdC5yZXNvbHZlTm9k ZShzZWxlY3RlZE5vZGUsICIiLCByZXNvbHZlZE5vZGUpOwogICAgIH0KIH07CiAK