200363 2019-08-01 14:42:30 -0700 results.webkit.org: Force update cache when timeline updated 2019-08-01 20:51:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue webkit-bug-importer zhifei_fang oldest_to_newest 1557757 0 jbedard 2019-08-01 14:42:30 -0700 We need to force the cache to update when the timeline is updated, and we need an exporter to update the timeline. 1557761 1 375349 jbedard 2019-08-01 14:48:55 -0700 Created attachment 375349 Patch 1557762 2 375349 zhifei_fang 2019-08-01 14:54:13 -0700 Comment on attachment 375349 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375349&action=review > Tools/resultsdbpy/resultsdbpy/view/static/library/js/components/TimelineComponents.js:151 > + if (element.logicWidth != width || force) { I think if (force) will be enough here 1557766 3 zhifei_fang 2019-08-01 15:05:12 -0700 I will give a new patch about this change, we shouldn't force to redraw cache every time when the state change, this will impact the performance. 1557772 4 375354 zhifei_fang 2019-08-01 15:15:17 -0700 Created attachment 375354 Patch 1557775 5 375354 jbedard 2019-08-01 15:24:44 -0700 Comment on attachment 375354 Patch Can we add the exporter hook? Also, I'm going to mark my patch as obsolete, since I redrew on scroll too. 1557778 6 375357 zhifei_fang 2019-08-01 15:30:25 -0700 Created attachment 375357 Patch 1557779 7 zhifei_fang 2019-08-01 15:30:44 -0700 (In reply to Jonathan Bedard from comment #5) > Comment on attachment 375354 [details] > Patch > > Can we add the exporter hook? > > Also, I'm going to mark my patch as obsolete, since I redrew on scroll too. Added. 1557805 8 375366 zhifei_fang 2019-08-01 16:46:47 -0700 Created attachment 375366 Patch 1557809 9 375366 jbedard 2019-08-01 17:10:31 -0700 Comment on attachment 375366 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375366&action=review > Tools/ChangeLog:11 > + (Timeline.CanvasXAxisComponent): Force redraw when scales are updated. I think you also need to mention the fact that you added the exporter bit. 1557823 10 375376 zhifei_fang 2019-08-01 18:46:29 -0700 Created attachment 375376 Patch 1557865 11 375376 commit-queue 2019-08-01 20:50:21 -0700 Comment on attachment 375376 Patch Clearing flags on attachment: 375376 Committed r248146: <https://trac.webkit.org/changeset/248146> 1557866 12 commit-queue 2019-08-01 20:50:23 -0700 All reviewed patches have been landed. Closing bug. 1557867 13 webkit-bug-importer 2019-08-01 20:51:16 -0700 <rdar://problem/53846931> 375349 2019-08-01 14:48:55 -0700 2019-08-01 15:25:00 -0700 Patch bug-200363-20190801144854.patch text/plain 4212 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0ODEzMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE5LTA4LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEZvcmNlIHVwZGF0ZSBjYWNoZSB3aGVu IHRpbWVsaW5lIHVwZGF0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwMDM2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9q cy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAgICAgICAgKG9mZnNjcmVlbkNh Y2hlZFJlbmRlckZhY3RvcnkpOiBBZGQgYWJpbGl0eSB0byBmb3JjZSB0aGUgcmVkcmF3LgorICAg ICAgICAoVGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KTogRm9yY2UgcmVkcmF3IHdoZW4g c3RhdGUgaXMgdXBkYXRlZC4KKyAgICAgICAgKFRpbWVsaW5lLkNhbnZhc1hBeGlzQ29tcG9uZW50 KTogQWRkIGFuIHVwZGF0ZSBjYWxsYmFjaywgZm9yY2UgcmVkcmF3IHdoZW4gc3RhdGUgaXMgdXBk YXRlZC4KKwogMjAxOS0wOC0wMSAgWmhpZmVpIEZhbmcgIDx6aGlmZWlfZmFuZ0BhcHBsZS5jb20+ CiAKICAgICAgICAgcmVzdWx0cy53ZWJraXQub3JnOiBDb2xsaXNpb24gZGV0ZWN0aW9uIGZvciBk b3RzIGlzIG9mZiBieSAyICogZG90TWFyZ2luCkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1 bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25l bnRzLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcv c3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMJKHJldmlz aW9uIDI0ODEzMykKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGlj L2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMJKHdvcmtpbmcgY29w eSkKQEAgLTEzMSw3ICsxMzEsNyBAQCBmdW5jdGlvbiBvZmZzY3JlZW5DYWNoZWRSZW5kZXJGYWN0 b3J5KHBhCiAgICAgLy8gVGhpcyBmdW5jdGlvbiB3aWxsIGNhbGwgcmVkcmF3Q2FjaGUgdG8gcmVu ZGVyIGEgb2Zmc2NyZWVuIGNhY2hlCiAgICAgLy8gYW5kIGNvcHkgdGhlIHZpZXdwb3J0IGFyZWEg ZnJvbSBvZiBpdAogICAgIC8vIEl0IHdpbGwgdHJpZ2dlciByZWRyYXdDYWNoZSB3aGVuIGNhY2hl IGRvbid0IGhhdmUgZW5vdWdoIHNwYWNlCi0gICAgcmV0dXJuIChyZWRyYXdDYWNoZSwgZWxlbWVu dCwgc3RhdGVEaWZmLCBzdGF0ZSkgPT4geworICAgIHJldHVybiAocmVkcmF3Q2FjaGUsIGVsZW1l bnQsIHN0YXRlRGlmZiwgc3RhdGUsIGZvcmNlPWZhbHNlKSA9PiB7CiAgICAgICAgIGNvbnN0IHdp ZHRoID0gdHlwZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJlcicgPyBzdGF0ZURpZmYud2lk dGggOiBzdGF0ZS53aWR0aDsKICAgICAgICAgaWYgKHdpZHRoIDw9IDApCiAgICAgICAgICAgICAv LyBOb3RoaW5nIHRvIHJlbmRlcgpAQCAtMTQ1LDcgKzE0NSwxMCBAQCBmdW5jdGlvbiBvZmZzY3Jl ZW5DYWNoZWRSZW5kZXJGYWN0b3J5KHBhCiAgICAgICAgIGlmIChlbGVtZW50LmxvZ2ljV2lkdGgg IT0gd2lkdGgpIHsKICAgICAgICAgICAgIC8vIFNldHVwIHRoZSBkcHIgaW4gY2FzZSBvZiBibHVy CiAgICAgICAgICAgICBzZXR1cENhbnZhc1dpZHRoV2l0aERwcihlbGVtZW50LCB3aWR0aCk7Cisg ICAgICAgICAgICBmb3JjZSA9IHRydWU7CisgICAgICAgIH0KIAorICAgICAgICBpZiAoZWxlbWVu dC5sb2dpY1dpZHRoICE9IHdpZHRoIHx8IGZvcmNlKSB7CiAgICAgICAgICAgICAvLyBXZSBkcmF3 IGV2ZXJ5dGhpbmcgb24gY2FjaGUKICAgICAgICAgICAgIHJlZHJhd0NhY2hlKG9mZnNjcmVlbkNh bnZhcywgZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSwgKCkgPT4gewogICAgICAgICAgICAgICAg IGNhY2hlZFNjcm9sbExlZnQgPSBzY3JvbGxMZWZ0IDwgcGFkZGluZyA/IHNjcm9sbExlZnQgOiBz Y3JvbGxMZWZ0IC0gcGFkZGluZzsKQEAgLTM2OSw3ICszNzIsNyBAQCBUaW1lbGluZS5DYW52YXNT ZXJpZXNDb21wb25lbnQgPSAoZG90cywgCiAgICAgICAgICAgICBjb25zdCBjb250ZXh0ID0gZWxl bWVudC5nZXRDb250ZXh0KCIyZCIpOwogICAgICAgICAgICAgaWYgKHN0YXRlRGlmZi5zY2FsZXMg fHwgc3RhdGVEaWZmLmRvdHMgfHwgdHlwZW9mIHN0YXRlRGlmZi5zY3JvbGxMZWZ0ID09PSAnbnVt YmVyJyB8fCB0eXBlb2Ygc3RhdGVEaWZmLndpZHRoID09PSAnbnVtYmVyJykgewogICAgICAgICAg ICAgICAgIGNvbnNvbGUuYXNzZXJ0KGRvdHMubGVuZ3RoIDw9IHNjYWxlcy5sZW5ndGgpOwotICAg ICAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRS ZW5kZXIocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUpKTsKKyAgICAgICAg ICAgICAgICByZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4gb2Zmc2NyZWVuQ2FjaGVkUmVuZGVy KHJlZHJhd0NhY2hlLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0YXRlLCB0cnVlKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9KTsKQEAgLTcxNCw3ICs3MTcsNyBAQCBUaW1lbGluZS5D YW52YXNYQXhpc0NvbXBvbmVudCA9IChzY2FsZXMsCiAgICAgICAgICAgICBpZiAoc3RhdGVEaWZm LnNjYWxlcyB8fCB0eXBlb2Ygc3RhdGVEaWZmLnNjcm9sbExlZnQgPT09ICdudW1iZXInIHx8IHR5 cGVvZiBzdGF0ZURpZmYud2lkdGggPT09ICdudW1iZXInKSB7CiAgICAgICAgICAgICAgICAgaWYg KHN0YXRlRGlmZi5zY2FsZXMpCiAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnNjYWxlc01hcExp bmtMaXN0ID0gZ2V0U2NhbGVzTWFwTGlua0xpc3Qoc3RhdGVEaWZmLnNjYWxlcyk7Ci0gICAgICAg ICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IG9mZnNjcmVlbkNhY2hlZFJlbmRl cihyZWRyYXdDYWNoZSwgZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSkpOworICAgICAgICAgICAg ICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIocmVk cmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUsIHRydWUpKTsKICAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgIH0pOwpAQCAtNzIyLDYgKzcyNSwxNCBAQCBUaW1lbGluZS5DYW52 YXNYQXhpc0NvbXBvbmVudCA9IChzY2FsZXMsCiAgICAgcmV0dXJuIHsKICAgICAgICAgc2VyaWVz OiBMaXN0UHJvdmlkZXJSZWNlaXZlcigodXBkYXRlQ29udGFpbmVyV2lkdGgsIG9uQ29udGFpbmVy U2Nyb2xsLCBvblJlc2l6ZSkgPT4gewogICAgICAgICAgICAgdXBkYXRlQ29udGFpbmVyV2lkdGgo c2NhbGVzLmxlbmd0aCAqIHNjYWxlV2lkdGggKiBnZXREZXZpY2VQaXhlbFJhdGlvKCkpOworICAg ICAgICAgICAgY29uc3QgdXBkYXRlRGF0YSA9IChzY2FsZXMpID0+IHsKKyAgICAgICAgICAgICAg ICB1cGRhdGVDb250YWluZXJXaWR0aChzY2FsZXMubGVuZ3RoICogc2NhbGVXaWR0aCAqIGdldERl dmljZVBpeGVsUmF0aW8oKSk7CisgICAgICAgICAgICAgICAgY2FudmFzUmVmLnNldFN0YXRlKHsK KyAgICAgICAgICAgICAgICAgICAgc2NhbGVzOiBzY2FsZXMsCisgICAgICAgICAgICAgICAgfSk7 CisgICAgICAgICAgICB9OworICAgICAgICAgICAgaWYgKHR5cGVvZiBvcHRpb24uZXhwb3J0ZXIg PT09ICJmdW5jdGlvbiIpCisgICAgICAgICAgICAgICAgb3B0aW9uLmV4cG9ydGVyKHVwZGF0ZURh dGEpOwogICAgICAgICAgICAgb25Db250YWluZXJTY3JvbGwuYWN0aW9uKChlKSA9PiB7CiAgICAg ICAgICAgICAgICAgY2FudmFzUmVmLnNldFN0YXRlKHtzY3JvbGxMZWZ0OiBlLnRhcmdldC5zY3Jv bGxMZWZ0IC8gZ2V0RGV2aWNlUGl4ZWxSYXRpbygpfSk7CiAgICAgICAgICAgICB9KTsK 375354 2019-08-01 15:15:17 -0700 2019-08-01 15:30:24 -0700 Patch 200363.diff text/plain 5285 zhifei_fang ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZmU5 ZTc4NGJjNC4uYTM2YzNkYjI2MzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wOC0wMSAgWmhpZmVpIEZhbmcg IDx6aGlmZWlfZmFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgcmVzdWx0cy53ZWJraXQub3JnOiBG b3JjZSB1cGRhdGUgY2FjaGUgd2hlbiB0aW1lbGluZSB1cGRhdGVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAzNjMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5 L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanM6 CisgICAgICAgIChvZmZzY3JlZW5DYWNoZWRSZW5kZXJGYWN0b3J5KTogQWRkIGFiaWxpdHkgdG8g Zm9yY2UgdGhlIHJlZHJhdy4KKyAgICAgICAgKFRpbWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVu dCk6IEZvcmNlIHJlZHJhdyB3aGVuIHNjYWxlcyBvciBkb3RzIGFyZSB1cGRhdGVkLgorICAgICAg ICAoVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25lbnQpOiBGb3JjZSByZWRyYXcgd2hlbiBzY2Fs ZXMgYXJlIHVwZGF0ZWQuCisKIDIwMTktMDgtMDEgIFpoaWZlaSBGYW5nICA8emhpZmVpX2ZhbmdA YXBwbGUuY29tPgogCiAgICAgICAgIFtyZXN1bHRzLndlYmtpdC5vcmddIFRpbWVsaW5lLkNhbnZh c1hBeGlzQ29tcG9uZW50IGhlaWdodCBzaG91bGQgYmUgZGVmaW5lZCBieSBvcHRpb24KZGlmZiAt LWdpdCBhL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkv anMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMgYi9Ub29scy9yZXN1bHRzZGJweS9y ZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21w b25lbnRzLmpzCmluZGV4IDEyZDA4NGQ3Y2M4Li5jMzliOTkyODNiNCAxMDA2NDQKLS0tIGEvVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25l bnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcworKysgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRz ZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRz LmpzCkBAIC0xMzEsNyArMTMxLDcgQEAgZnVuY3Rpb24gb2Zmc2NyZWVuQ2FjaGVkUmVuZGVyRmFj dG9yeShwYWRkaW5nLCBoZWlnaHQpIHsKICAgICAvLyBUaGlzIGZ1bmN0aW9uIHdpbGwgY2FsbCBy ZWRyYXdDYWNoZSB0byByZW5kZXIgYSBvZmZzY3JlZW4gY2FjaGUKICAgICAvLyBhbmQgY29weSB0 aGUgdmlld3BvcnQgYXJlYSBmcm9tIG9mIGl0CiAgICAgLy8gSXQgd2lsbCB0cmlnZ2VyIHJlZHJh d0NhY2hlIHdoZW4gY2FjaGUgZG9uJ3QgaGF2ZSBlbm91Z2ggc3BhY2UKLSAgICByZXR1cm4gKHJl ZHJhd0NhY2hlLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0YXRlKSA9PiB7CisgICAgcmV0dXJuIChy ZWRyYXdDYWNoZSwgZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSwgZm9yY2VSZWRyYXdDYWNoZSA9 IGZhbHNlKSA9PiB7CiAgICAgICAgIGNvbnN0IHdpZHRoID0gdHlwZW9mIHN0YXRlRGlmZi53aWR0 aCA9PT0gJ251bWJlcicgPyBzdGF0ZURpZmYud2lkdGggOiBzdGF0ZS53aWR0aDsKICAgICAgICAg aWYgKHdpZHRoIDw9IDApCiAgICAgICAgICAgICAvLyBOb3RoaW5nIHRvIHJlbmRlcgpAQCAtMTQx LDI1ICsxNDEsMjEgQEAgZnVuY3Rpb24gb2Zmc2NyZWVuQ2FjaGVkUmVuZGVyRmFjdG9yeShwYWRk aW5nLCBoZWlnaHQpIHsKICAgICAgICAgY29uc3Qgc2Nyb2xsTGVmdCA9IHR5cGVvZiBzdGF0ZURp ZmYuc2Nyb2xsTGVmdCA9PT0gJ251bWJlcicgPyBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA6IHN0YXRl LnNjcm9sbExlZnQ7CiAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBlbGVtZW50LmdldENvbnRleHQo JzJkJyk7CiAgICAgICAgIGxldCBjYWNoZVBvc0xlZnQgPSBzY3JvbGxMZWZ0IC0gY2FjaGVkU2Ny b2xsTGVmdDsKKyAgICAgICAgbGV0IG5lZWRUb1JlZHJhd0NhY2hlID0gZm9yY2VSZWRyYXdDYWNo ZTsKIAogICAgICAgICBpZiAoZWxlbWVudC5sb2dpY1dpZHRoICE9IHdpZHRoKSB7CiAgICAgICAg ICAgICAvLyBTZXR1cCB0aGUgZHByIGluIGNhc2Ugb2YgYmx1cgogICAgICAgICAgICAgc2V0dXBD YW52YXNXaWR0aFdpdGhEcHIoZWxlbWVudCwgd2lkdGgpOwotCi0gICAgICAgICAgICAvLyBXZSBk cmF3IGV2ZXJ5dGhpbmcgb24gY2FjaGUKLSAgICAgICAgICAgIHJlZHJhd0NhY2hlKG9mZnNjcmVl bkNhbnZhcywgZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSwgKCkgPT4gewotICAgICAgICAgICAg ICAgIGNhY2hlZFNjcm9sbExlZnQgPSBzY3JvbGxMZWZ0IDwgcGFkZGluZyA/IHNjcm9sbExlZnQg OiBzY3JvbGxMZWZ0IC0gcGFkZGluZzsKLSAgICAgICAgICAgICAgICBjYWNoZVBvc0xlZnQgPSBz Y3JvbGxMZWZ0IC0gY2FjaGVkU2Nyb2xsTGVmdDsKLSAgICAgICAgICAgICAgICBpZiAoY2FjaGVQ b3NMZWZ0IDwgMCkKLSAgICAgICAgICAgICAgICAgICAgY2FjaGVQb3NMZWZ0ID0gMDsKLSAgICAg ICAgICAgICAgICBjb250ZXh0LmNsZWFyUmVjdCgwLCAwLCBlbGVtZW50LndpZHRoLCBlbGVtZW50 LmhlaWdodCk7Ci0gICAgICAgICAgICAgICAgY29udGV4dC5kcmF3SW1hZ2Uob2Zmc2NyZWVuQ2Fu dmFzLCBjYWNoZVBvc0xlZnQgKiBnZXREZXZpY2VQaXhlbFJhdGlvKCksIDAsICAgIGVsZW1lbnQu d2lkdGgsIGVsZW1lbnQuaGVpZ2h0LCAwLCAwLCB3aWR0aCAqIGdldERldmljZVBpeGVsUmF0aW8o KSwgZWxlbWVudC5oZWlnaHQpOwotICAgICAgICAgICAgfSk7Ci0KKyAgICAgICAgICAgIG5lZWRU b1JlZHJhd0NhY2hlID0gdHJ1ZTsKICAgICAgICAgfSBlbHNlIGlmIChjYWNoZVBvc0xlZnQgPCAw IHx8IGNhY2hlUG9zTGVmdCArIHdpZHRoID4gdG90YWxXaWR0aCkgewogICAgICAgICAgICAgaWYg KHNjcm9sbExlZnQgPCAwICkKICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBy ZWRyYXdDYWNoZShvZmZzY3JlZW5DYW52YXMsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUsICAg ICgpID0+IHsKKyAgICAgICAgICAgIG5lZWRUb1JlZHJhd0NhY2hlID0gdHJ1ZTsKKyAgICAgICAg fQorCisgICAgICAgIGlmIChuZWVkVG9SZWRyYXdDYWNoZSkgeworICAgICAgICAgICAgLy8gV2Ug ZHJhdyBldmVyeXRoaW5nIG9uIGNhY2hlCisgICAgICAgICAgICByZWRyYXdDYWNoZShvZmZzY3Jl ZW5DYW52YXMsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUsICgpID0+IHsKICAgICAgICAgICAg ICAgICBjYWNoZWRTY3JvbGxMZWZ0ID0gc2Nyb2xsTGVmdCA8IHBhZGRpbmcgPyBzY3JvbGxMZWZ0 IDogc2Nyb2xsTGVmdCAtIHBhZGRpbmc7CiAgICAgICAgICAgICAgICAgY2FjaGVQb3NMZWZ0ID0g c2Nyb2xsTGVmdCAtIGNhY2hlZFNjcm9sbExlZnQ7CiAgICAgICAgICAgICAgICAgaWYgKGNhY2hl UG9zTGVmdCA8IDApCkBAIC0zNjcsOSArMzYzLDEzIEBAIFRpbWVsaW5lLkNhbnZhc1Nlcmllc0Nv bXBvbmVudCA9IChkb3RzLCBzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAgICAgICAgIH0sCiAg ICAgICAgIG9uU3RhdGVVcGRhdGU6IChlbGVtZW50LCBzdGF0ZURpZmYsIHN0YXRlKSA9PiB7CiAg ICAgICAgICAgICBjb25zdCBjb250ZXh0ID0gZWxlbWVudC5nZXRDb250ZXh0KCIyZCIpOworICAg ICAgICAgICAgbGV0IGZvcmNlUmVkcmF3Q2FjaGUgPSBmYWxzZTsKICAgICAgICAgICAgIGlmIChz dGF0ZURpZmYuc2NhbGVzIHx8IHN0YXRlRGlmZi5kb3RzIHx8IHR5cGVvZiBzdGF0ZURpZmYuc2Ny b2xsTGVmdCA9PT0gJ251bWJlcicgfHwgdHlwZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJl cicpIHsKICAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChkb3RzLmxlbmd0aCA8PSBzY2Fs ZXMubGVuZ3RoKTsKLSAgICAgICAgICAgICAgICByZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4g b2Zmc2NyZWVuQ2FjaGVkUmVuZGVyKHJlZHJhd0NhY2hlLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0 YXRlKSk7CisgICAgICAgICAgICAgICAgaWYgKHN0YXRlRGlmZi5zY2FsZXMgfHwgc3RhdGVEaWZm LmRvdHMpIHsKKyAgICAgICAgICAgICAgICAgICAgZm9yY2VSZWRyYXdDYWNoZSA9IHRydWU7Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgo KSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlm Ziwgc3RhdGUsIGZvcmNlUmVkcmF3Q2FjaGUpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog ICAgIH0pOwpAQCAtNzExLDEwICs3MTEsMTMgQEAgVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25l bnQgPSAoc2NhbGVzLCBvcHRpb24gPSB7fSkgPT4gewogICAgICAgICAgICAgfQogICAgICAgICB9 LAogICAgICAgICBvblN0YXRlVXBkYXRlOiAoZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSkgPT4g eworICAgICAgICAgICAgbGV0IGZvcmNlUmVkcmF3Q2FjaGUgPSBmYWxzZTsKICAgICAgICAgICAg IGlmIChzdGF0ZURpZmYuc2NhbGVzIHx8IHR5cGVvZiBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA9PT0g J251bWJlcicgfHwgdHlwZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJlcicpIHsKLSAgICAg ICAgICAgICAgICBpZiAoc3RhdGVEaWZmLnNjYWxlcykKKyAgICAgICAgICAgICAgICBpZiAoc3Rh dGVEaWZmLnNjYWxlcykgewogICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zY2FsZXNNYXBMaW5r TGlzdCA9IGdldFNjYWxlc01hcExpbmtMaXN0KHN0YXRlRGlmZi5zY2FsZXMpOwotICAgICAgICAg ICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIo cmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUpKTsKKyAgICAgICAgICAgICAg ICAgICAgZm9yY2VSZWRyYXdDYWNoZSA9IHRydWU7CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5k ZXIocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUsIGZvcmNlUmVkcmF3Q2Fj aGUpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0pOwo= 375357 2019-08-01 15:30:25 -0700 2019-08-01 16:46:46 -0700 Patch bug-200363-20190801153024.patch text/plain 6214 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MTM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2ZlOWU3ODRiYzRkOWIwMWE5NGNmMjFmNjgwNTRhZTVl NWRlMDIzZS4uYTM2YzNkYjI2MzNlNjhlYzkzN2NmZWE2MjMzYjMxYWY0M2Y4OGFmMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE5LTA4LTAxICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEZvcmNlIHVwZGF0ZSBjYWNoZSB3aGVuIHRpbWVs aW5lIHVwZGF0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwMDM2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21w b25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAgICAgICAgKG9mZnNjcmVlbkNhY2hlZFJl bmRlckZhY3RvcnkpOiBBZGQgYWJpbGl0eSB0byBmb3JjZSB0aGUgcmVkcmF3LgorICAgICAgICAo VGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KTogRm9yY2UgcmVkcmF3IHdoZW4gc2NhbGVz IG9yIGRvdHMgYXJlIHVwZGF0ZWQuCisgICAgICAgIChUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBv bmVudCk6IEZvcmNlIHJlZHJhdyB3aGVuIHNjYWxlcyBhcmUgdXBkYXRlZC4KKwogMjAxOS0wOC0w MSAgWmhpZmVpIEZhbmcgIDx6aGlmZWlfZmFuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgW3Jlc3Vs dHMud2Via2l0Lm9yZ10gVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25lbnQgaGVpZ2h0IHNob3Vs ZCBiZSBkZWZpbmVkIGJ5IG9wdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9u ZW50cy5qcyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJh cnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMKaW5kZXggMTJkMDg0ZDdjYzhj NzIzZTliMzkxNDU5ODdhZmM1ZDc3NjMyNWY1OS4uYTQ2MmU5ZjAwY2VlMjA5ODhiNTQ5ZDgwNTg4 YmU3NzVlNzQzMDAzNyAxMDA2NDQKLS0tIGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv dmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcwor KysgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pz L2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzCkBAIC0xMzEsNyArMTMxLDcgQEAgZnVu Y3Rpb24gb2Zmc2NyZWVuQ2FjaGVkUmVuZGVyRmFjdG9yeShwYWRkaW5nLCBoZWlnaHQpIHsKICAg ICAvLyBUaGlzIGZ1bmN0aW9uIHdpbGwgY2FsbCByZWRyYXdDYWNoZSB0byByZW5kZXIgYSBvZmZz Y3JlZW4gY2FjaGUKICAgICAvLyBhbmQgY29weSB0aGUgdmlld3BvcnQgYXJlYSBmcm9tIG9mIGl0 CiAgICAgLy8gSXQgd2lsbCB0cmlnZ2VyIHJlZHJhd0NhY2hlIHdoZW4gY2FjaGUgZG9uJ3QgaGF2 ZSBlbm91Z2ggc3BhY2UKLSAgICByZXR1cm4gKHJlZHJhd0NhY2hlLCBlbGVtZW50LCBzdGF0ZURp ZmYsIHN0YXRlKSA9PiB7CisgICAgcmV0dXJuIChyZWRyYXdDYWNoZSwgZWxlbWVudCwgc3RhdGVE aWZmLCBzdGF0ZSwgZm9yY2VSZWRyYXdDYWNoZSA9IGZhbHNlKSA9PiB7CiAgICAgICAgIGNvbnN0 IHdpZHRoID0gdHlwZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJlcicgPyBzdGF0ZURpZmYu d2lkdGggOiBzdGF0ZS53aWR0aDsKICAgICAgICAgaWYgKHdpZHRoIDw9IDApCiAgICAgICAgICAg ICAvLyBOb3RoaW5nIHRvIHJlbmRlcgpAQCAtMTQxLDI1ICsxNDEsMjEgQEAgZnVuY3Rpb24gb2Zm c2NyZWVuQ2FjaGVkUmVuZGVyRmFjdG9yeShwYWRkaW5nLCBoZWlnaHQpIHsKICAgICAgICAgY29u c3Qgc2Nyb2xsTGVmdCA9IHR5cGVvZiBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA9PT0gJ251bWJlcicg PyBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA6IHN0YXRlLnNjcm9sbExlZnQ7CiAgICAgICAgIGNvbnN0 IGNvbnRleHQgPSBlbGVtZW50LmdldENvbnRleHQoJzJkJyk7CiAgICAgICAgIGxldCBjYWNoZVBv c0xlZnQgPSBzY3JvbGxMZWZ0IC0gY2FjaGVkU2Nyb2xsTGVmdDsKKyAgICAgICAgbGV0IG5lZWRU b1JlZHJhd0NhY2hlID0gZm9yY2VSZWRyYXdDYWNoZTsKIAogICAgICAgICBpZiAoZWxlbWVudC5s b2dpY1dpZHRoICE9IHdpZHRoKSB7CiAgICAgICAgICAgICAvLyBTZXR1cCB0aGUgZHByIGluIGNh c2Ugb2YgYmx1cgogICAgICAgICAgICAgc2V0dXBDYW52YXNXaWR0aFdpdGhEcHIoZWxlbWVudCwg d2lkdGgpOwotCi0gICAgICAgICAgICAvLyBXZSBkcmF3IGV2ZXJ5dGhpbmcgb24gY2FjaGUKLSAg ICAgICAgICAgIHJlZHJhd0NhY2hlKG9mZnNjcmVlbkNhbnZhcywgZWxlbWVudCwgc3RhdGVEaWZm LCBzdGF0ZSwgKCkgPT4gewotICAgICAgICAgICAgICAgIGNhY2hlZFNjcm9sbExlZnQgPSBzY3Jv bGxMZWZ0IDwgcGFkZGluZyA/IHNjcm9sbExlZnQgOiBzY3JvbGxMZWZ0IC0gcGFkZGluZzsKLSAg ICAgICAgICAgICAgICBjYWNoZVBvc0xlZnQgPSBzY3JvbGxMZWZ0IC0gY2FjaGVkU2Nyb2xsTGVm dDsKLSAgICAgICAgICAgICAgICBpZiAoY2FjaGVQb3NMZWZ0IDwgMCkKLSAgICAgICAgICAgICAg ICAgICAgY2FjaGVQb3NMZWZ0ID0gMDsKLSAgICAgICAgICAgICAgICBjb250ZXh0LmNsZWFyUmVj dCgwLCAwLCBlbGVtZW50LndpZHRoLCBlbGVtZW50LmhlaWdodCk7Ci0gICAgICAgICAgICAgICAg Y29udGV4dC5kcmF3SW1hZ2Uob2Zmc2NyZWVuQ2FudmFzLCBjYWNoZVBvc0xlZnQgKiBnZXREZXZp Y2VQaXhlbFJhdGlvKCksIDAsICAgIGVsZW1lbnQud2lkdGgsIGVsZW1lbnQuaGVpZ2h0LCAwLCAw LCB3aWR0aCAqIGdldERldmljZVBpeGVsUmF0aW8oKSwgZWxlbWVudC5oZWlnaHQpOwotICAgICAg ICAgICAgfSk7Ci0KKyAgICAgICAgICAgIG5lZWRUb1JlZHJhd0NhY2hlID0gdHJ1ZTsKICAgICAg ICAgfSBlbHNlIGlmIChjYWNoZVBvc0xlZnQgPCAwIHx8IGNhY2hlUG9zTGVmdCArIHdpZHRoID4g dG90YWxXaWR0aCkgewogICAgICAgICAgICAgaWYgKHNjcm9sbExlZnQgPCAwICkKICAgICAgICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICByZWRyYXdDYWNoZShvZmZzY3JlZW5DYW52YXMs IGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUsICAgICgpID0+IHsKKyAgICAgICAgICAgIG5lZWRU b1JlZHJhd0NhY2hlID0gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChuZWVkVG9SZWRy YXdDYWNoZSkgeworICAgICAgICAgICAgLy8gV2UgZHJhdyBldmVyeXRoaW5nIG9uIGNhY2hlCisg ICAgICAgICAgICByZWRyYXdDYWNoZShvZmZzY3JlZW5DYW52YXMsIGVsZW1lbnQsIHN0YXRlRGlm Ziwgc3RhdGUsICgpID0+IHsKICAgICAgICAgICAgICAgICBjYWNoZWRTY3JvbGxMZWZ0ID0gc2Ny b2xsTGVmdCA8IHBhZGRpbmcgPyBzY3JvbGxMZWZ0IDogc2Nyb2xsTGVmdCAtIHBhZGRpbmc7CiAg ICAgICAgICAgICAgICAgY2FjaGVQb3NMZWZ0ID0gc2Nyb2xsTGVmdCAtIGNhY2hlZFNjcm9sbExl ZnQ7CiAgICAgICAgICAgICAgICAgaWYgKGNhY2hlUG9zTGVmdCA8IDApCkBAIC0zNjcsOSArMzYz LDEzIEBAIFRpbWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVudCA9IChkb3RzLCBzY2FsZXMsIG9w dGlvbiA9IHt9KSA9PiB7CiAgICAgICAgIH0sCiAgICAgICAgIG9uU3RhdGVVcGRhdGU6IChlbGVt ZW50LCBzdGF0ZURpZmYsIHN0YXRlKSA9PiB7CiAgICAgICAgICAgICBjb25zdCBjb250ZXh0ID0g ZWxlbWVudC5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICAgICAgbGV0IGZvcmNlUmVkcmF3Q2Fj aGUgPSBmYWxzZTsKICAgICAgICAgICAgIGlmIChzdGF0ZURpZmYuc2NhbGVzIHx8IHN0YXRlRGlm Zi5kb3RzIHx8IHR5cGVvZiBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA9PT0gJ251bWJlcicgfHwgdHlw ZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJlcicpIHsKICAgICAgICAgICAgICAgICBjb25z b2xlLmFzc2VydChkb3RzLmxlbmd0aCA8PSBzY2FsZXMubGVuZ3RoKTsKLSAgICAgICAgICAgICAg ICByZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4gb2Zmc2NyZWVuQ2FjaGVkUmVuZGVyKHJlZHJh d0NhY2hlLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0YXRlKSk7CisgICAgICAgICAgICAgICAgaWYg KHN0YXRlRGlmZi5zY2FsZXMgfHwgc3RhdGVEaWZmLmRvdHMpIHsKKyAgICAgICAgICAgICAgICAg ICAgZm9yY2VSZWRyYXdDYWNoZSA9IHRydWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIo cmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUsIGZvcmNlUmVkcmF3Q2FjaGUp KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0pOwpAQCAtNzExLDEwICs3MTEsMTMg QEAgVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25lbnQgPSAoc2NhbGVzLCBvcHRpb24gPSB7fSkg PT4gewogICAgICAgICAgICAgfQogICAgICAgICB9LAogICAgICAgICBvblN0YXRlVXBkYXRlOiAo ZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSkgPT4geworICAgICAgICAgICAgbGV0IGZvcmNlUmVk cmF3Q2FjaGUgPSBmYWxzZTsKICAgICAgICAgICAgIGlmIChzdGF0ZURpZmYuc2NhbGVzIHx8IHR5 cGVvZiBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA9PT0gJ251bWJlcicgfHwgdHlwZW9mIHN0YXRlRGlm Zi53aWR0aCA9PT0gJ251bWJlcicpIHsKLSAgICAgICAgICAgICAgICBpZiAoc3RhdGVEaWZmLnNj YWxlcykKKyAgICAgICAgICAgICAgICBpZiAoc3RhdGVEaWZmLnNjYWxlcykgewogICAgICAgICAg ICAgICAgICAgICBzdGF0ZS5zY2FsZXNNYXBMaW5rTGlzdCA9IGdldFNjYWxlc01hcExpbmtMaXN0 KHN0YXRlRGlmZi5zY2FsZXMpOwotICAgICAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFt ZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRl RGlmZiwgc3RhdGUpKTsKKyAgICAgICAgICAgICAgICAgICAgZm9yY2VSZWRyYXdDYWNoZSA9IHRy dWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25G cmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0 YXRlRGlmZiwgc3RhdGUsIGZvcmNlUmVkcmF3Q2FjaGUpKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0pOwpAQCAtNzIyLDYgKzcyNSwxNCBAQCBUaW1lbGluZS5DYW52YXNYQXhpc0Nv bXBvbmVudCA9IChzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAgICAgcmV0dXJuIHsKICAgICAg ICAgc2VyaWVzOiBMaXN0UHJvdmlkZXJSZWNlaXZlcigodXBkYXRlQ29udGFpbmVyV2lkdGgsIG9u Q29udGFpbmVyU2Nyb2xsLCBvblJlc2l6ZSkgPT4gewogICAgICAgICAgICAgdXBkYXRlQ29udGFp bmVyV2lkdGgoc2NhbGVzLmxlbmd0aCAqIHNjYWxlV2lkdGggKiBnZXREZXZpY2VQaXhlbFJhdGlv KCkpOworICAgICAgICAgICAgY29uc3QgdXBkYXRlRGF0YSA9IChzY2FsZXMpID0+IHsKKyAgICAg ICAgICAgICAgICB1cGRhdGVDb250YWluZXJXaWR0aChzY2FsZXMubGVuZ3RoICogc2NhbGVXaWR0 aCAqIGdldERldmljZVBpeGVsUmF0aW8oKSk7CisgICAgICAgICAgICAgICAgY2FudmFzUmVmLnNl dFN0YXRlKHsKKyAgICAgICAgICAgICAgICAgICAgc2NhbGVzOiBzY2FsZXMKKyAgICAgICAgICAg ICAgICB9KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICh0eXBlb2Ygb3B0aW9uLmV4 cG9ydGVyID09PSAiZnVuY3Rpb24iKQorICAgICAgICAgICAgICAgIG9wdGlvbi5leHBvcnRlcih1 cGRhdGVEYXRhKTsKICAgICAgICAgICAgIG9uQ29udGFpbmVyU2Nyb2xsLmFjdGlvbigoZSkgPT4g ewogICAgICAgICAgICAgICAgIGNhbnZhc1JlZi5zZXRTdGF0ZSh7c2Nyb2xsTGVmdDogZS50YXJn ZXQuc2Nyb2xsTGVmdCAvIGdldERldmljZVBpeGVsUmF0aW8oKX0pOwogICAgICAgICAgICAgfSk7 Cg== 375366 2019-08-01 16:46:47 -0700 2019-08-01 18:46:28 -0700 Patch bug-200363-20190801164646.patch text/plain 6583 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MTM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2ZlOWU3ODRiYzRkOWIwMWE5NGNmMjFmNjgwNTRhZTVl NWRlMDIzZS4uYTM2YzNkYjI2MzNlNjhlYzkzN2NmZWE2MjMzYjMxYWY0M2Y4OGFmMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE5LTA4LTAxICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEZvcmNlIHVwZGF0ZSBjYWNoZSB3aGVuIHRpbWVs aW5lIHVwZGF0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwMDM2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21w b25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAgICAgICAgKG9mZnNjcmVlbkNhY2hlZFJl bmRlckZhY3RvcnkpOiBBZGQgYWJpbGl0eSB0byBmb3JjZSB0aGUgcmVkcmF3LgorICAgICAgICAo VGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KTogRm9yY2UgcmVkcmF3IHdoZW4gc2NhbGVz IG9yIGRvdHMgYXJlIHVwZGF0ZWQuCisgICAgICAgIChUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBv bmVudCk6IEZvcmNlIHJlZHJhdyB3aGVuIHNjYWxlcyBhcmUgdXBkYXRlZC4KKwogMjAxOS0wOC0w MSAgWmhpZmVpIEZhbmcgIDx6aGlmZWlfZmFuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgW3Jlc3Vs dHMud2Via2l0Lm9yZ10gVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25lbnQgaGVpZ2h0IHNob3Vs ZCBiZSBkZWZpbmVkIGJ5IG9wdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9u ZW50cy5qcyBiL1Rvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJh cnkvanMvY29tcG9uZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMKaW5kZXggMTJkMDg0ZDdjYzhj NzIzZTliMzkxNDU5ODdhZmM1ZDc3NjMyNWY1OS4uOWY4YjFiZTU3ZGEyNWUxODE0MDI2M2M5YWNm NTNiZjA5Zjk5N2JmMCAxMDA2NDQKLS0tIGEvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv dmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcwor KysgYi9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9saWJyYXJ5L2pz L2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzCkBAIC0xMzEsNyArMTMxLDcgQEAgZnVu Y3Rpb24gb2Zmc2NyZWVuQ2FjaGVkUmVuZGVyRmFjdG9yeShwYWRkaW5nLCBoZWlnaHQpIHsKICAg ICAvLyBUaGlzIGZ1bmN0aW9uIHdpbGwgY2FsbCByZWRyYXdDYWNoZSB0byByZW5kZXIgYSBvZmZz Y3JlZW4gY2FjaGUKICAgICAvLyBhbmQgY29weSB0aGUgdmlld3BvcnQgYXJlYSBmcm9tIG9mIGl0 CiAgICAgLy8gSXQgd2lsbCB0cmlnZ2VyIHJlZHJhd0NhY2hlIHdoZW4gY2FjaGUgZG9uJ3QgaGF2 ZSBlbm91Z2ggc3BhY2UKLSAgICByZXR1cm4gKHJlZHJhd0NhY2hlLCBlbGVtZW50LCBzdGF0ZURp ZmYsIHN0YXRlKSA9PiB7CisgICAgcmV0dXJuIChyZWRyYXdDYWNoZSwgZWxlbWVudCwgc3RhdGVE aWZmLCBzdGF0ZSwgZm9yY2VSZWRyYXdDYWNoZSA9IGZhbHNlKSA9PiB7CiAgICAgICAgIGNvbnN0 IHdpZHRoID0gdHlwZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJlcicgPyBzdGF0ZURpZmYu d2lkdGggOiBzdGF0ZS53aWR0aDsKICAgICAgICAgaWYgKHdpZHRoIDw9IDApCiAgICAgICAgICAg ICAvLyBOb3RoaW5nIHRvIHJlbmRlcgpAQCAtMTQxLDExICsxNDEsMTkgQEAgZnVuY3Rpb24gb2Zm c2NyZWVuQ2FjaGVkUmVuZGVyRmFjdG9yeShwYWRkaW5nLCBoZWlnaHQpIHsKICAgICAgICAgY29u c3Qgc2Nyb2xsTGVmdCA9IHR5cGVvZiBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA9PT0gJ251bWJlcicg PyBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA6IHN0YXRlLnNjcm9sbExlZnQ7CiAgICAgICAgIGNvbnN0 IGNvbnRleHQgPSBlbGVtZW50LmdldENvbnRleHQoJzJkJyk7CiAgICAgICAgIGxldCBjYWNoZVBv c0xlZnQgPSBzY3JvbGxMZWZ0IC0gY2FjaGVkU2Nyb2xsTGVmdDsKKyAgICAgICAgbGV0IG5lZWRU b1JlZHJhd0NhY2hlID0gZm9yY2VSZWRyYXdDYWNoZTsKIAogICAgICAgICBpZiAoZWxlbWVudC5s b2dpY1dpZHRoICE9IHdpZHRoKSB7CiAgICAgICAgICAgICAvLyBTZXR1cCB0aGUgZHByIGluIGNh c2Ugb2YgYmx1cgogICAgICAgICAgICAgc2V0dXBDYW52YXNXaWR0aFdpdGhEcHIoZWxlbWVudCwg d2lkdGgpOworICAgICAgICAgICAgbmVlZFRvUmVkcmF3Q2FjaGUgPSB0cnVlOworICAgICAgICB9 IGVsc2UgaWYgKGNhY2hlUG9zTGVmdCA8IDAgfHwgY2FjaGVQb3NMZWZ0ICsgd2lkdGggPiB0b3Rh bFdpZHRoKSB7CisgICAgICAgICAgICBpZiAoc2Nyb2xsTGVmdCA8IDAgJiYgIW5lZWRUb1JlZHJh d0NhY2hlKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIG5lZWRUb1JlZHJh d0NhY2hlID0gdHJ1ZTsKKyAgICAgICAgfQogCisgICAgICAgIGlmIChuZWVkVG9SZWRyYXdDYWNo ZSkgewogICAgICAgICAgICAgLy8gV2UgZHJhdyBldmVyeXRoaW5nIG9uIGNhY2hlCiAgICAgICAg ICAgICByZWRyYXdDYWNoZShvZmZzY3JlZW5DYW52YXMsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3Rh dGUsICgpID0+IHsKICAgICAgICAgICAgICAgICBjYWNoZWRTY3JvbGxMZWZ0ID0gc2Nyb2xsTGVm dCA8IHBhZGRpbmcgPyBzY3JvbGxMZWZ0IDogc2Nyb2xsTGVmdCAtIHBhZGRpbmc7CkBAIC0xNTUs MTggKzE2Myw2IEBAIGZ1bmN0aW9uIG9mZnNjcmVlbkNhY2hlZFJlbmRlckZhY3RvcnkocGFkZGlu ZywgaGVpZ2h0KSB7CiAgICAgICAgICAgICAgICAgY29udGV4dC5jbGVhclJlY3QoMCwgMCwgZWxl bWVudC53aWR0aCwgZWxlbWVudC5oZWlnaHQpOwogICAgICAgICAgICAgICAgIGNvbnRleHQuZHJh d0ltYWdlKG9mZnNjcmVlbkNhbnZhcywgY2FjaGVQb3NMZWZ0ICogZ2V0RGV2aWNlUGl4ZWxSYXRp bygpLCAwLCAgICBlbGVtZW50LndpZHRoLCBlbGVtZW50LmhlaWdodCwgMCwgMCwgd2lkdGggKiBn ZXREZXZpY2VQaXhlbFJhdGlvKCksIGVsZW1lbnQuaGVpZ2h0KTsKICAgICAgICAgICAgIH0pOwot Ci0gICAgICAgIH0gZWxzZSBpZiAoY2FjaGVQb3NMZWZ0IDwgMCB8fCBjYWNoZVBvc0xlZnQgKyB3 aWR0aCA+IHRvdGFsV2lkdGgpIHsKLSAgICAgICAgICAgIGlmIChzY3JvbGxMZWZ0IDwgMCApCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgcmVkcmF3Q2FjaGUob2Zmc2NyZWVu Q2FudmFzLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0YXRlLCAgICAoKSA9PiB7Ci0gICAgICAgICAg ICAgICAgY2FjaGVkU2Nyb2xsTGVmdCA9IHNjcm9sbExlZnQgPCBwYWRkaW5nID8gc2Nyb2xsTGVm dCA6IHNjcm9sbExlZnQgLSBwYWRkaW5nOwotICAgICAgICAgICAgICAgIGNhY2hlUG9zTGVmdCA9 IHNjcm9sbExlZnQgLSBjYWNoZWRTY3JvbGxMZWZ0OwotICAgICAgICAgICAgICAgIGlmIChjYWNo ZVBvc0xlZnQgPCAwKQotICAgICAgICAgICAgICAgICAgICBjYWNoZVBvc0xlZnQgPSAwOwotICAg ICAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAsIGVsZW1lbnQud2lkdGgsIGVsZW1l bnQuaGVpZ2h0KTsKLSAgICAgICAgICAgICAgICBjb250ZXh0LmRyYXdJbWFnZShvZmZzY3JlZW5D YW52YXMsIGNhY2hlUG9zTGVmdCAqIGdldERldmljZVBpeGVsUmF0aW8oKSwgMCwgICAgZWxlbWVu dC53aWR0aCwgZWxlbWVudC5oZWlnaHQsIDAsIDAsIHdpZHRoICogZ2V0RGV2aWNlUGl4ZWxSYXRp bygpLCBlbGVtZW50LmhlaWdodCk7Ci0gICAgICAgICAgICB9KTsKICAgICAgICAgfSBlbHNlIHsK ICAgICAgICAgICAgIGlmIChjYWNoZVBvc0xlZnQgPCAwKQogICAgICAgICAgICAgICAgIGNhY2hl UG9zTGVmdCA9IDA7CkBAIC0zNjcsOSArMzYzLDEzIEBAIFRpbWVsaW5lLkNhbnZhc1Nlcmllc0Nv bXBvbmVudCA9IChkb3RzLCBzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAgICAgICAgIH0sCiAg ICAgICAgIG9uU3RhdGVVcGRhdGU6IChlbGVtZW50LCBzdGF0ZURpZmYsIHN0YXRlKSA9PiB7CiAg ICAgICAgICAgICBjb25zdCBjb250ZXh0ID0gZWxlbWVudC5nZXRDb250ZXh0KCIyZCIpOworICAg ICAgICAgICAgbGV0IGZvcmNlUmVkcmF3Q2FjaGUgPSBmYWxzZTsKICAgICAgICAgICAgIGlmIChz dGF0ZURpZmYuc2NhbGVzIHx8IHN0YXRlRGlmZi5kb3RzIHx8IHR5cGVvZiBzdGF0ZURpZmYuc2Ny b2xsTGVmdCA9PT0gJ251bWJlcicgfHwgdHlwZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJl cicpIHsKICAgICAgICAgICAgICAgICBjb25zb2xlLmFzc2VydChkb3RzLmxlbmd0aCA8PSBzY2Fs ZXMubGVuZ3RoKTsKLSAgICAgICAgICAgICAgICByZXF1ZXN0QW5pbWF0aW9uRnJhbWUoKCkgPT4g b2Zmc2NyZWVuQ2FjaGVkUmVuZGVyKHJlZHJhd0NhY2hlLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0 YXRlKSk7CisgICAgICAgICAgICAgICAgaWYgKHN0YXRlRGlmZi5zY2FsZXMgfHwgc3RhdGVEaWZm LmRvdHMpIHsKKyAgICAgICAgICAgICAgICAgICAgZm9yY2VSZWRyYXdDYWNoZSA9IHRydWU7Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgo KSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlm Ziwgc3RhdGUsIGZvcmNlUmVkcmF3Q2FjaGUpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog ICAgIH0pOwpAQCAtNzExLDEwICs3MTEsMTMgQEAgVGltZWxpbmUuQ2FudmFzWEF4aXNDb21wb25l bnQgPSAoc2NhbGVzLCBvcHRpb24gPSB7fSkgPT4gewogICAgICAgICAgICAgfQogICAgICAgICB9 LAogICAgICAgICBvblN0YXRlVXBkYXRlOiAoZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSkgPT4g eworICAgICAgICAgICAgbGV0IGZvcmNlUmVkcmF3Q2FjaGUgPSBmYWxzZTsKICAgICAgICAgICAg IGlmIChzdGF0ZURpZmYuc2NhbGVzIHx8IHR5cGVvZiBzdGF0ZURpZmYuc2Nyb2xsTGVmdCA9PT0g J251bWJlcicgfHwgdHlwZW9mIHN0YXRlRGlmZi53aWR0aCA9PT0gJ251bWJlcicpIHsKLSAgICAg ICAgICAgICAgICBpZiAoc3RhdGVEaWZmLnNjYWxlcykKKyAgICAgICAgICAgICAgICBpZiAoc3Rh dGVEaWZmLnNjYWxlcykgewogICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zY2FsZXNNYXBMaW5r TGlzdCA9IGdldFNjYWxlc01hcExpbmtMaXN0KHN0YXRlRGlmZi5zY2FsZXMpOwotICAgICAgICAg ICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIo cmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUpKTsKKyAgICAgICAgICAgICAg ICAgICAgZm9yY2VSZWRyYXdDYWNoZSA9IHRydWU7CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5k ZXIocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUsIGZvcmNlUmVkcmF3Q2Fj aGUpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0pOwpAQCAtNzIyLDYgKzcyNSwx NCBAQCBUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBvbmVudCA9IChzY2FsZXMsIG9wdGlvbiA9IHt9 KSA9PiB7CiAgICAgcmV0dXJuIHsKICAgICAgICAgc2VyaWVzOiBMaXN0UHJvdmlkZXJSZWNlaXZl cigodXBkYXRlQ29udGFpbmVyV2lkdGgsIG9uQ29udGFpbmVyU2Nyb2xsLCBvblJlc2l6ZSkgPT4g ewogICAgICAgICAgICAgdXBkYXRlQ29udGFpbmVyV2lkdGgoc2NhbGVzLmxlbmd0aCAqIHNjYWxl V2lkdGggKiBnZXREZXZpY2VQaXhlbFJhdGlvKCkpOworICAgICAgICAgICAgY29uc3QgdXBkYXRl RGF0YSA9IChzY2FsZXMpID0+IHsKKyAgICAgICAgICAgICAgICB1cGRhdGVDb250YWluZXJXaWR0 aChzY2FsZXMubGVuZ3RoICogc2NhbGVXaWR0aCAqIGdldERldmljZVBpeGVsUmF0aW8oKSk7Cisg ICAgICAgICAgICAgICAgY2FudmFzUmVmLnNldFN0YXRlKHsKKyAgICAgICAgICAgICAgICAgICAg c2NhbGVzOiBzY2FsZXMKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIGlmICh0eXBlb2Ygb3B0aW9uLmV4cG9ydGVyID09PSAiZnVuY3Rpb24iKQorICAgICAg ICAgICAgICAgIG9wdGlvbi5leHBvcnRlcih1cGRhdGVEYXRhKTsKICAgICAgICAgICAgIG9uQ29u dGFpbmVyU2Nyb2xsLmFjdGlvbigoZSkgPT4gewogICAgICAgICAgICAgICAgIGNhbnZhc1JlZi5z ZXRTdGF0ZSh7c2Nyb2xsTGVmdDogZS50YXJnZXQuc2Nyb2xsTGVmdCAvIGdldERldmljZVBpeGVs UmF0aW8oKX0pOwogICAgICAgICAgICAgfSk7Cg== 375376 2019-08-01 18:46:29 -0700 2019-08-01 20:50:21 -0700 Patch bug-200363-20190801184629.patch text/plain 6264 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4MTM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2ZlOWU3ODRiYzRkOWIwMWE5NGNmMjFmNjgwNTRhZTVl NWRlMDIzZS4uNTdlMWFkOWI4M2M2NjFhZDRmNDI3NmU0NWZhYTZhNGM3MjhiOGU5MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE5LTA4LTAxICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEZvcmNlIHVwZGF0ZSBjYWNoZSB3aGVuIHRpbWVs aW5lIHVwZGF0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwMDM2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9jb21w b25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qczoKKyAgICAgICAgKG9mZnNjcmVlbkNhY2hlZFJl bmRlckZhY3RvcnkpOiBBZGQgYWJpbGl0eSB0byBmb3JjZSB0aGUgcmVkcmF3LgorICAgICAgICAo VGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50KTogRm9yY2UgcmVkcmF3IHdoZW4gc2NhbGVz IG9yIGRvdHMgYXJlIHVwZGF0ZWQuCisgICAgICAgIChUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBv bmVudCk6IEZvcmNlIHJlZHJhdyB3aGVuIHNjYWxlcyBhcmUgdXBkYXRlZC4gQWRkIG1pc3Npbmcg ZXhwb3J0ZXIgZm9yIGV4cG9ydCBzY2FsZXMgdXBkYXRlIEFQSQorCiAyMDE5LTA4LTAxICBaaGlm ZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBbcmVzdWx0cy53ZWJr aXQub3JnXSBUaW1lbGluZS5DYW52YXNYQXhpc0NvbXBvbmVudCBoZWlnaHQgc2hvdWxkIGJlIGRl ZmluZWQgYnkgb3B0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3N0YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpz IGIvVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvbGlicmFyeS9qcy9j b21wb25lbnRzL1RpbWVsaW5lQ29tcG9uZW50cy5qcwppbmRleCAxMmQwODRkN2NjOGM3MjNlOWIz OTE0NTk4N2FmYzVkNzc2MzI1ZjU5Li5hNDYyZTlmMDBjZWUyMDk4OGI1NDlkODA1ODhiZTc3NWU3 NDMwMDM3IDEwMDY0NAotLS0gYS9Ub29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0 YXRpYy9saWJyYXJ5L2pzL2NvbXBvbmVudHMvVGltZWxpbmVDb21wb25lbnRzLmpzCisrKyBiL1Rv b2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2xpYnJhcnkvanMvY29tcG9u ZW50cy9UaW1lbGluZUNvbXBvbmVudHMuanMKQEAgLTEzMSw3ICsxMzEsNyBAQCBmdW5jdGlvbiBv ZmZzY3JlZW5DYWNoZWRSZW5kZXJGYWN0b3J5KHBhZGRpbmcsIGhlaWdodCkgewogICAgIC8vIFRo aXMgZnVuY3Rpb24gd2lsbCBjYWxsIHJlZHJhd0NhY2hlIHRvIHJlbmRlciBhIG9mZnNjcmVlbiBj YWNoZQogICAgIC8vIGFuZCBjb3B5IHRoZSB2aWV3cG9ydCBhcmVhIGZyb20gb2YgaXQKICAgICAv LyBJdCB3aWxsIHRyaWdnZXIgcmVkcmF3Q2FjaGUgd2hlbiBjYWNoZSBkb24ndCBoYXZlIGVub3Vn aCBzcGFjZQotICAgIHJldHVybiAocmVkcmF3Q2FjaGUsIGVsZW1lbnQsIHN0YXRlRGlmZiwgc3Rh dGUpID0+IHsKKyAgICByZXR1cm4gKHJlZHJhd0NhY2hlLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0 YXRlLCBmb3JjZVJlZHJhd0NhY2hlID0gZmFsc2UpID0+IHsKICAgICAgICAgY29uc3Qgd2lkdGgg PSB0eXBlb2Ygc3RhdGVEaWZmLndpZHRoID09PSAnbnVtYmVyJyA/IHN0YXRlRGlmZi53aWR0aCA6 IHN0YXRlLndpZHRoOwogICAgICAgICBpZiAod2lkdGggPD0gMCkKICAgICAgICAgICAgIC8vIE5v dGhpbmcgdG8gcmVuZGVyCkBAIC0xNDEsMjUgKzE0MSwyMSBAQCBmdW5jdGlvbiBvZmZzY3JlZW5D YWNoZWRSZW5kZXJGYWN0b3J5KHBhZGRpbmcsIGhlaWdodCkgewogICAgICAgICBjb25zdCBzY3Jv bGxMZWZ0ID0gdHlwZW9mIHN0YXRlRGlmZi5zY3JvbGxMZWZ0ID09PSAnbnVtYmVyJyA/IHN0YXRl RGlmZi5zY3JvbGxMZWZ0IDogc3RhdGUuc2Nyb2xsTGVmdDsKICAgICAgICAgY29uc3QgY29udGV4 dCA9IGVsZW1lbnQuZ2V0Q29udGV4dCgnMmQnKTsKICAgICAgICAgbGV0IGNhY2hlUG9zTGVmdCA9 IHNjcm9sbExlZnQgLSBjYWNoZWRTY3JvbGxMZWZ0OworICAgICAgICBsZXQgbmVlZFRvUmVkcmF3 Q2FjaGUgPSBmb3JjZVJlZHJhd0NhY2hlOwogCiAgICAgICAgIGlmIChlbGVtZW50LmxvZ2ljV2lk dGggIT0gd2lkdGgpIHsKICAgICAgICAgICAgIC8vIFNldHVwIHRoZSBkcHIgaW4gY2FzZSBvZiBi bHVyCiAgICAgICAgICAgICBzZXR1cENhbnZhc1dpZHRoV2l0aERwcihlbGVtZW50LCB3aWR0aCk7 Ci0KLSAgICAgICAgICAgIC8vIFdlIGRyYXcgZXZlcnl0aGluZyBvbiBjYWNoZQotICAgICAgICAg ICAgcmVkcmF3Q2FjaGUob2Zmc2NyZWVuQ2FudmFzLCBlbGVtZW50LCBzdGF0ZURpZmYsIHN0YXRl LCAoKSA9PiB7Ci0gICAgICAgICAgICAgICAgY2FjaGVkU2Nyb2xsTGVmdCA9IHNjcm9sbExlZnQg PCBwYWRkaW5nID8gc2Nyb2xsTGVmdCA6IHNjcm9sbExlZnQgLSBwYWRkaW5nOwotICAgICAgICAg ICAgICAgIGNhY2hlUG9zTGVmdCA9IHNjcm9sbExlZnQgLSBjYWNoZWRTY3JvbGxMZWZ0OwotICAg ICAgICAgICAgICAgIGlmIChjYWNoZVBvc0xlZnQgPCAwKQotICAgICAgICAgICAgICAgICAgICBj YWNoZVBvc0xlZnQgPSAwOwotICAgICAgICAgICAgICAgIGNvbnRleHQuY2xlYXJSZWN0KDAsIDAs IGVsZW1lbnQud2lkdGgsIGVsZW1lbnQuaGVpZ2h0KTsKLSAgICAgICAgICAgICAgICBjb250ZXh0 LmRyYXdJbWFnZShvZmZzY3JlZW5DYW52YXMsIGNhY2hlUG9zTGVmdCAqIGdldERldmljZVBpeGVs UmF0aW8oKSwgMCwgICAgZWxlbWVudC53aWR0aCwgZWxlbWVudC5oZWlnaHQsIDAsIDAsIHdpZHRo ICogZ2V0RGV2aWNlUGl4ZWxSYXRpbygpLCBlbGVtZW50LmhlaWdodCk7Ci0gICAgICAgICAgICB9 KTsKLQorICAgICAgICAgICAgbmVlZFRvUmVkcmF3Q2FjaGUgPSB0cnVlOwogICAgICAgICB9IGVs c2UgaWYgKGNhY2hlUG9zTGVmdCA8IDAgfHwgY2FjaGVQb3NMZWZ0ICsgd2lkdGggPiB0b3RhbFdp ZHRoKSB7CiAgICAgICAgICAgICBpZiAoc2Nyb2xsTGVmdCA8IDAgKQogICAgICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgICAgIHJlZHJhd0NhY2hlKG9mZnNjcmVlbkNhbnZhcywgZWxlbWVu dCwgc3RhdGVEaWZmLCBzdGF0ZSwgICAgKCkgPT4geworICAgICAgICAgICAgbmVlZFRvUmVkcmF3 Q2FjaGUgPSB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKG5lZWRUb1JlZHJhd0NhY2hl KSB7CisgICAgICAgICAgICAvLyBXZSBkcmF3IGV2ZXJ5dGhpbmcgb24gY2FjaGUKKyAgICAgICAg ICAgIHJlZHJhd0NhY2hlKG9mZnNjcmVlbkNhbnZhcywgZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0 ZSwgKCkgPT4gewogICAgICAgICAgICAgICAgIGNhY2hlZFNjcm9sbExlZnQgPSBzY3JvbGxMZWZ0 IDwgcGFkZGluZyA/IHNjcm9sbExlZnQgOiBzY3JvbGxMZWZ0IC0gcGFkZGluZzsKICAgICAgICAg ICAgICAgICBjYWNoZVBvc0xlZnQgPSBzY3JvbGxMZWZ0IC0gY2FjaGVkU2Nyb2xsTGVmdDsKICAg ICAgICAgICAgICAgICBpZiAoY2FjaGVQb3NMZWZ0IDwgMCkKQEAgLTM2Nyw5ICszNjMsMTMgQEAg VGltZWxpbmUuQ2FudmFzU2VyaWVzQ29tcG9uZW50ID0gKGRvdHMsIHNjYWxlcywgb3B0aW9uID0g e30pID0+IHsKICAgICAgICAgfSwKICAgICAgICAgb25TdGF0ZVVwZGF0ZTogKGVsZW1lbnQsIHN0 YXRlRGlmZiwgc3RhdGUpID0+IHsKICAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBlbGVtZW50 LmdldENvbnRleHQoIjJkIik7CisgICAgICAgICAgICBsZXQgZm9yY2VSZWRyYXdDYWNoZSA9IGZh bHNlOwogICAgICAgICAgICAgaWYgKHN0YXRlRGlmZi5zY2FsZXMgfHwgc3RhdGVEaWZmLmRvdHMg fHwgdHlwZW9mIHN0YXRlRGlmZi5zY3JvbGxMZWZ0ID09PSAnbnVtYmVyJyB8fCB0eXBlb2Ygc3Rh dGVEaWZmLndpZHRoID09PSAnbnVtYmVyJykgewogICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KGRvdHMubGVuZ3RoIDw9IHNjYWxlcy5sZW5ndGgpOwotICAgICAgICAgICAgICAgIHJlcXVl c3RBbmltYXRpb25GcmFtZSgoKSA9PiBvZmZzY3JlZW5DYWNoZWRSZW5kZXIocmVkcmF3Q2FjaGUs IGVsZW1lbnQsIHN0YXRlRGlmZiwgc3RhdGUpKTsKKyAgICAgICAgICAgICAgICBpZiAoc3RhdGVE aWZmLnNjYWxlcyB8fCBzdGF0ZURpZmYuZG90cykgeworICAgICAgICAgICAgICAgICAgICBmb3Jj ZVJlZHJhd0NhY2hlID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg cmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+IG9mZnNjcmVlbkNhY2hlZFJlbmRlcihyZWRyYXdD YWNoZSwgZWxlbWVudCwgc3RhdGVEaWZmLCBzdGF0ZSwgZm9yY2VSZWRyYXdDYWNoZSkpOwogICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSk7CkBAIC03MTEsMTAgKzcxMSwxMyBAQCBUaW1l bGluZS5DYW52YXNYQXhpc0NvbXBvbmVudCA9IChzY2FsZXMsIG9wdGlvbiA9IHt9KSA9PiB7CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0sCiAgICAgICAgIG9uU3RhdGVVcGRhdGU6IChlbGVtZW50 LCBzdGF0ZURpZmYsIHN0YXRlKSA9PiB7CisgICAgICAgICAgICBsZXQgZm9yY2VSZWRyYXdDYWNo ZSA9IGZhbHNlOwogICAgICAgICAgICAgaWYgKHN0YXRlRGlmZi5zY2FsZXMgfHwgdHlwZW9mIHN0 YXRlRGlmZi5zY3JvbGxMZWZ0ID09PSAnbnVtYmVyJyB8fCB0eXBlb2Ygc3RhdGVEaWZmLndpZHRo ID09PSAnbnVtYmVyJykgewotICAgICAgICAgICAgICAgIGlmIChzdGF0ZURpZmYuc2NhbGVzKQor ICAgICAgICAgICAgICAgIGlmIChzdGF0ZURpZmYuc2NhbGVzKSB7CiAgICAgICAgICAgICAgICAg ICAgIHN0YXRlLnNjYWxlc01hcExpbmtMaXN0ID0gZ2V0U2NhbGVzTWFwTGlua0xpc3Qoc3RhdGVE aWZmLnNjYWxlcyk7Ci0gICAgICAgICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgpID0+ IG9mZnNjcmVlbkNhY2hlZFJlbmRlcihyZWRyYXdDYWNoZSwgZWxlbWVudCwgc3RhdGVEaWZmLCBz dGF0ZSkpOworICAgICAgICAgICAgICAgICAgICBmb3JjZVJlZHJhd0NhY2hlID0gdHJ1ZTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKCgp ID0+IG9mZnNjcmVlbkNhY2hlZFJlbmRlcihyZWRyYXdDYWNoZSwgZWxlbWVudCwgc3RhdGVEaWZm LCBzdGF0ZSwgZm9yY2VSZWRyYXdDYWNoZSkpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgfSk7CkBAIC03MjIsNiArNzI1LDE0IEBAIFRpbWVsaW5lLkNhbnZhc1hBeGlzQ29tcG9uZW50 ID0gKHNjYWxlcywgb3B0aW9uID0ge30pID0+IHsKICAgICByZXR1cm4gewogICAgICAgICBzZXJp ZXM6IExpc3RQcm92aWRlclJlY2VpdmVyKCh1cGRhdGVDb250YWluZXJXaWR0aCwgb25Db250YWlu ZXJTY3JvbGwsIG9uUmVzaXplKSA9PiB7CiAgICAgICAgICAgICB1cGRhdGVDb250YWluZXJXaWR0 aChzY2FsZXMubGVuZ3RoICogc2NhbGVXaWR0aCAqIGdldERldmljZVBpeGVsUmF0aW8oKSk7Cisg ICAgICAgICAgICBjb25zdCB1cGRhdGVEYXRhID0gKHNjYWxlcykgPT4geworICAgICAgICAgICAg ICAgIHVwZGF0ZUNvbnRhaW5lcldpZHRoKHNjYWxlcy5sZW5ndGggKiBzY2FsZVdpZHRoICogZ2V0 RGV2aWNlUGl4ZWxSYXRpbygpKTsKKyAgICAgICAgICAgICAgICBjYW52YXNSZWYuc2V0U3RhdGUo eworICAgICAgICAgICAgICAgICAgICBzY2FsZXM6IHNjYWxlcworICAgICAgICAgICAgICAgIH0p OworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKHR5cGVvZiBvcHRpb24uZXhwb3J0ZXIg PT09ICJmdW5jdGlvbiIpCisgICAgICAgICAgICAgICAgb3B0aW9uLmV4cG9ydGVyKHVwZGF0ZURh dGEpOwogICAgICAgICAgICAgb25Db250YWluZXJTY3JvbGwuYWN0aW9uKChlKSA9PiB7CiAgICAg ICAgICAgICAgICAgY2FudmFzUmVmLnNldFN0YXRlKHtzY3JvbGxMZWZ0OiBlLnRhcmdldC5zY3Jv bGxMZWZ0IC8gZ2V0RGV2aWNlUGl4ZWxSYXRpbygpfSk7CiAgICAgICAgICAgICB9KTsK