111697 2013-03-07 01:32:04 -0800 Web Inspector: Flame Chart. Stick item color to the function. 2013-03-07 05:38:54 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 849870 0 loislo 2013-03-07 01:32:04 -0800 EOM 849878 1 191949 loislo 2013-03-07 01:47:15 -0800 Created attachment 191949 Patch 849955 2 191949 yurys 2013-03-07 04:25:06 -0800 Comment on attachment 191949 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=191949&action=review > Source/WebCore/inspector/front-end/FlameChart.js:181 > + var lightness = this._highlightedNode === node ? 33 : 67; The color isn't restored when selected node changes. r- for this 849961 3 191970 loislo 2013-03-07 04:36:16 -0800 Created attachment 191970 Patch 849992 4 loislo 2013-03-07 05:30:52 -0800 (In reply to comment #2) > (From update of attachment 191949 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=191949&action=review > > > Source/WebCore/inspector/front-end/FlameChart.js:181 > > + var lightness = this._highlightedNode === node ? 33 : 67; > > The color isn't restored when selected node changes. r- for this fixed 849996 5 loislo 2013-03-07 05:38:54 -0800 Committed r145065: <http://trac.webkit.org/changeset/145065> 191949 2013-03-07 01:47:15 -0800 2013-03-07 04:36:09 -0800 Patch bug-111697-20130307134319.patch text/plain 5316 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0OTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzUxOGY2NTc3MDkyNWMx YTk0NjAxMWM0OTViOGFiMzlkM2U4NDIyOS4uMGQ2NDk4NTY0NWVjODgyZDQ5OWY4MWJmNGJhYjQx YzRhYWZhMzUwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA3ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBGbGFtZSBDaGFydC4gU3RpY2sgaXRlbSBjb2xvciB0byB0aGUgZnVuY3Rpb24uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2OTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEaWZmZXJlbnQgbm9k ZXMgYXNzb2NpYXRlZCB3aXRoIGEgc2luZ2xlIGZ1bmN0aW9uIGhhdmUgdG8gdXNlIHRoZSBzYW1l IGNvbG9yLgorICAgICAgICBNaW5vciBwb2xpc2g6IGRvIG5vdCBmaWx0ZXIgb3V0IChpZGxlKSBh bmQgKHByb2dyYW0pIGl0ZW1zLiBUaGV5IHdlcmUgYmlnIGR1ZSB0byBhbiBlcnJvciBvbiB2OCBz aWRlLgorICAgICAgICBTZXQgbWluaW11bSB3aWR0aCB0byAwIGZvciBtb3JlIHByZWNpc2UgcGlj dHVyZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G bGFtZUNoYXJ0LnByb3RvdHlwZS5fcm9vdE5vZGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G bGFtZUNoYXJ0LnByb3RvdHlwZS5kcmF3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNo YXJ0LnByb3RvdHlwZS5fZHJhd05vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hh cnQucHJvdG90eXBlLl9kcmF3QmFyKToKKwogMjAxMy0wMy0wNiAgQWxsYW4gU2FuZGZlbGQgSmVu c2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KIAogICAgICAgICBSRUdHUkVTU0lPTiAocjE0 MjExMik6IEl0IG1hZGUgY29tcG9zaXRpbmcgdGVzdHMgZmFpbCBvbiBFRkwsIFF0LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzCmluZGV4IGFk MmUwM2VhZWI1MGM0ODdkNzQ2YjUxMWQ0ZjAwNWFkM2ZmYTVjYTEuLjE4MmVhMWZmNzcxMTQzZTU5 ZGQ5YmE3YjMxYmU1YTNjMmRjMDJlMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0ZsYW1lQ2hhcnQuanMKQEAgLTQzLDEzICs0MywxNCBAQCBXZWJJbnNwZWN0 b3IuRmxhbWVDaGFydCA9IGZ1bmN0aW9uKGNwdVByb2ZpbGVWaWV3KQogICAgIHRoaXMuX2NwdVBy b2ZpbGVWaWV3ID0gY3B1UHJvZmlsZVZpZXc7CiAgICAgdGhpcy5feFNjYWxlRmFjdG9yID0gMC4w OwogICAgIHRoaXMuX3lTY2FsZUZhY3RvciA9IDEwOwotICAgIHRoaXMuX21pbldpZHRoID0gMzsK KyAgICB0aGlzLl9taW5XaWR0aCA9IDA7CiAgICAgdGhpcy5lbGVtZW50Lm9ubW91c2Vtb3ZlID0g dGhpcy5fb25Nb3VzZU1vdmUuYmluZCh0aGlzKTsKICAgICB0aGlzLmVsZW1lbnQub25jbGljayA9 IHRoaXMuX29uQ2xpY2suYmluZCh0aGlzKTsKICAgICB0aGlzLl9wb3BvdmVySGVscGVyID0gbmV3 IFdlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyKHRoaXMuZWxlbWVudCwgdGhpcy5fZ2V0UG9wb3Zl ckFuY2hvci5iaW5kKHRoaXMpLCB0aGlzLl9zaG93UG9wb3Zlci5iaW5kKHRoaXMpKTsKICAgICB0 aGlzLl9hbmNob3JFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxkKCJzcGFuIik7CiAg ICAgdGhpcy5fYW5jaG9yRWxlbWVudC5jbGFzc05hbWUgPSAiaXRlbS1hbmNob3IiOwogICAgIHRo aXMuX2xpbmtpZmllciA9IG5ldyBXZWJJbnNwZWN0b3IuTGlua2lmaWVyKCk7CisgICAgdGhpcy5f Y29sb3JzID0geyB9OwogfQogCiBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5FdmVudHMgPSB7CkBA IC0xMzcsMjUgKzEzOCwxMCBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUgPSB7 CiAgICAgICovCiAgICAgX3Jvb3ROb2RlczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYg KHRoaXMuX3Jvb3ROb2Rlc0FycmF5KQotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3Jvb3ROb2Rl c0FycmF5LnNsaWNlKCk7Ci0KLSAgICAgICAgdmFyIHByb2ZpbGVIZWFkID0gdGhpcy5fY3B1UHJv ZmlsZVZpZXcucHJvZmlsZUhlYWQ7Ci0gICAgICAgIGlmICghcHJvZmlsZUhlYWQpCisgICAgICAg IGlmICghdGhpcy5fY3B1UHJvZmlsZVZpZXcucHJvZmlsZUhlYWQpCiAgICAgICAgICAgICByZXR1 cm4gbnVsbDsKLSAgICAgICAgdmFyIHRvdGFsVGltZSA9IDA7Ci0gICAgICAgIHZhciBub2RlcyA9 IFtdOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb2ZpbGVIZWFkLmNoaWxkcmVuLmxl bmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgbm9kZSA9IHByb2ZpbGVIZWFkLmNoaWxkcmVu W2ldOwotICAgICAgICAgICAgaWYgKG5vZGUuZnVuY3Rpb25OYW1lID09PSAiKHByb2dyYW0pIiB8 fCBub2RlLmZ1bmN0aW9uTmFtZSA9PT0gIihpZGxlKSIpCi0gICAgICAgICAgICAgICAgY29udGlu dWU7Ci0gICAgICAgICAgICB0b3RhbFRpbWUgKz0gbm9kZS50b3RhbFRpbWU7Ci0gICAgICAgICAg ICBub2Rlcy5wdXNoKG5vZGUpOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fcm9vdE5vZGVz QXJyYXkgPSBub2RlczsKLSAgICAgICAgdGhpcy5fdG90YWxUaW1lID0gdG90YWxUaW1lOwotICAg ICAgICByZXR1cm4gbm9kZXMuc2xpY2UoKTsKKyAgICAgICAgdGhpcy5fdG90YWxUaW1lID0gdGhp cy5fY3B1UHJvZmlsZVZpZXcucHJvZmlsZUhlYWQudG90YWxUaW1lOworICAgICAgICByZXR1cm4g dGhpcy5fY3B1UHJvZmlsZVZpZXcucHJvZmlsZUhlYWQuY2hpbGRyZW4uc2xpY2UoKTsKICAgICB9 LAogCiAgICAgLyoqCkBAIC0xNjcsOSArMTUzLDggQEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQu cHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3Jvb3ROb2RlcygpKQogICAgICAgICAg ICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBtYXJnaW4gPSAwOwotICAgICAgICB0aGlzLl9jYW52 YXMuaGVpZ2h0ID0gaGVpZ2h0IC0gbWFyZ2luOwotICAgICAgICB0aGlzLl9jYW52YXMud2lkdGgg PSB3aWR0aCAtIG1hcmdpbjsKKyAgICAgICAgdGhpcy5fY2FudmFzLmhlaWdodCA9IGhlaWdodDsK KyAgICAgICAgdGhpcy5fY2FudmFzLndpZHRoID0gd2lkdGg7CiAKICAgICAgICAgdGhpcy5feFNj YWxlRmFjdG9yID0gd2lkdGggLyB0aGlzLl90b3RhbFRpbWU7CiAgICAgICAgIHRoaXMuX2NvbG9y SW5kZXggPSAwOwpAQCAtMTg2LDEwICsxNzEsMTcgQEAgV2ViSW5zcGVjdG9yLkZsYW1lQ2hhcnQu cHJvdG90eXBlID0gewogICAgICAqLwogICAgIF9kcmF3Tm9kZTogZnVuY3Rpb24ob2Zmc2V0LCBs ZXZlbCwgbm9kZSkKICAgICB7Ci0gICAgICAgICsrdGhpcy5fY29sb3JJbmRleDsKLSAgICAgICAg dmFyIGh1ZSA9ICh0aGlzLl9jb2xvckluZGV4ICogMiArIDExICogKHRoaXMuX2NvbG9ySW5kZXgg JSAyKSkgJSAzNjA7Ci0gICAgICAgIHZhciBsaWdodG5lc3MgPSB0aGlzLl9oaWdobGlnaHRlZE5v ZGUgPT09IG5vZGUgPyAzMyA6IDY3OwotICAgICAgICB2YXIgY29sb3IgPSAiaHNsKCIgKyBodWUg KyAiLCAxMDAlLCAiICsgbGlnaHRuZXNzICsgIiUpIjsKKyAgICAgICAgdmFyIGZ1bmN0aW9uVUlE ID0gbm9kZS5mdW5jdGlvblVJRDsKKyAgICAgICAgaWYgKCFmdW5jdGlvblVJRCkKKyAgICAgICAg ICAgIG5vZGUuZnVuY3Rpb25VSUQgPSBmdW5jdGlvblVJRCA9IG5vZGUuZnVuY3Rpb25OYW1lICsg IjoiICsgbm9kZS51cmwgKyAiOiIgKyBub2RlLmxpbmVOdW1iZXI7CisgICAgICAgIHZhciBjb2xv ciA9IHRoaXMuX2NvbG9yc1tmdW5jdGlvblVJRF07CisgICAgICAgIGlmICghY29sb3IpIHsKKyAg ICAgICAgICAgICsrdGhpcy5fY29sb3JJbmRleDsKKyAgICAgICAgICAgIHZhciBodWUgPSAodGhp cy5fY29sb3JJbmRleCAqIDUgKyAxMSAqICh0aGlzLl9jb2xvckluZGV4ICUgMikpICUgMzYwOwor ICAgICAgICAgICAgdmFyIGxpZ2h0bmVzcyA9IHRoaXMuX2hpZ2hsaWdodGVkTm9kZSA9PT0gbm9k ZSA/IDMzIDogNjc7CisgICAgICAgICAgICBjb2xvciA9ICJoc2woIiArIGh1ZSArICIsIDEwMCUs ICIgKyBsaWdodG5lc3MgKyAiJSkiOworICAgICAgICAgICAgdGhpcy5fY29sb3JzW2Z1bmN0aW9u VUlEXSA9IGNvbG9yOworICAgICAgICB9CiAgICAgICAgIHRoaXMuX2RyYXdCYXIodGhpcy5fY29u dGV4dCwgb2Zmc2V0LCBsZXZlbCwgbm9kZSwgY29sb3IpOwogICAgIH0sCiAKQEAgLTIyOSw3ICsy MjEsNyBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUgPSB7CiAgICAgICogQHBh cmFtIHshUHJvZmlsZXJBZ2VudC5DUFVQcm9maWxlTm9kZX0gbm9kZQogICAgICAqIEBwYXJhbSB7 IXN0cmluZ30gaHNsQ29sb3IKICAgICAgKi8KLSAgICBfZHJhd0JhcjogZnVuY3Rpb24oY29udGV4 dCwgb2Zmc2V0LCBsZXZlbCwgbm9kZSwgaHNsQ29sb3IpCisgICAgX2RyYXdCYXI6IGZ1bmN0aW9u KGNvbnRleHQsIG9mZnNldCwgbGV2ZWwsIG5vZGUsIGNvbG9yKQogICAgIHsKICAgICAgICAgdmFy IHdpZHRoID0gbm9kZS50b3RhbFRpbWUgKiB0aGlzLl94U2NhbGVGYWN0b3I7CiAgICAgICAgIHZh ciBoZWlnaHQgPSB0aGlzLl95U2NhbGVGYWN0b3I7CkBAIC0yMzcsNyArMjI5LDcgQEAgV2ViSW5z cGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgeSA9IHRoaXMuX2Nh bnZhcy5oZWlnaHQgLSBsZXZlbCAqIHRoaXMuX3lTY2FsZUZhY3RvciAtIGhlaWdodDsKICAgICAg ICAgY29udGV4dC5iZWdpblBhdGgoKTsKICAgICAgICAgY29udGV4dC5yZWN0KHgsIHksIHdpZHRo IC0gMSwgaGVpZ2h0IC0gMSk7Ci0gICAgICAgIGNvbnRleHQuZmlsbFN0eWxlID0gaHNsQ29sb3I7 CisgICAgICAgIGNvbnRleHQuZmlsbFN0eWxlID0gY29sb3I7CiAgICAgICAgIGNvbnRleHQuZmls bCgpOwogICAgIH0sCiAK 191970 2013-03-07 04:36:16 -0800 2013-03-07 05:35:25 -0800 Patch bug-111697-20130307163220.patch text/plain 5205 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0OTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzUxOGY2NTc3MDkyNWMx YTk0NjAxMWM0OTViOGFiMzlkM2U4NDIyOS4uMGQ2NDk4NTY0NWVjODgyZDQ5OWY4MWJmNGJhYjQx YzRhYWZhMzUwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA3ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBGbGFtZSBDaGFydC4gU3RpY2sgaXRlbSBjb2xvciB0byB0aGUgZnVuY3Rpb24uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2OTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEaWZmZXJlbnQgbm9k ZXMgYXNzb2NpYXRlZCB3aXRoIGEgc2luZ2xlIGZ1bmN0aW9uIGhhdmUgdG8gdXNlIHRoZSBzYW1l IGNvbG9yLgorICAgICAgICBNaW5vciBwb2xpc2g6IGRvIG5vdCBmaWx0ZXIgb3V0IChpZGxlKSBh bmQgKHByb2dyYW0pIGl0ZW1zLiBUaGV5IHdlcmUgYmlnIGR1ZSB0byBhbiBlcnJvciBvbiB2OCBz aWRlLgorICAgICAgICBTZXQgbWluaW11bSB3aWR0aCB0byAwIGZvciBtb3JlIHByZWNpc2UgcGlj dHVyZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNoYXJ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G bGFtZUNoYXJ0LnByb3RvdHlwZS5fcm9vdE5vZGVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G bGFtZUNoYXJ0LnByb3RvdHlwZS5kcmF3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GbGFtZUNo YXJ0LnByb3RvdHlwZS5fZHJhd05vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZsYW1lQ2hh cnQucHJvdG90eXBlLl9kcmF3QmFyKToKKwogMjAxMy0wMy0wNiAgQWxsYW4gU2FuZGZlbGQgSmVu c2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KIAogICAgICAgICBSRUdHUkVTU0lPTiAocjE0 MjExMik6IEl0IG1hZGUgY29tcG9zaXRpbmcgdGVzdHMgZmFpbCBvbiBFRkwsIFF0LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GbGFtZUNoYXJ0LmpzCmluZGV4IGFk MmUwM2VhZWI1MGM0ODdkNzQ2YjUxMWQ0ZjAwNWFkM2ZmYTVjYTEuLjQxNzYwMGU4ODRhNTZjMDJm ZDY1ZWFmYTQyZjMxMGVjZjI4OWVlNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRmxhbWVDaGFydC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0ZsYW1lQ2hhcnQuanMKQEAgLTQzLDEzICs0MywxNCBAQCBXZWJJbnNwZWN0 b3IuRmxhbWVDaGFydCA9IGZ1bmN0aW9uKGNwdVByb2ZpbGVWaWV3KQogICAgIHRoaXMuX2NwdVBy b2ZpbGVWaWV3ID0gY3B1UHJvZmlsZVZpZXc7CiAgICAgdGhpcy5feFNjYWxlRmFjdG9yID0gMC4w OwogICAgIHRoaXMuX3lTY2FsZUZhY3RvciA9IDEwOwotICAgIHRoaXMuX21pbldpZHRoID0gMzsK KyAgICB0aGlzLl9taW5XaWR0aCA9IDA7CiAgICAgdGhpcy5lbGVtZW50Lm9ubW91c2Vtb3ZlID0g dGhpcy5fb25Nb3VzZU1vdmUuYmluZCh0aGlzKTsKICAgICB0aGlzLmVsZW1lbnQub25jbGljayA9 IHRoaXMuX29uQ2xpY2suYmluZCh0aGlzKTsKICAgICB0aGlzLl9wb3BvdmVySGVscGVyID0gbmV3 IFdlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyKHRoaXMuZWxlbWVudCwgdGhpcy5fZ2V0UG9wb3Zl ckFuY2hvci5iaW5kKHRoaXMpLCB0aGlzLl9zaG93UG9wb3Zlci5iaW5kKHRoaXMpKTsKICAgICB0 aGlzLl9hbmNob3JFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxkKCJzcGFuIik7CiAg ICAgdGhpcy5fYW5jaG9yRWxlbWVudC5jbGFzc05hbWUgPSAiaXRlbS1hbmNob3IiOwogICAgIHRo aXMuX2xpbmtpZmllciA9IG5ldyBXZWJJbnNwZWN0b3IuTGlua2lmaWVyKCk7CisgICAgdGhpcy5f Y29sb3JJbmRleGVzID0geyB9OwogfQogCiBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5FdmVudHMg PSB7CkBAIC0xMzcsMjUgKzEzOCwxMCBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5 cGUgPSB7CiAgICAgICovCiAgICAgX3Jvb3ROb2RlczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAg ICAgaWYgKHRoaXMuX3Jvb3ROb2Rlc0FycmF5KQotICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3Jv b3ROb2Rlc0FycmF5LnNsaWNlKCk7Ci0KLSAgICAgICAgdmFyIHByb2ZpbGVIZWFkID0gdGhpcy5f Y3B1UHJvZmlsZVZpZXcucHJvZmlsZUhlYWQ7Ci0gICAgICAgIGlmICghcHJvZmlsZUhlYWQpCisg ICAgICAgIGlmICghdGhpcy5fY3B1UHJvZmlsZVZpZXcucHJvZmlsZUhlYWQpCiAgICAgICAgICAg ICByZXR1cm4gbnVsbDsKLSAgICAgICAgdmFyIHRvdGFsVGltZSA9IDA7Ci0gICAgICAgIHZhciBu b2RlcyA9IFtdOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByb2ZpbGVIZWFkLmNoaWxk cmVuLmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICB2YXIgbm9kZSA9IHByb2ZpbGVIZWFkLmNo aWxkcmVuW2ldOwotICAgICAgICAgICAgaWYgKG5vZGUuZnVuY3Rpb25OYW1lID09PSAiKHByb2dy YW0pIiB8fCBub2RlLmZ1bmN0aW9uTmFtZSA9PT0gIihpZGxlKSIpCi0gICAgICAgICAgICAgICAg Y29udGludWU7Ci0gICAgICAgICAgICB0b3RhbFRpbWUgKz0gbm9kZS50b3RhbFRpbWU7Ci0gICAg ICAgICAgICBub2Rlcy5wdXNoKG5vZGUpOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fcm9v dE5vZGVzQXJyYXkgPSBub2RlczsKLSAgICAgICAgdGhpcy5fdG90YWxUaW1lID0gdG90YWxUaW1l OwotICAgICAgICByZXR1cm4gbm9kZXMuc2xpY2UoKTsKKyAgICAgICAgdGhpcy5fdG90YWxUaW1l ID0gdGhpcy5fY3B1UHJvZmlsZVZpZXcucHJvZmlsZUhlYWQudG90YWxUaW1lOworICAgICAgICBy ZXR1cm4gdGhpcy5fY3B1UHJvZmlsZVZpZXcucHJvZmlsZUhlYWQuY2hpbGRyZW4uc2xpY2UoKTsK ICAgICB9LAogCiAgICAgLyoqCkBAIC0xNjcsOSArMTUzLDggQEAgV2ViSW5zcGVjdG9yLkZsYW1l Q2hhcnQucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX3Jvb3ROb2RlcygpKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHZhciBtYXJnaW4gPSAwOwotICAgICAgICB0aGlz Ll9jYW52YXMuaGVpZ2h0ID0gaGVpZ2h0IC0gbWFyZ2luOwotICAgICAgICB0aGlzLl9jYW52YXMu d2lkdGggPSB3aWR0aCAtIG1hcmdpbjsKKyAgICAgICAgdGhpcy5fY2FudmFzLmhlaWdodCA9IGhl aWdodDsKKyAgICAgICAgdGhpcy5fY2FudmFzLndpZHRoID0gd2lkdGg7CiAKICAgICAgICAgdGhp cy5feFNjYWxlRmFjdG9yID0gd2lkdGggLyB0aGlzLl90b3RhbFRpbWU7CiAgICAgICAgIHRoaXMu X2NvbG9ySW5kZXggPSAwOwpAQCAtMTg2LDggKzE3MSwxNSBAQCBXZWJJbnNwZWN0b3IuRmxhbWVD aGFydC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2RyYXdOb2RlOiBmdW5jdGlvbihvZmZz ZXQsIGxldmVsLCBub2RlKQogICAgIHsKLSAgICAgICAgKyt0aGlzLl9jb2xvckluZGV4OwotICAg ICAgICB2YXIgaHVlID0gKHRoaXMuX2NvbG9ySW5kZXggKiAyICsgMTEgKiAodGhpcy5fY29sb3JJ bmRleCAlIDIpKSAlIDM2MDsKKyAgICAgICAgdmFyIGNvbG9ySW5kZXggPSBub2RlLmNvbG9ySW5k ZXg7CisgICAgICAgIGlmICghY29sb3JJbmRleCkgeworICAgICAgICAgICAgdmFyIGZ1bmN0aW9u VUlEID0gbm9kZS5mdW5jdGlvbk5hbWUgKyAiOiIgKyBub2RlLnVybCArICI6IiArIG5vZGUubGlu ZU51bWJlcjsKKyAgICAgICAgICAgIGNvbG9ySW5kZXggPSB0aGlzLl9jb2xvckluZGV4ZXNbZnVu Y3Rpb25VSURdOworICAgICAgICAgICAgaWYgKCFjb2xvckluZGV4KQorICAgICAgICAgICAgICAg IHRoaXMuX2NvbG9ySW5kZXhlc1tmdW5jdGlvblVJRF0gPSBjb2xvckluZGV4ID0gKyt0aGlzLl9j b2xvckluZGV4OworICAgICAgICAgICAgbm9kZS5jb2xvckluZGV4ID0gY29sb3JJbmRleDsKKyAg ICAgICAgfQorICAgICAgICB2YXIgaHVlID0gKGNvbG9ySW5kZXggKiA1ICsgMTEgKiAoY29sb3JJ bmRleCAlIDIpKSAlIDM2MDsKICAgICAgICAgdmFyIGxpZ2h0bmVzcyA9IHRoaXMuX2hpZ2hsaWdo dGVkTm9kZSA9PT0gbm9kZSA/IDMzIDogNjc7CiAgICAgICAgIHZhciBjb2xvciA9ICJoc2woIiAr IGh1ZSArICIsIDEwMCUsICIgKyBsaWdodG5lc3MgKyAiJSkiOwogICAgICAgICB0aGlzLl9kcmF3 QmFyKHRoaXMuX2NvbnRleHQsIG9mZnNldCwgbGV2ZWwsIG5vZGUsIGNvbG9yKTsKQEAgLTIyOSw3 ICsyMjEsNyBAQCBXZWJJbnNwZWN0b3IuRmxhbWVDaGFydC5wcm90b3R5cGUgPSB7CiAgICAgICog QHBhcmFtIHshUHJvZmlsZXJBZ2VudC5DUFVQcm9maWxlTm9kZX0gbm9kZQogICAgICAqIEBwYXJh bSB7IXN0cmluZ30gaHNsQ29sb3IKICAgICAgKi8KLSAgICBfZHJhd0JhcjogZnVuY3Rpb24oY29u dGV4dCwgb2Zmc2V0LCBsZXZlbCwgbm9kZSwgaHNsQ29sb3IpCisgICAgX2RyYXdCYXI6IGZ1bmN0 aW9uKGNvbnRleHQsIG9mZnNldCwgbGV2ZWwsIG5vZGUsIGNvbG9yKQogICAgIHsKICAgICAgICAg dmFyIHdpZHRoID0gbm9kZS50b3RhbFRpbWUgKiB0aGlzLl94U2NhbGVGYWN0b3I7CiAgICAgICAg IHZhciBoZWlnaHQgPSB0aGlzLl95U2NhbGVGYWN0b3I7CkBAIC0yMzcsNyArMjI5LDcgQEAgV2Vi SW5zcGVjdG9yLkZsYW1lQ2hhcnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgeSA9IHRoaXMu X2NhbnZhcy5oZWlnaHQgLSBsZXZlbCAqIHRoaXMuX3lTY2FsZUZhY3RvciAtIGhlaWdodDsKICAg ICAgICAgY29udGV4dC5iZWdpblBhdGgoKTsKICAgICAgICAgY29udGV4dC5yZWN0KHgsIHksIHdp ZHRoIC0gMSwgaGVpZ2h0IC0gMSk7Ci0gICAgICAgIGNvbnRleHQuZmlsbFN0eWxlID0gaHNsQ29s b3I7CisgICAgICAgIGNvbnRleHQuZmlsbFN0eWxlID0gY29sb3I7CiAgICAgICAgIGNvbnRleHQu ZmlsbCgpOwogICAgIH0sCiAK