[chromium] Remove linux theme related files and switch to default
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2012 01:20:59 +0000 (01:20 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2012 01:20:59 +0000 (01:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=103897

Patch by Scott Violet <sky@chromium.org> on 2012-12-03
Reviewed by Darin Fisher.

Source/Platform:

* Platform.gypi: remove WebThemeEngine.h
* chromium/public/linux/WebThemeEngine.h: Removed.

Source/WebCore:

linux theme related files are now named default. This removes
linux theme files, updates build files and removes ifdefs.

Code cleanup, no new tests.

* WebCore.gyp/WebCore.gyp: Update build rules
* WebCore.gypi: Update build rules
* platform/chromium/PlatformThemeChromiumLinux.cpp: Removed.
* platform/chromium/PlatformThemeChromiumLinux.h: Removed.
* platform/chromium/ScrollbarThemeChromiumLinux.cpp: Removed.
* platform/chromium/ScrollbarThemeChromiumLinux.h: Removed.
* rendering/RenderThemeChromiumAndroid.h: Change superclass
* rendering/RenderThemeChromiumAndroid.cpp: Change call to superclass
* rendering/RenderThemeChromiumLinux.cpp: Removed.
* rendering/RenderThemeChromiumLinux.h: Removed.

Source/WebKit/chromium:

linux theme related files are now named default. This removes
linux files updates build files and removes ifdefs.

* WebKit.gyp: update rules.
* public/linux/WebRenderTheme.h: Removed.
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setScrollbarColors): Update ifdefs
(WebKit::WebViewImpl::setSelectionColors): Update ifdefs
* src/linux/WebRenderTheme.cpp: Removed.

Tools:

* Scripts/webkitpy/common/config/build_unittest.py:
(ShouldBuildTest): linux->default

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136460 268f45cc-cd09-0410-ab3c-d52691b4dbfc

21 files changed:
Source/Platform/ChangeLog
Source/Platform/Platform.gypi
Source/Platform/chromium/public/linux/WebThemeEngine.h [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/platform/chromium/PlatformThemeChromiumLinux.cpp [deleted file]
Source/WebCore/platform/chromium/PlatformThemeChromiumLinux.h [deleted file]
Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp [deleted file]
Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.h [deleted file]
Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp
Source/WebCore/rendering/RenderThemeChromiumAndroid.h
Source/WebCore/rendering/RenderThemeChromiumLinux.cpp [deleted file]
Source/WebCore/rendering/RenderThemeChromiumLinux.h [deleted file]
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/public/linux/WebRenderTheme.h [deleted file]
Source/WebKit/chromium/src/WebViewImpl.cpp
Source/WebKit/chromium/src/linux/WebRenderTheme.cpp [deleted file]
Tools/ChangeLog
Tools/Scripts/webkitpy/common/config/build_unittest.py

index 03da4fe..e4e8539 100644 (file)
@@ -1,3 +1,13 @@
+2012-12-03  Scott Violet  <sky@chromium.org>
+
+        [chromium] Remove linux theme related files and switch to default
+        https://bugs.webkit.org/show_bug.cgi?id=103897
+
+        Reviewed by Darin Fisher.
+
+        * Platform.gypi: remove WebThemeEngine.h
+        * chromium/public/linux/WebThemeEngine.h: Removed.
+
 2012-12-03  Sami Kyostila  <skyostil@chromium.org>
 
         [chromium] Tell WebInputHandlerClient when end of input is reached for current vsync period
index 36e4156..b974d38 100644 (file)
             'chromium/public/linux/WebFontInfo.h',
             'chromium/public/linux/WebFontRenderStyle.h',
             'chromium/public/linux/WebSandboxSupport.h',
-            'chromium/public/linux/WebThemeEngine.h',
             'chromium/public/mac/WebSandboxSupport.h',
             'chromium/public/mac/WebThemeEngine.h',
             'chromium/public/win/WebSandboxSupport.h',
diff --git a/Source/Platform/chromium/public/linux/WebThemeEngine.h b/Source/Platform/chromium/public/linux/WebThemeEngine.h
deleted file mode 100644 (file)
index f84f292..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebThemeEngine_h
-#define WebThemeEngine_h
-
-#include "../WebCanvas.h"
-#include "../WebColor.h"
-#include "../WebSize.h"
-
-namespace WebKit {
-
-struct WebRect;
-
-class WebThemeEngine {
-public:
-    // The UI part which is being accessed.
-    enum Part {
-        // ScrollbarTheme parts
-        PartScrollbarDownArrow,
-        PartScrollbarLeftArrow,
-        PartScrollbarRightArrow,
-        PartScrollbarUpArrow,
-        PartScrollbarHorizontalThumb,
-        PartScrollbarVerticalThumb,
-        PartScrollbarHorizontalTrack,
-        PartScrollbarVerticalTrack,
-
-        // RenderTheme parts
-        PartCheckbox,
-        PartRadio,
-        PartButton,
-        PartTextField,
-        PartMenuList,
-        PartSliderTrack,
-        PartSliderThumb,
-        PartInnerSpinButton,
-        PartProgressBar
-    };
-
-    // The current state of the associated Part.
-    enum State {
-        StateDisabled,
-        StateHover,
-        StateNormal,
-        StatePressed,
-    };
-
-    // Extra parameters for drawing the PartScrollbarHorizontalTrack and
-    // PartScrollbarVerticalTrack.
-    struct ScrollbarTrackExtraParams {
-        // The bounds of the entire track, as opposed to the part being painted.
-        int trackX;
-        int trackY;
-        int trackWidth;
-        int trackHeight;
-    };
-
-    // Extra parameters for PartCheckbox, PartPushButton and PartRadio.
-    struct ButtonExtraParams {
-        bool checked;
-        bool indeterminate; // Whether the button state is indeterminate.
-        bool isDefault; // Whether the button is default button.
-        bool hasBorder;
-        WebColor backgroundColor;
-    };
-
-    // Extra parameters for PartTextField
-    struct TextFieldExtraParams {
-        bool isTextArea;
-        bool isListbox;
-        WebColor backgroundColor;
-    };
-
-    // Extra parameters for PartMenuList
-    struct MenuListExtraParams {
-        bool hasBorder;
-        bool hasBorderRadius;
-        int arrowX;
-        int arrowY;
-        WebColor backgroundColor;
-    };
-
-    // Extra parameters for PartSliderTrack and PartSliderThumb
-    struct SliderExtraParams {
-        bool vertical;
-        bool inDrag;
-    };
-
-    // Extra parameters for PartInnerSpinButton
-    struct InnerSpinButtonExtraParams {
-        bool spinUp;
-        bool readOnly;
-    };
-
-    // Extra parameters for PartProgressBar
-    struct ProgressBarExtraParams {
-        bool determinate;
-        int valueRectX;
-        int valueRectY;
-        int valueRectWidth;
-        int valueRectHeight;
-    };
-
-    union ExtraParams {
-        ScrollbarTrackExtraParams scrollbarTrack;
-        ButtonExtraParams button;
-        TextFieldExtraParams textField;
-        MenuListExtraParams menuList;
-        SliderExtraParams slider;
-        InnerSpinButtonExtraParams innerSpin;
-        ProgressBarExtraParams progressBar;
-    };
-
-    // Gets the size of the given theme part. For variable sized items
-    // like vertical scrollbar thumbs, the width will be the required width of
-    // the track while the height will be the minimum height.
-    virtual WebSize getSize(Part) { return WebSize(); }
-    // Paint the given the given theme part.
-    virtual void paint(WebCanvas*, Part, State, const WebRect&, const ExtraParams*) { }
-};
-
-} // namespace WebKit
-
-#endif
index f6d74c1..ae540c8 100644 (file)
@@ -1,3 +1,26 @@
+2012-12-03  Scott Violet  <sky@chromium.org>
+
+        [chromium] Remove linux theme related files and switch to default
+        https://bugs.webkit.org/show_bug.cgi?id=103897
+
+        Reviewed by Darin Fisher.
+
+        linux theme related files are now named default. This removes
+        linux theme files, updates build files and removes ifdefs.
+
+        Code cleanup, no new tests.
+
+        * WebCore.gyp/WebCore.gyp: Update build rules
+        * WebCore.gypi: Update build rules
+        * platform/chromium/PlatformThemeChromiumLinux.cpp: Removed.
+        * platform/chromium/PlatformThemeChromiumLinux.h: Removed.
+        * platform/chromium/ScrollbarThemeChromiumLinux.cpp: Removed.
+        * platform/chromium/ScrollbarThemeChromiumLinux.h: Removed.
+        * rendering/RenderThemeChromiumAndroid.h: Change superclass
+        * rendering/RenderThemeChromiumAndroid.cpp: Change call to superclass
+        * rendering/RenderThemeChromiumLinux.cpp: Removed.
+        * rendering/RenderThemeChromiumLinux.h: Removed.
+
 2012-12-03  Pierre Rossi  <pierre.rossi@digia.com>
 
         [Qt] Unreviewed build fix after r136410
index f7b351f..496b86d 100644 (file)
         }],
         ['use_default_render_theme==1', {
           'sources/': [
-            ['exclude', 'platform/chromium/PlatformThemeChromiumLinux.h'],
-            ['exclude', 'platform/chromium/PlatformThemeChromiumLinux.cpp'],
             ['exclude', 'platform/chromium/PlatformThemeChromiumWin.h'],
             ['exclude', 'platform/chromium/PlatformThemeChromiumWin.cpp'],
-            ['exclude', 'platform/chromium/ScrollbarThemeChromiumLinux.cpp'],
-            ['exclude', 'platform/chromium/ScrollbarThemeChromiumLinux.h'],
             ['exclude', 'platform/chromium/ScrollbarThemeChromiumWin.cpp'],
             ['exclude', 'platform/chromium/ScrollbarThemeChromiumWin.h'],
           ],
-        }],
-        ['use_default_render_theme==0', {
+        }, { # use_default_render_theme==0
           'sources/': [
             ['exclude', 'platform/chromium/PlatformThemeChromiumDefault.cpp'],
             ['exclude', 'platform/chromium/PlatformThemeChromiumDefault.h'],
         }],
         ['use_default_render_theme==1', {
           'sources/': [
-            ['exclude', 'RenderThemeChromiumLinux.*'],
             ['exclude', 'RenderThemeChromiumWin.*'],
           ],
         }],
         ['OS=="android"', {
           'sources/': [
             ['include', 'rendering/RenderThemeChromiumFontProviderLinux\\.cpp$'],
-            ['include', 'rendering/RenderThemeChromiumLinux\\.cpp$'],
+            ['include', 'rendering/RenderThemeChromiumDefault\\.cpp$'],
           ],
         },{ # OS!="android"
           'sources/': [
index 128f87c..12583e2 100644 (file)
             'rendering/RenderThemeChromiumFontProvider.h',
             'rendering/RenderThemeChromiumFontProviderLinux.cpp',
             'rendering/RenderThemeChromiumFontProviderWin.cpp',
-            'rendering/RenderThemeChromiumLinux.cpp',
-            'rendering/RenderThemeChromiumLinux.h',
             'rendering/RenderThemeChromiumMac.h',
             'rendering/RenderThemeChromiumMac.mm',
             'rendering/RenderThemeChromiumSkia.cpp',
             'platform/chromium/PlatformSupport.h',
             'platform/chromium/PlatformThemeChromiumDefault.cpp',
             'platform/chromium/PlatformThemeChromiumDefault.h',
-            'platform/chromium/PlatformThemeChromiumLinux.cpp',
-            'platform/chromium/PlatformThemeChromiumLinux.h',
             'platform/chromium/PlatformWidget.h',
             'platform/chromium/PopupContainer.cpp',
             'platform/chromium/PopupContainer.h',
             'platform/chromium/ScrollbarThemeChromiumAndroid.h',
             'platform/chromium/ScrollbarThemeChromiumDefault.cpp',
             'platform/chromium/ScrollbarThemeChromiumDefault.h',
-            'platform/chromium/ScrollbarThemeChromiumLinux.cpp',
-            'platform/chromium/ScrollbarThemeChromiumLinux.h',
             'platform/chromium/ScrollbarThemeChromiumMac.h',
             'platform/chromium/ScrollbarThemeChromiumMac.mm',
             'platform/chromium/ScrollbarThemeChromiumWin.cpp',
diff --git a/Source/WebCore/platform/chromium/PlatformThemeChromiumLinux.cpp b/Source/WebCore/platform/chromium/PlatformThemeChromiumLinux.cpp
deleted file mode 100644 (file)
index 70cc64b..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "PlatformThemeChromiumLinux.h"
-
-namespace WebCore {
-
-unsigned PlatformThemeChromiumLinux::s_thumbInactiveColor = 0xeaeaea;
-unsigned PlatformThemeChromiumLinux::s_thumbActiveColor = 0xf4f4f4;
-unsigned PlatformThemeChromiumLinux::s_trackColor = 0xd3d3d3;
-
-void PlatformThemeChromiumLinux::setScrollbarColors(
-    SkColor inactiveColor, SkColor activeColor, SkColor trackColor)
-{
-    s_thumbInactiveColor = inactiveColor;
-    s_thumbActiveColor = activeColor;
-    s_trackColor = trackColor;
-}
-
-static SkScalar clamp(SkScalar value, SkScalar min, SkScalar max)
-{
-    return std::min(std::max(value, min), max);
-}
-
-SkColor PlatformThemeChromiumLinux::saturateAndBrighten(const SkScalar hsv[3], SkScalar saturateAmount, SkScalar brightenAmount)
-{
-    SkScalar color[3];
-    color[0] = hsv[0];
-    color[1] = clamp(hsv[1] + saturateAmount, 0.0, 1.0);
-    color[2] = clamp(hsv[2] + brightenAmount, 0.0, 1.0);
-    return SkHSVToColor(color);
-}
-
-SkColor PlatformThemeChromiumLinux::outlineColor(const SkScalar hsv1[3], const SkScalar hsv2[3])
-{
-    // GTK Theme engines have way too much control over the layout of
-    // the scrollbar. We might be able to more closely approximate its
-    // look-and-feel, if we sent whole images instead of just colors
-    // from the browser to the renderer. But even then, some themes
-    // would just break.
-    //
-    // So, instead, we don't even try to 100% replicate the look of
-    // the native scrollbar. We render our own version, but we make
-    // sure to pick colors that blend in nicely with the system GTK
-    // theme. In most cases, we can just sample a couple of pixels
-    // from the system scrollbar and use those colors to draw our
-    // scrollbar.
-    //
-    // This works fine for the track color and the overall thumb
-    // color. But it fails spectacularly for the outline color used
-    // around the thumb piece. Not all themes have a clearly defined
-    // outline. For some of them it is partially transparent, and for
-    // others the thickness is very unpredictable.
-    //
-    // So, instead of trying to approximate the system theme, we
-    // instead try to compute a reasonable looking choice based on the
-    // known color of the track and the thumb piece. This is difficult
-    // when trying to deal both with high- and low-contrast themes,
-    // and both with positive and inverted themes.
-    //
-    // The following code has been tested to look OK with all of the
-    // default GTK themes.
-    SkScalar minDiff = clamp((hsv1[1] + hsv2[1]) * 1.2, 0.28, 0.5);
-    SkScalar diff = clamp(fabs(hsv1[2] - hsv2[2]) / 2, minDiff, 0.5);
-
-    if (hsv1[2] + hsv2[2] > 1.0)
-        diff = -diff;
-
-    return saturateAndBrighten(hsv2, -0.2, diff);
-}
-
-void PlatformThemeChromiumLinux::paintArrowButton(GraphicsContext* gc, const IntRect& rect, ArrowDirection direction, ControlStates states)
-{
-    PlatformContextSkia* platformContext = gc->platformContext();
-    int widthMiddle, lengthMiddle;
-    SkPaint paint;
-    if (direction == North || direction == South) {
-        widthMiddle = rect.width() / 2 + 1;
-        lengthMiddle = rect.height() / 2 + 1;
-    } else {
-        lengthMiddle = rect.width() / 2 + 1;
-        widthMiddle = rect.height() / 2 + 1;
-    }
-
-    // Calculate button color.
-    SkScalar trackHSV[3];
-    SkColorToHSV(trackColor(), trackHSV);
-    SkColor buttonColor = saturateAndBrighten(trackHSV, 0, 0.2);
-    SkColor backgroundColor = buttonColor;
-    if (states & PressedState) {
-        SkScalar buttonHSV[3];
-        SkColorToHSV(buttonColor, buttonHSV);
-        buttonColor = saturateAndBrighten(buttonHSV, 0, -0.1);
-    } else if (states & HoverState) {
-        SkScalar buttonHSV[3];
-        SkColorToHSV(buttonColor, buttonHSV);
-        buttonColor = saturateAndBrighten(buttonHSV, 0, 0.05);
-    }
-
-    SkIRect skrect;
-    skrect.set(rect.x(), rect.y(), rect.x() + rect.width(), rect.y() + rect.height());
-    // Paint the background (the area visible behind the rounded corners).
-    paint.setColor(backgroundColor);
-    platformContext->drawIRect(skrect, paint);
-
-    // Paint the button's outline and fill the middle
-    SkPath outline;
-    switch (direction) {
-    case North:
-        outline.moveTo(rect.x() + 0.5, rect.y() + rect.height() + 0.5);
-        outline.rLineTo(0, -(rect.height() - 2));
-        outline.rLineTo(2, -2);
-        outline.rLineTo(rect.width() - 5, 0);
-        outline.rLineTo(2, 2);
-        outline.rLineTo(0, rect.height() - 2);
-        break;
-    case South:
-        outline.moveTo(rect.x() + 0.5, rect.y() - 0.5);
-        outline.rLineTo(0, rect.height() - 2);
-        outline.rLineTo(2, 2);
-        outline.rLineTo(rect.width() - 5, 0);
-        outline.rLineTo(2, -2);
-        outline.rLineTo(0, -(rect.height() - 2));
-        break;
-    case East:
-        outline.moveTo(rect.x() - 0.5, rect.y() + 0.5);
-        outline.rLineTo(rect.width() - 2, 0);
-        outline.rLineTo(2, 2);
-        outline.rLineTo(0, rect.height() - 5);
-        outline.rLineTo(-2, 2);
-        outline.rLineTo(-(rect.width() - 2), 0);
-        break;
-    case West:
-        outline.moveTo(rect.x() + rect.width() + 0.5, rect.y() + 0.5);
-        outline.rLineTo(-(rect.width() - 2), 0);
-        outline.rLineTo(-2, 2);
-        outline.rLineTo(0, rect.height() - 5);
-        outline.rLineTo(2, 2);
-        outline.rLineTo(rect.width() - 2, 0);
-        break;
-    }
-    outline.close();
-
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setColor(buttonColor);
-    platformContext->drawPath(outline, paint);
-
-    paint.setAntiAlias(true);
-    paint.setStyle(SkPaint::kStroke_Style);
-    SkScalar thumbHSV[3];
-    SkColorToHSV(thumbInactiveColor(), thumbHSV);
-    paint.setColor(outlineColor(trackHSV, thumbHSV));
-    platformContext->drawPath(outline, paint);
-
-    // If the button is disabled or read-only, the arrow is drawn with the outline color.
-    if (states & EnabledState && !(states & ReadOnlyState))
-        paint.setColor(SK_ColorBLACK);
-
-    paint.setAntiAlias(false);
-    paint.setStyle(SkPaint::kFill_Style);
-
-    SkPath path;
-    // The constants in this block of code are hand-tailored to produce good
-    // looking arrows without anti-aliasing.
-    switch (direction) {
-    case North:
-        path.moveTo(rect.x() + widthMiddle - 4, rect.y() + lengthMiddle + 2);
-        path.rLineTo(7, 0);
-        path.rLineTo(-4, -4);
-        break;
-    case South:
-        path.moveTo(rect.x() + widthMiddle - 4, rect.y() + lengthMiddle - 3);
-        path.rLineTo(7, 0);
-        path.rLineTo(-4, 4);
-        break;
-    case East:
-        path.moveTo(rect.x() + lengthMiddle - 3, rect.y() + widthMiddle - 4);
-        path.rLineTo(0, 7);
-        path.rLineTo(4, -4);
-        break;
-    case West:
-        path.moveTo(rect.x() + lengthMiddle + 1, rect.y() + widthMiddle - 5);
-        path.rLineTo(0, 9);
-        path.rLineTo(-4, -4);
-        break;
-    }
-    path.close();
-
-    platformContext->drawPath(path, paint);
-}
-
-} // namespace WebCore
-
diff --git a/Source/WebCore/platform/chromium/PlatformThemeChromiumLinux.h b/Source/WebCore/platform/chromium/PlatformThemeChromiumLinux.h
deleted file mode 100644 (file)
index 653aeb6..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PlatformThemeChromiumLinux_h
-#define PlatformThemeChromiumLinux_h
-
-#include "PlatformContextSkia.h"
-#include "SkColor.h"
-#include "SkScalar.h"
-#include "ThemeTypes.h"
-
-namespace WebCore {
-
-class PlatformThemeChromiumLinux {
-public:
-    enum ArrowDirection {
-        North,
-        East,
-        South,
-        West,
-    };
-
-    static void setScrollbarColors(unsigned inactiveColor,
-                                   unsigned activeColor,
-                                   unsigned trackColor);
-    static unsigned thumbInactiveColor() { return s_thumbInactiveColor; }
-    static unsigned thumbActiveColor() { return s_thumbActiveColor; }
-    static unsigned trackColor() { return s_trackColor; }
-
-    static SkColor saturateAndBrighten(const SkScalar hsv[3], SkScalar saturateAmount, SkScalar brightenAmount);
-    static SkColor outlineColor(const SkScalar hsv1[3], const SkScalar hsv2[3]);
-    static void paintArrowButton(GraphicsContext*, const IntRect&, ArrowDirection, ControlStates);
-
-private:
-    PlatformThemeChromiumLinux() { }
-
-    static unsigned s_thumbInactiveColor;
-    static unsigned s_thumbActiveColor;
-    static unsigned s_trackColor;
-};
-
-} // namespace WebCore
-
-#endif // PlatformThemeChromiumLinux_h
diff --git a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
deleted file mode 100644 (file)
index c88a409..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ScrollbarThemeChromiumLinux.h"
-
-#include "PlatformContextSkia.h"
-#include "PlatformMouseEvent.h"
-#include "Scrollbar.h"
-#include <public/Platform.h>
-#include <public/WebRect.h>
-#include <public/linux/WebThemeEngine.h>
-
-namespace WebCore {
-
-ScrollbarTheme* ScrollbarTheme::nativeTheme()
-{
-    DEFINE_STATIC_LOCAL(ScrollbarThemeChromiumLinux, theme, ());
-    return &theme;
-}
-
-int ScrollbarThemeChromiumLinux::scrollbarThickness(ScrollbarControlSize controlSize)
-{
-    // Horiz and Vert scrollbars are the same thickness.
-    IntSize scrollbarSize = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalTrack);
-    return scrollbarSize.width();
-}
-
-void ScrollbarThemeChromiumLinux::paintTrackPiece(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart partType)
-{
-    WebKit::WebThemeEngine::State state = scrollbar->hoveredPart() == partType ? WebKit::WebThemeEngine::StateHover : WebKit::WebThemeEngine::StateNormal;
-    IntRect alignRect = trackRect(scrollbar, false);
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = gc->platformContext()->canvas();
-    extraParams.scrollbarTrack.trackX = alignRect.x();
-    extraParams.scrollbarTrack.trackY = alignRect.y();
-    extraParams.scrollbarTrack.trackWidth = alignRect.width();
-    extraParams.scrollbarTrack.trackHeight = alignRect.height();
-    WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalTrack : WebKit::WebThemeEngine::PartScrollbarVerticalTrack, state, WebKit::WebRect(rect), &extraParams);
-}
-
-void ScrollbarThemeChromiumLinux::paintButton(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect, ScrollbarPart part)
-{
-    WebKit::WebThemeEngine::Part paintPart;
-    WebKit::WebThemeEngine::State state = WebKit::WebThemeEngine::StateNormal;
-    WebKit::WebCanvas* canvas = gc->platformContext()->canvas();
-    bool checkMin = false;
-    bool checkMax = false;
-    if (scrollbar->orientation() == HorizontalScrollbar) {
-        if (part == BackButtonStartPart) {
-            paintPart = WebKit::WebThemeEngine::PartScrollbarLeftArrow;
-            checkMin = true;
-        } else {
-            paintPart = WebKit::WebThemeEngine::PartScrollbarRightArrow;
-            checkMax = true;
-        }
-    } else {
-        if (part == BackButtonStartPart) {
-            paintPart = WebKit::WebThemeEngine::PartScrollbarUpArrow;
-            checkMin = true;
-        } else {
-            paintPart = WebKit::WebThemeEngine::PartScrollbarDownArrow;
-            checkMax = true;
-        }
-    }
-    if ((checkMin && (scrollbar->currentPos() <= 0))
-        || (checkMax && scrollbar->currentPos() == scrollbar->maximum())) {
-        state = WebKit::WebThemeEngine::StateDisabled;
-    } else {
-        if (part == scrollbar->pressedPart())
-            state = WebKit::WebThemeEngine::StatePressed;
-        else if (part == scrollbar->hoveredPart())
-            state = WebKit::WebThemeEngine::StateHover;
-    }
-    WebKit::Platform::current()->themeEngine()->paint(canvas, paintPart, state, WebKit::WebRect(rect), 0);
-}
-
-void ScrollbarThemeChromiumLinux::paintThumb(GraphicsContext* gc, ScrollbarThemeClient* scrollbar, const IntRect& rect)
-{
-    WebKit::WebThemeEngine::State state;
-    WebKit::WebCanvas* canvas = gc->platformContext()->canvas();
-    if (scrollbar->pressedPart() == ThumbPart)
-        state = WebKit::WebThemeEngine::StatePressed;
-    else if (scrollbar->hoveredPart() == ThumbPart)
-        state = WebKit::WebThemeEngine::StateHover;
-    else
-        state = WebKit::WebThemeEngine::StateNormal;
-    WebKit::Platform::current()->themeEngine()->paint(canvas, scrollbar->orientation() == HorizontalScrollbar ? WebKit::WebThemeEngine::PartScrollbarHorizontalThumb : WebKit::WebThemeEngine::PartScrollbarVerticalThumb, state, WebKit::WebRect(rect), 0);
-}
-
-bool ScrollbarThemeChromiumLinux::shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent& evt)
-{
-    return (evt.shiftKey() && evt.button() == LeftButton) || (evt.button() == MiddleButton);
-}
-
-IntSize ScrollbarThemeChromiumLinux::buttonSize(ScrollbarThemeClient* scrollbar)
-{
-    if (scrollbar->orientation() == VerticalScrollbar) {
-        IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarUpArrow);
-        return IntSize(size.width(), scrollbar->height() < 2 * size.height() ? scrollbar->height() / 2 : size.height());
-    }
-
-    // HorizontalScrollbar
-    IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarLeftArrow);
-    return IntSize(scrollbar->width() < 2 * size.width() ? scrollbar->width() / 2 : size.width(), size.height());
-}
-
-int ScrollbarThemeChromiumLinux::minimumThumbLength(ScrollbarThemeClient* scrollbar)
-{
-    if (scrollbar->orientation() == VerticalScrollbar) {
-        IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarVerticalThumb);
-        return size.height();
-    }
-
-    IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartScrollbarHorizontalThumb);
-    return size.width();
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.h b/Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.h
deleted file mode 100644 (file)
index 330d03f..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2009, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ScrollbarThemeChromiumLinux_h
-#define ScrollbarThemeChromiumLinux_h
-
-#include "ScrollbarThemeChromium.h"
-
-namespace WebCore {
-    class ScrollbarThemeChromiumLinux : public ScrollbarThemeChromium {
-    public:
-        virtual int scrollbarThickness(ScrollbarControlSize);
-
-    protected:
-        virtual void paintTrackPiece(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart);
-        virtual void paintButton(GraphicsContext*, ScrollbarThemeClient*, const IntRect&, ScrollbarPart);
-        virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRect&);
-        virtual bool shouldCenterOnThumb(ScrollbarThemeClient*, const PlatformMouseEvent&);
-        virtual IntSize buttonSize(ScrollbarThemeClient*);
-        virtual int minimumThumbLength(ScrollbarThemeClient*);
-    };
-} // namespace WebCore
-
-#endif
index d25a804..78a9cc9 100644 (file)
@@ -74,7 +74,7 @@ String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet()
 
 String RenderThemeChromiumAndroid::extraDefaultStyleSheet()
 {
-    return RenderThemeChromiumLinux::extraDefaultStyleSheet() +
+    return RenderThemeChromiumDefault::extraDefaultStyleSheet() +
         String(themeChromiumAndroidUserAgentStyleSheet, sizeof(themeChromiumAndroidUserAgentStyleSheet));
 }
 
