Changeset 58788 in webkit
- Timestamp:
- May 4, 2010 5:16:27 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r58786 r58788 1 2010-05-04 Luiz Agostini <luiz.agostini@openbossa.org> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] QT_MOBILE_THEME compile time flag 6 https://bugs.webkit.org/show_bug.cgi?id=38439 7 8 Replacing preprocessor conditional used in RenderThemeQt from Q_WS_MAEMO_5 to 9 USE(QT_MOBILE_THEME). 10 11 * WebCore.pro: 12 * platform/qt/RenderThemeQt.cpp: 13 (WebCore::RenderThemeQt::RenderThemeQt): 14 (WebCore::RenderThemeQt::qStyle): 15 (WebCore::RenderThemeQt::extraDefaultStyleSheet): 16 (WebCore::RenderThemeQt::adjustMenuListButtonStyle): 17 (WebCore::RenderThemeQt::setPaletteFromPageClientIfExists): 18 * platform/qt/RenderThemeQt.h: 19 1 20 2010-05-04 Joseph Pecoraro <joepeck@webkit.org> 2 21 -
trunk/WebCore/WebCore.pro
r58751 r58788 124 124 125 125 maemo5 { 126 DEFINES += WTF_USE_QT_MOBILE_THEME=1 127 } 128 129 contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) { 126 130 DEFINES += ENABLE_NO_LISTBOX_RENDERING=1 127 131 } … … 2150 2154 ../WebKit/qt/Api/qwebkitversion.cpp 2151 2155 2156 2157 contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) { 2158 HEADERS += platform/qt/Maemo5Webstyle.h 2159 SOURCES += platform/qt/Maemo5Webstyle.cpp 2160 } 2161 2152 2162 maemo5 { 2153 HEADERS += \ 2154 ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h \ 2155 platform/qt/Maemo5Webstyle.h 2156 SOURCES += \ 2157 ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp \ 2158 platform/qt/Maemo5Webstyle.cpp 2163 HEADERS += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h 2164 SOURCES += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp 2159 2165 } 2160 2166 -
trunk/WebCore/platform/qt/RenderThemeQt.cpp
r58672 r58788 43 43 #include "HTMLMediaElement.h" 44 44 #include "HTMLNames.h" 45 #if def Q_WS_MAEMO_545 #if USE(QT_MOBILE_THEME) 46 46 #include "Maemo5Webstyle.h" 47 47 #endif … … 154 154 #endif 155 155 156 #if def Q_WS_MAEMO_5156 #if USE(QT_MOBILE_THEME) 157 157 m_fallbackStyle = new Maemo5WebStyle; 158 158 #else … … 169 169 } 170 170 171 #if def Q_WS_MAEMO_5171 #if USE(QT_MOBILE_THEME) 172 172 bool RenderThemeQt::isControlStyled(const RenderStyle* style, const BorderData& border, const FillLayer& fill, const Color& backgroundColor) const 173 173 { … … 201 201 QStyle* RenderThemeQt::qStyle() const 202 202 { 203 #if def Q_WS_MAEMO_5203 #if USE(QT_MOBILE_THEME) 204 204 return fallbackStyle(); 205 205 #endif … … 221 221 result += String(themeQtNoListboxesUserAgentStyleSheet, sizeof(themeQtNoListboxesUserAgentStyleSheet)); 222 222 #endif 223 #if def Q_WS_MAEMO_5223 #if USE(QT_MOBILE_THEME) 224 224 result += String(themeQtMaemo5UserAgentStyleSheet, sizeof(themeQtMaemo5UserAgentStyleSheet)); 225 225 #endif … … 657 657 void RenderThemeQt::adjustMenuListButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 658 658 { 659 #ifndef Q_WS_MAEMO_5 659 #if USE(QT_MOBILE_THEME) 660 // Mobile theme uses border radius. 661 #else 660 662 // WORKAROUND because html.css specifies -webkit-border-radius for <select> so we override it here 661 663 // see also http://bugs.webkit.org/show_bug.cgi?id=18399 … … 907 909 void RenderThemeQt::setPaletteFromPageClientIfExists(QPalette& palette) const 908 910 { 909 #if def Q_WS_MAEMO_5911 #if USE(QT_MOBILE_THEME) 910 912 static QPalette lightGrayPalette(Qt::lightGray); 911 913 palette = lightGrayPalette; -
trunk/WebCore/platform/qt/RenderThemeQt.h
r56860 r58788 79 79 virtual double caretBlinkInterval() const; 80 80 81 #if def Q_WS_MAEMO_581 #if USE(QT_MOBILE_THEME) 82 82 virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const; 83 83 virtual int popupInternalPaddingBottom(RenderStyle*) const;
Note: See TracChangeset
for help on using the changeset viewer.