Changeset 161674 in webkit


Ignore:
Timestamp:
Jan 10, 2014 2:06:15 PM (10 years ago)
Author:
timothy@apple.com
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.

Location:
trunk/Source/WebInspectorUI
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r161673 r161674  
     12014-01-10  Timothy Hatcher  <timothy@apple.com>
     2
     3        Fix an exception in WebInspector.Color.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=126765
     6
     7        Reviewed by Joseph Pecoraro.
     8
     9        * UserInterface/Color.js:
     10        (WebInspector.Color.fromString): Check hasOwnPrperty before using the nickname color array.
     11        (WebInspector.Color.prototype._toNicknameString): Ditto.
     12
    1132014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
    214
  • trunk/Source/WebInspectorUI/UserInterface/Color.js

    r160483 r161674  
    9494        } else if (match[3]) { // nickname
    9595            var nickname = match[3].toLowerCase();
    96             if (nickname in WebInspector.Color.Nicknames) {
     96            if (WebInspector.Color.Nicknames.hasOwnProperty(nickname)) {
    9797                var color = new WebInspector.Color(WebInspector.Color.Format.Nickname, WebInspector.Color.Nicknames[nickname].concat(1));
    9898                color.nickname = nickname;
     
    277277        var nicknames = WebInspector.Color.Nicknames;
    278278        for (var nickname in nicknames) {
     279            if (!nicknames.hasOwnProperty(nickname))
     280                continue;
     281
    279282            var nicknameRGB = nicknames[nickname];
    280283            if (nicknameRGB[0] === rgba[0] && nicknameRGB[1] === rgba[1] && nicknameRGB[2] === rgba[2])
Note: See TracChangeset for help on using the changeset viewer.