Changeset 136979 in webkit


Ignore:
Timestamp:
Dec 7, 2012 1:34:25 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-07
Reviewed by Dimitri Glazkov.

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

    r136926 r136979  
     12012-12-07  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 Dimitri Glazkov.
     7
     8        * Platform.gypi: Remove WebThemeEngine.h
     9        * chromium/public/linux/WebThemeEngine.h: Removed.
     10
    1112012-12-06  Sami Kyostila  <skyostil@chromium.org>
    212

  • trunk/Source/Platform/Platform.gypi

    r136812 r136979  
    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

    r136978 r136979  
     12012-12-07  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 Dimitri Glazkov.
     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-07  Eric Carlson  <eric.carlson@apple.com>
    225

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

    r136862 r136979  
    16971697        ['use_default_render_theme==1', {
    16981698          'sources/': [
    1699             ['exclude', 'platform/chromium/PlatformThemeChromiumLinux.h'],
    1700             ['exclude', 'platform/chromium/PlatformThemeChromiumLinux.cpp'],
    17011699            ['exclude', 'platform/chromium/PlatformThemeChromiumWin.h'],
    17021700            ['exclude', 'platform/chromium/PlatformThemeChromiumWin.cpp'],
    1703             ['exclude', 'platform/chromium/ScrollbarThemeChromiumLinux.cpp'],
    1704             ['exclude', 'platform/chromium/ScrollbarThemeChromiumLinux.h'],
    17051701            ['exclude', 'platform/chromium/ScrollbarThemeChromiumWin.cpp'],
    17061702            ['exclude', 'platform/chromium/ScrollbarThemeChromiumWin.h'],
    17071703          ],
    1708         }],
    1709         ['use_default_render_theme==0', {
     1704        }, { # use_default_render_theme==0
    17101705          'sources/': [
    17111706            ['exclude', 'platform/chromium/PlatformThemeChromiumDefault.cpp'],
    … …  
    20092004        ['use_default_render_theme==1', {
    20102005          'sources/': [
    2011             ['exclude', 'RenderThemeChromiumLinux.*'],
    20122006            ['exclude', 'RenderThemeChromiumWin.*'],
    20132007          ],
    … …  
    20562050          'sources/': [
    20572051            ['include', 'rendering/RenderThemeChromiumFontProviderLinux\\.cpp$'],
    2058             ['include', 'rendering/RenderThemeChromiumLinux\\.cpp$'],
     2052            ['include', 'rendering/RenderThemeChromiumDefault\\.cpp$'],
    20592053          ],
    20602054        },{ # OS!="android"

  • trunk/Source/WebCore/WebCore.gypi

    r136959 r136979  
    24162416            'rendering/RenderThemeChromiumFontProviderLinux.cpp',
    24172417            'rendering/RenderThemeChromiumFontProviderWin.cpp',
    2418             'rendering/RenderThemeChromiumLinux.cpp',
    2419             'rendering/RenderThemeChromiumLinux.h',
    24202418            'rendering/RenderThemeChromiumMac.h',
    24212419            'rendering/RenderThemeChromiumMac.mm',
    … …  
    36433641            'platform/chromium/PlatformThemeChromiumDefault.cpp',
    36443642            'platform/chromium/PlatformThemeChromiumDefault.h',
    3645             'platform/chromium/PlatformThemeChromiumLinux.cpp',
    3646             'platform/chromium/PlatformThemeChromiumLinux.h',
    36473643            'platform/chromium/PlatformWidget.h',
    36483644            'platform/chromium/PopupContainer.cpp',
    … …  
    36633659            'platform/chromium/ScrollbarThemeChromiumDefault.cpp',
    36643660            'platform/chromium/ScrollbarThemeChromiumDefault.h',
    3665             'platform/chromium/ScrollbarThemeChromiumLinux.cpp',
    3666             'platform/chromium/ScrollbarThemeChromiumLinux.h',
    36673661            'platform/chromium/ScrollbarThemeChromiumMac.h',
    36683662            'platform/chromium/ScrollbarThemeChromiumMac.mm',

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

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

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

    r136812 r136979  
    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

    r136977 r136979  
     12012-12-07  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 Dimitri Glazkov.
     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-07  Stephen White  <senorblanco@chromium.org>
    219

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

    r136951 r136979  
    295295                'public/linux/WebFontRenderStyle.h',
    296296                'public/linux/WebFontRendering.h',
    297                 'public/linux/WebRenderTheme.h',
    298297                'public/mac/WebInputEventFactory.h',
    299298                'public/mac/WebSandboxSupport.h',
    … …  
    440439                'src/linux/WebFontRendering.cpp',
    441440                'src/linux/WebFontRenderStyle.cpp',
    442                 'src/linux/WebRenderTheme.cpp',
    443441                'src/x11/WebScreenInfoFactory.cpp',
    444442                'src/mac/WebInputEventFactory.mm',
    … …  
    848846                }],
    849847                ['use_default_render_theme==1', {
    850                     'sources/': [
    851                         ['exclude', 'src/linux/WebRenderTheme.cpp'],
    852                         ['exclude', 'public/linux/WebRenderTheme.h'],
    853                     ],
    854848                    'include_dirs': [
    855849                        'public/default',

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

    r136926 r136979  
    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
    … …  
    35733569#if ENABLE(DEFAULT_RENDER_THEME)
    35743570    PlatformThemeChromiumDefault::setScrollbarColors(inactiveColor, activeColor, trackColor);
    3575 #elif OS(UNIX) && !OS(DARWIN) && !OS(ANDROID)
    3576     PlatformThemeChromiumLinux::setScrollbarColors(inactiveColor, activeColor, trackColor);
    35773571#endif
    35783572}
    … …  
    35843578#if ENABLE(DEFAULT_RENDER_THEME)
    35853579    RenderThemeChromiumDefault::setSelectionColors(activeBackgroundColor, activeForegroundColor, inactiveBackgroundColor, inactiveForegroundColor);
    3586     theme()->platformColorsDidChange();
    3587 #elif OS(UNIX) && !OS(DARWIN) && !OS(ANDROID)
    3588     RenderThemeChromiumLinux::setSelectionColors(activeBackgroundColor, activeForegroundColor, inactiveBackgroundColor, inactiveForegroundColor);
    35893580    theme()->platformColorsDidChange();
    35903581#endif

  • trunk/Tools/ChangeLog

    r136965 r136979  
     12012-12-07  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 Dimitri Glazkov.
     7
     8        * Scripts/webkitpy/common/config/build_unittest.py:
     9        (ShouldBuildTest): linux->default
     10
    1112012-12-07  Mike Lattanzio  <mlattanzio@rim.com>
    212

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

    r136812 r136979  
    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.