index 027628e..ea9ec32 100644 (file)
 #ifndef RenderThemeChromiumAndroid_h
 #define RenderThemeChromiumAndroid_h
 
-#include "RenderThemeChromiumLinux.h"
+#include "RenderThemeChromiumDefault.h"
 
 namespace WebCore {
 
-class RenderThemeChromiumAndroid : public RenderThemeChromiumLinux {
+class RenderThemeChromiumAndroid : public RenderThemeChromiumDefault {
 public:
     static PassRefPtr<RenderTheme> create();
     virtual String extraDefaultStyleSheet() OVERRIDE;
diff --git a/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp b/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp
deleted file mode 100644 (file)
index 8af4fc7..0000000
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- * Copyright (C) 2008 Collabora Ltd.
- * Copyright (C) 2008, 2009 Google Inc.
- * Copyright (C) 2009 Kenneth Rohde Christiansen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "RenderThemeChromiumLinux.h"
-
-#include "CSSValueKeywords.h"
-#include "Color.h"
-#include "PaintInfo.h"
-#include "PlatformContextSkia.h"
-#include "RenderObject.h"
-#include "RenderProgress.h"
-#include "RenderSlider.h"
-#include "ScrollbarTheme.h"
-#include "UserAgentStyleSheets.h"
-#include <public/Platform.h>
-#include <public/WebRect.h>
-#include <public/linux/WebThemeEngine.h>
-
-namespace WebCore {
-
-unsigned RenderThemeChromiumLinux::m_activeSelectionBackgroundColor =
-    0xff1e90ff;
-unsigned RenderThemeChromiumLinux::m_activeSelectionForegroundColor =
-    Color::black;
-unsigned RenderThemeChromiumLinux::m_inactiveSelectionBackgroundColor =
-    0xffc8c8c8;
-unsigned RenderThemeChromiumLinux::m_inactiveSelectionForegroundColor =
-    0xff323232;
-
-double RenderThemeChromiumLinux::m_caretBlinkInterval;
-
-static const unsigned defaultButtonBackgroundColor = 0xffdddddd;
-
-static WebKit::WebThemeEngine::State getWebThemeState(const RenderTheme* theme, const RenderObject* o)
-{
-    if (!theme->isEnabled(o))
-        return WebKit::WebThemeEngine::StateDisabled;
-    if (theme->isPressed(o))
-        return WebKit::WebThemeEngine::StatePressed;
-    if (theme->isHovered(o))
-        return WebKit::WebThemeEngine::StateHover;
-
-    return WebKit::WebThemeEngine::StateNormal;
-}
-
-PassRefPtr<RenderTheme> RenderThemeChromiumLinux::create()
-{
-    return adoptRef(new RenderThemeChromiumLinux());
-}
-
-// RenderTheme::themeForPage for Android is defined in RenderThemeChromiumAndroid.cpp.
-#if !OS(ANDROID)
-PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
-{
-    static RenderTheme* rt = RenderThemeChromiumLinux::create().leakRef();
-    return rt;
-}
-#endif
-
-RenderThemeChromiumLinux::RenderThemeChromiumLinux()
-{
-    m_caretBlinkInterval = RenderTheme::caretBlinkInterval();
-}
-
-RenderThemeChromiumLinux::~RenderThemeChromiumLinux()
-{
-}
-
-Color RenderThemeChromiumLinux::systemColor(int cssValueId) const
-{
-    static const Color linuxButtonGrayColor(0xffdddddd);
-
-    if (cssValueId == CSSValueButtonface)
-        return linuxButtonGrayColor;
-    return RenderTheme::systemColor(cssValueId);
-}
-
-String RenderThemeChromiumLinux::extraDefaultStyleSheet()
-{
-    return RenderThemeChromiumSkia::extraDefaultStyleSheet() +
-           String(themeChromiumLinuxUserAgentStyleSheet, sizeof(themeChromiumLinuxUserAgentStyleSheet));
-}
-
-bool RenderThemeChromiumLinux::controlSupportsTints(const RenderObject* o) const
-{
-    return isEnabled(o);
-}
-
-Color RenderThemeChromiumLinux::activeListBoxSelectionBackgroundColor() const
-{
-    return Color(0x28, 0x28, 0x28);
-}
-
-Color RenderThemeChromiumLinux::activeListBoxSelectionForegroundColor() const
-{
-    return Color::black;
-}
-
-Color RenderThemeChromiumLinux::inactiveListBoxSelectionBackgroundColor() const
-{
-    return Color(0xc8, 0xc8, 0xc8);
-}
-
-Color RenderThemeChromiumLinux::inactiveListBoxSelectionForegroundColor() const
-{
-    return Color(0x32, 0x32, 0x32);
-}
-
-Color RenderThemeChromiumLinux::platformActiveSelectionBackgroundColor() const
-{
-    return m_activeSelectionBackgroundColor;
-}
-
-Color RenderThemeChromiumLinux::platformInactiveSelectionBackgroundColor() const
-{
-    return m_inactiveSelectionBackgroundColor;
-}
-
-Color RenderThemeChromiumLinux::platformActiveSelectionForegroundColor() const
-{
-    return m_activeSelectionForegroundColor;
-}
-
-Color RenderThemeChromiumLinux::platformInactiveSelectionForegroundColor() const
-{
-    return m_inactiveSelectionForegroundColor;
-}
-
-#if ENABLE(DATALIST_ELEMENT)
-IntSize RenderThemeChromiumLinux::sliderTickSize() const
-{
-    return IntSize(1, 6);
-}
-
-int RenderThemeChromiumLinux::sliderTickOffsetFromTrackCenter() const
-{
-    return -16;
-}
-#endif
-
-void RenderThemeChromiumLinux::adjustSliderThumbSize(RenderStyle* style, Element* element) const
-{
-    IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartSliderThumb);
-
-    if (style->appearance() == SliderThumbHorizontalPart) {
-        style->setWidth(Length(size.width(), Fixed));
-        style->setHeight(Length(size.height(), Fixed));
-    } else if (style->appearance() == SliderThumbVerticalPart) {
-        style->setWidth(Length(size.height(), Fixed));
-        style->setHeight(Length(size.width(), Fixed));
-    } else
-        RenderThemeChromiumSkia::adjustSliderThumbSize(style, element);
-}
-
-bool RenderThemeChromiumLinux::supportsControlTints() const
-{
-    return true;
-}
-
-void RenderThemeChromiumLinux::setCaretBlinkInterval(double interval)
-{
-    m_caretBlinkInterval = interval;
-}
-
-double RenderThemeChromiumLinux::caretBlinkIntervalInternal() const
-{
-    return m_caretBlinkInterval;
-}
-
-void RenderThemeChromiumLinux::setSelectionColors(
-    unsigned activeBackgroundColor,
-    unsigned activeForegroundColor,
-    unsigned inactiveBackgroundColor,
-    unsigned inactiveForegroundColor)
-{
-    m_activeSelectionBackgroundColor = activeBackgroundColor;
-    m_activeSelectionForegroundColor = activeForegroundColor;
-    m_inactiveSelectionBackgroundColor = inactiveBackgroundColor;
-    m_inactiveSelectionForegroundColor = inactiveForegroundColor;
-}
-
-bool RenderThemeChromiumLinux::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-    extraParams.button.checked = isChecked(o);
-    extraParams.button.indeterminate = isIndeterminate(o);
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartCheckbox, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-void RenderThemeChromiumLinux::setCheckboxSize(RenderStyle* style) const
-{
-    // If the width and height are both specified, then we have nothing to do.
-    if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
-        return;
-
-    IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartCheckbox);
-    setSizeIfAuto(style, size);
-}
-
-bool RenderThemeChromiumLinux::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-    extraParams.button.checked = isChecked(o);
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartRadio, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-void RenderThemeChromiumLinux::setRadioSize(RenderStyle* style) const
-{
-    // If the width and height are both specified, then we have nothing to do.
-    if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
-        return;
-
-    IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartRadio);
-    setSizeIfAuto(style, size);
-}
-
-bool RenderThemeChromiumLinux::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-    extraParams.button.isDefault = isDefault(o);
-    extraParams.button.hasBorder = true;
-    extraParams.button.backgroundColor = defaultButtonBackgroundColor;
-    if (o->hasBackground())
-        extraParams.button.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartButton, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-bool RenderThemeChromiumLinux::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    // WebThemeEngine does not handle border rounded corner and background image
-    // so return true to draw CSS border and background.
-    if (o->style()->hasBorderRadius() || o->style()->hasBackgroundImage())
-        return true;
-
-    ControlPart part = o->style()->appearance();
-
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    extraParams.textField.isTextArea = part == TextAreaPart;
-    extraParams.textField.isListbox = part == ListboxPart;
-
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-
-    // Fallback to white if the specified color object is invalid.
-    Color backgroundColor(Color::white);
-    if (o->style()->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
-        backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor);
-    extraParams.textField.backgroundColor = backgroundColor.rgb();
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartTextField, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-bool RenderThemeChromiumLinux::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    if (!o->isBox())
-        return false;
-
-    const int right = rect.x() + rect.width();
-    const int middle = rect.y() + rect.height() / 2;
-
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    extraParams.menuList.arrowX = (o->style()->direction() == RTL) ? rect.x() + 7 : right - 13;
-    extraParams.menuList.arrowY = middle;
-    const RenderBox* box = toRenderBox(o);
-    // Match Chromium Win behaviour of showing all borders if any are shown.
-    extraParams.menuList.hasBorder = box->borderRight() || box->borderLeft() || box->borderTop() || box->borderBottom();
-    extraParams.menuList.hasBorderRadius = o->style()->hasBorderRadius();
-    // Fallback to transparent if the specified color object is invalid.
-    extraParams.menuList.backgroundColor = Color::transparent;
-    if (o->hasBackground())
-        extraParams.menuList.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
-
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartMenuList, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-bool RenderThemeChromiumLinux::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-    extraParams.slider.vertical = o->style()->appearance() == SliderVerticalPart;
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderTrack, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-
-#if ENABLE(DATALIST_ELEMENT)
-    paintSliderTicks(o, i, rect);
-#endif
-
-    return false;
-}
-
-bool RenderThemeChromiumLinux::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-    extraParams.slider.vertical = o->style()->appearance() == SliderThumbVerticalPart;
-    extraParams.slider.inDrag = isPressed(o);
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartSliderThumb, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-void RenderThemeChromiumLinux::adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle* style, Element*) const
-{
-    IntSize size = WebKit::Platform::current()->themeEngine()->getSize(WebKit::WebThemeEngine::PartInnerSpinButton);
-
-    style->setWidth(Length(size.width(), Fixed));
-    style->setMinWidth(Length(size.width(), Fixed));
-}
-
-bool RenderThemeChromiumLinux::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-    extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpState);
-    extraParams.innerSpin.readOnly = isReadOnlyControl(o);
-
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartInnerSpinButton, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-#if ENABLE(PROGRESS_ELEMENT)
-
-bool RenderThemeChromiumLinux::paintProgressBar(RenderObject* o, const PaintInfo& i, const IntRect& rect)
-{
-    if (!o->isProgress())
-        return true;
-
-    RenderProgress* renderProgress = toRenderProgress(o);
-    IntRect valueRect = progressValueRectFor(renderProgress, rect);
-
-    WebKit::WebThemeEngine::ExtraParams extraParams;
-    extraParams.progressBar.determinate = renderProgress->isDeterminate();
-    extraParams.progressBar.valueRectX = valueRect.x();
-    extraParams.progressBar.valueRectY = valueRect.y();
-    extraParams.progressBar.valueRectWidth = valueRect.width();
-    extraParams.progressBar.valueRectHeight = valueRect.height();
-
-    DirectionFlippingScope scope(o, i, rect);
-    WebKit::WebCanvas* canvas = i.context->platformContext()->canvas();
-    WebKit::Platform::current()->themeEngine()->paint(canvas, WebKit::WebThemeEngine::PartProgressBar, getWebThemeState(this, o), WebKit::WebRect(rect), &extraParams);
-    return false;
-}
-
-#endif
-
-bool RenderThemeChromiumLinux::shouldOpenPickerWithF4Key() const
-{
-    return true;
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/rendering/RenderThemeChromiumLinux.h b/Source/WebCore/rendering/RenderThemeChromiumLinux.h
deleted file mode 100644 (file)
index 5fc4b35..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * This file is part of the WebKit project.
- *
- * Copyright (C) 2006 Apple Computer, Inc.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
- * Copyright (C) 2007 Holger Hans Peter Freyther
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- * Copyright (C) 2008, 2009 Google, Inc.
- * All rights reserved.
- * Copyright (C) 2009 Kenneth Rohde Christiansen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef RenderThemeChromiumLinux_h
-#define RenderThemeChromiumLinux_h
-
-#include "RenderThemeChromiumSkia.h"
-
-namespace WebCore {
-
-    class RenderThemeChromiumLinux : public RenderThemeChromiumSkia {
-    public:
-        static PassRefPtr<RenderTheme> create();
-        virtual String extraDefaultStyleSheet();
-
-        virtual Color systemColor(int cssValidId) const;
-
-        // A method asking if the control changes its tint when the window has focus or not.
-        virtual bool controlSupportsTints(const RenderObject*) const;
-
-        // List Box selection color
-        virtual Color activeListBoxSelectionBackgroundColor() const;
-        virtual Color activeListBoxSelectionForegroundColor() const;
-        virtual Color inactiveListBoxSelectionBackgroundColor() const;
-        virtual Color inactiveListBoxSelectionForegroundColor() const;
-
-        virtual Color platformActiveSelectionBackgroundColor() const;
-        virtual Color platformInactiveSelectionBackgroundColor() const;
-        virtual Color platformActiveSelectionForegroundColor() const;
-        virtual Color platformInactiveSelectionForegroundColor() const;
-
-#if ENABLE(DATALIST_ELEMENT)
-        virtual IntSize sliderTickSize() const OVERRIDE;
-        virtual int sliderTickOffsetFromTrackCenter() const OVERRIDE;
-#endif
-        virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
-
-        static void setCaretBlinkInterval(double interval);
-        virtual double caretBlinkIntervalInternal() const;
-
-        virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&);
-        virtual void setCheckboxSize(RenderStyle*) const;
-
-        virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&);
-        virtual void setRadioSize(RenderStyle*) const;
-
-        virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
-        virtual bool paintTextField(RenderObject*, const PaintInfo&, const IntRect&);
-        virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
-        virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
-        virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
-
-        virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
-        virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&);
-
-        virtual bool popsMenuBySpaceOrReturn() const OVERRIDE { return true; }
-
-#if ENABLE(PROGRESS_ELEMENT)
-        virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&);
-#endif
-
-        virtual bool shouldOpenPickerWithF4Key() const OVERRIDE;
-
-        static void setSelectionColors(unsigned activeBackgroundColor,
-                                       unsigned activeForegroundColor,
-                                       unsigned inactiveBackgroundColor,
-                                       unsigned inactiveForegroundColor);
-
-    protected:
-        RenderThemeChromiumLinux();
-        virtual ~RenderThemeChromiumLinux();
-
-    private:
-        // A general method asking if any control tinting is supported at all.
-        virtual bool supportsControlTints() const;
-
-        static double m_caretBlinkInterval;
-
-        static unsigned m_activeSelectionBackgroundColor;
-        static unsigned m_activeSelectionForegroundColor;
-        static unsigned m_inactiveSelectionBackgroundColor;
-        static unsigned m_inactiveSelectionForegroundColor;
-    };
-
-} // namespace WebCore
-
-#endif // RenderThemeChromiumLinux_h
index 24919ec..15b3d47 100644 (file)
@@ -1,3 +1,20 @@
+2012-12-03  Scott Violet  <sky@chromium.org>
+
+        [chromium] Remove linux theme related files and switch to default
+        https://bugs.webkit.org/show_bug.cgi?id=103897
+
+        Reviewed by Darin Fisher.
+
+        linux theme related files are now named default. This removes
+        linux files updates build files and removes ifdefs.
+
+        * WebKit.gyp: update rules.
+        * public/linux/WebRenderTheme.h: Removed.
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setScrollbarColors): Update ifdefs
+        (WebKit::WebViewImpl::setSelectionColors): Update ifdefs
+        * src/linux/WebRenderTheme.cpp: Removed.
+
 2012-12-03  Fady Samuel  <fsamuel@chromium.org>
 
         [Chromium] Expose removeAttribute in WebElement
