Title: [161674] trunk/Source/WebInspectorUI
- Revision
- 161674
- Author
- [email protected]
- Date
- 2014-01-10 14:06:15 -0800 (Fri, 10 Jan 2014)
Log Message
Fix an exception in WebInspector.Color.
https://bugs.webkit.org/show_bug.cgi?id=126765
Reviewed by Joseph Pecoraro.
* UserInterface/Color.js:
(WebInspector.Color.fromString): Check hasOwnPrperty before using the nickname color array.
(WebInspector.Color.prototype._toNicknameString): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (161673 => 161674)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-10 21:42:07 UTC (rev 161673)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-10 22:06:15 UTC (rev 161674)
@@ -1,3 +1,15 @@
+2014-01-10 Timothy Hatcher <[email protected]>
+
+ Fix an exception in WebInspector.Color.
+
+ https://bugs.webkit.org/show_bug.cgi?id=126765
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Color.js:
+ (WebInspector.Color.fromString): Check hasOwnPrperty before using the nickname color array.
+ (WebInspector.Color.prototype._toNicknameString): Ditto.
+
2014-01-10 Joseph Pecoraro <[email protected]>
[CSS Blending] Log blending as a layer creation reason in the WI
Modified: trunk/Source/WebInspectorUI/UserInterface/Color.js (161673 => 161674)
--- trunk/Source/WebInspectorUI/UserInterface/Color.js 2014-01-10 21:42:07 UTC (rev 161673)
+++ trunk/Source/WebInspectorUI/UserInterface/Color.js 2014-01-10 22:06:15 UTC (rev 161674)
@@ -93,7 +93,7 @@
]);
} else if (match[3]) { // nickname
var nickname = match[3].toLowerCase();
- if (nickname in WebInspector.Color.Nicknames) {
+ if (WebInspector.Color.Nicknames.hasOwnProperty(nickname)) {
var color = new WebInspector.Color(WebInspector.Color.Format.Nickname, WebInspector.Color.Nicknames[nickname].concat(1));
color.nickname = nickname;
color.original = colorString;
@@ -276,6 +276,9 @@
var nicknames = WebInspector.Color.Nicknames;
for (var nickname in nicknames) {
+ if (!nicknames.hasOwnProperty(nickname))
+ continue;
+
var nicknameRGB = nicknames[nickname];
if (nicknameRGB[0] === rgba[0] && nicknameRGB[1] === rgba[1] && nicknameRGB[2] === rgba[2])
return nickname;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
