133997 2014-06-17 13:48:43 -0700 Web Inspector: Hexadecimal color values in all CSS editors are purple when they should be blue 2014-07-01 17:13:52 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jonowells jonowells bunhere cdumez commit-queue graouts gyuyoung.kim joepeck sergio timothy webkit-bug-importer oldest_to_newest 1016238 0 jonowells 2014-06-17 13:48:43 -0700 CodeMirror 4 regression. 1016239 1 webkit-bug-importer 2014-06-17 13:49:18 -0700 <rdar://problem/17348008> 1019792 2 234206 jonowells 2014-07-01 15:36:39 -0700 Created attachment 234206 [PATCH] Attempted fix. 1019803 3 234206 joepeck 2014-07-01 15:51:38 -0700 Comment on attachment 234206 [PATCH] Attempted fix. View in context: https://bugs.webkit.org/attachment.cgi?id=234206&action=review > Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:185 > + const hexColorRegex = /(#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})/g; I would suggest: /#(?:[0-9a-fA-F){6}|[0-9a-fA-F){3})/g Changes: 1. Share the "#" because it is common 2. Use a non-captured group (?:...) instead of (...) because you don't reference the group > Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:203 > - if (style === "atom" && stream.current() === "url") { > + if (style === "atom" && hexColorRegex.test(stream.current())) > + style = style + " hex-color"; > + else if (style === "atom" && stream.current() === "url") { > // If the current text is "url" then we should expect the next string token to be a link. > state._expectLink = true; > } else if (state._expectLink && style === "atom") { Nit: There are a lot of style === "atom" checks here. Can we pull that out into a bool above the if/else chain? Also, it looks like you add style "hex-color" but the CSS below checks for .cm-hex-color. Does the ".cm-" prefix automatically get added somewhere? 1019805 4 joepeck 2014-07-01 15:58:20 -0700 (In reply to comment #3) > (From update of attachment 234206 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=234206&action=review > > > Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:185 > > + const hexColorRegex = /(#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})/g; > > I would suggest: > > /#(?:[0-9a-fA-F){6}|[0-9a-fA-F){3})/g In person discussion, we may want to gracefully handle something like: #12345678 So we might want to throw a \b on the end of the regex and not match this. 1019806 5 jonowells 2014-07-01 16:07:38 -0700 I agree. 1019807 6 234210 jonowells 2014-07-01 16:12:50 -0700 Created attachment 234210 [PATCH] Attempted fix with cleanup. Cleaned up the logic and saved the regexp test for later to lower the number of calls to the RegExp API. 1019814 7 234210 joepeck 2014-07-01 16:17:32 -0700 Comment on attachment 234210 [PATCH] Attempted fix with cleanup. View in context: https://bugs.webkit.org/attachment.cgi?id=234210&action=review Awesome! r=me > Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:185 > + const hexColorRegex = /(#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})\b/g; Nit: I think we still want at least the (?:...) non-capture group. As that can be a performance win with Regexs. 1019824 8 234215 jonowells 2014-07-01 16:32:45 -0700 Created attachment 234215 [PATCH] Reviewed fix with small edits. 1019849 9 234215 commit-queue 2014-07-01 17:13:48 -0700 Comment on attachment 234215 [PATCH] Reviewed fix with small edits. Clearing flags on attachment: 234215 Committed r170681: <http://trac.webkit.org/changeset/170681> 1019850 10 commit-queue 2014-07-01 17:13:52 -0700 All reviewed patches have been landed. Closing bug. 234206 2014-07-01 15:36:39 -0700 2014-07-01 15:51:38 -0700 [PATCH] Attempted fix. hexcolor.diff text/plain 2715 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3Njk4MGYuLjE4Njc1YjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA3LTAxICBKb25hdGhhbiBXZWxs cyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSGV4YWRl Y2ltYWwgY29sb3IgdmFsdWVzIGluIGFsbCBDU1MgZWRpdG9ycyBhcmUgcHVycGxlIHdoZW4gdGhl eSBzaG91bGQgYmUgYmx1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMzOTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ29kZU1pcnJvciA0IHJlbW92ZWQgdGhlIHN0eWxlIGZvciBoZXggY29sb3JzIGZy b20gdGhlIENTUyB0b2tlbml6ZXIuCisgICAgICAgIEZlYXR1cmUgaGFzIGJlZW4gYWRkZWQgdG8g Q29kZU1pcnJvckFkZGl0aW9ucy5qcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q29kZU1pcnJvckFkZGl0aW9ucy5qczogQWRkZWQgaGV4LWNvbG9yIHRvIHN0eWxlIGZvciBhIHZh bGlkIGhleGFkZWNpbWFsIGNvbG9yLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3lu dGF4SGlnaGxpZ2h0aW5nRGVmYXVsdFRoZW1lLmNzczogQWRkZWQgc2VsZWN0b3IgZm9yIGhleGFk ZWNpbWFsIGNvbG9yLgorCiAyMDE0LTA2LTI2ICBKb25vIFdlbGxzICA8am9ub3dlbGxzQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb21tYW5kLS8gKHNsYXNoKSBub3cgYXV0 by1jb21tZW50cyBjb2RlIHZpYSBDb2RlTWlycm9yIDQuIFNob3VsZCByZW1vdmUgYXMgY29tbWFu ZCB0byBwYXVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMKaW5kZXggNzE2NzBlMy4u MDUxMDM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25zLmpzCkBAIC0xODIsNiArMTgy LDggQEAKIAogICAgIGZ1bmN0aW9uIGV4dGVuZGVkQ1NTVG9rZW4oc3RyZWFtLCBzdGF0ZSkKICAg ICB7CisgICAgICAgIGNvbnN0IGhleENvbG9yUmVnZXggPSAvKCNbMC05YS1mQS1GXXs2fXwjWzAt OWEtZkEtRl17M30pL2c7CisKICAgICAgICAgaWYgKHN0YXRlLl91cmxUb2tlbml6ZSkgewogICAg ICAgICAgICAgLy8gQ2FsbCB0aGUgbGluayB0b2tlbml6ZXIgaW5zdGVhZC4KICAgICAgICAgICAg IHZhciBzdHlsZSA9IHN0YXRlLl91cmxUb2tlbml6ZShzdHJlYW0sIHN0YXRlKTsKQEAgLTE5Myw3 ICsxOTUsOSBAQAogICAgICAgICB2YXIgc3R5bGUgPSB0aGlzLl90b2tlbihzdHJlYW0sIHN0YXRl KTsKIAogICAgICAgICBpZiAoc3R5bGUpIHsKLSAgICAgICAgICAgIGlmIChzdHlsZSA9PT0gImF0 b20iICYmIHN0cmVhbS5jdXJyZW50KCkgPT09ICJ1cmwiKSB7CisgICAgICAgICAgICBpZiAoc3R5 bGUgPT09ICJhdG9tIiAmJiBoZXhDb2xvclJlZ2V4LnRlc3Qoc3RyZWFtLmN1cnJlbnQoKSkpCisg ICAgICAgICAgICAgICAgc3R5bGUgPSBzdHlsZSArICIgaGV4LWNvbG9yIjsKKyAgICAgICAgICAg IGVsc2UgaWYgKHN0eWxlID09PSAiYXRvbSIgJiYgc3RyZWFtLmN1cnJlbnQoKSA9PT0gInVybCIp IHsKICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgY3VycmVudCB0ZXh0IGlzICJ1cmwiIHRoZW4g d2Ugc2hvdWxkIGV4cGVjdCB0aGUgbmV4dCBzdHJpbmcgdG9rZW4gdG8gYmUgYSBsaW5rLgogICAg ICAgICAgICAgICAgIHN0YXRlLl9leHBlY3RMaW5rID0gdHJ1ZTsKICAgICAgICAgICAgIH0gZWxz ZSBpZiAoc3RhdGUuX2V4cGVjdExpbmsgJiYgc3R5bGUgPT09ICJhdG9tIikgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ludGF4SGlnaGxp Z2h0aW5nRGVmYXVsdFRoZW1lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1N5bnRheEhpZ2hsaWdodGluZ0RlZmF1bHRUaGVtZS5jc3MKaW5kZXggMDQyMGFi YjIuLmU3YzVmOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1N5bnRheEhpZ2hsaWdodGluZ0RlZmF1bHRUaGVtZS5jc3MKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ludGF4SGlnaGxpZ2h0aW5nRGVm YXVsdFRoZW1lLmNzcwpAQCAtNjAsNiArNjAsNyBAQAogfQogCiAuY20tcy1kZWZhdWx0IC5jbS1u dW1iZXIsCisuY20tcy1kZWZhdWx0IC5jbS1hdG9tLmNtLWhleC1jb2xvciwKIC5zeW50YXgtaGln aGxpZ2h0ZWQgLmNzcy1udW1iZXIsCiAuc3ludGF4LWhpZ2hsaWdodGVkIC5qYXZhc2NyaXB0LW51 bWJlciB7CiAgICAgY29sb3I6IHJnYigyOCwgMCwgMjA3KTsK 234210 2014-07-01 16:12:50 -0700 2014-07-01 16:32:45 -0700 [PATCH] Attempted fix with cleanup. hexcolor.diff text/plain 5057 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3Njk4MGYuLjE4Njc1YjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA3LTAxICBKb25hdGhhbiBXZWxs cyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSGV4YWRl Y2ltYWwgY29sb3IgdmFsdWVzIGluIGFsbCBDU1MgZWRpdG9ycyBhcmUgcHVycGxlIHdoZW4gdGhl eSBzaG91bGQgYmUgYmx1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMzOTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ29kZU1pcnJvciA0IHJlbW92ZWQgdGhlIHN0eWxlIGZvciBoZXggY29sb3JzIGZy b20gdGhlIENTUyB0b2tlbml6ZXIuCisgICAgICAgIEZlYXR1cmUgaGFzIGJlZW4gYWRkZWQgdG8g Q29kZU1pcnJvckFkZGl0aW9ucy5qcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q29kZU1pcnJvckFkZGl0aW9ucy5qczogQWRkZWQgaGV4LWNvbG9yIHRvIHN0eWxlIGZvciBhIHZh bGlkIGhleGFkZWNpbWFsIGNvbG9yLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3lu dGF4SGlnaGxpZ2h0aW5nRGVmYXVsdFRoZW1lLmNzczogQWRkZWQgc2VsZWN0b3IgZm9yIGhleGFk ZWNpbWFsIGNvbG9yLgorCiAyMDE0LTA2LTI2ICBKb25vIFdlbGxzICA8am9ub3dlbGxzQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb21tYW5kLS8gKHNsYXNoKSBub3cgYXV0 by1jb21tZW50cyBjb2RlIHZpYSBDb2RlTWlycm9yIDQuIFNob3VsZCByZW1vdmUgYXMgY29tbWFu ZCB0byBwYXVzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMKaW5kZXggNzE2NzBlMy4u YzE5YzI0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25zLmpzCkBAIC0xODIsNiArMTgy LDggQEAKIAogICAgIGZ1bmN0aW9uIGV4dGVuZGVkQ1NTVG9rZW4oc3RyZWFtLCBzdGF0ZSkKICAg ICB7CisgICAgICAgIGNvbnN0IGhleENvbG9yUmVnZXggPSAvKCNbMC05YS1mQS1GXXs2fXwjWzAt OWEtZkEtRl17M30pXGIvZzsKKwogICAgICAgICBpZiAoc3RhdGUuX3VybFRva2VuaXplKSB7CiAg ICAgICAgICAgICAvLyBDYWxsIHRoZSBsaW5rIHRva2VuaXplciBpbnN0ZWFkLgogICAgICAgICAg ICAgdmFyIHN0eWxlID0gc3RhdGUuX3VybFRva2VuaXplKHN0cmVhbSwgc3RhdGUpOwpAQCAtMTkz LDI5ICsxOTUsMzIgQEAKICAgICAgICAgdmFyIHN0eWxlID0gdGhpcy5fdG9rZW4oc3RyZWFtLCBz dGF0ZSk7CiAKICAgICAgICAgaWYgKHN0eWxlKSB7Ci0gICAgICAgICAgICBpZiAoc3R5bGUgPT09 ICJhdG9tIiAmJiBzdHJlYW0uY3VycmVudCgpID09PSAidXJsIikgewotICAgICAgICAgICAgICAg IC8vIElmIHRoZSBjdXJyZW50IHRleHQgaXMgInVybCIgdGhlbiB3ZSBzaG91bGQgZXhwZWN0IHRo ZSBuZXh0IHN0cmluZyB0b2tlbiB0byBiZSBhIGxpbmsuCi0gICAgICAgICAgICAgICAgc3RhdGUu X2V4cGVjdExpbmsgPSB0cnVlOwotICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZS5fZXhwZWN0 TGluayAmJiBzdHlsZSA9PT0gImF0b20iKSB7Ci0gICAgICAgICAgICAgICAgLy8gV2UgZXhwZWN0 ZWQgYSBzdHJpbmcgYW5kIGdvdCBpdC4gVGhpcyBpcyBhIGxpbmsuIFBhcnNlIGl0IHRoZSB3YXkg d2Ugd2FudCBpdC4KLSAgICAgICAgICAgICAgICBkZWxldGUgc3RhdGUuX2V4cGVjdExpbms7Ci0K LSAgICAgICAgICAgICAgICAvLyBUaGlzIGlzIGEgbGluaywgc28gc2V0dXAgdGhlIHN0YXRlIHRv IHByb2Nlc3MgaXQgbmV4dC4KLSAgICAgICAgICAgICAgICBzdGF0ZS5fdXJsVG9rZW5pemUgPSB0 b2tlbml6ZUNTU1VSTFN0cmluZzsKLSAgICAgICAgICAgICAgICBzdGF0ZS5fdXJsQmFzZVN0eWxl ID0gc3R5bGU7Ci0KLSAgICAgICAgICAgICAgICAvLyBUaGUgdXJsIG1heSBvciBtYXkgbm90IGJl IHF1b3RlZC4KLSAgICAgICAgICAgICAgICB2YXIgcXVvdGUgPSBzdHJlYW0uY3VycmVudCgpWzBd OwotICAgICAgICAgICAgICAgIHN0YXRlLl91cmxRdW90ZUNoYXJhY3RlciA9IHF1b3RlID09PSAi JyIgfHwgcXVvdGUgPT09ICJcIiIgPyBxdW90ZSA6ICIpIjsKLSAgICAgICAgICAgICAgICBzdGF0 ZS5fdW5xdW90ZWRVUkxTdHJpbmcgPSBzdGF0ZS5fdXJsUXVvdGVDaGFyYWN0ZXIgPT09ICIpIjsK LQotICAgICAgICAgICAgICAgIC8vIFJld2luZCB0aGUgc3RlYW0gdG8gdGhlIHN0YXJ0IG9mIHRo aXMgdG9rZW4uCi0gICAgICAgICAgICAgICAgc3RyZWFtLnBvcyA9IHN0YXJ0UG9zaXRpb247Ci0K LSAgICAgICAgICAgICAgICAvLyBFYXQgdGhlIG9wZW4gcXVvdGUgb2YgdGhlIHN0cmluZyBzbyB0 aGUgc3RyaW5nIHN0eWxlCi0gICAgICAgICAgICAgICAgLy8gd2lsbCBiZSB1c2VkIGZvciB0aGUg cXVvdGUgY2hhcmFjdGVyLgotICAgICAgICAgICAgICAgIGlmICghc3RhdGUuX3VucXVvdGVkVVJM U3RyaW5nKQotICAgICAgICAgICAgICAgICAgICBzdHJlYW0uZWF0KHN0YXRlLl91cmxRdW90ZUNo YXJhY3Rlcik7CisgICAgICAgICAgICBpZiAoc3R5bGUgPT09ICJhdG9tIikgeworICAgICAgICAg ICAgICAgIGlmIChzdHJlYW0uY3VycmVudCgpID09PSAidXJsIikgeworICAgICAgICAgICAgICAg ICAgICAvLyBJZiB0aGUgY3VycmVudCB0ZXh0IGlzICJ1cmwiIHRoZW4gd2Ugc2hvdWxkIGV4cGVj dCB0aGUgbmV4dCBzdHJpbmcgdG9rZW4gdG8gYmUgYSBsaW5rLgorICAgICAgICAgICAgICAgICAg ICBzdGF0ZS5fZXhwZWN0TGluayA9IHRydWU7CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChz dGF0ZS5fZXhwZWN0TGluaykgeworICAgICAgICAgICAgICAgICAgICAvLyBXZSBleHBlY3RlZCBh IHN0cmluZyBhbmQgZ290IGl0LiBUaGlzIGlzIGEgbGluay4gUGFyc2UgaXQgdGhlIHdheSB3ZSB3 YW50IGl0LgorICAgICAgICAgICAgICAgICAgICBkZWxldGUgc3RhdGUuX2V4cGVjdExpbms7CisK KyAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyBhIGxpbmssIHNvIHNldHVwIHRoZSBzdGF0 ZSB0byBwcm9jZXNzIGl0IG5leHQuCisgICAgICAgICAgICAgICAgICAgIHN0YXRlLl91cmxUb2tl bml6ZSA9IHRva2VuaXplQ1NTVVJMU3RyaW5nOworICAgICAgICAgICAgICAgICAgICBzdGF0ZS5f dXJsQmFzZVN0eWxlID0gc3R5bGU7CisKKyAgICAgICAgICAgICAgICAgICAgLy8gVGhlIHVybCBt YXkgb3IgbWF5IG5vdCBiZSBxdW90ZWQuCisgICAgICAgICAgICAgICAgICAgIHZhciBxdW90ZSA9 IHN0cmVhbS5jdXJyZW50KClbMF07CisgICAgICAgICAgICAgICAgICAgIHN0YXRlLl91cmxRdW90 ZUNoYXJhY3RlciA9IHF1b3RlID09PSAiJyIgfHwgcXVvdGUgPT09ICJcIiIgPyBxdW90ZSA6ICIp IjsKKyAgICAgICAgICAgICAgICAgICAgc3RhdGUuX3VucXVvdGVkVVJMU3RyaW5nID0gc3RhdGUu X3VybFF1b3RlQ2hhcmFjdGVyID09PSAiKSI7CisKKyAgICAgICAgICAgICAgICAgICAgLy8gUmV3 aW5kIHRoZSBzdGVhbSB0byB0aGUgc3RhcnQgb2YgdGhpcyB0b2tlbi4KKyAgICAgICAgICAgICAg ICAgICAgc3RyZWFtLnBvcyA9IHN0YXJ0UG9zaXRpb247CisKKyAgICAgICAgICAgICAgICAgICAg Ly8gRWF0IHRoZSBvcGVuIHF1b3RlIG9mIHRoZSBzdHJpbmcgc28gdGhlIHN0cmluZyBzdHlsZQor ICAgICAgICAgICAgICAgICAgICAvLyB3aWxsIGJlIHVzZWQgZm9yIHRoZSBxdW90ZSBjaGFyYWN0 ZXIuCisgICAgICAgICAgICAgICAgICAgIGlmICghc3RhdGUuX3VucXVvdGVkVVJMU3RyaW5nKQor ICAgICAgICAgICAgICAgICAgICAgICAgc3RyZWFtLmVhdChzdGF0ZS5fdXJsUXVvdGVDaGFyYWN0 ZXIpOworICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoaGV4Q29sb3JSZWdleC50ZXN0KHN0cmVh bS5jdXJyZW50KCkpKQorICAgICAgICAgICAgICAgICAgICBzdHlsZSA9IHN0eWxlICsgIiBoZXgt Y29sb3IiOwogICAgICAgICAgICAgfSBlbHNlIGlmIChzdGF0ZS5fZXhwZWN0TGluaykgewogICAg ICAgICAgICAgICAgIC8vIFdlIGV4cGVjdGVkIGEgc3RyaW5nIGFuZCBkaWRuJ3QgZ2V0IG9uZS4g Q2xlYW51cC4KICAgICAgICAgICAgICAgICBkZWxldGUgc3RhdGUuX2V4cGVjdExpbms7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TeW50YXhI aWdobGlnaHRpbmdEZWZhdWx0VGhlbWUuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU3ludGF4SGlnaGxpZ2h0aW5nRGVmYXVsdFRoZW1lLmNzcwppbmRleCAw NDIwYWJiMi4uZTdjNWY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU3ludGF4SGlnaGxpZ2h0aW5nRGVmYXVsdFRoZW1lLmNzcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TeW50YXhIaWdobGlnaHRp bmdEZWZhdWx0VGhlbWUuY3NzCkBAIC02MCw2ICs2MCw3IEBACiB9CiAKIC5jbS1zLWRlZmF1bHQg LmNtLW51bWJlciwKKy5jbS1zLWRlZmF1bHQgLmNtLWF0b20uY20taGV4LWNvbG9yLAogLnN5bnRh eC1oaWdobGlnaHRlZCAuY3NzLW51bWJlciwKIC5zeW50YXgtaGlnaGxpZ2h0ZWQgLmphdmFzY3Jp cHQtbnVtYmVyIHsKICAgICBjb2xvcjogcmdiKDI4LCAwLCAyMDcpOwo= 234215 2014-07-01 16:32:45 -0700 2014-07-01 17:13:48 -0700 [PATCH] Reviewed fix with small edits. hexcolor.diff text/plain 5059 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDc3Njk4MGYuLjY5NTQ5ZTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA3LTAxICBKb25hdGhhbiBXZWxs cyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSGV4YWRl Y2ltYWwgY29sb3IgdmFsdWVzIGluIGFsbCBDU1MgZWRpdG9ycyBhcmUgcHVycGxlIHdoZW4gdGhl eSBzaG91bGQgYmUgYmx1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMzOTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgor CisgICAgICAgIENvZGVNaXJyb3IgNCByZW1vdmVkIHRoZSBzdHlsZSBmb3IgaGV4IGNvbG9ycyBm cm9tIHRoZSBDU1MgdG9rZW5pemVyLgorICAgICAgICBGZWF0dXJlIGhhcyBiZWVuIGFkZGVkIHRv IENvZGVNaXJyb3JBZGRpdGlvbnMuanMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L0NvZGVNaXJyb3JBZGRpdGlvbnMuanM6IEFkZGVkIGhleC1jb2xvciB0byBzdHlsZSBmb3IgYSB2 YWxpZCBoZXhhZGVjaW1hbCBjb2xvci4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1N5 bnRheEhpZ2hsaWdodGluZ0RlZmF1bHRUaGVtZS5jc3M6IEFkZGVkIHNlbGVjdG9yIGZvciBoZXhh ZGVjaW1hbCBjb2xvci4KKwogMjAxNC0wNi0yNiAgSm9ubyBXZWxscyAgPGpvbm93ZWxsc0BhcHBs ZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ29tbWFuZC0vIChzbGFzaCkgbm93IGF1 dG8tY29tbWVudHMgY29kZSB2aWEgQ29kZU1pcnJvciA0LiBTaG91bGQgcmVtb3ZlIGFzIGNvbW1h bmQgdG8gcGF1c2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25zLmpzCmluZGV4IDcxNjcwZTMu Ljk1NWNlMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcwpAQCAtMTgyLDYgKzE4 Miw4IEBACiAKICAgICBmdW5jdGlvbiBleHRlbmRlZENTU1Rva2VuKHN0cmVhbSwgc3RhdGUpCiAg ICAgeworICAgICAgICBjb25zdCBoZXhDb2xvclJlZ2V4ID0gLyMoPzpbMC05YS1mQS1GXXs2fXxb MC05YS1mQS1GXXszfSlcYi9nOworCiAgICAgICAgIGlmIChzdGF0ZS5fdXJsVG9rZW5pemUpIHsK ICAgICAgICAgICAgIC8vIENhbGwgdGhlIGxpbmsgdG9rZW5pemVyIGluc3RlYWQuCiAgICAgICAg ICAgICB2YXIgc3R5bGUgPSBzdGF0ZS5fdXJsVG9rZW5pemUoc3RyZWFtLCBzdGF0ZSk7CkBAIC0x OTMsMjkgKzE5NSwzMiBAQAogICAgICAgICB2YXIgc3R5bGUgPSB0aGlzLl90b2tlbihzdHJlYW0s IHN0YXRlKTsKIAogICAgICAgICBpZiAoc3R5bGUpIHsKLSAgICAgICAgICAgIGlmIChzdHlsZSA9 PT0gImF0b20iICYmIHN0cmVhbS5jdXJyZW50KCkgPT09ICJ1cmwiKSB7Ci0gICAgICAgICAgICAg ICAgLy8gSWYgdGhlIGN1cnJlbnQgdGV4dCBpcyAidXJsIiB0aGVuIHdlIHNob3VsZCBleHBlY3Qg dGhlIG5leHQgc3RyaW5nIHRva2VuIHRvIGJlIGEgbGluay4KLSAgICAgICAgICAgICAgICBzdGF0 ZS5fZXhwZWN0TGluayA9IHRydWU7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKHN0YXRlLl9leHBl Y3RMaW5rICYmIHN0eWxlID09PSAiYXRvbSIpIHsKLSAgICAgICAgICAgICAgICAvLyBXZSBleHBl Y3RlZCBhIHN0cmluZyBhbmQgZ290IGl0LiBUaGlzIGlzIGEgbGluay4gUGFyc2UgaXQgdGhlIHdh eSB3ZSB3YW50IGl0LgotICAgICAgICAgICAgICAgIGRlbGV0ZSBzdGF0ZS5fZXhwZWN0TGluazsK LQotICAgICAgICAgICAgICAgIC8vIFRoaXMgaXMgYSBsaW5rLCBzbyBzZXR1cCB0aGUgc3RhdGUg dG8gcHJvY2VzcyBpdCBuZXh0LgotICAgICAgICAgICAgICAgIHN0YXRlLl91cmxUb2tlbml6ZSA9 IHRva2VuaXplQ1NTVVJMU3RyaW5nOwotICAgICAgICAgICAgICAgIHN0YXRlLl91cmxCYXNlU3R5 bGUgPSBzdHlsZTsKLQotICAgICAgICAgICAgICAgIC8vIFRoZSB1cmwgbWF5IG9yIG1heSBub3Qg YmUgcXVvdGVkLgotICAgICAgICAgICAgICAgIHZhciBxdW90ZSA9IHN0cmVhbS5jdXJyZW50KClb MF07Ci0gICAgICAgICAgICAgICAgc3RhdGUuX3VybFF1b3RlQ2hhcmFjdGVyID0gcXVvdGUgPT09 ICInIiB8fCBxdW90ZSA9PT0gIlwiIiA/IHF1b3RlIDogIikiOwotICAgICAgICAgICAgICAgIHN0 YXRlLl91bnF1b3RlZFVSTFN0cmluZyA9IHN0YXRlLl91cmxRdW90ZUNoYXJhY3RlciA9PT0gIiki OwotCi0gICAgICAgICAgICAgICAgLy8gUmV3aW5kIHRoZSBzdGVhbSB0byB0aGUgc3RhcnQgb2Yg dGhpcyB0b2tlbi4KLSAgICAgICAgICAgICAgICBzdHJlYW0ucG9zID0gc3RhcnRQb3NpdGlvbjsK LQotICAgICAgICAgICAgICAgIC8vIEVhdCB0aGUgb3BlbiBxdW90ZSBvZiB0aGUgc3RyaW5nIHNv IHRoZSBzdHJpbmcgc3R5bGUKLSAgICAgICAgICAgICAgICAvLyB3aWxsIGJlIHVzZWQgZm9yIHRo ZSBxdW90ZSBjaGFyYWN0ZXIuCi0gICAgICAgICAgICAgICAgaWYgKCFzdGF0ZS5fdW5xdW90ZWRV UkxTdHJpbmcpCi0gICAgICAgICAgICAgICAgICAgIHN0cmVhbS5lYXQoc3RhdGUuX3VybFF1b3Rl Q2hhcmFjdGVyKTsKKyAgICAgICAgICAgIGlmIChzdHlsZSA9PT0gImF0b20iKSB7CisgICAgICAg ICAgICAgICAgaWYgKHN0cmVhbS5jdXJyZW50KCkgPT09ICJ1cmwiKSB7CisgICAgICAgICAgICAg ICAgICAgIC8vIElmIHRoZSBjdXJyZW50IHRleHQgaXMgInVybCIgdGhlbiB3ZSBzaG91bGQgZXhw ZWN0IHRoZSBuZXh0IHN0cmluZyB0b2tlbiB0byBiZSBhIGxpbmsuCisgICAgICAgICAgICAgICAg ICAgIHN0YXRlLl9leHBlY3RMaW5rID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYg KHN0YXRlLl9leHBlY3RMaW5rKSB7CisgICAgICAgICAgICAgICAgICAgIC8vIFdlIGV4cGVjdGVk IGEgc3RyaW5nIGFuZCBnb3QgaXQuIFRoaXMgaXMgYSBsaW5rLiBQYXJzZSBpdCB0aGUgd2F5IHdl IHdhbnQgaXQuCisgICAgICAgICAgICAgICAgICAgIGRlbGV0ZSBzdGF0ZS5fZXhwZWN0TGluazsK KworICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIGlzIGEgbGluaywgc28gc2V0dXAgdGhlIHN0 YXRlIHRvIHByb2Nlc3MgaXQgbmV4dC4KKyAgICAgICAgICAgICAgICAgICAgc3RhdGUuX3VybFRv a2VuaXplID0gdG9rZW5pemVDU1NVUkxTdHJpbmc7CisgICAgICAgICAgICAgICAgICAgIHN0YXRl Ll91cmxCYXNlU3R5bGUgPSBzdHlsZTsKKworICAgICAgICAgICAgICAgICAgICAvLyBUaGUgdXJs IG1heSBvciBtYXkgbm90IGJlIHF1b3RlZC4KKyAgICAgICAgICAgICAgICAgICAgdmFyIHF1b3Rl ID0gc3RyZWFtLmN1cnJlbnQoKVswXTsKKyAgICAgICAgICAgICAgICAgICAgc3RhdGUuX3VybFF1 b3RlQ2hhcmFjdGVyID0gcXVvdGUgPT09ICInIiB8fCBxdW90ZSA9PT0gIlwiIiA/IHF1b3RlIDog IikiOworICAgICAgICAgICAgICAgICAgICBzdGF0ZS5fdW5xdW90ZWRVUkxTdHJpbmcgPSBzdGF0 ZS5fdXJsUXVvdGVDaGFyYWN0ZXIgPT09ICIpIjsKKworICAgICAgICAgICAgICAgICAgICAvLyBS ZXdpbmQgdGhlIHN0ZWFtIHRvIHRoZSBzdGFydCBvZiB0aGlzIHRva2VuLgorICAgICAgICAgICAg ICAgICAgICBzdHJlYW0ucG9zID0gc3RhcnRQb3NpdGlvbjsKKworICAgICAgICAgICAgICAgICAg ICAvLyBFYXQgdGhlIG9wZW4gcXVvdGUgb2YgdGhlIHN0cmluZyBzbyB0aGUgc3RyaW5nIHN0eWxl CisgICAgICAgICAgICAgICAgICAgIC8vIHdpbGwgYmUgdXNlZCBmb3IgdGhlIHF1b3RlIGNoYXJh Y3Rlci4KKyAgICAgICAgICAgICAgICAgICAgaWYgKCFzdGF0ZS5fdW5xdW90ZWRVUkxTdHJpbmcp CisgICAgICAgICAgICAgICAgICAgICAgICBzdHJlYW0uZWF0KHN0YXRlLl91cmxRdW90ZUNoYXJh Y3Rlcik7CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChoZXhDb2xvclJlZ2V4LnRlc3Qoc3Ry ZWFtLmN1cnJlbnQoKSkpCisgICAgICAgICAgICAgICAgICAgIHN0eWxlID0gc3R5bGUgKyAiIGhl eC1jb2xvciI7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHN0YXRlLl9leHBlY3RMaW5rKSB7CiAg ICAgICAgICAgICAgICAgLy8gV2UgZXhwZWN0ZWQgYSBzdHJpbmcgYW5kIGRpZG4ndCBnZXQgb25l LiBDbGVhbnVwLgogICAgICAgICAgICAgICAgIGRlbGV0ZSBzdGF0ZS5fZXhwZWN0TGluazsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N5bnRh eEhpZ2hsaWdodGluZ0RlZmF1bHRUaGVtZS5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TeW50YXhIaWdobGlnaHRpbmdEZWZhdWx0VGhlbWUuY3NzCmluZGV4 IDA0MjBhYmIyLi5lN2M1ZjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TeW50YXhIaWdobGlnaHRpbmdEZWZhdWx0VGhlbWUuY3NzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N5bnRheEhpZ2hsaWdo dGluZ0RlZmF1bHRUaGVtZS5jc3MKQEAgLTYwLDYgKzYwLDcgQEAKIH0KIAogLmNtLXMtZGVmYXVs dCAuY20tbnVtYmVyLAorLmNtLXMtZGVmYXVsdCAuY20tYXRvbS5jbS1oZXgtY29sb3IsCiAuc3lu dGF4LWhpZ2hsaWdodGVkIC5jc3MtbnVtYmVyLAogLnN5bnRheC1oaWdobGlnaHRlZCAuamF2YXNj cmlwdC1udW1iZXIgewogICAgIGNvbG9yOiByZ2IoMjgsIDAsIDIwNyk7Cg==