Changeset 136784 in webkit


Ignore:
Timestamp:
Dec 5, 2012 5:38:29 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Remove linux theme related files and switch to default
​https://bugs.webkit.org/show_bug.cgi?id=103897

Patch by Scott Violet <​sky@chromium.org> on 2012-12-05
Reviewed by Tony Chang.

Source/Platform:

  • Platform.gypi: Remove WebThemeEngine.h
  • chromium/public/linux/WebThemeEngine.h: Removed.

Source/WebCore:

Linux related theme files are now named Default.

No new tests, code cleanup.

  • WebCore.gyp/WebCore.gyp: Update files
  • WebCore.gypi: Update files
  • platform/chromium/PlatformThemeChromiumLinux.cpp: Removed.
  • platform/chromium/PlatformThemeChromiumLinux.h: Removed.
  • platform/chromium/ScrollbarThemeChromiumLinux.cpp: Removed.
  • platform/chromium/ScrollbarThemeChromiumLinux.h: Removed.
  • rendering/RenderThemeChromiumAndroid.cpp:

(WebCore::RenderThemeChromiumAndroid::extraDefaultStyleSheet): Linux->Default

  • rendering/RenderThemeChromiumAndroid.h: Change superclass
  • rendering/RenderThemeChromiumLinux.cpp: Removed.
  • rendering/RenderThemeChromiumLinux.h: Removed.

Source/WebKit/chromium:

Linux theme related files are now named Default.

  • WebKit.gyp:
  • public/linux/WebRenderTheme.h: Removed.
  • public/platform/linux/WebThemeEngine.h: Removed.
  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::setScrollbarColors): Cleanup ifdefs.
(WebKit::WebViewImpl::setSelectionColors): Cleanup ifdefs.

  • src/linux/WebRenderTheme.cpp: Removed.

Tools:

  • Scripts/webkitpy/common/config/build_unittest.py:

(ShouldBuildTest): linux->default

