200321 2019-07-31 14:54:29 -0700 [results.webkit.org] Timeline.CanvasXAxisComponent height should be defined by option 2019-08-01 14:46:18 -0700 1 1 1 Unclassified WebKit Tools / Tests Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zhifei_fang webkit-unassigned commit-queue jbedard webkit-bug-importer zhifei_fang oldest_to_newest 1557398 0 zhifei_fang 2019-07-31 14:54:29 -0700 Timeline.CanvasXAxisComponent height should be defined by option, this will make user more flexible to define the timeline axis. 1557439 1 375264 zhifei_fang 2019-07-31 16:10:19 -0700 Created attachment 375264 Patch 1557444 2 375265 zhifei_fang 2019-07-31 16:34:34 -0700 Created attachment 375265 Patch 1557600 3 375265 jbedard 2019-08-01 07:44:11 -0700 Comment on attachment 375265 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375265&action=review > Tools/ChangeLog:9 > + Let the axis' height can be defined in the option. time line Nit: 'Let the axis' height be defined in the option object.' > Tools/ChangeLog:10 > + Compoenent will read these height and automatically set the height for I think this should be 'The timeline component will use this value to set the padding-top for headers, which allows headers to start in the correct position even with multiple top axises.' > Tools/resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js:512 > + const canvasHeight = typeof option.height === "number" ? option.height : parseInt(computedStyle.getPropertyValue('--smallSize')) * 5; This changer makes the default canvasHeight larger too, right? 1557640 4 zhifei_fang 2019-08-01 10:24:11 -0700 (In reply to Jonathan Bedard from comment #3) > Comment on attachment 375265 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=375265&action=review > > > Tools/ChangeLog:9 > > + Let the axis' height can be defined in the option. time line > > Nit: 'Let the axis' height be defined in the option object.' > > > Tools/ChangeLog:10 > > + Compoenent will read these height and automatically set the height for > > I think this should be 'The timeline component will use this value to set > the padding-top for headers, which allows headers to start in the correct > position even with multiple top axises.' > > > Tools/resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js:512 > > + const canvasHeight = typeof option.height === "number" ? option.height : parseInt(computedStyle.getPropertyValue('--smallSize')) * 5; > > This changer makes the default canvasHeight larger too, right? Yes 1557642 5 375322 zhifei_fang 2019-08-01 10:26:13 -0700 Created attachment 375322 Patch 1557673 6 375322 jbedard 2019-08-01 11:39:33 -0700 Comment on attachment 375322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375322&action=review > Tools/ChangeLog:9 > + Let the axis' height be defined in the option. Timeine compoenent will use this value to Nit: 'component' Nit: 'use this value as padding-top' 1557730 7 375342 zhifei_fang 2019-08-01 13:56:01 -0700 Created attachment 375342 Patch 1557758 8 375342 commit-queue 2019-08-01 14:45:48 -0700 Comment on attachment 375342 Patch Clearing flags on attachment: 375342 Committed r248134: <https://trac.webkit.org/changeset/248134> 1557759 9 commit-queue 2019-08-01 14:45:49 -0700 All reviewed patches have been landed. Closing bug. 1557760 10 webkit-bug-importer 2019-08-01 14:46:18 -0700 <rdar://problem/53833251> 375264 2019-07-31 16:10:19 -0700 2019-07-31 16:34:33 -0700 Patch bug-200321-20190731161019.patch text/plain 4044 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MDc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmRiMzc2MjVkNzk0YTE3MjM2ZjkzMWM4MzhjZTJkOTQ3 NDc2OTljYS4uMzAwNDVjYmE4ZDQ2NGJjNGExNDQwZWJhOTA3N2ZkYTlhZGJiNTQyMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE5LTA3LTMxICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBvbmVu dCBoZWlnaHQgc2hvdWxkIGJlIGRlZmluZWQgYnkgb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzMjEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAg ICAgICAgTGV0IHRoZSBheGlzJyBoZWlnaHQgY2FuIGJlIGRlZmluZWQgaW4gdGhlIG9wdGlvbi4g dGltZSBsaW5lCisgICAgICAgIENvbXBvZW5lbnQgd2lsbCByZWFkIHRoZXNlIGhlaWdodCBhbmQg YXV0b21hdGljYWxseSBzZXQgdGhlIGhlaWdodCBmb3IKKyAgICAgICAgdGhlIGhlYWRlciBwYXJ0 J3MgcGFkZGluZy10b3AsIHRoaXMgbWFrZXMgaGVhZGVycyBzdGFydCBpbiB0aGUgcmlnaHQKKyAg ICAgICAgcG9zaXRpb24sIGV2ZW4gd2UgaGF2ZSBtdWx0aXBsZSB0b3AgYXhpc2VzLgorICAgICAg ICAoVGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KToKKyAgICAgICAgKHByb3RvdHlwZS5U aW1lbGluZS5DYW52YXNDb250YWluZXIpOgorCiAyMDE5LTA3LTMxICBMb8OvYyBZaHVlbCAgPGxv aWMueWh1ZWxAc29mdGF0aG9tZS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBGaXggZ3RrZG9j IGJ1aWxkIHdpdGggImJ1aWxkLXdlYmtpdCAtLTMyLWJpdCIgb24gNjQtYml0IGhvc3RzCmRpZmYg LS1naXQgYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5 L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzIGIvVG9vbHMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29t cG9uZW50cy5qcwppbmRleCA0ZTRiMjQ4MTJjODcyODc4ODYzOGQxMzZkZTkwODNjNWVmYmNhNzBk Li4zNDRiMTVlZTk3ZDQyOTQ0MWQ2ZjdlYmNlNzU1NzcxZDU2MDNkOTNlIDEwMDY0NAotLS0gYS9U b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBv bmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzCisrKyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVu dHMuanMKQEAgLTIwOSw2ICsyMDksNyBAQCBUaW1lbGluZS5DYW52YXNTZXJpZXNDb21wb25lbnQg PSAoZG90cywgc2NhbGVzLCBvcHRpb24gPSB7fSkgPT4gewogICAgICAgICBlbXB0eWxpbmVDb2xv ciA9IGVtcHR5bGluZUNvbG9yID8gZW1wdHlsaW5lQ29sb3IgOiBkZWZhdWx0RW1wdHlMaW5lQ29s b3I7CiAgICAgICAgICAgICBpZiAoIWlzRW1wdHkpIHsKICAgICAgICAgICAgICAgICAvL0RyYXcg dGhlIGRvdAorICAgICAgICAgICAgICAgIGNvbnRleHQuYmVnaW5QYXRoKCk7CiAgICAgICAgICAg ICAgICAgY29udGV4dC5hcmMoeCArIGRvdE1hcmdpbiArIHJhZGl1cywgeSwgcmFkaXVzLCAwLCAy ICogTWF0aC5QSSk7CiAgICAgICAgICAgICAgICAgY29udGV4dC5maWxsU3R5bGUgPSBjb2xvcjsK ICAgICAgICAgICAgICAgICBjb250ZXh0LmZpbGwoKTsKQEAgLTUwOCw3ICs1MDksNyBAQCBUaW1l bGluZS5DYW52YXNYQXhpc0NvbXBvbmVudCA9IChzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAg ICAgY29uc3Qgc2NhbGVUYWdMaW5lUGFkZGluZyA9IDEwOwogICAgIGNvbnN0IHNjYWxlQnJvYWRM aW5lSGVpZ2h0ID0gcGFyc2VJbnQoY29tcHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCctLXRp bnlTaXplJykpIC8gMjsKICAgICBjb25zdCBtYXhpbnVtVGV4dEhlaWdodCA9IHNjYWxlV2lkdGgg KiA0LjU7Ci0gICAgY29uc3QgY2FudmFzSGVpZ2h0ID0gcGFyc2VJbnQoY29tcHV0ZWRTdHlsZS5n ZXRQcm9wZXJ0eVZhbHVlKCctLXNtYWxsU2l6ZScpKSAqIDQ7CisgICAgY29uc3QgY2FudmFzSGVp Z2h0ID0gdHlwZW9mIG9wdGlvbi5oZWlnaHQgPT09ICJudW1iZXIiID8gb3B0aW9uLmhlaWdodCA6 IHBhcnNlSW50KGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnLS1zbWFsbFNpemUnKSkg KiA1OwogICAgIGNvbnN0IHNxcnQzID0gTWF0aC5zcXJ0KDMpOwogCiAgICAgY29uc3QgZHJhd1Nj YWxlID0gKHNjYWxlTGFiZWwsIGdyb3VwLCBjb250ZXh0LCB4LCB5LCBpc0hvdmVyYWJsZSwgbGlu ZUNvbG9yLCBncm91cENvbG9yKSA9PiB7CkBAIC03MzEsMTIgKzczMiwxNCBAQCBUaW1lbGluZS5D YW52YXNYQXhpc0NvbXBvbmVudCA9IChzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAgICAgICAg ICAgICAgICAgPGNhbnZhcyByZWY9IiR7Y2FudmFzUmVmfSI+CiAgICAgICAgICAgICA8L2Rpdj5g OwogICAgICAgICB9KSwKLSAgICAgICAgaXNBeGlzOiB0cnVlIC8vIE1hcmsgc2VsZiBhcyBhbiBh eGlzCisgICAgICAgIGlzQXhpczogdHJ1ZSwgLy8gTWFyayBzZWxmIGFzIGFuIGF4aXMsCisgICAg ICAgIGhlaWdodDogY2FudmFzSGVpZ2h0LCAvLyBFeHBvc2UgSGVpZ2h0IHRvIHBhcmVudAogICAg IH07CiB9CiAKIFRpbWVsaW5lLkNhbnZhc0NvbnRhaW5lciA9IChleHBvcnRlciwgLi4uY2hpbGRy ZW4pID0+IHsKLSAgICBjb25zdCBoYXNUb3BYQXhpcyA9IGNoaWxkcmVuWzBdLmlzQXhpczsKKyAg ICBsZXQgaGVhZGVyQXhpc1BsYWNlSG9sZGVySGVpZ2h0ID0gMDsKKyAgICBsZXQgdG9wQXhpcyA9 IHRydWU7CiAgICAgY29uc3QgdXBhY2tDaGlsZHJlbiA9IChjaGlsZHJlbikgPT4gewogICAgICAg ICBjb25zdCBoZWFkZXJzID0gW107CiAgICAgICAgIGNvbnN0IHNlcmllc2VzID0gW107CkBAIC03 NDgsNiArNzUxLDEwIEBAIFRpbWVsaW5lLkNhbnZhc0NvbnRhaW5lciA9IChleHBvcnRlciwgLi4u Y2hpbGRyZW4pID0+IHsKICAgICAgICAgICAgIGlmIChjaGlsZC5oZWFkZXIpCiAgICAgICAgICAg ICAgICAgaGVhZGVycy5wdXNoKGNoaWxkLmhlYWRlcik7CiAgICAgICAgICAgICBzZXJpZXNlcy5w dXNoKGNoaWxkLnNlcmllcyk7CisgICAgICAgICAgICBpZiAoY2hpbGQuaXNBeGlzICYmIHRvcEF4 aXMpCisgICAgICAgICAgICAgICAgaGVhZGVyQXhpc1BsYWNlSG9sZGVySGVpZ2h0ICs9IGNoaWxk LmhlaWdodDsKKyAgICAgICAgICAgIGVsc2UgaWYgKHRvcEF4aXMpCisgICAgICAgICAgICAgICAg dG9wQXhpcyA9IGZhbHNlOwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuIHtoZWFkZXJzLCBz ZXJpZXNlc307CiAgICAgfTsKQEAgLTc2Miw3ICs3NjksNyBAQCBUaW1lbGluZS5DYW52YXNDb250 YWluZXIgPSAoZXhwb3J0ZXIsIC4uLmNoaWxkcmVuKSA9PiB7CiAgICAgfSkpOwogICAgIHJldHVy biAoCiAgICAgICAgIGA8ZGl2IGNsYXNzPSJ0aW1lbGluZSI+Ci0gICAgICAgICAgICA8ZGl2IGNs YXNzPSJoZWFkZXIgJHtoYXNUb3BYQXhpcyA/ICJ3aXRoLXRvcC14LWF4aXMiIDogIiJ9Ij4KKyAg ICAgICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciIgc3R5bGU9InBhZGRpbmctdG9wOiR7aGVhZGVy QXhpc1BsYWNlSG9sZGVySGVpZ2h0fXB4Ij4KICAgICAgICAgICAgICAgICAke0xpc3RDb21wb25l bnQoY29tcG9zZXIsIC4uLmhlYWRlcnMpfQogICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAg ICAke1hTY3JvbGxhYmxlQ2FudmFzUHJvdmlkZXIoY29tcG9zZXIsIC4uLnNlcmllc2VzKX0K 375265 2019-07-31 16:34:34 -0700 2019-08-01 10:26:12 -0700 Patch bug-200321-20190731163434.patch text/plain 3630 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MDgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODFlNmQ1MGFmODQ1OTljNWJmMzQ2YjhmYzc4OWE0YjUy NzI4N2I0Zi4uMGI1ZDk3MDlkNzM3NzQ2NjIxNTEyOWQyMTI3ODg2YzVmNjE0NjYwYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE5LTA3LTMxICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBvbmVu dCBoZWlnaHQgc2hvdWxkIGJlIGRlZmluZWQgYnkgb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzMjEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAg ICAgICAgTGV0IHRoZSBheGlzJyBoZWlnaHQgY2FuIGJlIGRlZmluZWQgaW4gdGhlIG9wdGlvbi4g dGltZSBsaW5lCisgICAgICAgIENvbXBvZW5lbnQgd2lsbCByZWFkIHRoZXNlIGhlaWdodCBhbmQg YXV0b21hdGljYWxseSBzZXQgdGhlIGhlaWdodCBmb3IKKyAgICAgICAgdGhlIGhlYWRlciBwYXJ0 J3MgcGFkZGluZy10b3AsIHRoaXMgbWFrZXMgaGVhZGVycyBzdGFydCBpbiB0aGUgcmlnaHQKKyAg ICAgICAgcG9zaXRpb24sIGV2ZW4gd2UgaGF2ZSBtdWx0aXBsZSB0b3AgYXhpc2VzLgorICAgICAg ICAoVGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KToKKyAgICAgICAgKHByb3RvdHlwZS5U aW1lbGluZS5DYW52YXNDb250YWluZXIpOgorCiAyMDE5LTA3LTMxICBKb25hdGhhbiBCZWRhcmQg IDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICByZXN1bHRzLndlYmtpdC5vZzogVGltZWxp bmUgaW4gY2FudmFzIHBhaW50aW5nIHdpdGggd3JvbmcgY29sb3JzLCBjYW5ub3QgY3VzdG9taXpl IHNjYWxlCmRpZmYgLS1naXQgYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0 YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzIGIvVG9vbHMv cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRz L1RpbWVsaW5lQ29tcG9uZW50cy5qcwppbmRleCBhNWY1NzZlYzIzNTMxOWY3NGQ5MzZiOWZhZWRl NDMzNGRlZjI2Y2ViLi45OGFhYTMyYzY1Zjk3ZTcyNTQ0NDgwYzUzNjM0N2VjMmE3YjhhZjYxIDEw MDY0NAotLS0gYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJy YXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzCisrKyBiL1Rvb2xzL3Jlc3Vs dHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1l bGluZUNvbXBvbmVudHMuanMKQEAgLTUwOSw3ICs1MDksNyBAQCBUaW1lbGluZS5DYW52YXNYQXhp c0NvbXBvbmVudCA9IChzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAgICAgY29uc3Qgc2NhbGVU YWdMaW5lUGFkZGluZyA9IDEwOwogICAgIGNvbnN0IHNjYWxlQnJvYWRMaW5lSGVpZ2h0ID0gcGFy c2VJbnQoY29tcHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCctLXRpbnlTaXplJykpIC8gMjsK ICAgICBjb25zdCBtYXhpbnVtVGV4dEhlaWdodCA9IHNjYWxlV2lkdGggKiA0LjU7Ci0gICAgY29u c3QgY2FudmFzSGVpZ2h0ID0gcGFyc2VJbnQoY29tcHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eVZhbHVl KCctLXNtYWxsU2l6ZScpKSAqIDQ7CisgICAgY29uc3QgY2FudmFzSGVpZ2h0ID0gdHlwZW9mIG9w dGlvbi5oZWlnaHQgPT09ICJudW1iZXIiID8gb3B0aW9uLmhlaWdodCA6IHBhcnNlSW50KGNvbXB1 dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnLS1zbWFsbFNpemUnKSkgKiA1OwogICAgIGNvbnN0 IHNxcnQzID0gTWF0aC5zcXJ0KDMpOwogCiAgICAgY29uc3QgZHJhd1NjYWxlID0gKHNjYWxlTGFi ZWwsIGdyb3VwLCBjb250ZXh0LCB4LCB5LCBpc0hvdmVyYWJsZSwgbGluZUNvbG9yLCBncm91cENv bG9yKSA9PiB7CkBAIC03MzIsMTIgKzczMiwxNCBAQCBUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBv bmVudCA9IChzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAgICAgICAgICAgICAgICAgPGNhbnZh cyByZWY9IiR7Y2FudmFzUmVmfSI+CiAgICAgICAgICAgICA8L2Rpdj5gOwogICAgICAgICB9KSwK LSAgICAgICAgaXNBeGlzOiB0cnVlIC8vIE1hcmsgc2VsZiBhcyBhbiBheGlzCisgICAgICAgIGlz QXhpczogdHJ1ZSwgLy8gTWFyayBzZWxmIGFzIGFuIGF4aXMsCisgICAgICAgIGhlaWdodDogY2Fu dmFzSGVpZ2h0LCAvLyBFeHBvc2UgSGVpZ2h0IHRvIHBhcmVudAogICAgIH07CiB9CiAKIFRpbWVs aW5lLkNhbnZhc0NvbnRhaW5lciA9IChleHBvcnRlciwgLi4uY2hpbGRyZW4pID0+IHsKLSAgICBj b25zdCBoYXNUb3BYQXhpcyA9IGNoaWxkcmVuWzBdLmlzQXhpczsKKyAgICBsZXQgaGVhZGVyQXhp c1BsYWNlSG9sZGVySGVpZ2h0ID0gMDsKKyAgICBsZXQgdG9wQXhpcyA9IHRydWU7CiAgICAgY29u c3QgdXBhY2tDaGlsZHJlbiA9IChjaGlsZHJlbikgPT4gewogICAgICAgICBjb25zdCBoZWFkZXJz ID0gW107CiAgICAgICAgIGNvbnN0IHNlcmllc2VzID0gW107CkBAIC03NDksNiArNzUxLDEwIEBA IFRpbWVsaW5lLkNhbnZhc0NvbnRhaW5lciA9IChleHBvcnRlciwgLi4uY2hpbGRyZW4pID0+IHsK ICAgICAgICAgICAgIGlmIChjaGlsZC5oZWFkZXIpCiAgICAgICAgICAgICAgICAgaGVhZGVycy5w dXNoKGNoaWxkLmhlYWRlcik7CiAgICAgICAgICAgICBzZXJpZXNlcy5wdXNoKGNoaWxkLnNlcmll cyk7CisgICAgICAgICAgICBpZiAoY2hpbGQuaXNBeGlzICYmIHRvcEF4aXMpCisgICAgICAgICAg ICAgICAgaGVhZGVyQXhpc1BsYWNlSG9sZGVySGVpZ2h0ICs9IGNoaWxkLmhlaWdodDsKKyAgICAg ICAgICAgIGVsc2UgaWYgKHRvcEF4aXMpCisgICAgICAgICAgICAgICAgdG9wQXhpcyA9IGZhbHNl OwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuIHtoZWFkZXJzLCBzZXJpZXNlc307CiAgICAg fTsKQEAgLTc2Myw3ICs3NjksNyBAQCBUaW1lbGluZS5DYW52YXNDb250YWluZXIgPSAoZXhwb3J0 ZXIsIC4uLmNoaWxkcmVuKSA9PiB7CiAgICAgfSkpOwogICAgIHJldHVybiAoCiAgICAgICAgIGA8 ZGl2IGNsYXNzPSJ0aW1lbGluZSI+Ci0gICAgICAgICAgICA8ZGl2IGNsYXNzPSJoZWFkZXIgJHto YXNUb3BYQXhpcyA/ICJ3aXRoLXRvcC14LWF4aXMiIDogIiJ9Ij4KKyAgICAgICAgICAgIDxkaXYg Y2xhc3M9ImhlYWRlciIgc3R5bGU9InBhZGRpbmctdG9wOiR7aGVhZGVyQXhpc1BsYWNlSG9sZGVy SGVpZ2h0fXB4Ij4KICAgICAgICAgICAgICAgICAke0xpc3RDb21wb25lbnQoY29tcG9zZXIsIC4u LmhlYWRlcnMpfQogICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAke1hTY3JvbGxhYmxl Q2FudmFzUHJvdmlkZXIoY29tcG9zZXIsIC4uLnNlcmllc2VzKX0K 375322 2019-08-01 10:26:13 -0700 2019-08-01 13:56:00 -0700 Patch bug-200321-20190801102613.patch text/plain 3572 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MDgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODFlNmQ1MGFmODQ1OTljNWJmMzQ2YjhmYzc4OWE0YjUy NzI4N2I0Zi4uMGRlNGU5NTRkY2Q1NDE1NGUwMGVlNTc1MmEyYmI0YTA2NDZlYTFhZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE5LTA3LTMxICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBvbmVu dCBoZWlnaHQgc2hvdWxkIGJlIGRlZmluZWQgYnkgb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzMjEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAg ICAgICAgTGV0IHRoZSBheGlzJyBoZWlnaHQgYmUgZGVmaW5lZCBpbiB0aGUgb3B0aW9uLiBUaW1l aW5lIGNvbXBvZW5lbnQgd2lsbCB1c2UgdGhpcyB2YWx1ZSB0byAKKyAgICAgICAgcGFkZGluZy10 b3AgZm9yIGhlYWRlcnMgd2hpY2ggYWxsb3dzIGhlYWRlcnMgc3RhcnQgaW4gdGhlIHJpZ2h0IHBv c2l0aW9uLCBldmVuIHdpdGggbXVsdGlwbGUgCisgICAgICAgIHRvcCBheGlzZXMuCisgICAgICAg IChUaW1lbGluZS5DYW52YXNTZXJpZXNDb21wb25lbnQpOgorICAgICAgICAocHJvdG90eXBlLlRp bWVsaW5lLkNhbnZhc0NvbnRhaW5lcik6CisKIDIwMTktMDctMzEgIEpvbmF0aGFuIEJlZGFyZCAg PGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIHJlc3VsdHMud2Via2l0Lm9nOiBUaW1lbGlu ZSBpbiBjYW52YXMgcGFpbnRpbmcgd2l0aCB3cm9uZyBjb2xvcnMsIGNhbm5vdCBjdXN0b21pemUg c2NhbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3Rh dGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMgYi9Ub29scy9y ZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMv VGltZWxpbmVDb21wb25lbnRzLmpzCmluZGV4IGE1ZjU3NmVjMjM1MzE5Zjc0ZDkzNmI5ZmFlZGU0 MzM0ZGVmMjZjZWIuLjk4YWFhMzJjNjVmOTdlNzI1NDQ0ODBjNTM2MzQ3ZWMyYTdiOGFmNjEgMTAw NjQ0Ci0tLSBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJh cnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMKKysrIGIvVG9vbHMvcmVzdWx0 c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVs aW5lQ29tcG9uZW50cy5qcwpAQCAtNTA5LDcgKzUwOSw3IEBAIFRpbWVsaW5lLkNhbnZhc1hBeGlz Q29tcG9uZW50ID0gKHNjYWxlcywgb3B0aW9uID0ge30pID0+IHsKICAgICBjb25zdCBzY2FsZVRh Z0xpbmVQYWRkaW5nID0gMTA7CiAgICAgY29uc3Qgc2NhbGVCcm9hZExpbmVIZWlnaHQgPSBwYXJz ZUludChjb21wdXRlZFN0eWxlLmdldFByb3BlcnR5VmFsdWUoJy0tdGlueVNpemUnKSkgLyAyOwog ICAgIGNvbnN0IG1heGludW1UZXh0SGVpZ2h0ID0gc2NhbGVXaWR0aCAqIDQuNTsKLSAgICBjb25z dCBjYW52YXNIZWlnaHQgPSBwYXJzZUludChjb21wdXRlZFN0eWxlLmdldFByb3BlcnR5VmFsdWUo Jy0tc21hbGxTaXplJykpICogNDsKKyAgICBjb25zdCBjYW52YXNIZWlnaHQgPSB0eXBlb2Ygb3B0 aW9uLmhlaWdodCA9PT0gIm51bWJlciIgPyBvcHRpb24uaGVpZ2h0IDogcGFyc2VJbnQoY29tcHV0 ZWRTdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKCctLXNtYWxsU2l6ZScpKSAqIDU7CiAgICAgY29uc3Qg c3FydDMgPSBNYXRoLnNxcnQoMyk7CiAKICAgICBjb25zdCBkcmF3U2NhbGUgPSAoc2NhbGVMYWJl bCwgZ3JvdXAsIGNvbnRleHQsIHgsIHksIGlzSG92ZXJhYmxlLCBsaW5lQ29sb3IsIGdyb3VwQ29s b3IpID0+IHsKQEAgLTczMiwxMiArNzMyLDE0IEBAIFRpbWVsaW5lLkNhbnZhc1hBeGlzQ29tcG9u ZW50ID0gKHNjYWxlcywgb3B0aW9uID0ge30pID0+IHsKICAgICAgICAgICAgICAgICA8Y2FudmFz IHJlZj0iJHtjYW52YXNSZWZ9Ij4KICAgICAgICAgICAgIDwvZGl2PmA7CiAgICAgICAgIH0pLAot ICAgICAgICBpc0F4aXM6IHRydWUgLy8gTWFyayBzZWxmIGFzIGFuIGF4aXMKKyAgICAgICAgaXNB eGlzOiB0cnVlLCAvLyBNYXJrIHNlbGYgYXMgYW4gYXhpcywKKyAgICAgICAgaGVpZ2h0OiBjYW52 YXNIZWlnaHQsIC8vIEV4cG9zZSBIZWlnaHQgdG8gcGFyZW50CiAgICAgfTsKIH0KIAogVGltZWxp bmUuQ2FudmFzQ29udGFpbmVyID0gKGV4cG9ydGVyLCAuLi5jaGlsZHJlbikgPT4gewotICAgIGNv bnN0IGhhc1RvcFhBeGlzID0gY2hpbGRyZW5bMF0uaXNBeGlzOworICAgIGxldCBoZWFkZXJBeGlz UGxhY2VIb2xkZXJIZWlnaHQgPSAwOworICAgIGxldCB0b3BBeGlzID0gdHJ1ZTsKICAgICBjb25z dCB1cGFja0NoaWxkcmVuID0gKGNoaWxkcmVuKSA9PiB7CiAgICAgICAgIGNvbnN0IGhlYWRlcnMg PSBbXTsKICAgICAgICAgY29uc3Qgc2VyaWVzZXMgPSBbXTsKQEAgLTc0OSw2ICs3NTEsMTAgQEAg VGltZWxpbmUuQ2FudmFzQ29udGFpbmVyID0gKGV4cG9ydGVyLCAuLi5jaGlsZHJlbikgPT4gewog ICAgICAgICAgICAgaWYgKGNoaWxkLmhlYWRlcikKICAgICAgICAgICAgICAgICBoZWFkZXJzLnB1 c2goY2hpbGQuaGVhZGVyKTsKICAgICAgICAgICAgIHNlcmllc2VzLnB1c2goY2hpbGQuc2VyaWVz KTsKKyAgICAgICAgICAgIGlmIChjaGlsZC5pc0F4aXMgJiYgdG9wQXhpcykKKyAgICAgICAgICAg ICAgICBoZWFkZXJBeGlzUGxhY2VIb2xkZXJIZWlnaHQgKz0gY2hpbGQuaGVpZ2h0OworICAgICAg ICAgICAgZWxzZSBpZiAodG9wQXhpcykKKyAgICAgICAgICAgICAgICB0b3BBeGlzID0gZmFsc2U7 CiAgICAgICAgIH0pOwogICAgICAgICByZXR1cm4ge2hlYWRlcnMsIHNlcmllc2VzfTsKICAgICB9 OwpAQCAtNzYzLDcgKzc2OSw3IEBAIFRpbWVsaW5lLkNhbnZhc0NvbnRhaW5lciA9IChleHBvcnRl ciwgLi4uY2hpbGRyZW4pID0+IHsKICAgICB9KSk7CiAgICAgcmV0dXJuICgKICAgICAgICAgYDxk aXYgY2xhc3M9InRpbWVsaW5lIj4KLSAgICAgICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciAke2hh c1RvcFhBeGlzID8gIndpdGgtdG9wLXgtYXhpcyIgOiAiIn0iPgorICAgICAgICAgICAgPGRpdiBj bGFzcz0iaGVhZGVyIiBzdHlsZT0icGFkZGluZy10b3A6JHtoZWFkZXJBeGlzUGxhY2VIb2xkZXJI ZWlnaHR9cHgiPgogICAgICAgICAgICAgICAgICR7TGlzdENvbXBvbmVudChjb21wb3NlciwgLi4u aGVhZGVycyl9CiAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAgICR7WFNjcm9sbGFibGVD YW52YXNQcm92aWRlcihjb21wb3NlciwgLi4uc2VyaWVzZXMpfQo= 375342 2019-08-01 13:56:01 -0700 2019-08-01 14:45:48 -0700 Patch bug-200321-20190801135601.patch text/plain 3571 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MDgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODFlNmQ1MGFmODQ1OTljNWJmMzQ2YjhmYzc4OWE0YjUy NzI4N2I0Zi4uZGY0ZjVkYzViNDJhZTNjN2NiOTFiZmI1YmZmMzNkNmQ2ODU4ZGFkMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE5LTA3LTMxICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBbcmVzdWx0cy53ZWJraXQub3JnXSBUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBvbmVu dCBoZWlnaHQgc2hvdWxkIGJlIGRlZmluZWQgYnkgb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzMjEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAg ICAgICAgTGV0IHRoZSBheGlzJyBoZWlnaHQgYmUgZGVmaW5lZCBpbiB0aGUgb3B0aW9uLiBUaW1l aW5lIGNvbXBvbmVudCB3aWxsIHVzZSB0aGlzIHZhbHVlIGFzIAorICAgICAgICBwYWRkaW5nLXRv cCBmb3IgaGVhZGVycyB3aGljaCBhbGxvd3MgaGVhZGVycyBzdGFydCBpbiB0aGUgcmlnaHQgcG9z aXRpb24sIGV2ZW4gd2l0aCBtdWx0aXBsZSAKKyAgICAgICAgdG9wIGF4aXNlcy4KKyAgICAgICAg KFRpbWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVudCk6CisgICAgICAgIChwcm90b3R5cGUuVGlt ZWxpbmUuQ2FudmFzQ29udGFpbmVyKToKKwogMjAxOS0wNy0zMSAgSm9uYXRoYW4gQmVkYXJkICA8 amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgcmVzdWx0cy53ZWJraXQub2c6IFRpbWVsaW5l IGluIGNhbnZhcyBwYWludGluZyB3aXRoIHdyb25nIGNvbG9ycywgY2Fubm90IGN1c3RvbWl6ZSBz Y2FsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0 aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcyBiL1Rvb2xzL3Jl c3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9U aW1lbGluZUNvbXBvbmVudHMuanMKaW5kZXggYTVmNTc2ZWMyMzUzMTlmNzRkOTM2YjlmYWVkZTQz MzRkZWYyNmNlYi4uOThhYWEzMmM2NWY5N2U3MjU0NDQ4MGM1MzYzNDdlYzJhN2I4YWY2MSAxMDA2 NDQKLS0tIGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFy eS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcworKysgYi9Ub29scy9yZXN1bHRz ZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxp bmVDb21wb25lbnRzLmpzCkBAIC01MDksNyArNTA5LDcgQEAgVGltZWxpbmUuQ2FudmFzWEF4aXND b21wb25lbnQgPSAoc2NhbGVzLCBvcHRpb24gPSB7fSkgPT4gewogICAgIGNvbnN0IHNjYWxlVGFn TGluZVBhZGRpbmcgPSAxMDsKICAgICBjb25zdCBzY2FsZUJyb2FkTGluZUhlaWdodCA9IHBhcnNl SW50KGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnLS10aW55U2l6ZScpKSAvIDI7CiAg ICAgY29uc3QgbWF4aW51bVRleHRIZWlnaHQgPSBzY2FsZVdpZHRoICogNC41OwotICAgIGNvbnN0 IGNhbnZhc0hlaWdodCA9IHBhcnNlSW50KGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgn LS1zbWFsbFNpemUnKSkgKiA0OworICAgIGNvbnN0IGNhbnZhc0hlaWdodCA9IHR5cGVvZiBvcHRp b24uaGVpZ2h0ID09PSAibnVtYmVyIiA/IG9wdGlvbi5oZWlnaHQgOiBwYXJzZUludChjb21wdXRl ZFN0eWxlLmdldFByb3BlcnR5VmFsdWUoJy0tc21hbGxTaXplJykpICogNTsKICAgICBjb25zdCBz cXJ0MyA9IE1hdGguc3FydCgzKTsKIAogICAgIGNvbnN0IGRyYXdTY2FsZSA9IChzY2FsZUxhYmVs LCBncm91cCwgY29udGV4dCwgeCwgeSwgaXNIb3ZlcmFibGUsIGxpbmVDb2xvciwgZ3JvdXBDb2xv cikgPT4gewpAQCAtNzMyLDEyICs3MzIsMTQgQEAgVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25l bnQgPSAoc2NhbGVzLCBvcHRpb24gPSB7fSkgPT4gewogICAgICAgICAgICAgICAgIDxjYW52YXMg cmVmPSIke2NhbnZhc1JlZn0iPgogICAgICAgICAgICAgPC9kaXY+YDsKICAgICAgICAgfSksCi0g ICAgICAgIGlzQXhpczogdHJ1ZSAvLyBNYXJrIHNlbGYgYXMgYW4gYXhpcworICAgICAgICBpc0F4 aXM6IHRydWUsIC8vIE1hcmsgc2VsZiBhcyBhbiBheGlzLAorICAgICAgICBoZWlnaHQ6IGNhbnZh c0hlaWdodCwgLy8gRXhwb3NlIEhlaWdodCB0byBwYXJlbnQKICAgICB9OwogfQogCiBUaW1lbGlu ZS5DYW52YXNDb250YWluZXIgPSAoZXhwb3J0ZXIsIC4uLmNoaWxkcmVuKSA9PiB7Ci0gICAgY29u c3QgaGFzVG9wWEF4aXMgPSBjaGlsZHJlblswXS5pc0F4aXM7CisgICAgbGV0IGhlYWRlckF4aXNQ bGFjZUhvbGRlckhlaWdodCA9IDA7CisgICAgbGV0IHRvcEF4aXMgPSB0cnVlOwogICAgIGNvbnN0 IHVwYWNrQ2hpbGRyZW4gPSAoY2hpbGRyZW4pID0+IHsKICAgICAgICAgY29uc3QgaGVhZGVycyA9 IFtdOwogICAgICAgICBjb25zdCBzZXJpZXNlcyA9IFtdOwpAQCAtNzQ5LDYgKzc1MSwxMCBAQCBU aW1lbGluZS5DYW52YXNDb250YWluZXIgPSAoZXhwb3J0ZXIsIC4uLmNoaWxkcmVuKSA9PiB7CiAg ICAgICAgICAgICBpZiAoY2hpbGQuaGVhZGVyKQogICAgICAgICAgICAgICAgIGhlYWRlcnMucHVz aChjaGlsZC5oZWFkZXIpOwogICAgICAgICAgICAgc2VyaWVzZXMucHVzaChjaGlsZC5zZXJpZXMp OworICAgICAgICAgICAgaWYgKGNoaWxkLmlzQXhpcyAmJiB0b3BBeGlzKQorICAgICAgICAgICAg ICAgIGhlYWRlckF4aXNQbGFjZUhvbGRlckhlaWdodCArPSBjaGlsZC5oZWlnaHQ7CisgICAgICAg ICAgICBlbHNlIGlmICh0b3BBeGlzKQorICAgICAgICAgICAgICAgIHRvcEF4aXMgPSBmYWxzZTsK ICAgICAgICAgfSk7CiAgICAgICAgIHJldHVybiB7aGVhZGVycywgc2VyaWVzZXN9OwogICAgIH07 CkBAIC03NjMsNyArNzY5LDcgQEAgVGltZWxpbmUuQ2FudmFzQ29udGFpbmVyID0gKGV4cG9ydGVy LCAuLi5jaGlsZHJlbikgPT4gewogICAgIH0pKTsKICAgICByZXR1cm4gKAogICAgICAgICBgPGRp diBjbGFzcz0idGltZWxpbmUiPgotICAgICAgICAgICAgPGRpdiBjbGFzcz0iaGVhZGVyICR7aGFz VG9wWEF4aXMgPyAid2l0aC10b3AteC1heGlzIiA6ICIifSI+CisgICAgICAgICAgICA8ZGl2IGNs YXNzPSJoZWFkZXIiIHN0eWxlPSJwYWRkaW5nLXRvcDoke2hlYWRlckF4aXNQbGFjZUhvbGRlckhl aWdodH1weCI+CiAgICAgICAgICAgICAgICAgJHtMaXN0Q29tcG9uZW50KGNvbXBvc2VyLCAuLi5o ZWFkZXJzKX0KICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICAgJHtYU2Nyb2xsYWJsZUNh bnZhc1Byb3ZpZGVyKGNvbXBvc2VyLCAuLi5zZXJpZXNlcyl9Cg==