Split ThemePainter out of LayoutTheme

Source/core/layout/LayoutThemeDefault.h

 /*
  * 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
@@ skipping 13 matching lines @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef LayoutThemeDefault_h
 #define LayoutThemeDefault_h
 
 #include "core/CoreExport.h"
 #include "core/layout/LayoutTheme.h"
+#include "core/paint/ThemePainterDefault.h"
 
 namespace blink {
 
 class LayoutProgress;
 
 class CORE_EXPORT LayoutThemeDefault : public LayoutTheme {
 public:
     virtual String extraDefaultStyleSheet() override;
     virtual String extraQuirksStyleSheet() override;
 
@@ skipping 11 matching lines @@
     virtual Color platformInactiveSelectionBackgroundColor() const override;
     virtual Color platformActiveSelectionForegroundColor() const override;
     virtual Color platformInactiveSelectionForegroundColor() const override;
 
     virtual IntSize sliderTickSize() const override;
     virtual int sliderTickOffsetFromTrackCenter() const override;
     virtual void adjustSliderThumbSize(ComputedStyle&, Element*) const override;
 
     static void setCaretBlinkInterval(double);
 
-    virtual bool paintCheckbox(LayoutObject*, const PaintInfo&, const IntRect&) override;
     virtual void setCheckboxSize(ComputedStyle&) const override;
-
-    virtual bool paintRadio(LayoutObject*, const PaintInfo&, const IntRect&) override;
     virtual void setRadioSize(ComputedStyle&) const override;
-
-    virtual bool paintButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintTextField(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMenuList(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMenuListButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintSliderTrack(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintSliderThumb(LayoutObject*, const PaintInfo&, const IntRect&) override;
-
     virtual void adjustInnerSpinButtonStyle(ComputedStyle&, Element*) const override;
-    virtual bool paintInnerSpinButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
 
     virtual bool popsMenuBySpaceKey() const override final { return true; }
     virtual bool popsMenuByReturnKey() const override final { return true; }
     virtual bool popsMenuByAltDownUpOrF4Key() const override { return true; }
 
-    virtual bool paintProgressBar(LayoutObject*, const PaintInfo&, const IntRect&) override;
-
     virtual bool shouldOpenPickerWithF4Key() const override;
 
     virtual Color platformTapHighlightColor() const override
     {
         return Color(defaultTapHighlightColor);
     }
 
     // A method asking if the theme's controls actually care about redrawing
     // when hovered.
     virtual bool supportsHover(const ComputedStyle&) const override final;
 
     virtual Color platformFocusRingColor() const override;
 
     virtual double caretBlinkInterval() const final;
 
     // System fonts.
     virtual void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, float& fontSize, AtomicString& fontFamily) const;
 
     virtual int minimumMenuListSize(const ComputedStyle&) const override;
 
     virtual void adjustButtonStyle(ComputedStyle&, Element*) const override;
-
-    virtual bool paintTextArea(LayoutObject*, const PaintInfo&, const IntRect&) override;
-
     virtual void adjustSearchFieldStyle(ComputedStyle&, Element*) const override;
-    virtual bool paintSearchField(LayoutObject*, const PaintInfo&, const IntRect&) override;
-
     virtual void adjustSearchFieldCancelButtonStyle(ComputedStyle&, Element*) const override;
-    virtual bool paintSearchFieldCancelButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-
     virtual void adjustSearchFieldDecorationStyle(ComputedStyle&, Element*) const override;
-
     virtual void adjustSearchFieldResultsDecorationStyle(ComputedStyle&, Element*) const override;
-    virtual bool paintSearchFieldResultsDecoration(LayoutObject*, const PaintInfo&, const IntRect&) override;
-
-    virtual bool paintMediaSliderTrack(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaVolumeSliderTrack(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaSliderThumb(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaToggleClosedCaptionsButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaCastButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaVolumeSliderThumb(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaPlayButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaOverlayPlayButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual bool paintMediaMuteButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
-    virtual String formatMediaControlsTime(float time) const override;
-    virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const override;
-    virtual bool paintMediaFullscreenButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
 
     // MenuList refers to an unstyled menulist (meaning a menulist without
     // background-color or border set) and MenuListButton refers to a styled
     // menulist (a menulist with background-color or border set). They have
     // this distinction to support showing aqua style themes whenever they
     // possibly can, which is something we don't want to replicate.
     //
     // In short, we either go down the MenuList code path or the MenuListButton
     // codepath. We never go down both. And in both cases, they layout the
     // entire menulist.
@@ skipping 19 matching lines @@
     static void setSelectionColors(unsigned activeBackgroundColor, unsigned activeForegroundColor, unsigned inactiveBackgroundColor, unsigned inactiveForegroundColor);
 
 protected:
     LayoutThemeDefault();
     virtual ~LayoutThemeDefault();
     virtual bool shouldUseFallbackTheme(const ComputedStyle&) const override;
     virtual int menuListArrowPadding() const;
 
     IntRect determinateProgressValueRectFor(LayoutProgress*, const IntRect&) const;
     IntRect indeterminateProgressValueRectFor(LayoutProgress*, const IntRect&) const;
-    IntRect progressValueRectFor(LayoutProgress*, const IntRect&) const;
-
-    class DirectionFlippingScope {
-    public:
-        DirectionFlippingScope(LayoutObject*, const PaintInfo&, const IntRect&);
-        ~DirectionFlippingScope();
-
-    private:
-        bool m_needsFlipping;
-        const PaintInfo& m_paintInfo;
-    };
 
 private:
     virtual bool shouldShowPlaceholderWhenFocused() const override;
 
+    virtual ThemePainter& painter() override { return m_painter; }
+
     int menuListInternalPadding(const ComputedStyle&, int paddingType) const;
-    bool paintMediaButtonInternal(GraphicsContext*, const IntRect&, Image*);
-    IntRect convertToPaintingRect(LayoutObject* inputLayoutObject, const LayoutObject* partLayoutObject, LayoutRect partRect, const IntRect& localOffset) const;
 
     static const RGBA32 defaultTapHighlightColor = 0x2e000000; // 18% black.
     static double m_caretBlinkInterval;
 
     static unsigned m_activeSelectionBackgroundColor;
     static unsigned m_activeSelectionForegroundColor;
     static unsigned m_inactiveSelectionBackgroundColor;
     static unsigned m_inactiveSelectionForegroundColor;
+
+    ThemePainterDefault m_painter;
 };
 
 } // namespace blink
 
 #endif // LayoutThemeDefault_h