index cb153ea..da95ec7 100644 (file)
                 'src/linux/WebFontInfo.cpp',
                 'src/linux/WebFontRendering.cpp',
                 'src/linux/WebFontRenderStyle.cpp',
-                'src/linux/WebRenderTheme.cpp',
                 'src/x11/WebScreenInfoFactory.cpp',
                 'src/mac/WebInputEventFactory.mm',
                 'src/mac/WebScreenInfoFactory.mm',
                     ],
                 }],
                 ['use_default_render_theme==1', {
-                    'sources/': [
-                        ['exclude', 'src/linux/WebRenderTheme.cpp'],
-                        ['exclude', 'public/linux/WebRenderTheme.h'],
-                    ],
                     'include_dirs': [
                         'public/default',
                     ],
diff --git a/Source/WebKit/chromium/public/linux/WebRenderTheme.h b/Source/WebKit/chromium/public/linux/WebRenderTheme.h
deleted file mode 100644 (file)
index ae517c6..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2009 Joel Stanley. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebRenderTheme_h
-#define WebRenderTheme_h
-
-#include "../platform/WebCommon.h"
-
-namespace WebKit {
-
-// Set caret blink interval for text input areas.
-WEBKIT_EXPORT void setCaretBlinkInterval(double);
-
-} // namespace WebKit
-
-#endif
index f66ae48..6f41939 100644 (file)
 #include "RenderThemeChromiumWin.h"
 #endif
 #else
-#if OS(UNIX) && !OS(DARWIN) && !ENABLE(DEFAULT_RENDER_THEME)
-#include "PlatformThemeChromiumLinux.h"
-#include "RenderThemeChromiumLinux.h"
-#endif
 #include "RenderTheme.h"
 #endif
 
@@ -3573,8 +3569,6 @@ void WebViewImpl::setScrollbarColors(unsigned inactiveColor,
                                      unsigned trackColor) {
 #if ENABLE(DEFAULT_RENDER_THEME)
     PlatformThemeChromiumDefault::setScrollbarColors(inactiveColor, activeColor, trackColor);
-#elif OS(UNIX) && !OS(DARWIN) && !OS(ANDROID)
-    PlatformThemeChromiumLinux::setScrollbarColors(inactiveColor, activeColor, trackColor);
 #endif
 }
 
@@ -3585,9 +3579,6 @@ void WebViewImpl::setSelectionColors(unsigned activeBackgroundColor,
 #if ENABLE(DEFAULT_RENDER_THEME)
     RenderThemeChromiumDefault::setSelectionColors(activeBackgroundColor, activeForegroundColor, inactiveBackgroundColor, inactiveForegroundColor);
     theme()->platformColorsDidChange();
-#elif OS(UNIX) && !OS(DARWIN) && !OS(ANDROID)
-    RenderThemeChromiumLinux::setSelectionColors(activeBackgroundColor, activeForegroundColor, inactiveBackgroundColor, inactiveForegroundColor);
-    theme()->platformColorsDidChange();
 #endif
 }
 
diff --git a/Source/WebKit/chromium/src/linux/WebRenderTheme.cpp b/Source/WebKit/chromium/src/linux/WebRenderTheme.cpp
deleted file mode 100644 (file)
index 16ea22c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2010 Joel Stanley. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebRenderTheme.h"
-
-#include "RenderThemeChromiumLinux.h"
-#include "WebView.h"
-
-using WebCore::RenderTheme;
-using WebCore::RenderThemeChromiumLinux;
-
-namespace WebKit {
-
-void setCaretBlinkInterval(double interval)
-{
-    RenderThemeChromiumLinux::setCaretBlinkInterval(interval);
-}
-
-} // namespace WebKit
index ffad86c..30f5b9a 100644 (file)
@@ -1,3 +1,13 @@
+2012-12-03  Scott Violet  <sky@chromium.org>
+
+        [chromium] Remove linux theme related files and switch to default
+        https://bugs.webkit.org/show_bug.cgi?id=103897
+
+        Reviewed by Darin Fisher.
+
+        * Scripts/webkitpy/common/config/build_unittest.py:
+        (ShouldBuildTest): linux->default
+
 2012-12-03  Roger Fong  <roger_fong@apple.com>
 
         Disable WebKit2 API tests on Apple Windows port.
index c496179..ac0deca 100644 (file)
@@ -52,7 +52,7 @@ class ShouldBuildTest(unittest.TestCase):
         (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-leopard", "mac-lion",  "mac-mountainlion", "mac-snowleopard"]),
-        (["Source/WebCore/rendering/RenderThemeChromiumLinux.h"], ["chromium-linux"]),
+        (["Source/WebCore/rendering/RenderThemeChromiumDefault.h"], ["chromium-linux"]),
         (["Source/WebCore/rendering/RenderThemeWinCE.h"], []),
         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
     ]