135870 2014-08-12 17:56:51 -0700 Web Inspector: Timeline Close buttons can use polish for new and legacy styles 2014-08-13 12:01:13 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1028686 0 joepeck 2014-08-12 17:56:51 -0700 * SUMMARY Timeline Close buttons can use polish for new and legacy styles. - new styles the X looks too thin on timeline overviews - legacy styles the X for timeline records has a white border but black filled content * STEPS TO REPRODUCE 1. Click around the timelines view with records 1028687 1 webkit-bug-importer 2014-08-12 17:56:59 -0700 <rdar://problem/17999596> 1028688 2 236489 joepeck 2014-08-12 18:00:12 -0700 Created attachment 236489 [PATCH] Proposed Fix 1028724 3 236489 timothy 2014-08-12 22:49:09 -0700 Comment on attachment 236489 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=236489&action=review Screenshot looks good. > Source/WebInspectorUI/ChangeLog:20 > + Use the Close.svg in new styles, and CloseLarge.svg in legacy, styled to 12x12. I am not sure why CloseLarge.svg is used in Legacy and Close.svg is used in modern. Ideally they would be the same size and only differ by stroke-width 2 vs 1. > Source/WebInspectorUI/UserInterface/Images/Legacy/Close.svg:4 > + <path class="stroked filled" d="M 12.949219 10.535156 L 11.535156 11.949219 L 8 8.414062 L 4.464844 11.949219 L 3.050781 10.535156 L 6.585938 7 L 3.050781 3.464844 L 4.464844 2.050781 L 8 5.585938 L 11.535156 2.050781 L 12.949219 3.464844 L 9.414062 7 Z"/> You can remove "stroked", "filled" is all that matters since there is no stroke-width. > Source/WebInspectorUI/UserInterface/Images/Legacy/CloseLarge.svg:4 > + <path class="stroked filled" fill="none" stroke="black" stroke-width="2" stroke-linecap="square" d="M 1.5 2.5 L 12.5 13.5 M 1.5 13.5 L 12.5 2.5"/> This should only be "stroked". Filled would not apply here since fill is "none" and the path is not a closed path. > Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css:250 > + /* Close button on timeline records */ I don't think this is needed. 1028831 4 joepeck 2014-08-13 11:18:25 -0700 (In reply to comment #3) > (From update of attachment 236489 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=236489&action=review > > Screenshot looks good. > > > Source/WebInspectorUI/ChangeLog:20 > > + Use the Close.svg in new styles, and CloseLarge.svg in legacy, styled to 12x12. > > I am not sure why CloseLarge.svg is used in Legacy and Close.svg is used in modern. Ideally they would be the same size and only differ by stroke-width 2 vs 1. Yep, we figured out what was wrong (I added stroked which added thickness) and this let us revert all the .js changes. > > > Source/WebInspectorUI/UserInterface/Images/Legacy/Close.svg:4 > > + <path class="stroked filled" d="M 12.949219 10.535156 L 11.535156 11.949219 L 8 8.414062 L 4.464844 11.949219 L 3.050781 10.535156 L 6.585938 7 L 3.050781 3.464844 L 4.464844 2.050781 L 8 5.585938 L 11.535156 2.050781 L 12.949219 3.464844 L 9.414062 7 Z"/> > > You can remove "stroked", "filled" is all that matters since there is no stroke-width. Ahh yes, and this was causing problems. 1028840 5 236539 joepeck 2014-08-13 11:41:21 -0700 Created attachment 236539 [PATCH] For Landing 1028849 6 236539 commit-queue 2014-08-13 12:01:09 -0700 Comment on attachment 236539 [PATCH] For Landing Clearing flags on attachment: 236539 Committed r172527: <http://trac.webkit.org/changeset/172527> 1028850 7 commit-queue 2014-08-13 12:01:13 -0700 All reviewed patches have been landed. Closing bug. 236489 2014-08-12 18:00:12 -0700 2014-08-13 11:41:21 -0700 [PATCH] Proposed Fix fix-close-styles.patch text/plain 9783 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJkZjYxMjIuLmQ4ZTA5MGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE0LTA4LTEyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxp bmUgQ2xvc2UgYnV0dG9ucyBjYW4gdXNlIHBvbGlzaCBmb3IgbmV3IGFuZCBsZWdhY3kgc3R5bGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU4NzAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvSW1hZ2VzL0xlZ2FjeS9DbG9zZS5zdmc6CisgICAgICAgICogVXNlckludGVyZmFj ZS9JbWFnZXMvTGVnYWN5L0Nsb3NlTGFyZ2Uuc3ZnOgorICAgICAgICBFbnN1cmUgdGhlc2UgYnV0 dG9ucyBjYW4gaGF2ZSBmaWxsIGNvbG9ycyBzZXQgaW4gdHJlZSBzZWxlY3Rpb25zLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdXBkYXRlVHJlZUVs ZW1lbnRXaXRoQ2xvc2VCdXR0b24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya1RpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxp bmVWaWV3LnByb3RvdHlwZS5fdXBkYXRlVHJlZUVsZW1lbnRXaXRoQ2xvc2VCdXR0b24pOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcucHJvdG90eXBlLl91cGRhdGVU cmVlRWxlbWVudFdpdGhDbG9zZUJ1dHRvbik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9TY3JpcHRUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGlt ZWxpbmVWaWV3LnByb3RvdHlwZS5fdXBkYXRlVHJlZUVsZW1lbnRXaXRoQ2xvc2VCdXR0b24pOgor ICAgICAgICBVc2UgdGhlIENsb3NlLnN2ZyBpbiBuZXcgc3R5bGVzLCBhbmQgQ2xvc2VMYXJnZS5z dmcgaW4gbGVnYWN5LCBzdHlsZWQgdG8gMTJ4MTIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBh bmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGltZWxpbmVzLWNvbnRlbnQgLmNsb3NlLWJ1dHRv bik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwu bmF2aWdhdGlvbi50aW1lbGluZSA+IC50aW1lbGluZXMtY29udGVudCAuY2xvc2UtYnV0dG9uKToK KyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5uYXZp Z2F0aW9uLnRpbWVsaW5lID4gLmNvbnRlbnQgLml0ZW0gPiAuc3RhdHVzID4gLnN0YXR1cy1idXR0 b24pOgorICAgICAgICBTaXplIHRoZSBjbG9zZS1idXR0b24gZm9yIHRoZSB0b3Agb3ZlcnZpZXdz IGRpZmZlcmVudGx5IGluIG5ldyBzdHlsZXMgKDE0eDE0KSBhbmQgbGVnYWN5ICgxMngxMikuCisK KzIwMTQtMDgtMTIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgdW51c2VkIHZhcmlhYmxlIGluIFBsYXRmb3JtLmpz CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU4NjkK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2Vz L0xlZ2FjeS9DbG9zZS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9J bWFnZXMvTGVnYWN5L0Nsb3NlLnN2ZwppbmRleCBjY2U2MDMwLi5kNGVhZGRiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvTGVnYWN5L0Nsb3Nl LnN2ZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvTGVn YWN5L0Nsb3NlLnN2ZwpAQCAtMSw1ICsxLDUgQEAKIDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rp bmc9InV0Zi04Ij8+CiA8IS0tIENvcHlyaWdodCDCqSAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4gLS0+CiA8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMu b3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTYgMTQiPgotICAgIDxwYXRoIGNsYXNzPSJzdHJv a2VkIiBkPSJNIDEyLjk0OTIxOSAxMC41MzUxNTYgTCAxMS41MzUxNTYgMTEuOTQ5MjE5IEwgOCA4 LjQxNDA2MiBMIDQuNDY0ODQ0IDExLjk0OTIxOSBMIDMuMDUwNzgxIDEwLjUzNTE1NiBMIDYuNTg1 OTM4IDcgTCAzLjA1MDc4MSAzLjQ2NDg0NCBMIDQuNDY0ODQ0IDIuMDUwNzgxIEwgOCA1LjU4NTkz OCBMIDExLjUzNTE1NiAyLjA1MDc4MSBMIDEyLjk0OTIxOSAzLjQ2NDg0NCBMIDkuNDE0MDYyIDcg WiIvPgorICAgIDxwYXRoIGNsYXNzPSJzdHJva2VkIGZpbGxlZCIgZD0iTSAxMi45NDkyMTkgMTAu NTM1MTU2IEwgMTEuNTM1MTU2IDExLjk0OTIxOSBMIDggOC40MTQwNjIgTCA0LjQ2NDg0NCAxMS45 NDkyMTkgTCAzLjA1MDc4MSAxMC41MzUxNTYgTCA2LjU4NTkzOCA3IEwgMy4wNTA3ODEgMy40NjQ4 NDQgTCA0LjQ2NDg0NCAyLjA1MDc4MSBMIDggNS41ODU5MzggTCAxMS41MzUxNTYgMi4wNTA3ODEg TCAxMi45NDkyMTkgMy40NjQ4NDQgTCA5LjQxNDA2MiA3IFoiLz4KIDwvc3ZnPgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0xlZ2FjeS9DbG9z ZUxhcmdlLnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9M ZWdhY3kvQ2xvc2VMYXJnZS5zdmcKaW5kZXggNTRjMjgwYS4uYWJjMWM4NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0xlZ2FjeS9DbG9zZUxh cmdlLnN2ZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMv TGVnYWN5L0Nsb3NlTGFyZ2Uuc3ZnCkBAIC0xLDUgKzEsNSBAQAogPD94bWwgdmVyc2lvbj0iMS4w IiBlbmNvZGluZz0idXRmLTgiPz4KIDwhLS0gQ29weXJpZ2h0IMKpIDIwMTQgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KIDxzdmcgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDov L3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNiAxNiI+Ci0gICAgPHBhdGggY2xh c3M9InN0cm9rZWQiIGZpbGw9Im5vbmUiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS13aWR0aD0iMiIg c3Ryb2tlLWxpbmVjYXA9InNxdWFyZSIgZD0iTSAxLjUgMi41IEwgMTIuNSAxMy41IE0gMS41IDEz LjUgTCAxMi41IDIuNSIvPgorICAgIDxwYXRoIGNsYXNzPSJzdHJva2VkIGZpbGxlZCIgZmlsbD0i bm9uZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0ic3F1 YXJlIiBkPSJNIDEuNSAyLjUgTCAxMi41IDEzLjUgTSAxLjUgMTMuNSBMIDEyLjUgMi41Ii8+CiA8 L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcwppbmRleCBhMDAwMmU1Li5iMjVmODE4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M YXlvdXRUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3LmpzCkBAIC0yMTAsNyArMjEwLDggQEAgV2Vi SW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICB3cmFwcGVkU1ZHRG9jdW1lbnQocGxhdGZvcm1J bWFnZVBhdGgoIkNsb3NlLnN2ZyIpLCBudWxsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsb3Nl IHJlc291cmNlIHZpZXciKSwgZnVuY3Rpb24oZWxlbWVudCkgeworICAgICAgICB2YXIgaW1hZ2VT cmMgPSBXZWJJbnNwZWN0b3IuUGxhdGZvcm0uaXNMZWdhY3lNYWNPUyA/ICJJbWFnZXMvTGVnYWN5 L0Nsb3NlTGFyZ2Uuc3ZnIiA6ICJJbWFnZXMvQ2xvc2Uuc3ZnIjsKKyAgICAgICAgd3JhcHBlZFNW R0RvY3VtZW50KGltYWdlU3JjLCBudWxsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsb3NlIHJl c291cmNlIHZpZXciKSwgZnVuY3Rpb24oZWxlbWVudCkgewogICAgICAgICAgICAgdGhpcy5fY2xv c2VTdGF0dXNCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9u KGVsZW1lbnQpOwogICAgICAgICAgICAgdGhpcy5fY2xvc2VTdGF0dXNCdXR0b24uYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b24uRXZlbnQuQ2xpY2tl ZCwgdGhpcy5fY2xvc2VTdGF0dXNCdXR0b25DbGlja2VkLCB0aGlzKTsKICAgICAgICAgICAgIGlm ICh0cmVlRWxlbWVudCA9PT0gdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVj dGVkVHJlZUVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwppbmRleCA2ODA3 NzIzLi42YjJjY2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKQEAgLTIyNiw3 ICsyMjYsOCBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICB3cmFwcGVkU1ZHRG9j dW1lbnQocGxhdGZvcm1JbWFnZVBhdGgoIkNsb3NlLnN2ZyIpLCBudWxsLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkNsb3NlIHJlc291cmNlIHZpZXciKSwgZnVuY3Rpb24oZWxlbWVudCkgeworICAg ICAgICB2YXIgaW1hZ2VTcmMgPSBXZWJJbnNwZWN0b3IuUGxhdGZvcm0uaXNMZWdhY3lNYWNPUyA/ ICJJbWFnZXMvTGVnYWN5L0Nsb3NlTGFyZ2Uuc3ZnIiA6ICJJbWFnZXMvQ2xvc2Uuc3ZnIjsKKyAg ICAgICAgd3JhcHBlZFNWR0RvY3VtZW50KGltYWdlU3JjLCBudWxsLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkNsb3NlIHJlc291cmNlIHZpZXciKSwgZnVuY3Rpb24oZWxlbWVudCkgewogICAgICAg ICAgICAgdGhpcy5fY2xvc2VTdGF0dXNCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVFbGVt ZW50U3RhdHVzQnV0dG9uKGVsZW1lbnQpOwogICAgICAgICAgICAgdGhpcy5fY2xvc2VTdGF0dXNC dXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnRTdGF0dXNCdXR0 b24uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xvc2VTdGF0dXNCdXR0b25DbGlja2VkLCB0aGlzKTsK ICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudCA9PT0gdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRy ZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVW aWV3LmpzCmluZGV4IGFhZmNhNGYuLmE1ZjY3M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGltZWxp bmVWaWV3LmpzCkBAIC0zNzIsNyArMzcyLDggQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxp bmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0g ICAgICAgIHdyYXBwZWRTVkdEb2N1bWVudChwbGF0Zm9ybUltYWdlUGF0aCgiQ2xvc2Uuc3ZnIiks IG51bGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xvc2UgcmVzb3VyY2UgdmlldyIpLCBmdW5j dGlvbihlbGVtZW50KSB7CisgICAgICAgIHZhciBpbWFnZVNyYyA9IFdlYkluc3BlY3Rvci5QbGF0 Zm9ybS5pc0xlZ2FjeU1hY09TID8gIkltYWdlcy9MZWdhY3kvQ2xvc2VMYXJnZS5zdmciIDogIklt YWdlcy9DbG9zZS5zdmciOworICAgICAgICB3cmFwcGVkU1ZHRG9jdW1lbnQoaW1hZ2VTcmMsIG51 bGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xvc2UgcmVzb3VyY2UgdmlldyIpLCBmdW5jdGlv bihlbGVtZW50KSB7CiAgICAgICAgICAgICB0aGlzLl9jbG9zZVN0YXR1c0J1dHRvbiA9IG5ldyBX ZWJJbnNwZWN0b3IuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b24oZWxlbWVudCk7CiAgICAgICAgICAg ICB0aGlzLl9jbG9zZVN0YXR1c0J1dHRvbi5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5U cmVlRWxlbWVudFN0YXR1c0J1dHRvbi5FdmVudC5DbGlja2VkLCB0aGlzLl9jbG9zZVN0YXR1c0J1 dHRvbkNsaWNrZWQsIHRoaXMpOwogICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50ID09PSB0aGlz Lm5hdmlnYXRpb25TaWRlYmFyVHJlZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRp bWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NjcmlwdFRpbWVsaW5lVmlldy5qcwppbmRleCBmOGQ2OWNlLi44YjM1MzY3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NyaXB0VGltZWxpbmVWaWV3LmpzCkBAIC0yODgsNyArMjg4LDggQEAgV2ViSW5zcGVjdG9yLlNj cmlwdFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIAotICAgICAgICB3cmFwcGVkU1ZHRG9jdW1lbnQocGxhdGZvcm1JbWFnZVBhdGgoIkNs b3NlLnN2ZyIpLCBudWxsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsb3NlIHJlc291cmNlIHZp ZXciKSwgZnVuY3Rpb24oZWxlbWVudCkgeworICAgICAgICB2YXIgaW1hZ2VTcmMgPSBXZWJJbnNw ZWN0b3IuUGxhdGZvcm0uaXNMZWdhY3lNYWNPUyA/ICJJbWFnZXMvTGVnYWN5L0Nsb3NlTGFyZ2Uu c3ZnIiA6ICJJbWFnZXMvQ2xvc2Uuc3ZnIjsKKyAgICAgICAgd3JhcHBlZFNWR0RvY3VtZW50KGlt YWdlU3JjLCBudWxsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsb3NlIHJlc291cmNlIHZpZXci KSwgZnVuY3Rpb24oZWxlbWVudCkgewogICAgICAgICAgICAgdGhpcy5fY2xvc2VTdGF0dXNCdXR0 b24gPSBuZXcgV2ViSW5zcGVjdG9yLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9uKGVsZW1lbnQpOwog ICAgICAgICAgICAgdGhpcy5fY2xvc2VTdGF0dXNCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b24uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xv c2VTdGF0dXNCdXR0b25DbGlja2VkLCB0aGlzKTsKICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVu dCA9PT0gdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclRyZWVPdXRsaW5lLnNlbGVjdGVkVHJlZUVsZW1l bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKaW5kZXggYWViNTVjZS4uZjBk YTRlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzcwpAQCAtMTczLDE4ICsx NzMsMjQgQEAgYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLm5hdmln YXRpb24udGltZWxpbmUgPiAudGl0bGUtYmFyLnRpbWUKICAgICBvdmVyZmxvdzogaGlkZGVuOwog fQogCi1ib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlv bi50aW1lbGluZSA+IC50aW1lbGluZXMtY29udGVudCB7Ci0gICAgdG9wOiA0NHB4OwotfQotCiAu c2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpbWVsaW5lcy1jb250ZW50 IC5jbG9zZS1idXR0b24gewotICAgIG1hcmdpbi10b3A6IDJweDsKLSAgICB3aWR0aDogMTJweDsK LSAgICBoZWlnaHQ6IDEycHg7CisgICAgbWFyZ2luLXRvcDogMXB4OworICAgIHdpZHRoOiAxNHB4 OworICAgIGhlaWdodDogMTRweDsKIAogICAgIHZpc2liaWxpdHk6IGhpZGRlbjsKIH0KIAorYm9k eS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxp bmUgPiAudGltZWxpbmVzLWNvbnRlbnQgeworICAgIHRvcDogNDRweDsKK30KKworYm9keS5tYWMt cGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAu dGltZWxpbmVzLWNvbnRlbnQgLmNsb3NlLWJ1dHRvbiB7CisgICAgbWFyZ2luLXRvcDogMnB4Owor ICAgIHdpZHRoOiAxMnB4OworICAgIGhlaWdodDogMTJweDsKK30KKwogLnNpZGViYXIgPiAucGFu ZWwubmF2aWdhdGlvbi50aW1lbGluZSA+IC50aW1lbGluZXMtY29udGVudCBsaS5pdGVtIC5pY29u IHsKICAgICB3aWR0aDogMjRweDsKICAgICBoZWlnaHQ6IDI0cHg7CkBAIC0yNDAsNiArMjQ2LDEz IEBAIGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9u LnRpbWVsaW5lID4gLmVtcHR5LWNvbnRlbnQtCiAgICAgcmlnaHQ6IC0xNnB4OwogfQogCitib2R5 Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGlu ZSA+IC5jb250ZW50IC5pdGVtID4gLnN0YXR1cyA+IC5zdGF0dXMtYnV0dG9uIHsKKyAvKiBDbG9z ZSBidXR0b24gb24gdGltZWxpbmUgcmVjb3JkcyAqLworICAgIHdpZHRoOiAxMnB4OworICAgIGhl aWdodDogMTJweDsKKyAgICBtYXJnaW4tdG9wOiAycHg7Cit9CisKIC5zaWRlYmFyID4gLnBhbmVs Lm5hdmlnYXRpb24udGltZWxpbmUgPiAuY29udGVudCA+IC5zdHJpcGUtYmFja2dyb3VuZCB7CiAg ICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRvcDogMDsK 236539 2014-08-13 11:41:21 -0700 2014-08-13 12:01:09 -0700 [PATCH] For Landing for-landing.patch text/plain 3796 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDJkZjYxMjIuLjgzMDRhOTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTA4LTEyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxp bmUgQ2xvc2UgYnV0dG9ucyBjYW4gdXNlIHBvbGlzaCBmb3IgbmV3IGFuZCBsZWdhY3kgc3R5bGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU4NzAK KworICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL0ltYWdlcy9MZWdhY3kvQ2xvc2Uuc3ZnOgorICAgICAgICBFbnN1cmUgdGhpcyBo YXMgZmlsbCBjb2xvcnMgaW4gdHJlZSBzZWxlY3Rpb25zLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+ IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpbWVsaW5lcy1jb250ZW50IC5jbG9zZS1i dXR0b24pOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBh bmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGltZWxpbmVzLWNvbnRlbnQgLmNsb3NlLWJ1dHRv bik6CisgICAgICAgIChib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwu bmF2aWdhdGlvbi50aW1lbGluZSA+IC5jb250ZW50IC5pdGVtID4gLnN0YXR1cyA+IC5zdGF0dXMt YnV0dG9uKToKKyAgICAgICAgU2l6ZSB0aGUgY2xvc2UtYnV0dG9uIGZvciB0aGUgdG9wIG92ZXJ2 aWV3cyBkaWZmZXJlbnRseSBpbiBuZXcgc3R5bGVzICgxNHgxNCkgYW5kIGxlZ2FjeSAoMTJ4MTIp LgorCisyMDE0LTA4LTEyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisK ICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIHVudXNlZCB2YXJpYWJsZSBpbiBQbGF0Zm9y bS5qcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1 ODY5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0lt YWdlcy9MZWdhY3kvQ2xvc2Uuc3ZnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvSW1hZ2VzL0xlZ2FjeS9DbG9zZS5zdmcKaW5kZXggY2NlNjAzMC4uM2JjZWVmMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0xlZ2FjeS9D bG9zZS5zdmcKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2Vz L0xlZ2FjeS9DbG9zZS5zdmcKQEAgLTEsNSArMSw1IEBACiA8P3htbCB2ZXJzaW9uPSIxLjAiIGVu Y29kaW5nPSJ1dGYtOCI/PgogPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuIC0tPgogPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3 LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDE2IDE0Ij4KLSAgICA8cGF0aCBjbGFzcz0i c3Ryb2tlZCIgZD0iTSAxMi45NDkyMTkgMTAuNTM1MTU2IEwgMTEuNTM1MTU2IDExLjk0OTIxOSBM IDggOC40MTQwNjIgTCA0LjQ2NDg0NCAxMS45NDkyMTkgTCAzLjA1MDc4MSAxMC41MzUxNTYgTCA2 LjU4NTkzOCA3IEwgMy4wNTA3ODEgMy40NjQ4NDQgTCA0LjQ2NDg0NCAyLjA1MDc4MSBMIDggNS41 ODU5MzggTCAxMS41MzUxNTYgMi4wNTA3ODEgTCAxMi45NDkyMTkgMy40NjQ4NDQgTCA5LjQxNDA2 MiA3IFoiLz4KKyAgICA8cGF0aCBjbGFzcz0iZmlsbGVkIiBkPSJNIDEyLjk0OTIxOSAxMC41MzUx NTYgTCAxMS41MzUxNTYgMTEuOTQ5MjE5IEwgOCA4LjQxNDA2MiBMIDQuNDY0ODQ0IDExLjk0OTIx OSBMIDMuMDUwNzgxIDEwLjUzNTE1NiBMIDYuNTg1OTM4IDcgTCAzLjA1MDc4MSAzLjQ2NDg0NCBM IDQuNDY0ODQ0IDIuMDUwNzgxIEwgOCA1LjU4NTkzOCBMIDExLjUzNTE1NiAyLjA1MDc4MSBMIDEy Ljk0OTIxOSAzLjQ2NDg0NCBMIDkuNDE0MDYyIDcgWiIvPgogPC9zdmc+CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQ YW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVNpZGViYXJQYW5lbC5jc3MKaW5kZXggYWViNTVjZS4uOTBhMGIxNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFy UGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzcwpAQCAtMTczLDE4ICsxNzMsMjQgQEAgYm9keS5tYWMt cGxhdGZvcm0ubGVnYWN5IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAu dGl0bGUtYmFyLnRpbWUKICAgICBvdmVyZmxvdzogaGlkZGVuOwogfQogCi1ib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGluZSA+IC50aW1l bGluZXMtY29udGVudCB7Ci0gICAgdG9wOiA0NHB4OwotfQotCiAuc2lkZWJhciA+IC5wYW5lbC5u YXZpZ2F0aW9uLnRpbWVsaW5lID4gLnRpbWVsaW5lcy1jb250ZW50IC5jbG9zZS1idXR0b24gewot ICAgIG1hcmdpbi10b3A6IDJweDsKLSAgICB3aWR0aDogMTJweDsKLSAgICBoZWlnaHQ6IDEycHg7 CisgICAgbWFyZ2luLXRvcDogMXB4OworICAgIHdpZHRoOiAxNHB4OworICAgIGhlaWdodDogMTRw eDsKIAogICAgIHZpc2liaWxpdHk6IGhpZGRlbjsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVn YWN5IC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGltZWxpbmVzLWNv bnRlbnQgeworICAgIHRvcDogNDRweDsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5z aWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24udGltZWxpbmUgPiAudGltZWxpbmVzLWNvbnRlbnQg LmNsb3NlLWJ1dHRvbiB7CisgICAgbWFyZ2luLXRvcDogMnB4OworICAgIHdpZHRoOiAxMnB4Owor ICAgIGhlaWdodDogMTJweDsKK30KKwogLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1l bGluZSA+IC50aW1lbGluZXMtY29udGVudCBsaS5pdGVtIC5pY29uIHsKICAgICB3aWR0aDogMjRw eDsKICAgICBoZWlnaHQ6IDI0cHg7CkBAIC0yNDAsNiArMjQ2LDEyIEBAIGJvZHkubWFjLXBsYXRm b3JtLmxlZ2FjeSAuc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLnRpbWVsaW5lID4gLmVtcHR5 LWNvbnRlbnQtCiAgICAgcmlnaHQ6IC0xNnB4OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdh Y3kgLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi50aW1lbGluZSA+IC5jb250ZW50IC5pdGVt ID4gLnN0YXR1cyA+IC5zdGF0dXMtYnV0dG9uIHsKKyAgICB3aWR0aDogMTJweDsKKyAgICBoZWln aHQ6IDEycHg7CisgICAgbWFyZ2luLXRvcDogMnB4OworfQorCiAuc2lkZWJhciA+IC5wYW5lbC5u YXZpZ2F0aW9uLnRpbWVsaW5lID4gLmNvbnRlbnQgPiAuc3RyaXBlLWJhY2tncm91bmQgewogICAg IHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICB0b3A6IDA7Cg==