Location:
trunk
Files:
10 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r136779 r136784  
     12012-12-05  Scott Violet  <sky@chromium.org>
     2
     3        [chromium] Remove linux theme related files and switch to default
     4        https://bugs.webkit.org/show_bug.cgi?id=103897
     5
     6        Reviewed by Tony Chang.
     7
     8        * Platform.gypi: Remove WebThemeEngine.h
     9        * chromium/public/linux/WebThemeEngine.h: Removed.
     10
    1112012-12-05  Dana Jansens  <danakj@chromium.org>
    212

  • trunk/Source/Platform/Platform.gypi

    r136466 r136784  
    153153            'chromium/public/linux/WebFontRenderStyle.h',
    154154            'chromium/public/linux/WebSandboxSupport.h',
    155             'chromium/public/linux/WebThemeEngine.h',
    156155            'chromium/public/mac/WebSandboxSupport.h',
    157156            'chromium/public/mac/WebThemeEngine.h',

  • trunk/Source/WebCore/ChangeLog

    r136782 r136784  
     12012-12-05  Scott Violet  <sky@chromium.org>
     2
     3        [chromium] Remove linux theme related files and switch to default
     4        https://bugs.webkit.org/show_bug.cgi?id=103897
     5
     6        Reviewed by Tony Chang.
     7
     8        Linux related theme files are now named Default.
     9
     10        No new tests, code cleanup.
     11
     12        * WebCore.gyp/WebCore.gyp: Update files
     13        * WebCore.gypi: Update files
     14        * platform/chromium/PlatformThemeChromiumLinux.cpp: Removed.
     15        * platform/chromium/PlatformThemeChromiumLinux.h: Removed.
     16        * platform/chromium/ScrollbarThemeChromiumLinux.cpp: Removed.
     17        * platform/chromium/ScrollbarThemeChromiumLinux.h: Removed.
     18        * rendering/RenderThemeChromiumAndroid.cpp:
     19        (WebCore::RenderThemeChromiumAndroid::extraDefaultStyleSheet): Linux->Default
     20        * rendering/RenderThemeChromiumAndroid.h: Change superclass
     21        * rendering/RenderThemeChromiumLinux.cpp: Removed.
     22        * rendering/RenderThemeChromiumLinux.h: Removed.
     23
    1242012-12-05  Joshua Bell  <jsbell@chromium.org>
    225

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r136466 r136784  
    17011701        ['use_default_render_theme==1', {
    17021702          'sources/': [
    1703             ['exclude', 'platform/chromium/PlatformThemeChromiumLinux.h'],
    1704             ['exclude', 'platform/chromium/PlatformThemeChromiumLinux.cpp'],
    17051703            ['exclude', 'platform/chromium/PlatformThemeChromiumWin.h'],
    17061704            ['exclude', 'platform/chromium/PlatformThemeChromiumWin.cpp'],
    1707             ['exclude', 'platform/chromium/ScrollbarThemeChromiumLinux.cpp'],
    1708             ['exclude', 'platform/chromium/ScrollbarThemeChromiumLinux.h'],
    17091705            ['exclude', 'platform/chromium/ScrollbarThemeChromiumWin.cpp'],
    17101706            ['exclude', 'platform/chromium/ScrollbarThemeChromiumWin.h'],
    17111707          ],
    1712         }],
    1713         ['use_default_render_theme==0', {
     1708        }, { # use_default_render_theme==0
    17141709          'sources/': [
    17151710            ['exclude', 'platform/chromium/PlatformThemeChromiumDefault.cpp'],
    … …  
    20142009        ['use_default_render_theme==1', {
    20152010          'sources/': [
    2016             ['exclude', 'RenderThemeChromiumLinux.*'],
    20172011            ['exclude', 'RenderThemeChromiumWin.*'],
    20182012          ],
    … …  
    20612055          'sources/': [
    20622056            ['include', 'rendering/RenderThemeChromiumFontProviderLinux\\.cpp$'],
    2063             ['include', 'rendering/RenderThemeChromiumLinux\\.cpp$'],
     2057            ['include', 'rendering/RenderThemeChromiumDefault\\.cpp$'],
    20642058          ],
    20652059        },{ # OS!="android"

  • trunk/Source/WebCore/WebCore.gypi

    r136744 r136784  
    34663466            'rendering/RenderThemeChromiumFontProviderLinux.cpp',
    34673467            'rendering/RenderThemeChromiumFontProviderWin.cpp',
    3468             'rendering/RenderThemeChromiumLinux.cpp',
    3469             'rendering/RenderThemeChromiumLinux.h',
    34703468            'rendering/RenderThemeChromiumMac.h',
    34713469            'rendering/RenderThemeChromiumMac.mm',
    … …  
    46854683            'platform/chromium/PlatformThemeChromiumDefault.cpp',
    46864684            'platform/chromium/PlatformThemeChromiumDefault.h',
    4687             'platform/chromium/PlatformThemeChromiumLinux.cpp',
    4688             'platform/chromium/PlatformThemeChromiumLinux.h',
    46894685            'platform/chromium/PlatformWidget.h',
    46904686            'platform/chromium/PopupContainer.cpp',
    … …  
    47054701            'platform/chromium/ScrollbarThemeChromiumDefault.cpp',
    47064702            'platform/chromium/ScrollbarThemeChromiumDefault.h',
    4707             'platform/chromium/ScrollbarThemeChromiumLinux.cpp',
    4708             'platform/chromium/ScrollbarThemeChromiumLinux.h',
    47094703            'platform/chromium/ScrollbarThemeChromiumMac.h',
    47104704            'platform/chromium/ScrollbarThemeChromiumMac.mm',

  • trunk/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp

    r136466 r136784  
    7575String RenderThemeChromiumAndroid::extraDefaultStyleSheet()
    7676{
    77     return RenderThemeChromiumLinux::extraDefaultStyleSheet() +
     77    return RenderThemeChromiumDefault::extraDefaultStyleSheet() +
    7878        String(themeChromiumAndroidUserAgentStyleSheet, sizeof(themeChromiumAndroidUserAgentStyleSheet));
    7979}

  • trunk/Source/WebCore/rendering/RenderThemeChromiumAndroid.h

    r136466 r136784  
    2727#define RenderThemeChromiumAndroid_h
    2828
    29 #include "RenderThemeChromiumLinux.h"
     29#include "RenderThemeChromiumDefault.h"
    3030
    3131namespace WebCore {
    3232
    33 class RenderThemeChromiumAndroid : public RenderThemeChromiumLinux {
     33class RenderThemeChromiumAndroid : public RenderThemeChromiumDefault {
    3434public:
    3535    static PassRefPtr<RenderTheme> create();

  • trunk/Source/WebKit/chromium/ChangeLog

    r136782 r136784  
     12012-12-05  Scott Violet  <sky@chromium.org>
     2
     3        [chromium] Remove linux theme related files and switch to default
     4        https://bugs.webkit.org/show_bug.cgi?id=103897
     5
     6        Reviewed by Tony Chang.
     7
     8        Linux theme related files are now named Default.
     9
     10        * WebKit.gyp:
     11        * public/linux/WebRenderTheme.h: Removed.
     12        * public/platform/linux/WebThemeEngine.h: Removed.
     13        * src/WebViewImpl.cpp:
     14        (WebKit::WebViewImpl::setScrollbarColors): Cleanup ifdefs.
     15        (WebKit::WebViewImpl::setSelectionColors): Cleanup ifdefs.
     16        * src/linux/WebRenderTheme.cpp: Removed.
     17
    1182012-12-05  Joshua Bell  <jsbell@chromium.org>
    219

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r136748 r136784  
    440440                'src/linux/WebFontRendering.cpp',
    441441                'src/linux/WebFontRenderStyle.cpp',
    442                 'src/linux/WebRenderTheme.cpp',
    443442                'src/x11/WebScreenInfoFactory.cpp',
    444443                'src/mac/WebInputEventFactory.mm',
    … …  
    847846                }],
    848847                ['use_default_render_theme==1', {
    849                     'sources/': [
    850                         ['exclude', 'src/linux/WebRenderTheme.cpp'],
    851                         ['exclude', 'public/linux/WebRenderTheme.h'],
    852                     ],
    853848                    'include_dirs': [
    854849                        'public/default',

  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r136763 r136784  
    180180#endif
    181181#else
    182 #if OS(UNIX) && !OS(DARWIN) && !ENABLE(DEFAULT_RENDER_THEME)
    183 #include "PlatformThemeChromiumLinux.h"
    184 #include "RenderThemeChromiumLinux.h"
    185 #endif
    186182#include "RenderTheme.h"
    187183#endif
    … …  
    35693565#if ENABLE(DEFAULT_RENDER_THEME)
    35703566    PlatformThemeChromiumDefault::setScrollbarColors(inactiveColor, activeColor, trackColor);
    3571 #elif OS(UNIX) && !OS(DARWIN) && !OS(ANDROID)
    3572     PlatformThemeChromiumLinux::setScrollbarColors(inactiveColor, activeColor, trackColor);
    35733567#endif
    35743568}
    … …  
    35803574#if ENABLE(DEFAULT_RENDER_THEME)
    35813575    RenderThemeChromiumDefault::setSelectionColors(activeBackgroundColor, activeForegroundColor, inactiveBackgroundColor, inactiveForegroundColor);
    3582     theme()->platformColorsDidChange();
    3583 #elif OS(UNIX) && !OS(DARWIN) && !OS(ANDROID)
    3584     RenderThemeChromiumLinux::setSelectionColors(activeBackgroundColor, activeForegroundColor, inactiveBackgroundColor, inactiveForegroundColor);
    35853576    theme()->platformColorsDidChange();
    35863577#endif

  • trunk/Tools/ChangeLog

    r136780 r136784  
     12012-12-05  Scott Violet  <sky@chromium.org>
     2
     3        [chromium] Remove linux theme related files and switch to default
     4        https://bugs.webkit.org/show_bug.cgi?id=103897
     5
     6        Reviewed by Tony Chang.
     7
     8        * Scripts/webkitpy/common/config/build_unittest.py:
     9        (ShouldBuildTest): linux->default
     10
    1112012-12-05  Dirk Pranke  <dpranke@chromium.org>
    212

  • trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py

    r136548 r136784  
    5353        (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
    5454        (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
    55         (["Source/WebCore/rendering/RenderThemeChromiumLinux.h"], ["chromium-linux"]),
     55        (["Source/WebCore/rendering/RenderThemeChromiumDefault.h"], ["chromium-linux"]),
    5656        (["Source/WebCore/rendering/RenderThemeWinCE.h"], []),
    5757        (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
Note: See TracChangeset for help on using the changeset viewer.