76823 2012-01-23 05:33:56 -0800 Web Inspector: response.bodySize in HAR is invalid (negative) for cached resources 2014-12-12 14:35:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik webkit.review.bot yurys oldest_to_newest 540497 0 caseq 2012-01-23 05:33:56 -0800 We used to compute response body size as resource.transferSize - resource.responseHeadersSize. Resource.transefrSize returns 0 for cached resources, so we were getting negative values in this case. The correct value to return is 0 as per HAR spec v1.2: bodySize [number] - Size of the received response body in bytes. Set to zero in case of responses coming from the cache (304). 540509 1 123549 caseq 2012-01-23 06:31:39 -0800 Created attachment 123549 Patch 540523 2 caseq 2012-01-23 06:53:17 -0800 Committed r105619: <http://trac.webkit.org/changeset/105619> 556245 3 caseq 2012-02-14 05:24:27 -0800 Reopening to attach new patch. 556246 4 126963 caseq 2012-02-14 05:24:32 -0800 Created attachment 126963 Patch 556247 5 webkit.review.bot 2012-02-14 05:26:49 -0800 Attachment 126963 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource First, rewinding head to replay your work on top of it... Applying: [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets Using index info to reconstruct a base tree... <stdin>:1578: trailing whitespace. <stdin>:1647: trailing whitespace. <stdin>:1657: trailing whitespace. <stdin>:1672: trailing whitespace. return 0; <stdin>:1674: trailing whitespace. warning: squelched 7 whitespace errors warning: 12 lines add whitespace errors. Falling back to patching base and 3-way merge... warning: too many files (created: 168776 deleted: 3), skipping inexact rename detection Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Auto-merging Source/WebKit2/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog Auto-merging Tools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. If any of these errors are false positives, please file a bug against check-webkit-style. 556248 6 126963 caseq 2012-02-14 05:28:34 -0800 Comment on attachment 126963 Patch Please disregard this, accidently uploaded a patch to the wrong bug. 1055206 7 burg 2014-12-12 14:35:45 -0800 Closing as invalid, as this bug pertains to the old inspector UI and/or its tests. Please file a new bug (https://www.webkit.org/new-inspector-bug) if the bug/feature/issue is still relevant to WebKit trunk. 123549 2012-01-23 06:31:39 -0800 2012-02-14 05:24:19 -0800 Patch bug-76823-20120123183137.patch text/plain 5341 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg0MGIzOGU4MzI2Y2Yy M2EwZmQyNGNhMzQzZmNjMzFjMTY5ZjBiMy4uZWRmYmJmOWFjMjEwN2ExMGI0NTViOTlkNTUwOWZk MjlhNThlYzNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAxLTIzICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVzcG9uc2UuYm9keVNpemUgaW4gSEFSIGlzIGludmFsaWQgKG5lZ2F0aXZlKSBmb3IgY2Fj aGVkIHJlc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzY4MjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAtIGZpeCByZXNwb25zZS5ib2R5U2l6ZSBmb3IgY2FjaGVkIHJlc291cmNlczsKKyAgICAg ICAgQWxzbyBzb21lIGRyaXZlLWJ5IGZpeGVzOgorICAgICAgICAtIHByZXR0eS1wcmludCBIQVIg d2hlbiBleHBvcnRlZAorICAgICAgICAtIHByb3BlciBhbm5vdGF0aW9uIGZvciBKU09OLnN0cmlu Z2lmeSgpCisgICAgICAgIC0gZGUtb2JmdXNjYXRlIGEgcGllY2Ugb2YgY29kZSBpbiBUaW1lbGlu ZVBhbmVsCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkhBUkVudHJ5LnByb3RvdHlwZS5nZXQgcmVzcG9uc2VCb2R5U2l6 ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlLl9leHBvcnRBbGwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZS5fZXhwb3J0UmVz b3VyY2UpOgorCiAyMDEyLTAxLTIzICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBy aW0uY29tPgogCiAgICAgICAgIDxmZUltYWdlPiBoYXMgcHJvYmxlbXMgcmVmZXJlbmNpbmcgbG9j YWwgZWxlbWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvSEFSRW50cnkuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVu dHJ5LmpzCmluZGV4IDBjMzNmNzc3MjdiYmQzNDQxZDlhNjE4ZDM2OTg1OGQ4NDc3MTU1NDIuLmU5 YzFkMzgzMGI4ZjU2OTE5MzkxNzdhZWVmODNkNmI0MDUxMjlhOTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcwpAQCAtMjUwLDYgKzI1MCw4IEBA IFdlYkluc3BlY3Rvci5IQVJFbnRyeS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgZ2V0IHJl c3BvbnNlQm9keVNpemUoKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNlLmNhY2hl ZCB8fCB0aGlzLl9yZXNvdXJjZS5zdGF0dXNDb2RlID09PSAzMDQpCisgICAgICAgICAgICByZXR1 cm4gMDsKICAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlLnRyYW5zZmVyU2l6ZSAtIHRoaXMu X3Jlc291cmNlLnJlc3BvbnNlSGVhZGVyc1NpemUKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDZmZDRmY2Q1 YWRkZTcxODEzOGI5YTM5ZWYwOTg0YWY0ODI5OWY2YTMuLjliNjVhODcxNzU4NjczM2NmMzg4N2Fk MzMyNGQxNGYxM2ExNDUyNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC05NjQsMTMgKzk2NCwxMyBAQCBXZWJJbnNwZWN0 b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgaGFyQXJjaGl2ZSA9 IHsKICAgICAgICAgICAgIGxvZzogKG5ldyBXZWJJbnNwZWN0b3IuSEFSTG9nKHRoaXMuX3Jlc291 cmNlcykpLmJ1aWxkKCkKICAgICAgICAgfTsKLSAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0 LmNvcHlUZXh0KEpTT04uc3RyaW5naWZ5KGhhckFyY2hpdmUpKTsKKyAgICAgICAgSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmNvcHlUZXh0KEpTT04uc3RyaW5naWZ5KGhhckFyY2hpdmUsIG51bGwsIDIp KTsKICAgICB9LAogCiAgICAgX2NvcHlSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UpCiAgICAg ewogICAgICAgICB2YXIgaGFyID0gKG5ldyBXZWJJbnNwZWN0b3IuSEFSRW50cnkocmVzb3VyY2Up KS5idWlsZCgpOwotICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQoSlNPTi5z dHJpbmdpZnkoaGFyKSk7CisgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5jb3B5VGV4dChK U09OLnN0cmluZ2lmeShoYXIsIG51bGwsIDIpKTsKICAgICB9LAogCiAgICAgX2NvcHlMb2NhdGlv bjogZnVuY3Rpb24ocmVzb3VyY2UpCkBAIC05OTQsMTMgKzk5NCwxMyBAQCBXZWJJbnNwZWN0b3Iu TmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgbG9nOiAobmV3IFdlYklu c3BlY3Rvci5IQVJMb2codGhpcy5fcmVzb3VyY2VzKSkuYnVpbGQoKQogICAgICAgICB9OwogICAg ICAgICAKLSAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmVBcyhXZWJJbnNwZWN0b3Iu aW5zcGVjdGVkUGFnZURvbWFpbiArICIuaGFyIiwgSlNPTi5zdHJpbmdpZnkoaGFyQXJjaGl2ZSkp OworICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZUFzKFdlYkluc3BlY3Rvci5pbnNw ZWN0ZWRQYWdlRG9tYWluICsgIi5oYXIiLCBKU09OLnN0cmluZ2lmeShoYXJBcmNoaXZlLCBudWxs LCAyKSk7CiAgICAgfSwKIAogICAgIF9leHBvcnRSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2Up CiAgICAgewogICAgICAgICB2YXIgaGFyID0gKG5ldyBXZWJJbnNwZWN0b3IuSEFSRW50cnkocmVz b3VyY2UpKS5idWlsZCgpOwotICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZUFzKHJl c291cmNlLmRpc3BsYXlOYW1lICsgIi5oYXIiLCBKU09OLnN0cmluZ2lmeShoYXIpKTsKKyAgICAg ICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmVBcyhyZXNvdXJjZS5kaXNwbGF5TmFtZSArICIu aGFyIiwgSlNPTi5zdHJpbmdpZnkoaGFyLCBudWxsLCAyKSk7CiAgICAgfSwKIAogICAgIF9jbGVh ckJyb3dzZXJDYWNoZTogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXggOTk0N2I5NmZmZDNiYTNh ODQxY2VmZTAwNWMwODA2NWUyODcyZmNkZS4uMjAxYmRiZTMyZWM5N2ViYjNmZTU5NmNlNGNhNGQ1 N2E2ZDkzZjI2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtMTM5MSwxMiArMTM5MSwxMyBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVNb2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICBfc2F2ZVRvRmlsZTogZnVuY3Rpb24o KQogICAgIHsKLSAgICAgICAgdmFyIHJlY29yZHMgPSBbJ1snICsgSlNPTi5zdHJpbmdpZnkod2lu ZG93Lm5hdmlnYXRvci5hcHBWZXJzaW9uKV07CisgICAgICAgIHZhciByZWNvcmRzID0gWydbJyAr IEpTT04uc3RyaW5naWZ5KG5ldyBTdHJpbmcod2luZG93Lm5hdmlnYXRvci5hcHBWZXJzaW9uKSld OwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3JlY29yZHMubGVuZ3RoOyArK2kp CiAgICAgICAgICAgICByZWNvcmRzLnB1c2goSlNPTi5zdHJpbmdpZnkodGhpcy5fcmVjb3Jkc1tp XSkpOwotICAgICAgICAgICAgcmVjb3Jkc1tyZWNvcmRzLmxlbmd0aCAtIDFdID0gcmVjb3Jkc1ty ZWNvcmRzLmxlbmd0aCAtIDFdICsgIl0iOwogCi0gICAgICAgIHZhciBub3c9IG5ldyBEYXRlKCk7 CisgICAgICAgIHJlY29yZHNbcmVjb3Jkcy5sZW5ndGggLSAxXSA9IHJlY29yZHNbcmVjb3Jkcy5s ZW5ndGggLSAxXSArICJdIjsKKworICAgICAgICB2YXIgbm93ID0gbmV3IERhdGUoKTsKICAgICAg ICAgdmFyIHN1Z2dlc3RlZEZpbGVOYW1lID0gIlRpbWVsaW5lUmF3RGF0YS0iICsgbm93LnRvSVNP ODYwMUNvbXBhY3QoKSArICIuanNvbiI7CiAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5z YXZlQXMoc3VnZ2VzdGVkRmlsZU5hbWUsIHJlY29yZHMuam9pbigiLFxuIikpOwogICAgIH0sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMKaW5kZXggZjc0 MjFmOWEyMzBjOGY5MzkyYWVjOTk0MzMzZjljZDI3NmRlYjhhMi4uZjNiZTZjYjRhZGFmYzBlYjUw YWE1ZDRhNmQzYTVmOTYxYTgyMDUzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9leHRlcm5zLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvZXh0ZXJucy5qcwpAQCAtNDEsOSArNDEsMTMgQEAgY29uc29sZS50cmFjZSA9IGZ1 bmN0aW9uKCkge30KIHZhciBKU09OID0ge30KIC8qKiBAcGFyYW0ge3N0cmluZ30gc3RyICovCiBK U09OLnBhcnNlID0gZnVuY3Rpb24oc3RyKSB7fQotLyoqIEBwYXJhbSB7T2JqZWN0fSBvYmogKi8K LS8qKiBAcmV0dXJuIHtzdHJpbmd9ICovCi1KU09OLnN0cmluZ2lmeSA9IGZ1bmN0aW9uKHN0cikg e30KKy8qKiAKKyAqIEBwYXJhbSB7T2JqZWN0fSBvYmoKKyAqIEBwYXJhbSB7RnVuY3Rpb249fSBy ZXBsYWNlcgorICogQHBhcmFtIHtudW1iZXI9fSBzcGFjZQorICogQHJldHVybiB7c3RyaW5nfSAK KyAqLworSlNPTi5zdHJpbmdpZnkgPSBmdW5jdGlvbihvYmosIHJlcGxhY2VyLCBzcGFjZSkge30K IAogLyoqIEBwYXJhbSB7Ym9vbGVhbj19IHBhcmFtICovCiBFbGVtZW50LnByb3RvdHlwZS5zY3Jv bGxJbnRvVmlld0lmTmVlZGVkID0gZnVuY3Rpb24ocGFyYW0pIHt9Cg== 126963 2012-02-14 05:24:32 -0800 2012-02-14 05:28:34 -0800 Patch bug-76823-20120214172430.patch text/plain 15827 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3NzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRlN2Q3YWFhYzdlMTk5 YmNhNGY2ZGE3NzNmMDZiNjg0Yzk4ZjVlMC4uNTFkNmFhMDMwNGNjYmM4MTk3ZGU4YWJhYWU4Njgy ODFlODZlOWFlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAyLTE0ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBleHRyYWN0IFRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cgZnJvbSBUaW1l bGluZU92ZXJ2aWV3UGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc4NTk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUucmVzZXQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5zY3JvbGxXaW5k b3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90eXBlLnJlc2V0 KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93LnByb3RvdHlw ZS5zY3JvbGxXaW5kb3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdX aW5kb3cucHJvdG90eXBlLl93aW5kb3dSZXNpemVEcmFnZ2luZyk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVPdmVydmlld1dpbmRvdy5wcm90b3R5cGUuX2RyYWdXaW5kb3cpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90eXBlLl93aW5k b3dTZWxlY3RvckRyYWdnaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3V2luZG93LnByb3RvdHlwZS5fZW5kV2luZG93U2VsZWN0b3JEcmFnZ2luZyk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1dpbmRvdy5wcm90b3R5cGUuX3dpbmRvd0Ry YWdnaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93LnBy b3RvdHlwZS5fcmVzaXplV2luZG93UmlnaHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90eXBlLl9yZXNpemVXaW5kb3dNYXhpbXVtKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93LnByb3RvdHlwZS5fc2V0V2lu ZG93UG9zaXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5k b3cucHJvdG90eXBlLl9lbmRXaW5kb3dEcmFnZ2luZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVQYW5lbC5XaW5kb3dTZWxlY3Rvcik6CisKIDIwMTItMDItMTQgIFZzZXZvbG9kIFZs YXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTWFr ZSBTY3JpcHRzTmF2aWdhdG9yIGRlZmF1bHQgZmlsZSBzZWxlY3Rvci4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5l LmpzCmluZGV4IDI5MWQ4NzA3YjdjZmE3MzUyMDJmMTM4MjlhMjFkMzgyODQ5NzNkZTAuLmRkMTU0 YzM3OWYzMmM5ZWE1ZTE0MzVkMmY4Yzc5YmM2NmM3NzdiZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5q cwpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpA QCAtMzgsOSArMzgsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUgPSBmdW5j dGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICB0aGlzLl9vdmVydmlld0dyaWQgPSBuZXcgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lR3JpZCgpOwogICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50 LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3LWdyaWQiOwogICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5p dGVtc0dyYXBoc0VsZW1lbnQuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctdGltZWxpbmVzIjsKLSAg ICB0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24i LCB0aGlzLl9kcmFnV2luZG93LmJpbmQodGhpcyksIHRydWUpOwotICAgIHRoaXMuX292ZXJ2aWV3 R3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNld2hlZWwiLCB0aGlzLnNjcm9sbFdp bmRvdy5iaW5kKHRoaXMpLCB0cnVlKTsKLSAgICB0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJkYmxjbGljayIsIHRoaXMuX3Jlc2l6ZVdpbmRvd01heGltdW0uYmlu ZCh0aGlzKSwgdHJ1ZSk7CiAKICAgICB0aGlzLl9oZWFwR3JhcGggPSBuZXcgV2ViSW5zcGVjdG9y LkhlYXBHcmFwaCgpOwogICAgIHRoaXMuX2hlYXBHcmFwaC5lbGVtZW50LmlkID0gInRpbWVsaW5l LW92ZXJ2aWV3LW1lbW9yeSI7CkBAIC02MCwzMiArNTcsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld1BhbmUgPSBmdW5jdGlvbihwcmVzZW50YXRpb25Nb2RlbCkKIAogICAgIHRoaXMu X292ZXJ2aWV3R3JpZC5zZXRTY3JvbGxBbmREaXZpZGVyVG9wKDAsIDApOwogCi0gICAgdGhpcy5f b3ZlcnZpZXdXaW5kb3dFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0g ICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3dFbGVtZW50LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3LXdp bmRvdyI7Ci0gICAgdGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f b3ZlcnZpZXdXaW5kb3dFbGVtZW50KTsKLQotICAgIHRoaXMuX292ZXJ2aWV3V2luZG93Qm9yZGVy c0VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9vdmVy dmlld1dpbmRvd0JvcmRlcnNFbGVtZW50LmNsYXNzTmFtZSA9ICJ0aW1lbGluZS1vdmVydmlldy13 aW5kb3ctcnVsZXJzIjsKLSAgICB0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLl9vdmVydmlld1dpbmRvd0JvcmRlcnNFbGVtZW50KTsKLQotICAgIHZhciBvdmVydmll d0RpdmlkZXJzQmFja2dyb3VuZCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAg IG92ZXJ2aWV3RGl2aWRlcnNCYWNrZ3JvdW5kLmNsYXNzTmFtZSA9ICJ0aW1lbGluZS1vdmVydmll dy1kaXZpZGVycy1iYWNrZ3JvdW5kIjsKLSAgICB0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5h cHBlbmRDaGlsZChvdmVydmlld0RpdmlkZXJzQmFja2dyb3VuZCk7Ci0KLSAgICB0aGlzLl9sZWZ0 UmVzaXplRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMu X2xlZnRSZXNpemVFbGVtZW50LmNsYXNzTmFtZSA9ICJ0aW1lbGluZS13aW5kb3ctcmVzaXplciI7 Ci0gICAgdGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQuc3R5bGUubGVmdCA9IDA7Ci0gICAgdGhpcy5f b3ZlcnZpZXdHcmlkLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQp OwotCi0gICAgdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50LmNsYXNzTmFtZSA9ICJ0aW1l bGluZS13aW5kb3ctcmVzaXplciB0aW1lbGluZS13aW5kb3ctcmVzaXplci1yaWdodCI7Ci0gICAg dGhpcy5fcmlnaHRSZXNpemVFbGVtZW50LnN0eWxlLnJpZ2h0ID0gMDsKLSAgICB0aGlzLl9vdmVy dmlld0dyaWQuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9yaWdodFJlc2l6ZUVsZW1lbnQpOwot CisgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3cgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXdXaW5kb3codGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQsIHByZXNlbnRhdGlvbk1vZGVs KTsKICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdDYWxjdWxhdG9yKCk7Ci0KLSAgICB0aGlzLndpbmRvd0xlZnQgPSAwLjA7Ci0g ICAgdGhpcy53aW5kb3dSaWdodCA9IDEuMDsKIH0KIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXdQYW5lLk1pblNlbGVjdGFibGVTaXplID0gMTI7CkBAIC0yMDIsMTYgKzE3NSw2OSBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogCiAgICAgcmVz ZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMud2luZG93TGVmdCA9IDAuMDsKLSAg ICAgICAgdGhpcy53aW5kb3dSaWdodCA9IDEuMDsKKyAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5k b3cucmVzZXQoKTsKKyAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLnJlc2V0KCk7Cisg ICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC51cGRhdGVEaXZpZGVycyh0cnVlLCB0aGlzLl9vdmVy dmlld0NhbGN1bGF0b3IpOworICAgIH0sCisKKyAgICBzY3JvbGxXaW5kb3c6IGZ1bmN0aW9uKGV2 ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3cuc2Nyb2xsV2luZG93KGV2 ZW50KTsKKyAgICB9Cit9CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge0VsZW1l bnR9IHBhcmVudEVsZW1lbnQKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2Vu dGF0aW9uTW9kZWx9IG1vZGVsCisgKi8KK1dlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2lu ZG93ID0gZnVuY3Rpb24ocGFyZW50RWxlbWVudCwgbW9kZWwpCit7CisgICAgdGhpcy5fcGFyZW50 ID0gcGFyZW50RWxlbWVudDsKKyAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCA9IG1vZGVsOwor CisgICAgdGhpcy5fcGFyZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2Ry YWdXaW5kb3cuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgdGhpcy5fcGFyZW50LmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNld2hlZWwiLCB0aGlzLnNjcm9sbFdpbmRvdy5iaW5kKHRoaXMpLCB0cnVlKTsK KyAgICB0aGlzLl9wYXJlbnQuYWRkRXZlbnRMaXN0ZW5lcigiZGJsY2xpY2siLCB0aGlzLl9yZXNp emVXaW5kb3dNYXhpbXVtLmJpbmQodGhpcyksIHRydWUpOworCisgICAgdGhpcy5fb3ZlcnZpZXdX aW5kb3dFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5f b3ZlcnZpZXdXaW5kb3dFbGVtZW50LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3LXdpbmRvdyI7Cisg ICAgcGFyZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9vdmVydmlld1dpbmRvd0VsZW1lbnQp OworCisgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3dCb3JkZXJzRWxlbWVudCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRoaXMuX292ZXJ2aWV3V2luZG93Qm9yZGVyc0VsZW1l bnQuY2xhc3NOYW1lID0gInRpbWVsaW5lLW92ZXJ2aWV3LXdpbmRvdy1ydWxlcnMiOworICAgIHBh cmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fb3ZlcnZpZXdXaW5kb3dCb3JkZXJzRWxlbWVu dCk7CisKKyAgICB2YXIgb3ZlcnZpZXdEaXZpZGVyc0JhY2tncm91bmQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKKyAgICBvdmVydmlld0RpdmlkZXJzQmFja2dyb3VuZC5jbGFzc05h bWUgPSAidGltZWxpbmUtb3ZlcnZpZXctZGl2aWRlcnMtYmFja2dyb3VuZCI7CisgICAgcGFyZW50 RWxlbWVudC5hcHBlbmRDaGlsZChvdmVydmlld0RpdmlkZXJzQmFja2dyb3VuZCk7CisKKyAgICB0 aGlzLl9sZWZ0UmVzaXplRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwor ICAgIHRoaXMuX2xlZnRSZXNpemVFbGVtZW50LmNsYXNzTmFtZSA9ICJ0aW1lbGluZS13aW5kb3ct cmVzaXplciI7CisgICAgdGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQuc3R5bGUubGVmdCA9IDA7Cisg ICAgcGFyZW50RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9sZWZ0UmVzaXplRWxlbWVudCk7CisK KyAgICB0aGlzLl9yaWdodFJlc2l6ZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKKyAgICB0aGlzLl9yaWdodFJlc2l6ZUVsZW1lbnQuY2xhc3NOYW1lID0gInRpbWVsaW5l LXdpbmRvdy1yZXNpemVyIHRpbWVsaW5lLXdpbmRvdy1yZXNpemVyLXJpZ2h0IjsKKyAgICB0aGlz Ll9yaWdodFJlc2l6ZUVsZW1lbnQuc3R5bGUucmlnaHQgPSAwOworICAgIHBhcmVudEVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5fcmlnaHRSZXNpemVFbGVtZW50KTsKK30KKworV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90eXBlID0geworICAgIHJlc2V0OiBmdW5jdGlv bigpCisgICAgewogICAgICAgICB0aGlzLl9vdmVydmlld1dpbmRvd0VsZW1lbnQuc3R5bGUubGVm dCA9ICIwJSI7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93RWxlbWVudC5zdHlsZS53aWR0 aCA9ICIxMDAlIjsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3dCb3JkZXJzRWxlbWVudC5z dHlsZS5sZWZ0ID0gIjAlIjsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3dCb3JkZXJzRWxl bWVudC5zdHlsZS5yaWdodCA9ICIwJSI7CiAgICAgICAgIHRoaXMuX2xlZnRSZXNpemVFbGVtZW50 LnN0eWxlLmxlZnQgPSAiMCUiOwogICAgICAgICB0aGlzLl9yaWdodFJlc2l6ZUVsZW1lbnQuc3R5 bGUubGVmdCA9ICIxMDAlIjsKLSAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLnJlc2V0 KCk7Ci0gICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC51cGRhdGVEaXZpZGVycyh0cnVlLCB0aGlz Ll9vdmVydmlld0NhbGN1bGF0b3IpOworICAgIH0sCisKKyAgICBzY3JvbGxXaW5kb3c6IGZ1bmN0 aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKHR5cGVvZiBldmVudC53aGVlbERlbHRhWCA9 PT0gIm51bWJlciIgJiYgZXZlbnQud2hlZWxEZWx0YVggIT09IDApCisgICAgICAgICAgICB0aGlz Ll93aW5kb3dEcmFnZ2luZyhldmVudC5wYWdlWCArIE1hdGgucm91bmQoZXZlbnQud2hlZWxEZWx0 YVggKiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuV2luZG93U2Nyb2xsU3BlZWRG YWN0b3IpLCB0aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQsIHRoaXMuX3JpZ2h0UmVzaXplRWxl bWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6 ZXJPZmZzZXQsIGV2ZW50KTsKICAgICB9LAogCiAgICAgX3Jlc2l6ZVdpbmRvdzogZnVuY3Rpb24o cmVzaXplRWxlbWVudCwgZXZlbnQpCkBAIC0yMjIsOSArMjQ4LDkgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICBfd2luZG93UmVzaXplRHJhZ2dp bmc6IGZ1bmN0aW9uKHJlc2l6ZUVsZW1lbnQsIGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKHJl c2l6ZUVsZW1lbnQgPT09IHRoaXMuX2xlZnRSZXNpemVFbGVtZW50KQotICAgICAgICAgICAgdGhp cy5fcmVzaXplV2luZG93TGVmdChldmVudC5wYWdlWCAtIHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVt ZW50Lm9mZnNldExlZnQpOworICAgICAgICAgICAgdGhpcy5fcmVzaXplV2luZG93TGVmdChldmVu dC5wYWdlWCAtIHRoaXMuX3BhcmVudC5vZmZzZXRMZWZ0KTsKICAgICAgICAgZWxzZQotICAgICAg ICAgICAgdGhpcy5fcmVzaXplV2luZG93UmlnaHQoZXZlbnQucGFnZVggLSB0aGlzLl9vdmVydmll d0dyaWQuZWxlbWVudC5vZmZzZXRMZWZ0KTsKKyAgICAgICAgICAgIHRoaXMuX3Jlc2l6ZVdpbmRv d1JpZ2h0KGV2ZW50LnBhZ2VYIC0gdGhpcy5fcGFyZW50Lm9mZnNldExlZnQpOwogICAgICAgICBl dmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgIH0sCiAKQEAgLTIzMiwxMyArMjU4LDEzIEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAg ICAgICB2YXIgbm9kZSA9IGV2ZW50LnRhcmdldDsKICAgICAgICAgd2hpbGUgKG5vZGUpIHsKLSAg ICAgICAgICAgIGlmIChub2RlID09PSB0aGlzLl9vdmVydmlld0dyaWQuX2RpdmlkZXJzTGFiZWxC YXJFbGVtZW50KSB7CisgICAgICAgICAgICBpZiAobm9kZS5oYXNTdHlsZUNsYXNzKCJyZXNvdXJj ZXMtZGl2aWRlcnMtbGFiZWwtYmFyIikpIHsKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iu ZWxlbWVudERyYWdTdGFydCh0aGlzLl9vdmVydmlld1dpbmRvd0VsZW1lbnQsIHRoaXMuX3dpbmRv d0RyYWdnaW5nLmJpbmQodGhpcywgZXZlbnQucGFnZVgsCiAgICAgICAgICAgICAgICAgICAgIHRo aXMuX2xlZnRSZXNpemVFbGVtZW50Lm9mZnNldExlZnQgKyBXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld1BhbmUuUmVzaXplck9mZnNldCwgdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50Lm9mZnNl dExlZnQgKyBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuUmVzaXplck9mZnNldCks IHRoaXMuX2VuZFdpbmRvd0RyYWdnaW5nLmJpbmQodGhpcyksIGV2ZW50LCAiZXctcmVzaXplIik7 CiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKG5vZGUgPT09 IHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50KSB7Ci0gICAgICAgICAgICAgICAgdmFyIHBvc2l0 aW9uID0gZXZlbnQucGFnZVggLSB0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5vZmZzZXRMZWZ0 OwotICAgICAgICAgICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93U2VsZWN0b3IgPSBuZXcgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuV2luZG93U2VsZWN0b3IodGhpcy5fb3ZlcnZpZXdHcmlk LmVsZW1lbnQsIHBvc2l0aW9uLCBldmVudCk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKG5vZGUg PT09IHRoaXMuX3BhcmVudCkgeworICAgICAgICAgICAgICAgIHZhciBwb3NpdGlvbiA9IGV2ZW50 LnBhZ2VYIC0gdGhpcy5fcGFyZW50Lm9mZnNldExlZnQ7CisgICAgICAgICAgICAgICAgdGhpcy5f b3ZlcnZpZXdXaW5kb3dTZWxlY3RvciA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5X aW5kb3dTZWxlY3Rvcih0aGlzLl9wYXJlbnQsIHBvc2l0aW9uKTsKICAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3IuZWxlbWVudERyYWdTdGFydChudWxsLCB0aGlzLl93aW5kb3dTZWxlY3RvckRy YWdnaW5nLmJpbmQodGhpcyksIHRoaXMuX2VuZFdpbmRvd1NlbGVjdG9yRHJhZ2dpbmcuYmluZCh0 aGlzKSwgZXZlbnQsICJldy1yZXNpemUiKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIH0gZWxzZSBpZiAobm9kZSA9PT0gdGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQgfHwgbm9k ZSA9PT0gdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50KSB7CkBAIC0yNTEsMjAgKzI3NywyMSBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogCiAgICAgX3dp bmRvd1NlbGVjdG9yRHJhZ2dpbmc6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdGhp cy5fb3ZlcnZpZXdXaW5kb3dTZWxlY3Rvci5fdXBkYXRlUG9zaXRpb24oZXZlbnQucGFnZVggLSB0 aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5vZmZzZXRMZWZ0KTsKKyAgICAgICAgdGhpcy5fb3Zl cnZpZXdXaW5kb3dTZWxlY3Rvci5fdXBkYXRlUG9zaXRpb24oZXZlbnQucGFnZVggLSB0aGlzLl9w YXJlbnQub2Zmc2V0TGVmdCk7CiAgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAg fSwKIAogICAgIF9lbmRXaW5kb3dTZWxlY3RvckRyYWdnaW5nOiBmdW5jdGlvbihldmVudCkKICAg ICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5lbGVtZW50RHJhZ0VuZChldmVudCk7Ci0gICAgICAg IHZhciB3aW5kb3cgPSB0aGlzLl9vdmVydmlld1dpbmRvd1NlbGVjdG9yLl9jbG9zZShldmVudC5w YWdlWCAtIHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50Lm9mZnNldExlZnQpOworICAgICAgICB2 YXIgd2luZG93ID0gdGhpcy5fb3ZlcnZpZXdXaW5kb3dTZWxlY3Rvci5fY2xvc2UoZXZlbnQucGFn ZVggLSB0aGlzLl9wYXJlbnQub2Zmc2V0TGVmdCk7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9vdmVy dmlld1dpbmRvd1NlbGVjdG9yOwotICAgICAgICBpZiAod2luZG93LmVuZCAtIHdpbmRvdy5zdGFy dCA8IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5NaW5TZWxlY3RhYmxlU2l6ZSkK LSAgICAgICAgICAgIGlmICh0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFwaHNFbGVtZW50Lm9m ZnNldFdpZHRoIC0gd2luZG93LmVuZCA+IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFu ZS5NaW5TZWxlY3RhYmxlU2l6ZSkKKyAgICAgICAgaWYgKHdpbmRvdy5lbmQgLSB3aW5kb3cuc3Rh cnQgPCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuTWluU2VsZWN0YWJsZVNpemUp IHsKKyAgICAgICAgICAgIGlmICh0aGlzLl9wYXJlbnQuY2xpZW50V2lkdGggLSB3aW5kb3cuZW5k ID4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1pblNlbGVjdGFibGVTaXplKQog ICAgICAgICAgICAgICAgIHdpbmRvdy5lbmQgPSB3aW5kb3cuc3RhcnQgKyBXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld1BhbmUuTWluU2VsZWN0YWJsZVNpemU7CiAgICAgICAgICAgICBlbHNl CiAgICAgICAgICAgICAgICAgd2luZG93LnN0YXJ0ID0gd2luZG93LmVuZCAtIFdlYkluc3BlY3Rv ci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5NaW5TZWxlY3RhYmxlU2l6ZTsKKyAgICAgICAgfQogICAg ICAgICB0aGlzLl9zZXRXaW5kb3dQb3NpdGlvbih3aW5kb3cuc3RhcnQsIHdpbmRvdy5lbmQpOwog ICAgIH0sCiAKQEAgLTI4MCw4ICszMDcsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmll d1BhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgZW5kID0gd2luZG93U2l6ZTsKICAgICAg ICAgfQogCi0gICAgICAgIGlmIChlbmQgPiB0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5jbGll bnRXaWR0aCkgewotICAgICAgICAgICAgZW5kID0gdGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQu Y2xpZW50V2lkdGg7CisgICAgICAgIGlmIChlbmQgPiB0aGlzLl9wYXJlbnQuY2xpZW50V2lkdGgp IHsKKyAgICAgICAgICAgIGVuZCA9IHRoaXMuX3BhcmVudC5jbGllbnRXaWR0aDsKICAgICAgICAg ICAgIHN0YXJ0ID0gZW5kIC0gd2luZG93U2l6ZTsKICAgICAgICAgfQogICAgICAgICB0aGlzLl9z ZXRXaW5kb3dQb3NpdGlvbihzdGFydCwgZW5kKTsKQEAgLTMwMiw4ICszMjksOCBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogICAgIF9yZXNpemVXaW5k b3dSaWdodDogZnVuY3Rpb24oZW5kKQogICAgIHsKICAgICAgICAgLy8gR2x1ZSB0byBlZGdlLgot ICAgICAgICBpZiAoZW5kID4gdGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQuY2xpZW50V2lkdGgg LSAxMCkKLSAgICAgICAgICAgIGVuZCA9IHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50LmNsaWVu dFdpZHRoOworICAgICAgICBpZiAoZW5kID4gdGhpcy5fcGFyZW50LmNsaWVudFdpZHRoIC0gMTAp CisgICAgICAgICAgICBlbmQgPSB0aGlzLl9wYXJlbnQuY2xpZW50V2lkdGg7CiAgICAgICAgIGVs c2UgaWYgKGVuZCA8IHRoaXMuX2xlZnRSZXNpemVFbGVtZW50Lm9mZnNldExlZnQgKyBXZWJJbnNw ZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuTWluU2VsZWN0YWJsZVNpemUpCiAgICAgICAgICAg ICBlbmQgPSB0aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1pblNlbGVjdGFibGVTaXplOwogICAgICAgICB0aGlzLl9z ZXRXaW5kb3dQb3NpdGlvbihudWxsLCBlbmQpOwpAQCAtMzExLDQxICszMzgsMzYgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKIAogICAgIF9yZXNpemVX aW5kb3dNYXhpbXVtOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9zZXRXaW5kb3dQ b3NpdGlvbigwLCB0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5jbGllbnRXaWR0aCk7CisgICAg ICAgIHRoaXMuX3NldFdpbmRvd1Bvc2l0aW9uKDAsIHRoaXMuX3BhcmVudC5jbGllbnRXaWR0aCk7 CiAgICAgfSwKIAogICAgIF9zZXRXaW5kb3dQb3NpdGlvbjogZnVuY3Rpb24oc3RhcnQsIGVuZCkK ICAgICB7Ci0gICAgICAgIGNvbnN0IHJ1bGVyQWRqdXN0bWVudCA9IDEgLyB0aGlzLl9vdmVydmll d0dyaWQuZWxlbWVudC5jbGllbnRXaWR0aDsKKyAgICAgICAgdmFyIGNsaWVudFdpZHRoID0gdGhp cy5fcGFyZW50LmNsaWVudFdpZHRoOworICAgICAgICBjb25zdCBydWxlckFkanVzdG1lbnQgPSAx IC8gY2xpZW50V2lkdGg7CisgICAgICAgIHZhciB3aW5kb3dMZWZ0ID0gdGhpcy5fcHJlc2VudGF0 aW9uTW9kZWwud2luZG93TGVmdDsKKyAgICAgICAgdmFyIHdpbmRvd1JpZ2h0ID0gdGhpcy5fcHJl c2VudGF0aW9uTW9kZWwud2luZG93UmlnaHQ7CiAgICAgICAgIGlmICh0eXBlb2Ygc3RhcnQgPT09 ICJudW1iZXIiKSB7Ci0gICAgICAgICAgICB0aGlzLndpbmRvd0xlZnQgPSBzdGFydCAvIHRoaXMu X292ZXJ2aWV3R3JpZC5lbGVtZW50LmNsaWVudFdpZHRoOwotICAgICAgICAgICAgdGhpcy5fbGVm dFJlc2l6ZUVsZW1lbnQuc3R5bGUubGVmdCA9IHRoaXMud2luZG93TGVmdCAqIDEwMCArICIlIjsK LSAgICAgICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93RWxlbWVudC5zdHlsZS5sZWZ0ID0gdGhp cy53aW5kb3dMZWZ0ICogMTAwICsgIiUiOwotICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5k b3dCb3JkZXJzRWxlbWVudC5zdHlsZS5sZWZ0ID0gKHRoaXMud2luZG93TGVmdCAtIHJ1bGVyQWRq dXN0bWVudCkgKiAxMDAgKyAiJSI7CisgICAgICAgICAgICB3aW5kb3dMZWZ0ID0gc3RhcnQgLyBj bGllbnRXaWR0aDsKKyAgICAgICAgICAgIHRoaXMuX2xlZnRSZXNpemVFbGVtZW50LnN0eWxlLmxl ZnQgPSB3aW5kb3dMZWZ0ICogMTAwICsgIiUiOworICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdX aW5kb3dFbGVtZW50LnN0eWxlLmxlZnQgPSB3aW5kb3dMZWZ0ICogMTAwICsgIiUiOworICAgICAg ICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3dCb3JkZXJzRWxlbWVudC5zdHlsZS5sZWZ0ID0gKHdp bmRvd0xlZnQgLSBydWxlckFkanVzdG1lbnQpICogMTAwICsgIiUiOwogICAgICAgICB9CiAgICAg ICAgIGlmICh0eXBlb2YgZW5kID09PSAibnVtYmVyIikgewotICAgICAgICAgICAgdGhpcy53aW5k b3dSaWdodCA9IGVuZCAvIHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50LmNsaWVudFdpZHRoOwot ICAgICAgICAgICAgdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50LnN0eWxlLmxlZnQgPSB0aGlzLndp bmRvd1JpZ2h0ICogMTAwICsgIiUiOworICAgICAgICAgICAgd2luZG93UmlnaHQgPSBlbmQgLyBj bGllbnRXaWR0aDsKKyAgICAgICAgICAgIHRoaXMuX3JpZ2h0UmVzaXplRWxlbWVudC5zdHlsZS5s ZWZ0ID0gd2luZG93UmlnaHQgKiAxMDAgKyAiJSI7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5f b3ZlcnZpZXdXaW5kb3dFbGVtZW50LnN0eWxlLndpZHRoID0gKHRoaXMud2luZG93UmlnaHQgLSB0 aGlzLndpbmRvd0xlZnQpICogMTAwICsgIiUiOwotICAgICAgICB0aGlzLl9vdmVydmlld1dpbmRv d0JvcmRlcnNFbGVtZW50LnN0eWxlLnJpZ2h0ID0gKDEgLSB0aGlzLndpbmRvd1JpZ2h0ICsgMiAq IHJ1bGVyQWRqdXN0bWVudCkgKiAxMDAgKyAiJSI7Ci0gICAgICAgIHRoaXMuX3ByZXNlbnRhdGlv bk1vZGVsLnNldFdpbmRvd1Bvc2l0aW9uKHRoaXMud2luZG93TGVmdCwgdGhpcy53aW5kb3dSaWdo dCk7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93RWxlbWVudC5zdHlsZS53aWR0aCA9ICh3 aW5kb3dSaWdodCAtIHdpbmRvd0xlZnQpICogMTAwICsgIiUiOworICAgICAgICB0aGlzLl9vdmVy dmlld1dpbmRvd0JvcmRlcnNFbGVtZW50LnN0eWxlLnJpZ2h0ID0gKDEgLSB3aW5kb3dSaWdodCAr IDIgKiBydWxlckFkanVzdG1lbnQpICogMTAwICsgIiUiOworICAgICAgICB0aGlzLl9wcmVzZW50 YXRpb25Nb2RlbC5zZXRXaW5kb3dQb3NpdGlvbih3aW5kb3dMZWZ0LCB3aW5kb3dSaWdodCk7CiAg ICAgfSwKIAogICAgIF9lbmRXaW5kb3dEcmFnZ2luZzogZnVuY3Rpb24oZXZlbnQpCiAgICAgewog ICAgICAgICBXZWJJbnNwZWN0b3IuZWxlbWVudERyYWdFbmQoZXZlbnQpOwogICAgIH0sCi0KLSAg ICBzY3JvbGxXaW5kb3c6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgaWYgKHR5cGVv ZiBldmVudC53aGVlbERlbHRhWCA9PT0gIm51bWJlciIgJiYgZXZlbnQud2hlZWxEZWx0YVggIT09 IDApCi0gICAgICAgICAgICB0aGlzLl93aW5kb3dEcmFnZ2luZyhldmVudC5wYWdlWCArIE1hdGgu cm91bmQoZXZlbnQud2hlZWxEZWx0YVggKiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1Bh bmUuV2luZG93U2Nyb2xsU3BlZWRGYWN0b3IpLCB0aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZz ZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQs IHRoaXMuX3JpZ2h0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQsIGV2ZW50KTsKLSAgICB9CiB9CiAKLVdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5z cGVjdG9yLk9iamVjdC5wcm90b3R5cGU7Ci0KIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKi8KQEAg LTQzOCw3ICs0NjAsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeUdyYXBoLnByb3Rv dHlwZSA9IHsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKi8KLVdlYkluc3BlY3Rvci5UaW1lbGlu ZVBhbmVsLldpbmRvd1NlbGVjdG9yID0gZnVuY3Rpb24ocGFyZW50LCBwb3NpdGlvbiwgZXZlbnQp CitXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5XaW5kb3dTZWxlY3RvciA9IGZ1bmN0aW9uKHBh cmVudCwgcG9zaXRpb24pCiB7CiAgICAgdGhpcy5fc3RhcnRQb3NpdGlvbiA9IHBvc2l0aW9uOwog ICAgIHRoaXMuX3dpZHRoID0gcGFyZW50Lm9mZnNldFdpZHRoOwo=