54464 2011-02-15 08:24:42 -0800 Rename Color::name() to Color::nameForRenderTreeAsText() 2011-02-15 11:02:45 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kling kling darin hyatt mitz oldest_to_newest 351283 0 kling 2011-02-15 08:24:42 -0800 Color::name() returns the color as either #RRGGBB or #RRGGBBAA. Since the latter is not a valid CSS color, it can't be re-parsed by WebKit, and should only be used in DRT dumps. Existing call sites that wrongly use drtName() will be updated separately with accompanying layout tests. 351285 1 82460 kling 2011-02-15 08:26:24 -0800 Created attachment 82460 Proposed patch 351291 2 mitz 2011-02-15 08:35:05 -0800 drtName us quite cryptic, and the function is not called by DumpRenderTree anyway. How about nameForRenderTreeAsText(), externalRepresentation(), or nameForExternalRepresentation()? 351295 3 kling 2011-02-15 08:38:34 -0800 (In reply to comment #2) > drtName us quite cryptic, and the function is not called by DumpRenderTree anyway. How about nameForRenderTreeAsText(), externalRepresentation(), or nameForExternalRepresentation()? I'm not fussed about the name- nameForRenderTreeAsText() sounds fine to me. 351373 4 82460 darin 2011-02-15 10:07:11 -0800 Comment on attachment 82460 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=82460&action=review Please use a better name, though! > Source/WebCore/platform/graphics/Color.h:101 > + // Returns the color serialized as either #RRGGBB or #RRGGBBAA > + // The latter format is not a valid CSS color, and should only be seen in DRT dumps. > + String drtName() const; I suggest nameForDumpRenderTree or nameForRenderTreeDumps, or nameForRegressionTestDumps or nameForLayoutTests or something along those lines. Not a big fan of acronyms, and they are even worse as all lowercase prefixes! 351375 5 darin 2011-02-15 10:07:57 -0800 (In reply to comment #3) > (In reply to comment #2) > > drtName us quite cryptic, and the function is not called by DumpRenderTree anyway. How about nameForRenderTreeAsText(), externalRepresentation(), or nameForExternalRepresentation()? > > I'm not fussed about the name- nameForRenderTreeAsText() sounds fine to me. I like that one too. Mitz’s names are all better than mine. I didn’t see Mitz’s comments before I posted mine. 351409 6 kling 2011-02-15 11:02:45 -0800 Committed r78590: <http://trac.webkit.org/changeset/78590> 82460 2011-02-15 08:26:24 -0800 2011-02-15 10:07:11 -0800 Proposed patch bug-54464.diff text/plain 12036 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNzE4MTNiLi44Y2RkYzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzgg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5h bWUgQ29sb3I6Om5hbWUoKSB0byBDb2xvcjo6ZHJ0TmFtZSgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDQ2NAorCisgICAgICAgIENvbG9yOjpuYW1l KCkgcmV0dXJucyB0aGUgY29sb3IgYXMgZWl0aGVyICNSUkdHQkIgb3IgI1JSR0dCQkFBLgorICAg ICAgICBTaW5jZSB0aGUgbGF0dGVyIGlzIG5vdCBhIHZhbGlkIENTUyBjb2xvciwgaXQgY2FuJ3Qg YmUgcmUtcGFyc2VkCisgICAgICAgIGJ5IFdlYktpdCwgYW5kIHNob3VsZCBvbmx5IGJlIHVzZWQg aW4gRFJUIGR1bXBzLgorCisgICAgICAgICogZWRpdGluZy9BcHBseVN0eWxlQ29tbWFuZC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUNoYW5nZTo6ZXh0cmFjdFRleHRTdHlsZXMpOgorICAg ICAgICAqIHBhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0Nv bnRyb2xsZXI6OmNvbmNsdWRlRWRpdERyYWcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0NvbG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbG9yOjpkcnROYW1lKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6ZHVt cFByb3BlcnRpZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVGbG9v ZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGRUZsb29kOjpleHRlcm5hbFJlcHJlc2VudGF0aW9u KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUcmVlQXNUZXh0Ojp3cml0ZVJlbmRlck9iamVjdCk6CisgICAgICAgICog cmVuZGVyaW5nL3N2Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Om9wZXJhdG9yPDwpOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVSZW5kZXJTVkdUZXh0Qm94KToK KyAgICAgICAgKiBzdmcvU1ZHQW5pbWF0ZUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U1ZHQW5pbWF0ZUVsZW1lbnQ6OmFwcGx5UmVzdWx0c1RvVGFyZ2V0KToKKyAgICAgICAgKiBzdmcv U1ZHQ29sb3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHQ29sb3I6OmNzc1RleHQpOgorCisy MDExLTAyLTE1ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBPcHRpbWl6ZSBDb2xvcjo6c2Vy aWFsaXplZCgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NDQ1MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVD b21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlTdHlsZUNvbW1hbmQuY3Bw CmluZGV4IDlkZDUzYzkuLjVlOTYyOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvQXBwbHlTdHlsZUNvbW1hbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQXBw bHlTdHlsZUNvbW1hbmQuY3BwCkBAIC0yNzQsNyArMjc0LDggQEAgdm9pZCBTdHlsZUNoYW5nZTo6 ZXh0cmFjdFRleHRTdHlsZXMoRG9jdW1lbnQqIGRvY3VtZW50LCBDU1NNdXRhYmxlU3R5bGVEZWNs YXJhdGkKICAgICB9CiAKICAgICBpZiAoc3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJv cGVydHlDb2xvcikpIHsKLSAgICAgICAgbV9hcHBseUZvbnRDb2xvciA9IENvbG9yKGdldFJHQkFG b250Q29sb3Ioc3R5bGUpKS5uYW1lKCk7CisgICAgICAgIC8vIEZJWE1FOiBVc2UgQ29sb3I6OnNl cmlhbGl6ZWQoKSBpbnN0ZWFkLCBvbmx5IERSVCBzaG91bGQgdXNlIGRydE5hbWUoKS4KKyAgICAg ICAgbV9hcHBseUZvbnRDb2xvciA9IENvbG9yKGdldFJHQkFGb250Q29sb3Ioc3R5bGUpKS5kcnRO YW1lKCk7CiAgICAgICAgIHN0eWxlLT5yZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eUNvbG9yKTsK ICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKaW5kZXggYjI1OGU5 ZC4uMGIwNTUzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKQEAgLTQw Myw3ICs0MDMsOCBAQCBib29sIERyYWdDb250cm9sbGVyOjpjb25jbHVkZUVkaXREcmFnKERyYWdE YXRhKiBkcmFnRGF0YSkKICAgICAgICAgUmVmUHRyPFJhbmdlPiBpbm5lclJhbmdlID0gaW5uZXJG cmFtZS0+c2VsZWN0aW9uKCktPnRvTm9ybWFsaXplZFJhbmdlKCk7CiAgICAgICAgIFJlZlB0cjxD U1NTdHlsZURlY2xhcmF0aW9uPiBzdHlsZSA9IG1fZG9jdW1lbnRVbmRlck1vdXNlLT5jcmVhdGVD U1NTdHlsZURlY2xhcmF0aW9uKCk7CiAgICAgICAgIEV4Y2VwdGlvbkNvZGUgZWM7Ci0gICAgICAg IHN0eWxlLT5zZXRQcm9wZXJ0eSgiY29sb3IiLCBjb2xvci5uYW1lKCksIGVjKTsKKyAgICAgICAg Ly8gRklYTUU6IFVzZSBDb2xvcjo6c2VyaWFsaXplZCgpIGluc3RlYWQsIG9ubHkgRFJUIHNob3Vs ZCB1c2UgZHJ0TmFtZSgpLgorICAgICAgICBzdHlsZS0+c2V0UHJvcGVydHkoImNvbG9yIiwgY29s b3IuZHJ0TmFtZSgpLCBlYyk7CiAgICAgICAgIGlmICghaW5uZXJGcmFtZS0+ZWRpdG9yKCktPnNo b3VsZEFwcGx5U3R5bGUoc3R5bGUuZ2V0KCksIGlubmVyUmFuZ2UuZ2V0KCkpKQogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBtX2NsaWVudC0+d2lsbFBlcmZvcm1EcmFnRGVzdGlu YXRpb25BY3Rpb24oRHJhZ0Rlc3RpbmF0aW9uQWN0aW9uRWRpdCwgZHJhZ0RhdGEpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwCmluZGV4IGRmZTk5ZGQuLmVlNTgw Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5jcHAKQEAgLTIy OCw3ICsyMjgsNyBAQCBTdHJpbmcgQ29sb3I6OnNlcmlhbGl6ZWQoKSBjb25zdAogICAgIHJldHVy biBTdHJpbmc6OmFkb3B0KHJlc3VsdCk7CiB9CiAKLVN0cmluZyBDb2xvcjo6bmFtZSgpIGNvbnN0 CitTdHJpbmcgQ29sb3I6OmRydE5hbWUoKSBjb25zdAogewogICAgIGlmIChhbHBoYSgpIDwgMHhG RikKICAgICAgICAgcmV0dXJuIFN0cmluZzo6Zm9ybWF0KCIjJTAyWCUwMlglMDJYJTAyWCIsIHJl ZCgpLCBncmVlbigpLCBibHVlKCksIGFscGhhKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0NvbG9yLmgKaW5kZXggZGE5OGRkMi4uNDJhMTQzYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oCkBAIC05Niw3ICs5NiwxMCBAQCBwdWJsaWM6CiAgICAg Ly8gLSBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrLyNz ZXJpYWxpemF0aW9uLW9mLWEtY29sb3IKICAgICBTdHJpbmcgc2VyaWFsaXplZCgpIGNvbnN0Owog Ci0gICAgU3RyaW5nIG5hbWUoKSBjb25zdDsKKyAgICAvLyBSZXR1cm5zIHRoZSBjb2xvciBzZXJp YWxpemVkIGFzIGVpdGhlciAjUlJHR0JCIG9yICNSUkdHQkJBQQorICAgIC8vIFRoZSBsYXR0ZXIg Zm9ybWF0IGlzIG5vdCBhIHZhbGlkIENTUyBjb2xvciwgYW5kIHNob3VsZCBvbmx5IGJlIHNlZW4g aW4gRFJUIGR1bXBzLgorICAgIFN0cmluZyBkcnROYW1lKCkgY29uc3Q7CisKICAgICB2b2lkIHNl dE5hbWVkQ29sb3IoY29uc3QgU3RyaW5nJik7CiAKICAgICBib29sIGlzVmFsaWQoKSBjb25zdCB7 IHJldHVybiBtX3ZhbGlkOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IDg0OTA1YTkuLjRjMzkwMzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCkBAIC00 NzAsNyArNDcwLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyOjpkdW1wUHJvcGVydGllcyhUZXh0U3Ry ZWFtJiB0cywgaW50IGluZGVudCwgTGF5ZXJUcmVlQXNUZXh0QmUKIAogICAgIGlmIChtX2JhY2tn cm91bmRDb2xvclNldCkgewogICAgICAgICB3cml0ZUluZGVudCh0cywgaW5kZW50ICsgMSk7Ci0g ICAgICAgIHRzIDw8ICIoYmFja2dyb3VuZENvbG9yICIgPDwgbV9iYWNrZ3JvdW5kQ29sb3IubmFt ZSgpIDw8ICIpXG4iOworICAgICAgICB0cyA8PCAiKGJhY2tncm91bmRDb2xvciAiIDw8IG1fYmFj a2dyb3VuZENvbG9yLmRydE5hbWUoKSA8PCAiKVxuIjsKICAgICB9CiAKICAgICBpZiAoIW1fdHJh bnNmb3JtLmlzSWRlbnRpdHkoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZmlsdGVycy9GRUZsb29kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2ZpbHRlcnMvRkVGbG9vZC5jcHAKaW5kZXggMGUwZTk0Yy4uOWQxYzZhZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUZsb29k LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFRmxv b2QuY3BwCkBAIC04NSw3ICs4NSw3IEBAIFRleHRTdHJlYW0mIEZFRmxvb2Q6OmV4dGVybmFsUmVw cmVzZW50YXRpb24oVGV4dFN0cmVhbSYgdHMsIGludCBpbmRlbnQpIGNvbnN0CiAgICAgd3JpdGVJ bmRlbnQodHMsIGluZGVudCk7CiAgICAgdHMgPDwgIltmZUZsb29kIjsKICAgICBGaWx0ZXJFZmZl Y3Q6OmV4dGVybmFsUmVwcmVzZW50YXRpb24odHMpOwotICAgIHRzIDw8ICIgZmxvb2QtY29sb3I9 XCIiIDw8IGZsb29kQ29sb3IoKS5uYW1lKCkgPDwgIlwiICIKKyAgICB0cyA8PCAiIGZsb29kLWNv bG9yPVwiIiA8PCBmbG9vZENvbG9yKCkuZHJ0TmFtZSgpIDw8ICJcIiAiCiAgICAgICAgPDwgImZs b29kLW9wYWNpdHk9XCIiIDw8IGZsb29kT3BhY2l0eSgpIDw8ICJcIl1cbiI7CiAgICAgcmV0dXJu IHRzOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVB c1RleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3Bw CmluZGV4IGE4MTE2M2IuLmFkYTM5NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVHJlZUFzVGV4dC5jcHAKQEAgLTI3OCwyMiArMjc4LDIyIEBAIHZvaWQgUmVuZGVyVHJl ZUFzVGV4dDo6d3JpdGVSZW5kZXJPYmplY3QoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlck9i amVjdCYgbywKICAgICAgICAgICAgIHRzIDw8ICIgIiA8PCBxdW90ZUFuZEVzY2FwZU5vblByaW50 YWJsZXModG9SZW5kZXJGaWxlVXBsb2FkQ29udHJvbCgmbyktPmZpbGVUZXh0VmFsdWUoKSk7CiAK ICAgICAgICAgaWYgKG8ucGFyZW50KCkgJiYgKG8ucGFyZW50KCktPnN0eWxlKCktPmNvbG9yKCkg IT0gby5zdHlsZSgpLT5jb2xvcigpKSkKLSAgICAgICAgICAgIHRzIDw8ICIgW2NvbG9yPSIgPDwg by5zdHlsZSgpLT5jb2xvcigpLm5hbWUoKSA8PCAiXSI7CisgICAgICAgICAgICB0cyA8PCAiIFtj b2xvcj0iIDw8IG8uc3R5bGUoKS0+Y29sb3IoKS5kcnROYW1lKCkgPDwgIl0iOwogCiAgICAgICAg IGlmIChvLnBhcmVudCgpICYmIChvLnBhcmVudCgpLT5zdHlsZSgpLT5iYWNrZ3JvdW5kQ29sb3Io KSAhPSBvLnN0eWxlKCktPmJhY2tncm91bmRDb2xvcigpKSAmJgogICAgICAgICAgICAgby5zdHls ZSgpLT5iYWNrZ3JvdW5kQ29sb3IoKS5pc1ZhbGlkKCkgJiYgby5zdHlsZSgpLT5iYWNrZ3JvdW5k Q29sb3IoKS5yZ2IoKSkKICAgICAgICAgICAgIC8vIERvIG5vdCBkdW1wIGludmFsaWQgb3IgdHJh bnNwYXJlbnQgYmFja2dyb3VuZHMsIHNpbmNlIHRoYXQgaXMgdGhlIGRlZmF1bHQuCi0gICAgICAg ICAgICB0cyA8PCAiIFtiZ2NvbG9yPSIgPDwgby5zdHlsZSgpLT5iYWNrZ3JvdW5kQ29sb3IoKS5u YW1lKCkgPDwgIl0iOworICAgICAgICAgICAgdHMgPDwgIiBbYmdjb2xvcj0iIDw8IG8uc3R5bGUo KS0+YmFja2dyb3VuZENvbG9yKCkuZHJ0TmFtZSgpIDw8ICJdIjsKICAgICAgICAgCiAgICAgICAg IGlmIChvLnBhcmVudCgpICYmIChvLnBhcmVudCgpLT5zdHlsZSgpLT50ZXh0RmlsbENvbG9yKCkg IT0gby5zdHlsZSgpLT50ZXh0RmlsbENvbG9yKCkpICYmCiAgICAgICAgICAgICBvLnN0eWxlKCkt PnRleHRGaWxsQ29sb3IoKS5pc1ZhbGlkKCkgJiYgby5zdHlsZSgpLT50ZXh0RmlsbENvbG9yKCkg IT0gby5zdHlsZSgpLT5jb2xvcigpICYmCiAgICAgICAgICAgICBvLnN0eWxlKCktPnRleHRGaWxs Q29sb3IoKS5yZ2IoKSkKLSAgICAgICAgICAgIHRzIDw8ICIgW3RleHRGaWxsQ29sb3I9IiA8PCBv LnN0eWxlKCktPnRleHRGaWxsQ29sb3IoKS5uYW1lKCkgPDwgIl0iOworICAgICAgICAgICAgdHMg PDwgIiBbdGV4dEZpbGxDb2xvcj0iIDw8IG8uc3R5bGUoKS0+dGV4dEZpbGxDb2xvcigpLmRydE5h bWUoKSA8PCAiXSI7CiAKICAgICAgICAgaWYgKG8ucGFyZW50KCkgJiYgKG8ucGFyZW50KCktPnN0 eWxlKCktPnRleHRTdHJva2VDb2xvcigpICE9IG8uc3R5bGUoKS0+dGV4dFN0cm9rZUNvbG9yKCkp ICYmCiAgICAgICAgICAgICBvLnN0eWxlKCktPnRleHRTdHJva2VDb2xvcigpLmlzVmFsaWQoKSAm JiBvLnN0eWxlKCktPnRleHRTdHJva2VDb2xvcigpICE9IG8uc3R5bGUoKS0+Y29sb3IoKSAmJgog ICAgICAgICAgICAgby5zdHlsZSgpLT50ZXh0U3Ryb2tlQ29sb3IoKS5yZ2IoKSkKLSAgICAgICAg ICAgIHRzIDw8ICIgW3RleHRTdHJva2VDb2xvcj0iIDw8IG8uc3R5bGUoKS0+dGV4dFN0cm9rZUNv bG9yKCkubmFtZSgpIDw8ICJdIjsKKyAgICAgICAgICAgIHRzIDw8ICIgW3RleHRTdHJva2VDb2xv cj0iIDw8IG8uc3R5bGUoKS0+dGV4dFN0cm9rZUNvbG9yKCkuZHJ0TmFtZSgpIDw8ICJdIjsKIAog ICAgICAgICBpZiAoby5wYXJlbnQoKSAmJiAoby5wYXJlbnQoKS0+c3R5bGUoKS0+dGV4dFN0cm9r ZVdpZHRoKCkgIT0gby5zdHlsZSgpLT50ZXh0U3Ryb2tlV2lkdGgoKSkgJiYKICAgICAgICAgICAg IG8uc3R5bGUoKS0+dGV4dFN0cm9rZVdpZHRoKCkgPiAwKQpAQCAtMzE3LDcgKzMxNyw3IEBAIHZv aWQgUmVuZGVyVHJlZUFzVGV4dDo6d3JpdGVSZW5kZXJPYmplY3QoVGV4dFN0cmVhbSYgdHMsIGNv bnN0IFJlbmRlck9iamVjdCYgbywKICAgICAgICAgICAgICAgICAgICAgQ29sb3IgY29sID0gby5z dHlsZSgpLT5ib3JkZXJUb3BDb2xvcigpOwogICAgICAgICAgICAgICAgICAgICBpZiAoIWNvbC5p c1ZhbGlkKCkpCiAgICAgICAgICAgICAgICAgICAgICAgICBjb2wgPSBvLnN0eWxlKCktPmNvbG9y KCk7Ci0gICAgICAgICAgICAgICAgICAgIHRzIDw8IGNvbC5uYW1lKCkgPDwgIikiOworICAgICAg ICAgICAgICAgICAgICB0cyA8PCBjb2wuZHJ0TmFtZSgpIDw8ICIpIjsKICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICB9CiAKQEAgLTMzMSw3ICszMzEsNyBAQCB2b2lkIFJlbmRlclRyZWVB c1RleHQ6OndyaXRlUmVuZGVyT2JqZWN0KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmpl Y3QmIG8sCiAgICAgICAgICAgICAgICAgICAgIENvbG9yIGNvbCA9IG8uc3R5bGUoKS0+Ym9yZGVy UmlnaHRDb2xvcigpOwogICAgICAgICAgICAgICAgICAgICBpZiAoIWNvbC5pc1ZhbGlkKCkpCiAg ICAgICAgICAgICAgICAgICAgICAgICBjb2wgPSBvLnN0eWxlKCktPmNvbG9yKCk7Ci0gICAgICAg ICAgICAgICAgICAgIHRzIDw8IGNvbC5uYW1lKCkgPDwgIikiOworICAgICAgICAgICAgICAgICAg ICB0cyA8PCBjb2wuZHJ0TmFtZSgpIDw8ICIpIjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICB9CiAKQEAgLTM0NSw3ICszNDUsNyBAQCB2b2lkIFJlbmRlclRyZWVBc1RleHQ6OndyaXRl UmVuZGVyT2JqZWN0KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJPYmplY3QmIG8sCiAgICAg ICAgICAgICAgICAgICAgIENvbG9yIGNvbCA9IG8uc3R5bGUoKS0+Ym9yZGVyQm90dG9tQ29sb3Io KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKCFjb2wuaXNWYWxpZCgpKQogICAgICAgICAgICAg ICAgICAgICAgICAgY29sID0gby5zdHlsZSgpLT5jb2xvcigpOwotICAgICAgICAgICAgICAgICAg ICB0cyA8PCBjb2wubmFtZSgpIDw8ICIpIjsKKyAgICAgICAgICAgICAgICAgICAgdHMgPDwgY29s LmRydE5hbWUoKSA8PCAiKSI7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogCkBA IC0zNTksNyArMzU5LDcgQEAgdm9pZCBSZW5kZXJUcmVlQXNUZXh0Ojp3cml0ZVJlbmRlck9iamVj dChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyT2JqZWN0JiBvLAogICAgICAgICAgICAgICAg ICAgICBDb2xvciBjb2wgPSBvLnN0eWxlKCktPmJvcmRlckxlZnRDb2xvcigpOwogICAgICAgICAg ICAgICAgICAgICBpZiAoIWNvbC5pc1ZhbGlkKCkpCiAgICAgICAgICAgICAgICAgICAgICAgICBj b2wgPSBvLnN0eWxlKCktPmNvbG9yKCk7Ci0gICAgICAgICAgICAgICAgICAgIHRzIDw8IGNvbC5u YW1lKCkgPDwgIikiOworICAgICAgICAgICAgICAgICAgICB0cyA8PCBjb2wuZHJ0TmFtZSgpIDw8 ICIpIjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHUmVuZGVyVHJlZUFzVGV4dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1JlbmRlclRyZWVBc1RleHQuY3BwCmluZGV4IDk3 ZTE1YWYuLjUyMzZmMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv U1ZHUmVuZGVyVHJlZUFzVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9TVkdSZW5kZXJUcmVlQXNUZXh0LmNwcApAQCAtMjIyLDcgKzIyMiw3IEBAIHN0YXRpYyBUZXh0 U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBTVkdNYXJrZXJFbGVtZW50 OjpTVkdNYXJrZXJVCiAKIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIGNv bnN0IENvbG9yJiBjKQogewotICAgIHJldHVybiB0cyA8PCBjLm5hbWUoKTsKKyAgICByZXR1cm4g dHMgPDwgYy5kcnROYW1lKCk7CiB9CiAKIC8vIEZJWE1FOiBNYXliZSB0aGlzIHNob3VsZCBiZSBp biBLQ2FudmFzUmVuZGVyaW5nU3R5bGUuY3BwCkBAIC00NDEsNyArNDQxLDcgQEAgc3RhdGljIHZv aWQgd3JpdGVSZW5kZXJTVkdUZXh0Qm94KFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJCbG9j ayYgdGV4dCkKICAgICB0cyA8PCAiIGNvbnRhaW5zIDEgY2h1bmsocykiOwogCiAgICAgaWYgKHRl eHQucGFyZW50KCkgJiYgKHRleHQucGFyZW50KCktPnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRD b2xvcihDU1NQcm9wZXJ0eUNvbG9yKSAhPSB0ZXh0LnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRD b2xvcihDU1NQcm9wZXJ0eUNvbG9yKSkpCi0gICAgICAgIHdyaXRlTmFtZVZhbHVlUGFpcih0cywg ImNvbG9yIiwgdGV4dC5zdHlsZSgpLT52aXNpdGVkRGVwZW5kZW50Q29sb3IoQ1NTUHJvcGVydHlD b2xvcikubmFtZSgpKTsKKyAgICAgICAgd3JpdGVOYW1lVmFsdWVQYWlyKHRzLCAiY29sb3IiLCB0 ZXh0LnN0eWxlKCktPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKS5kcnRO YW1lKCkpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgd3JpdGVTVkdJbmxpbmVUZXh0Qm94KFRl eHRTdHJlYW0mIHRzLCBTVkdJbmxpbmVUZXh0Qm94KiB0ZXh0Qm94LCBpbnQgaW5kZW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0FuaW1hdGVFbGVtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3N2Zy9TVkdBbmltYXRlRWxlbWVudC5jcHAKaW5kZXggMzY1OTA0OS4uM2U3MGFk MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0FuaW1hdGVFbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQW5pbWF0ZUVsZW1lbnQuY3BwCkBAIC00MjgsOSAr NDI4LDEwIEBAIHZvaWQgU1ZHQW5pbWF0ZUVsZW1lbnQ6OnJlc2V0VG9CYXNlVmFsdWUoY29uc3Qg U3RyaW5nJiBiYXNlU3RyaW5nKQogdm9pZCBTVkdBbmltYXRlRWxlbWVudDo6YXBwbHlSZXN1bHRz VG9UYXJnZXQoKQogewogICAgIFN0cmluZyB2YWx1ZVRvQXBwbHk7Ci0gICAgaWYgKG1fcHJvcGVy dHlUeXBlID09IENvbG9yUHJvcGVydHkpCi0gICAgICAgIHZhbHVlVG9BcHBseSA9IG1fYW5pbWF0 ZWRDb2xvci5uYW1lKCk7Ci0gICAgZWxzZSBpZiAobV9wcm9wZXJ0eVR5cGUgPT0gTnVtYmVyUHJv cGVydHkpCisgICAgaWYgKG1fcHJvcGVydHlUeXBlID09IENvbG9yUHJvcGVydHkpIHsKKyAgICAg ICAgLy8gRklYTUU6IFVzZSBDb2xvcjo6c2VyaWFsaXplZCgpIGluc3RlYWQsIG9ubHkgRFJUIHNo b3VsZCB1c2UgZHJ0TmFtZSgpLgorICAgICAgICB2YWx1ZVRvQXBwbHkgPSBtX2FuaW1hdGVkQ29s b3IuZHJ0TmFtZSgpOworICAgIH0gZWxzZSBpZiAobV9wcm9wZXJ0eVR5cGUgPT0gTnVtYmVyUHJv cGVydHkpCiAgICAgICAgIHZhbHVlVG9BcHBseSA9IFN0cmluZzo6bnVtYmVyKG1fYW5pbWF0ZWRO dW1iZXIpICsgbV9udW1iZXJVbml0OwogICAgIGVsc2UgaWYgKG1fcHJvcGVydHlUeXBlID09IFBh dGhQcm9wZXJ0eSkgewogICAgICAgICBpZiAoIW1fYW5pbWF0ZWRQYXRoUG9pbnRlciB8fCBtX2Fu aW1hdGVkUGF0aFBvaW50ZXItPmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdDb2xvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQ29sb3IuY3BwCmluZGV4 IDc1OTAwYWQuLjhlODEzNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdDb2xv ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0NvbG9yLmNwcApAQCAtODcsOCArODcs MTAgQEAgdm9pZCBTVkdDb2xvcjo6c2V0Q29sb3IodW5zaWduZWQgc2hvcnQgY29sb3JUeXBlLCBj b25zdCBTdHJpbmcmIC8qIHJnYkNvbG9yICovICwKIAogU3RyaW5nIFNWR0NvbG9yOjpjc3NUZXh0 KCkgY29uc3QKIHsKLSAgICBpZiAobV9jb2xvclR5cGUgPT0gU1ZHX0NPTE9SVFlQRV9SR0JDT0xP UikKLSAgICAgICAgcmV0dXJuIG1fY29sb3IubmFtZSgpOworICAgIGlmIChtX2NvbG9yVHlwZSA9 PSBTVkdfQ09MT1JUWVBFX1JHQkNPTE9SKSB7CisgICAgICAgIC8vIEZJWE1FOiBVc2UgQ29sb3I6 OnNlcmlhbGl6ZWQoKSBpbnN0ZWFkLCBvbmx5IERSVCBzaG91bGQgdXNlIGRydE5hbWUoKS4KKyAg ICAgICAgcmV0dXJuIG1fY29sb3IuZHJ0TmFtZSgpOworICAgIH0KIAogICAgIHJldHVybiBTdHJp bmcoKTsKIH0K