OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights |
4 * reserved. | 4 * reserved. |
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. | 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 2072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2083 case CSSPropertyBorderBottomColor: | 2083 case CSSPropertyBorderBottomColor: |
2084 result = | 2084 result = |
2085 visitedLink ? visitedLinkBorderBottomColor() : borderBottomColor(); | 2085 visitedLink ? visitedLinkBorderBottomColor() : borderBottomColor(); |
2086 borderStyle = borderBottomStyle(); | 2086 borderStyle = borderBottomStyle(); |
2087 break; | 2087 break; |
2088 case CSSPropertyCaretColor: { | 2088 case CSSPropertyCaretColor: { |
2089 StyleAutoColor autoColor = | 2089 StyleAutoColor autoColor = |
2090 visitedLink ? visitedLinkCaretColor() : caretColor(); | 2090 visitedLink ? visitedLinkCaretColor() : caretColor(); |
2091 // TODO(rego): We may want to adjust the caret color if it's the same than | 2091 // TODO(rego): We may want to adjust the caret color if it's the same than |
2092 // the background to ensure good visibility and contrast. | 2092 // the background to ensure good visibility and contrast. |
2093 result = autoColor.toStyleColor(); | 2093 result = autoColor.isAutoColor() ? StyleColor::currentColor() |
| 2094 : autoColor.toStyleColor(); |
2094 break; | 2095 break; |
2095 } | 2096 } |
2096 case CSSPropertyColor: | 2097 case CSSPropertyColor: |
2097 result = visitedLink ? visitedLinkColor() : color(); | 2098 result = visitedLink ? visitedLinkColor() : color(); |
2098 break; | 2099 break; |
2099 case CSSPropertyOutlineColor: | 2100 case CSSPropertyOutlineColor: |
2100 result = visitedLink ? visitedLinkOutlineColor() : outlineColor(); | 2101 result = visitedLink ? visitedLinkOutlineColor() : outlineColor(); |
2101 break; | 2102 break; |
2102 case CSSPropertyColumnRuleColor: | 2103 case CSSPropertyColumnRuleColor: |
2103 result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor(); | 2104 result = visitedLink ? visitedLinkColumnRuleColor() : columnRuleColor(); |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2464 if (value < 0) | 2465 if (value < 0) |
2465 fvalue -= 0.5f; | 2466 fvalue -= 0.5f; |
2466 else | 2467 else |
2467 fvalue += 0.5f; | 2468 fvalue += 0.5f; |
2468 } | 2469 } |
2469 | 2470 |
2470 return roundForImpreciseConversion<int>(fvalue / zoomFactor); | 2471 return roundForImpreciseConversion<int>(fvalue / zoomFactor); |
2471 } | 2472 } |
2472 | 2473 |
2473 } // namespace blink | 2474 } // namespace blink |
OLD | NEW |