| OLD | NEW |
| 1 /** | 1 /** |
| 2 * This file is part of the theme implementation for form controls in WebCore. | 2 * This file is part of the theme implementation for form controls in WebCore. |
| 3 * | 3 * |
| 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. | 4 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Computer, Inc. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 case kSearchFieldCancelButtonPart: | 249 case kSearchFieldCancelButtonPart: |
| 250 return AdjustSearchFieldCancelButtonStyle(style); | 250 return AdjustSearchFieldCancelButtonStyle(style); |
| 251 default: | 251 default: |
| 252 break; | 252 break; |
| 253 } | 253 } |
| 254 } | 254 } |
| 255 | 255 |
| 256 String LayoutTheme::ExtraDefaultStyleSheet() { | 256 String LayoutTheme::ExtraDefaultStyleSheet() { |
| 257 StringBuilder runtime_css; | 257 StringBuilder runtime_css; |
| 258 if (RuntimeEnabledFeatures::contextMenuEnabled()) | 258 if (RuntimeEnabledFeatures::contextMenuEnabled()) |
| 259 runtime_css.Append("menu[type=\"popup\" i] { display: none; }"); | 259 runtime_css.Append("menu[type=\"context\" i] { display: none; }"); |
| 260 return runtime_css.ToString(); | 260 return runtime_css.ToString(); |
| 261 } | 261 } |
| 262 | 262 |
| 263 static String FormatChromiumMediaControlsTime(float time, | 263 static String FormatChromiumMediaControlsTime(float time, |
| 264 float duration, | 264 float duration, |
| 265 bool include_separator) { | 265 bool include_separator) { |
| 266 if (!std::isfinite(time)) | 266 if (!std::isfinite(time)) |
| 267 time = 0; | 267 time = 0; |
| 268 if (!std::isfinite(duration)) | 268 if (!std::isfinite(duration)) |
| 269 duration = 0; | 269 duration = 0; |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 912 // padding - not honored by WinIE, needs to be removed. | 912 // padding - not honored by WinIE, needs to be removed. |
| 913 style.ResetPadding(); | 913 style.ResetPadding(); |
| 914 | 914 |
| 915 // border - honored by WinIE, but looks terrible (just paints in the control | 915 // border - honored by WinIE, but looks terrible (just paints in the control |
| 916 // box and turns off the Windows XP theme) | 916 // box and turns off the Windows XP theme) |
| 917 // for now, we will not honor it. | 917 // for now, we will not honor it. |
| 918 style.ResetBorder(); | 918 style.ResetBorder(); |
| 919 } | 919 } |
| 920 | 920 |
| 921 } // namespace blink | 921 } // namespace blink |
| OLD | NEW |