Index: Source/core/layout/LayoutTheme.h |
diff --git a/Source/core/layout/LayoutTheme.h b/Source/core/layout/LayoutTheme.h |
index 61b01dc15c48a5737b08d3770102509f220da262..a9089eddc73371f866834fa2888a5899bc8a05ed 100644 |
--- a/Source/core/layout/LayoutTheme.h |
+++ b/Source/core/layout/LayoutTheme.h |
@@ -55,14 +55,14 @@ public: |
// appropriate platform theme. |
static LayoutTheme& theme(); |
- static void setSizeIfAuto(RenderStyle*, const IntSize&); |
+ static void setSizeIfAuto(RenderStyle&, const IntSize&); |
// This method is called whenever style has been computed for an element and the appearance |
// property has been set to a value other than "none". The theme should map in all of the appropriate |
// metrics and defaults given the contents of the style. This includes sophisticated operations like |
// selection of control size based off the font, the disabling of appearance when certain other properties like |
// "border" are set, or if the appearance is not supported by the theme. |
- void adjustStyle(RenderStyle*, Element*, const CachedUAStyle*); |
+ void adjustStyle(RenderStyle&, Element*, const CachedUAStyle*); |
// This method is called to paint the widget as a background of the RenderObject. A widget's foreground, e.g., the |
// text of a button, is always rendered by the engine itself. The boolean return value indicates |
@@ -91,7 +91,7 @@ public: |
bool isControlContainer(ControlPart) const; |
// Whether or not the control has been styled enough by the author to disable the native appearance. |
- virtual bool isControlStyled(const RenderStyle*, const CachedUAStyle*) const; |
+ virtual bool isControlStyled(const RenderStyle&, const CachedUAStyle*) const; |
// Some controls may spill out of their containers (e.g., the check on an OS X checkbox). When these controls issues paint invalidations, |
// the theme needs to communicate this inflated rect to the engine so that it can invalidate the whole control. |
@@ -104,7 +104,7 @@ public: |
bool shouldDrawDefaultFocusRing(RenderObject*) const; |
// A method asking if the theme's controls actually care about redrawing when hovered. |
- virtual bool supportsHover(const RenderStyle*) const { return false; } |
+ virtual bool supportsHover(const RenderStyle&) const { return false; } |
#if ENABLE(INPUT_MULTIPLE_FIELDS_UI) |
// A method asking if the platform is able to show a calendar picker for a given input type. |
@@ -142,14 +142,14 @@ public: |
void systemFont(CSSValueID systemFontID, FontDescription&); |
virtual Color systemColor(CSSValueID) const; |
- virtual int minimumMenuListSize(RenderStyle*) const { return 0; } |
+ virtual int minimumMenuListSize(const RenderStyle&) const { return 0; } |
- virtual void adjustSliderThumbSize(RenderStyle*, Element*) const; |
+ virtual void adjustSliderThumbSize(RenderStyle&, Element*) const; |
- virtual int popupInternalPaddingLeft(RenderStyle*) const { return 0; } |
- virtual int popupInternalPaddingRight(RenderStyle*) const { return 0; } |
- virtual int popupInternalPaddingTop(RenderStyle*) const { return 0; } |
- virtual int popupInternalPaddingBottom(RenderStyle*) const { return 0; } |
+ virtual int popupInternalPaddingLeft(const RenderStyle&) const { return 0; } |
+ virtual int popupInternalPaddingRight(const RenderStyle&) const { return 0; } |
+ virtual int popupInternalPaddingTop(const RenderStyle&) const { return 0; } |
+ virtual int popupInternalPaddingBottom(const RenderStyle&) const { return 0; } |
virtual bool popupOptionSupportsTextIndent() const { return false; } |
virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return RegularScrollbar; } |
@@ -207,22 +207,22 @@ protected: |
virtual Color platformInactiveListBoxSelectionForegroundColor() const; |
// A method asking if the theme is able to draw the focus ring. |
- virtual bool supportsFocusRing(const RenderStyle*) const; |
+ virtual bool supportsFocusRing(const RenderStyle&) const; |
#if !USE(NEW_THEME) |
// Methods for each appearance value. |
- virtual void adjustCheckboxStyle(RenderStyle*, Element*) const; |
+ virtual void adjustCheckboxStyle(RenderStyle&, Element*) const; |
virtual bool paintCheckbox(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void setCheckboxSize(RenderStyle*) const { } |
+ virtual void setCheckboxSize(RenderStyle&) const { } |
- virtual void adjustRadioStyle(RenderStyle*, Element*) const; |
+ virtual void adjustRadioStyle(RenderStyle&, Element*) const; |
virtual bool paintRadio(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void setRadioSize(RenderStyle*) const { } |
+ virtual void setRadioSize(RenderStyle&) const { } |
- virtual void adjustButtonStyle(RenderStyle*, Element*) const; |
+ virtual void adjustButtonStyle(RenderStyle&, Element*) const; |
virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustInnerSpinButtonStyle(RenderStyle*, Element*) const; |
+ virtual void adjustInnerSpinButtonStyle(RenderStyle&, Element*) const; |
virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
#endif |
@@ -230,10 +230,10 @@ protected: |
virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustMenuListStyle(RenderStyle*, Element*) const; |
+ virtual void adjustMenuListStyle(RenderStyle&, Element*) const; |
virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustMenuListButtonStyle(RenderStyle*, Element*) const; |
+ virtual void adjustMenuListButtonStyle(RenderStyle&, Element*) const; |
virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&); |
@@ -242,19 +242,19 @@ protected: |
virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustSliderThumbStyle(RenderStyle*, Element*) const; |
+ virtual void adjustSliderThumbStyle(RenderStyle&, Element*) const; |
virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustSearchFieldStyle(RenderStyle*, Element*) const; |
+ virtual void adjustSearchFieldStyle(RenderStyle&, Element*) const; |
virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustSearchFieldCancelButtonStyle(RenderStyle*, Element*) const; |
+ virtual void adjustSearchFieldCancelButtonStyle(RenderStyle&, Element*) const; |
virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const; |
+ virtual void adjustSearchFieldDecorationStyle(RenderStyle&, Element*) const; |
virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const; |
+ virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle&, Element*) const; |
virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
@@ -274,12 +274,12 @@ protected: |
virtual bool paintMediaFullScreenVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
virtual bool paintMediaFullScreenVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) { return true; } |
- virtual bool shouldUseFallbackTheme(RenderStyle*) const; |
- void adjustStyleUsingFallbackTheme(RenderStyle*, Element*); |
+ virtual bool shouldUseFallbackTheme(const RenderStyle&) const; |
+ void adjustStyleUsingFallbackTheme(RenderStyle&, Element*); |
bool paintUsingFallbackTheme(RenderObject*, const PaintInfo&, const IntRect&); |
- void adjustCheckboxStyleUsingFallbackTheme(RenderStyle*, Element*) const; |
+ void adjustCheckboxStyleUsingFallbackTheme(RenderStyle&, Element*) const; |
bool paintCheckboxUsingFallbackTheme(RenderObject*, const PaintInfo&, const IntRect&); |
- void adjustRadioStyleUsingFallbackTheme(RenderStyle*, Element*) const; |
+ void adjustRadioStyleUsingFallbackTheme(RenderStyle&, Element*) const; |
bool paintRadioUsingFallbackTheme(RenderObject*, const PaintInfo&, const IntRect&); |
public: |