77199 2012-01-27 03:45:06 -0800 Web Inspector: show memory sizes in bytes in heap profiler 2012-02-11 01:26:39 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P3 Normal --- 78411 0 alph webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 543938 0 alph 2012-01-27 03:45:06 -0800 Show allocated sizes in bytes instead of KB and MB as it makes it easier to compare numbers. 543968 1 124290 alph 2012-01-27 04:50:13 -0800 Created attachment 124290 Patch 544023 2 124290 pfeldman 2012-01-27 06:33:09 -0800 Comment on attachment 124290 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124290&action=review > Source/WebCore/inspector/front-end/UIUtils.js:449 > + while (str.match(re)) { nit: no need for { } here. 545893 3 124695 alph 2012-01-31 02:58:06 -0800 Created attachment 124695 Patch 545896 4 webkit.review.bot 2012-01-31 03:00:48 -0800 Attachment 124695 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: Fix compilation errors on build-webkit --debug --no-workers on mac. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/qt/Skipped CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac. 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. 545937 5 124695 webkit.review.bot 2012-01-31 04:11:50 -0800 Comment on attachment 124695 Patch Clearing flags on attachment: 124695 Committed r106354: <http://trac.webkit.org/changeset/106354> 545938 6 webkit.review.bot 2012-01-31 04:11:55 -0800 All reviewed patches have been landed. Closing bug. 124290 2012-01-27 04:50:13 -0800 2012-01-31 02:57:56 -0800 Patch bug-77199-20120127165011.patch text/plain 5763 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE3MjkwNjgzNmMyNmUy OTUyY2EzZTlkNWIzYzkyNWJjODU5ZjFkNi4uNGZmOGQxYjcxYWZlZWZkYWQyM2E3MDM2ZDA4MGQ0 M2U1ZjlmOGQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTI3ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBzaG93IHNpemVzIGluIGJ5dGVzIGluc3RlYWQgb2YgS0IsIE1CIGluIGhlYXAgcHJvZmls ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzE5 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlLnByb3RvdHlwZS5nZXQg ZGF0YSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90SW5zdGFuY2VOb2RlLnBy b3RvdHlwZS5fZW5oYW5jZURhdGEpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dENvbnN0cnVjdG9yTm9kZS5wcm90b3R5cGUuZ2V0IGRhdGEpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZS5nZXQgZGF0YSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzOgorICAgICAgICAoTnVtYmVyLndpdGhUaG91 c2FuZHNTZXBhcmF0b3IpOgorCiAyMDEyLTAxLTI2ICBNYXR0aGV3IERlbGFuZXkgIDxtZGVsYW5l eUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1hZ2VCdWZmZXI6OmRyYXcgc2hvdWxkIGRlZXAgY29w eSBpZiBkcmF3aW5nIHRvIGFuIGFjY2VsZXJhdGVkIGNvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdy aWROb2Rlcy5qcwppbmRleCAzNmU1MWIwNzZkODIxNzllYjY3MDIyOThmNDQ4Y2QxN2NiMTQ0MmUz Li41YmJjZDkwZDVjYTRmYTA2MWUxZTkzY2QzZjM3MzhkZWY1ZDBlZGFhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9k ZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhl YXBzaG90R3JpZE5vZGVzLmpzCkBAIC0yNjgsOCArMjY4LDggQEAgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgZGF0YVsib2Jq ZWN0Il0gPSB7IHZhbHVlU3R5bGU6IHZhbHVlU3R5bGUsIHZhbHVlOiB2YWx1ZSArICI6IEAiICsg dGhpcy5zbmFwc2hvdE5vZGVJZCB9OwogCiAgICAgICAgIHZhciB2aWV3ID0gdGhpcy5kYXRhR3Jp ZC5zbmFwc2hvdFZpZXc7Ci0gICAgICAgIGRhdGFbInNoYWxsb3dTaXplIl0gPSB2aWV3LnNob3dT aGFsbG93U2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiUlIiwgdGhp cy5fc2hhbGxvd1NpemVQZXJjZW50KSA6IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuX3NoYWxs b3dTaXplKTsKLSAgICAgICAgZGF0YVsicmV0YWluZWRTaXplIl0gPSB2aWV3LnNob3dSZXRhaW5l ZFNpemVBc1BlcmNlbnQgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiUuMmYlJSIsIHRoaXMuX3Jl dGFpbmVkU2l6ZVBlcmNlbnQpIDogTnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5fcmV0YWluZWRT aXplKTsKKyAgICAgICAgZGF0YVsic2hhbGxvd1NpemUiXSA9IHZpZXcuc2hvd1NoYWxsb3dTaXpl QXNQZXJjZW50ID8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlLjJmJSUiLCB0aGlzLl9zaGFsbG93 U2l6ZVBlcmNlbnQpIDogTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0b3IodGhpcy5fc2hhbGxv d1NpemUpOworICAgICAgICBkYXRhWyJyZXRhaW5lZFNpemUiXSA9IHZpZXcuc2hvd1JldGFpbmVk U2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiUlIiwgdGhpcy5fcmV0 YWluZWRTaXplUGVyY2VudCkgOiBOdW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9y ZXRhaW5lZFNpemUpOwogCiAgICAgICAgIHJldHVybiB0aGlzLl9lbmhhbmNlRGF0YSA/IHRoaXMu X2VuaGFuY2VEYXRhKGRhdGEpIDogZGF0YTsKICAgICB9LApAQCAtNTAzLDEwICs1MDMsMTAgQEAg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEluc3RhbmNlTm9kZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBkYXRhWyJhZGRlZENvdW50Il0gPSAiIjsKICAgICAgICAgICAgIGRhdGFbImFkZGVk U2l6ZSJdID0gIiI7CiAgICAgICAgICAgICBkYXRhWyJyZW1vdmVkQ291bnQiXSA9ICJcdTIwMjIi OwotICAgICAgICAgICAgZGF0YVsicmVtb3ZlZFNpemUiXSA9IE51bWJlci5ieXRlc1RvU3RyaW5n KHRoaXMuX3NoYWxsb3dTaXplKTsKKyAgICAgICAgICAgIGRhdGFbInJlbW92ZWRTaXplIl0gPSBO dW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9zaGFsbG93U2l6ZSk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBkYXRhWyJhZGRlZENvdW50Il0gPSAiXHUyMDIyIjsKLSAg ICAgICAgICAgIGRhdGFbImFkZGVkU2l6ZSJdID0gTnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5f c2hhbGxvd1NpemUpOworICAgICAgICAgICAgZGF0YVsiYWRkZWRTaXplIl0gPSBOdW1iZXIud2l0 aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9zaGFsbG93U2l6ZSk7CiAgICAgICAgICAgICBkYXRh WyJyZW1vdmVkQ291bnQiXSA9ICIiOwogICAgICAgICAgICAgZGF0YVsicmVtb3ZlZFNpemUiXSA9 ICIiOwogICAgICAgICB9CkBAIC01NzAsOCArNTcwLDggQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdENvbnN0cnVjdG9yTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBkYXRhID0ge29i amVjdDogdGhpcy5fbmFtZSwgY291bnQ6IHRoaXMuX2NvdW50fTsKICAgICAgICAgdmFyIHZpZXcg PSB0aGlzLmRhdGFHcmlkLnNuYXBzaG90VmlldzsKICAgICAgICAgZGF0YVsiY291bnQiXSA9IHZp ZXcuc2hvd0NvdW50QXNQZXJjZW50ID8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlLjJmJSUiLCB0 aGlzLl9jb3VudFBlcmNlbnQpIDogdGhpcy5fY291bnQ7Ci0gICAgICAgIGRhdGFbInNoYWxsb3dT aXplIl0gPSB2aWV3LnNob3dTaGFsbG93U2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiJS4yZiUlIiwgdGhpcy5fc2hhbGxvd1NpemVQZXJjZW50KSA6IE51bWJlci5ieXRlc1Rv U3RyaW5nKHRoaXMuX3NoYWxsb3dTaXplKTsKLSAgICAgICAgZGF0YVsicmV0YWluZWRTaXplIl0g PSAiPiAiICsgKHZpZXcuc2hvd1JldGFpbmVkU2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5V SVN0cmluZygiJS4yZiUlIiwgdGhpcy5fcmV0YWluZWRTaXplUGVyY2VudCkgOiBOdW1iZXIuYnl0 ZXNUb1N0cmluZyh0aGlzLl9yZXRhaW5lZFNpemUpKTsKKyAgICAgICAgZGF0YVsic2hhbGxvd1Np emUiXSA9IHZpZXcuc2hvd1NoYWxsb3dTaXplQXNQZXJjZW50ID8gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIlLjJmJSUiLCB0aGlzLl9zaGFsbG93U2l6ZVBlcmNlbnQpIDogTnVtYmVyLndpdGhUaG91 c2FuZHNTZXBhcmF0b3IodGhpcy5fc2hhbGxvd1NpemUpOworICAgICAgICBkYXRhWyJyZXRhaW5l ZFNpemUiXSA9IHZpZXcuc2hvd1JldGFpbmVkU2l6ZUFzUGVyY2VudCA/ICJ+IiArIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiJS4yZiUlIiwgdGhpcy5fcmV0YWluZWRTaXplUGVyY2VudCkgOiBOdW1i ZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9yZXRhaW5lZFNpemUpICsgIisiOwogICAg ICAgICByZXR1cm4gZGF0YTsKICAgICB9LAogCkBAIC03NTEsOSArNzUxLDkgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgZGF0YVsiYWRk ZWRDb3VudCJdID0gdGhpcy5fYWRkZWRDb3VudDsKICAgICAgICAgZGF0YVsicmVtb3ZlZENvdW50 Il0gPSB0aGlzLl9yZW1vdmVkQ291bnQ7CiAgICAgICAgIGRhdGFbImNvdW50RGVsdGEiXSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiJXMlZCIsIHRoaXMuX3NpZ25Gb3JEZWx0YSh0aGlzLl9jb3Vu dERlbHRhKSwgTWF0aC5hYnModGhpcy5fY291bnREZWx0YSkpOwotICAgICAgICBkYXRhWyJhZGRl ZFNpemUiXSA9IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuX2FkZGVkU2l6ZSk7Ci0gICAgICAg IGRhdGFbInJlbW92ZWRTaXplIl0gPSBOdW1iZXIuYnl0ZXNUb1N0cmluZyh0aGlzLl9yZW1vdmVk U2l6ZSk7Ci0gICAgICAgIGRhdGFbInNpemVEZWx0YSJdID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCIlcyVzIiwgdGhpcy5fc2lnbkZvckRlbHRhKHRoaXMuX3NpemVEZWx0YSksIE51bWJlci5ieXRl c1RvU3RyaW5nKE1hdGguYWJzKHRoaXMuX3NpemVEZWx0YSkpKTsKKyAgICAgICAgZGF0YVsiYWRk ZWRTaXplIl0gPSBOdW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9hZGRlZFNpemUp OworICAgICAgICBkYXRhWyJyZW1vdmVkU2l6ZSJdID0gTnVtYmVyLndpdGhUaG91c2FuZHNTZXBh cmF0b3IodGhpcy5fcmVtb3ZlZFNpemUpOworICAgICAgICBkYXRhWyJzaXplRGVsdGEiXSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiJXMlcyIsIHRoaXMuX3NpZ25Gb3JEZWx0YSh0aGlzLl9zaXpl RGVsdGEpLCBOdW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcihNYXRoLmFicyh0aGlzLl9zaXpl RGVsdGEpKSk7CiAKICAgICAgICAgcmV0dXJuIGRhdGE7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzCmluZGV4IGFlMzAwZWQwYzcyNjA2NTJj NmYwZDBmMTJiYmQwZDEyYTcwYmNhNWUuLmM0NTQ3MjEyOTk5OTYzNjEwN2RmMDQ1ZDIwOWQ0OTBh NWIzOTI3ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VUlVdGlscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRp bHMuanMKQEAgLTQ0Miw2ICs0NDIsMTYgQEAgTnVtYmVyLmJ5dGVzVG9TdHJpbmcgPSBmdW5jdGlv bihieXRlcywgaGlnaGVyUmVzb2x1dGlvbikKICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5V SVN0cmluZygiJS4wZk1CIiwgbWVnYWJ5dGVzKTsKIH0KIAorTnVtYmVyLndpdGhUaG91c2FuZHNT ZXBhcmF0b3IgPSBmdW5jdGlvbihudW0pCit7CisgICAgdmFyIHN0ciA9IG51bSArICIiOworICAg IHZhciByZSA9IC8oXGQrKShcZHszfSkvOworICAgIHdoaWxlIChzdHIubWF0Y2gocmUpKSB7Cisg ICAgICAgIHN0ciA9IHN0ci5yZXBsYWNlKHJlLCAiJDEsJDIiKTsKKyAgICB9CisgICAgcmV0dXJu IHN0cjsKK30KKwogV2ViSW5zcGVjdG9yLl9taXNzaW5nTG9jYWxpemVkU3RyaW5ncyA9IHt9Owog CiAvKioK 124695 2012-01-31 02:58:06 -0800 2012-01-31 04:11:50 -0800 Patch bug-77199-20120131145804.patch text/plain 5754 alph U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDE3MjkwNjgzNmMyNmUy OTUyY2EzZTlkNWIzYzkyNWJjODU5ZjFkNi4uNGZmOGQxYjcxYWZlZWZkYWQyM2E3MDM2ZDA4MGQ0 M2U1ZjlmOGQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTI3ICBBbGV4 ZWkgRmlsaXBwb3YgIDxhbGV4ZWlmQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBzaG93IHNpemVzIGluIGJ5dGVzIGluc3RlYWQgb2YgS0IsIE1CIGluIGhlYXAgcHJvZmls ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzE5 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlLnByb3RvdHlwZS5nZXQg ZGF0YSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90SW5zdGFuY2VOb2RlLnBy b3RvdHlwZS5fZW5oYW5jZURhdGEpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dENvbnN0cnVjdG9yTm9kZS5wcm90b3R5cGUuZ2V0IGRhdGEpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZS5nZXQgZGF0YSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzOgorICAgICAgICAoTnVtYmVyLndpdGhUaG91 c2FuZHNTZXBhcmF0b3IpOgorCiAyMDEyLTAxLTI2ICBNYXR0aGV3IERlbGFuZXkgIDxtZGVsYW5l eUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1hZ2VCdWZmZXI6OmRyYXcgc2hvdWxkIGRlZXAgY29w eSBpZiBkcmF3aW5nIHRvIGFuIGFjY2VsZXJhdGVkIGNvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdy aWROb2Rlcy5qcwppbmRleCAzNmU1MWIwNzZkODIxNzllYjY3MDIyOThmNDQ4Y2QxN2NiMTQ0MmUz Li41YmJjZDkwZDVjYTRmYTA2MWUxZTkzY2QzZjM3MzhkZWY1ZDBlZGFhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9k ZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhl YXBzaG90R3JpZE5vZGVzLmpzCkBAIC0yNjgsOCArMjY4LDggQEAgV2ViSW5zcGVjdG9yLkhlYXBT bmFwc2hvdEdlbmVyaWNPYmplY3ROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgZGF0YVsib2Jq ZWN0Il0gPSB7IHZhbHVlU3R5bGU6IHZhbHVlU3R5bGUsIHZhbHVlOiB2YWx1ZSArICI6IEAiICsg dGhpcy5zbmFwc2hvdE5vZGVJZCB9OwogCiAgICAgICAgIHZhciB2aWV3ID0gdGhpcy5kYXRhR3Jp ZC5zbmFwc2hvdFZpZXc7Ci0gICAgICAgIGRhdGFbInNoYWxsb3dTaXplIl0gPSB2aWV3LnNob3dT aGFsbG93U2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiUlIiwgdGhp cy5fc2hhbGxvd1NpemVQZXJjZW50KSA6IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuX3NoYWxs b3dTaXplKTsKLSAgICAgICAgZGF0YVsicmV0YWluZWRTaXplIl0gPSB2aWV3LnNob3dSZXRhaW5l ZFNpemVBc1BlcmNlbnQgPyBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiUuMmYlJSIsIHRoaXMuX3Jl dGFpbmVkU2l6ZVBlcmNlbnQpIDogTnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5fcmV0YWluZWRT aXplKTsKKyAgICAgICAgZGF0YVsic2hhbGxvd1NpemUiXSA9IHZpZXcuc2hvd1NoYWxsb3dTaXpl QXNQZXJjZW50ID8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlLjJmJSUiLCB0aGlzLl9zaGFsbG93 U2l6ZVBlcmNlbnQpIDogTnVtYmVyLndpdGhUaG91c2FuZHNTZXBhcmF0b3IodGhpcy5fc2hhbGxv d1NpemUpOworICAgICAgICBkYXRhWyJyZXRhaW5lZFNpemUiXSA9IHZpZXcuc2hvd1JldGFpbmVk U2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiUlIiwgdGhpcy5fcmV0 YWluZWRTaXplUGVyY2VudCkgOiBOdW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9y ZXRhaW5lZFNpemUpOwogCiAgICAgICAgIHJldHVybiB0aGlzLl9lbmhhbmNlRGF0YSA/IHRoaXMu X2VuaGFuY2VEYXRhKGRhdGEpIDogZGF0YTsKICAgICB9LApAQCAtNTAzLDEwICs1MDMsMTAgQEAg V2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdEluc3RhbmNlTm9kZS5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICBkYXRhWyJhZGRlZENvdW50Il0gPSAiIjsKICAgICAgICAgICAgIGRhdGFbImFkZGVk U2l6ZSJdID0gIiI7CiAgICAgICAgICAgICBkYXRhWyJyZW1vdmVkQ291bnQiXSA9ICJcdTIwMjIi OwotICAgICAgICAgICAgZGF0YVsicmVtb3ZlZFNpemUiXSA9IE51bWJlci5ieXRlc1RvU3RyaW5n KHRoaXMuX3NoYWxsb3dTaXplKTsKKyAgICAgICAgICAgIGRhdGFbInJlbW92ZWRTaXplIl0gPSBO dW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9zaGFsbG93U2l6ZSk7CiAgICAgICAg IH0gZWxzZSB7CiAgICAgICAgICAgICBkYXRhWyJhZGRlZENvdW50Il0gPSAiXHUyMDIyIjsKLSAg ICAgICAgICAgIGRhdGFbImFkZGVkU2l6ZSJdID0gTnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5f c2hhbGxvd1NpemUpOworICAgICAgICAgICAgZGF0YVsiYWRkZWRTaXplIl0gPSBOdW1iZXIud2l0 aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9zaGFsbG93U2l6ZSk7CiAgICAgICAgICAgICBkYXRh WyJyZW1vdmVkQ291bnQiXSA9ICIiOwogICAgICAgICAgICAgZGF0YVsicmVtb3ZlZFNpemUiXSA9 ICIiOwogICAgICAgICB9CkBAIC01NzAsOCArNTcwLDggQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdENvbnN0cnVjdG9yTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBkYXRhID0ge29i amVjdDogdGhpcy5fbmFtZSwgY291bnQ6IHRoaXMuX2NvdW50fTsKICAgICAgICAgdmFyIHZpZXcg PSB0aGlzLmRhdGFHcmlkLnNuYXBzaG90VmlldzsKICAgICAgICAgZGF0YVsiY291bnQiXSA9IHZp ZXcuc2hvd0NvdW50QXNQZXJjZW50ID8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlLjJmJSUiLCB0 aGlzLl9jb3VudFBlcmNlbnQpIDogdGhpcy5fY291bnQ7Ci0gICAgICAgIGRhdGFbInNoYWxsb3dT aXplIl0gPSB2aWV3LnNob3dTaGFsbG93U2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiJS4yZiUlIiwgdGhpcy5fc2hhbGxvd1NpemVQZXJjZW50KSA6IE51bWJlci5ieXRlc1Rv U3RyaW5nKHRoaXMuX3NoYWxsb3dTaXplKTsKLSAgICAgICAgZGF0YVsicmV0YWluZWRTaXplIl0g PSAiPiAiICsgKHZpZXcuc2hvd1JldGFpbmVkU2l6ZUFzUGVyY2VudCA/IFdlYkluc3BlY3Rvci5V SVN0cmluZygiJS4yZiUlIiwgdGhpcy5fcmV0YWluZWRTaXplUGVyY2VudCkgOiBOdW1iZXIuYnl0 ZXNUb1N0cmluZyh0aGlzLl9yZXRhaW5lZFNpemUpKTsKKyAgICAgICAgZGF0YVsic2hhbGxvd1Np emUiXSA9IHZpZXcuc2hvd1NoYWxsb3dTaXplQXNQZXJjZW50ID8gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIlLjJmJSUiLCB0aGlzLl9zaGFsbG93U2l6ZVBlcmNlbnQpIDogTnVtYmVyLndpdGhUaG91 c2FuZHNTZXBhcmF0b3IodGhpcy5fc2hhbGxvd1NpemUpOworICAgICAgICBkYXRhWyJyZXRhaW5l ZFNpemUiXSA9IHZpZXcuc2hvd1JldGFpbmVkU2l6ZUFzUGVyY2VudCA/ICJ+IiArIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiJS4yZiUlIiwgdGhpcy5fcmV0YWluZWRTaXplUGVyY2VudCkgOiBOdW1i ZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9yZXRhaW5lZFNpemUpICsgIisiOwogICAg ICAgICByZXR1cm4gZGF0YTsKICAgICB9LAogCkBAIC03NTEsOSArNzUxLDkgQEAgV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdERpZmZOb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgZGF0YVsiYWRk ZWRDb3VudCJdID0gdGhpcy5fYWRkZWRDb3VudDsKICAgICAgICAgZGF0YVsicmVtb3ZlZENvdW50 Il0gPSB0aGlzLl9yZW1vdmVkQ291bnQ7CiAgICAgICAgIGRhdGFbImNvdW50RGVsdGEiXSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiJXMlZCIsIHRoaXMuX3NpZ25Gb3JEZWx0YSh0aGlzLl9jb3Vu dERlbHRhKSwgTWF0aC5hYnModGhpcy5fY291bnREZWx0YSkpOwotICAgICAgICBkYXRhWyJhZGRl ZFNpemUiXSA9IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMuX2FkZGVkU2l6ZSk7Ci0gICAgICAg IGRhdGFbInJlbW92ZWRTaXplIl0gPSBOdW1iZXIuYnl0ZXNUb1N0cmluZyh0aGlzLl9yZW1vdmVk U2l6ZSk7Ci0gICAgICAgIGRhdGFbInNpemVEZWx0YSJdID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCIlcyVzIiwgdGhpcy5fc2lnbkZvckRlbHRhKHRoaXMuX3NpemVEZWx0YSksIE51bWJlci5ieXRl c1RvU3RyaW5nKE1hdGguYWJzKHRoaXMuX3NpemVEZWx0YSkpKTsKKyAgICAgICAgZGF0YVsiYWRk ZWRTaXplIl0gPSBOdW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcih0aGlzLl9hZGRlZFNpemUp OworICAgICAgICBkYXRhWyJyZW1vdmVkU2l6ZSJdID0gTnVtYmVyLndpdGhUaG91c2FuZHNTZXBh cmF0b3IodGhpcy5fcmVtb3ZlZFNpemUpOworICAgICAgICBkYXRhWyJzaXplRGVsdGEiXSA9IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiJXMlcyIsIHRoaXMuX3NpZ25Gb3JEZWx0YSh0aGlzLl9zaXpl RGVsdGEpLCBOdW1iZXIud2l0aFRob3VzYW5kc1NlcGFyYXRvcihNYXRoLmFicyh0aGlzLl9zaXpl RGVsdGEpKSk7CiAKICAgICAgICAgcmV0dXJuIGRhdGE7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzCmluZGV4IGFlMzAwZWQwYzcyNjA2NTJj NmYwZDBmMTJiYmQwZDEyYTcwYmNhNWUuLmU2MjUzNWQ4ZDVkMTdhMTNjYmYxMTU4ZDE5MTQ4M2Qy ZGZlMWE5NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv VUlVdGlscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRp bHMuanMKQEAgLTQ0Miw2ICs0NDIsMTUgQEAgTnVtYmVyLmJ5dGVzVG9TdHJpbmcgPSBmdW5jdGlv bihieXRlcywgaGlnaGVyUmVzb2x1dGlvbikKICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5V SVN0cmluZygiJS4wZk1CIiwgbWVnYWJ5dGVzKTsKIH0KIAorTnVtYmVyLndpdGhUaG91c2FuZHNT ZXBhcmF0b3IgPSBmdW5jdGlvbihudW0pCit7CisgICAgdmFyIHN0ciA9IG51bSArICIiOworICAg IHZhciByZSA9IC8oXGQrKShcZHszfSkvOworICAgIHdoaWxlIChzdHIubWF0Y2gocmUpKQorICAg ICAgICBzdHIgPSBzdHIucmVwbGFjZShyZSwgIiQxLCQyIik7CisgICAgcmV0dXJuIHN0cjsKK30K KwogV2ViSW5zcGVjdG9yLl9taXNzaW5nTG9jYWxpemVkU3RyaW5ncyA9IHt9OwogCiAvKioK