| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. | 2 * Copyright (C) 2007 Apple Inc. |
| 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> | 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> |
| 4 * Copyright (C) 2008 Collabora Ltd. | 4 * Copyright (C) 2008 Collabora Ltd. |
| 5 * Copyright (C) 2008, 2009 Google Inc. | 5 * Copyright (C) 2008, 2009 Google Inc. |
| 6 * Copyright (C) 2009 Kenneth Rohde Christiansen | 6 * Copyright (C) 2009 Kenneth Rohde Christiansen |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 return defaultButtonGrayColor; | 102 return defaultButtonGrayColor; |
| 103 } | 103 } |
| 104 if (cssValueId == CSSValueMenu) | 104 if (cssValueId == CSSValueMenu) |
| 105 return defaultMenuColor; | 105 return defaultMenuColor; |
| 106 return LayoutTheme::systemColor(cssValueId); | 106 return LayoutTheme::systemColor(cssValueId); |
| 107 } | 107 } |
| 108 | 108 |
| 109 // Use the Windows style sheets to match their metrics. | 109 // Use the Windows style sheets to match their metrics. |
| 110 String LayoutThemeDefault::extraDefaultStyleSheet() | 110 String LayoutThemeDefault::extraDefaultStyleSheet() |
| 111 { | 111 { |
| 112 String legacyOptionStyle; | |
| 113 if (!RuntimeEnabledFeatures::htmlPopupMenuEnabled()) { | |
| 114 // Option font must be inherited because we depend on computing the size | |
| 115 // of the <select> based on the size of the options, and they must use | |
| 116 // the same font for that computation to be correct. | |
| 117 legacyOptionStyle = "option { font: inherit !important; }"; | |
| 118 } | |
| 119 return LayoutTheme::extraDefaultStyleSheet() | 112 return LayoutTheme::extraDefaultStyleSheet() |
| 120 + loadResourceAsASCIIString("themeWin.css") | 113 + loadResourceAsASCIIString("themeWin.css") |
| 121 + loadResourceAsASCIIString("themeChromiumSkia.css") | 114 + loadResourceAsASCIIString("themeChromiumSkia.css") |
| 122 + loadResourceAsASCIIString("themeChromium.css") | |
| 123 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) | 115 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) |
| 124 + loadResourceAsASCIIString("themeInputMultipleFields.css") | 116 + loadResourceAsASCIIString("themeInputMultipleFields.css") |
| 125 #endif | 117 #endif |
| 126 + legacyOptionStyle; | 118 + loadResourceAsASCIIString("themeChromium.css"); |
| 127 } | 119 } |
| 128 | 120 |
| 129 String LayoutThemeDefault::extraQuirksStyleSheet() | 121 String LayoutThemeDefault::extraQuirksStyleSheet() |
| 130 { | 122 { |
| 131 return loadResourceAsASCIIString("themeWinQuirks.css"); | 123 return loadResourceAsASCIIString("themeWinQuirks.css"); |
| 132 } | 124 } |
| 133 | 125 |
| 134 Color LayoutThemeDefault::activeListBoxSelectionBackgroundColor() const | 126 Color LayoutThemeDefault::activeListBoxSelectionBackgroundColor() const |
| 135 { | 127 { |
| 136 return Color(0x28, 0x28, 0x28); | 128 return Color(0x28, 0x28, 0x28); |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 { | 427 { |
| 436 return progressAnimationInterval; | 428 return progressAnimationInterval; |
| 437 } | 429 } |
| 438 | 430 |
| 439 double LayoutThemeDefault::animationDurationForProgressBar() const | 431 double LayoutThemeDefault::animationDurationForProgressBar() const |
| 440 { | 432 { |
| 441 return progressAnimationInterval * progressAnimationFrames * 2; // "2" for b
ack and forth | 433 return progressAnimationInterval * progressAnimationFrames * 2; // "2" for b
ack and forth |
| 442 } | 434 } |
| 443 | 435 |
| 444 } // namespace blink | 436 } // namespace blink |
| OLD | NEW |