Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1316)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/layout/LayoutThemeChromiumMac.h

Issue 894393003: Constify and use reference for RenderStyle in LayoutTheme (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« Source/core/layout/LayoutTheme.cpp ('K') | « Source/core/layout/LayoutThemeChromiumDefault.cpp ('k') | Source/core/layout/LayoutThemeChromiumMac.mm » ('j') | Source/core/layout/LayoutThemeChromiumMac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutThemeChromiumMac.h
diff --git a/Source/core/layout/LayoutThemeChromiumMac.h b/Source/core/layout/LayoutThemeChromiumMac.h
index 65845e720a4c55af026bde9f9d502ed6e39ff88f..71cd9aa82ac576793bb40347301647d6f296b6fd 100644
--- a/Source/core/layout/LayoutThemeChromiumMac.h
+++ b/Source/core/layout/LayoutThemeChromiumMac.h
@@ -38,7 +38,7 @@ public:
virtual void adjustPaintInvalidationRect(const RenderObject*, IntRect&) override;
- virtual bool isControlStyled(const RenderStyle*, const CachedUAStyle*) const override;
+ virtual bool isControlStyled(const RenderStyle&, const CachedUAStyle*) const override;
virtual Color platformActiveSelectionBackgroundColor() const override;
virtual Color platformInactiveSelectionBackgroundColor() const override;
@@ -56,17 +56,17 @@ public:
// System fonts.
virtual void systemFont(CSSValueID systemFontID, FontStyle&, FontWeight&, float& fontSize, AtomicString& fontFamily) const override;
- virtual int minimumMenuListSize(RenderStyle*) const override;
+ virtual int minimumMenuListSize(const RenderStyle&) const override;
- virtual void adjustSliderThumbSize(RenderStyle*, Element*) const override;
+ virtual void adjustSliderThumbSize(RenderStyle&, Element*) const override;
virtual IntSize sliderTickSize() const override;
virtual int sliderTickOffsetFromTrackCenter() const override;
- virtual int popupInternalPaddingLeft(RenderStyle*) const override;
- virtual int popupInternalPaddingRight(RenderStyle*) const override;
- virtual int popupInternalPaddingTop(RenderStyle*) const override;
- virtual int popupInternalPaddingBottom(RenderStyle*) const override;
+ virtual int popupInternalPaddingLeft(const RenderStyle&) const override;
+ virtual int popupInternalPaddingRight(const RenderStyle&) const override;
+ virtual int popupInternalPaddingTop(const RenderStyle&) const override;
+ virtual int popupInternalPaddingBottom(const RenderStyle&) const override;
virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&) override;
@@ -97,10 +97,10 @@ protected:
virtual bool paintTextArea(RenderObject*, const PaintInfo&, const IntRect&) override;
virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustMenuListStyle(RenderStyle*, Element*) const override;
+ virtual void adjustMenuListStyle(RenderStyle&, Element*) const override;
virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustMenuListButtonStyle(RenderStyle*, Element*) const override;
+ virtual void adjustMenuListButtonStyle(RenderStyle&, Element*) const override;
virtual bool paintProgressBar(RenderObject*, const PaintInfo&, const IntRect&) override;
@@ -109,15 +109,15 @@ protected:
virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&) override;
virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustSearchFieldStyle(RenderStyle*, Element*) const override;
+ virtual void adjustSearchFieldStyle(RenderStyle&, Element*) const override;
- virtual void adjustSearchFieldCancelButtonStyle(RenderStyle*, Element*) const override;
+ virtual void adjustSearchFieldCancelButtonStyle(RenderStyle&, Element*) const override;
virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustSearchFieldDecorationStyle(RenderStyle*, Element*) const override;
+ virtual void adjustSearchFieldDecorationStyle(RenderStyle&, Element*) const override;
virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle*, Element*) const override;
+ virtual void adjustSearchFieldResultsDecorationStyle(RenderStyle&, Element*) const override;
virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&) override;
private:
@@ -126,13 +126,13 @@ private:
FloatRect convertToPaintingRect(const RenderObject* inputRenderer, const RenderObject* partRenderer, const FloatRect& inputRect, const IntRect&) const;
// Get the control size based off the font. Used by some of the controls (like buttons).
- NSControlSize controlSizeForFont(RenderStyle*) const;
- NSControlSize controlSizeForSystemFont(RenderStyle*) const;
+ NSControlSize controlSizeForFont(RenderStyle&) const;
+ NSControlSize controlSizeForSystemFont(RenderStyle&) const;
void setControlSize(NSCell*, const IntSize* sizes, const IntSize& minSize, float zoomLevel = 1.0f);
- void setSizeFromFont(RenderStyle*, const IntSize* sizes) const;
- IntSize sizeForFont(RenderStyle*, const IntSize* sizes) const;
- IntSize sizeForSystemFont(RenderStyle*, const IntSize* sizes) const;
- void setFontFromControlSize(RenderStyle*, NSControlSize) const;
+ void setSizeFromFont(RenderStyle&, const IntSize* sizes) const;
+ IntSize sizeForFont(const RenderStyle&, const IntSize* sizes) const;
+ IntSize sizeForSystemFont(const RenderStyle&, const IntSize* sizes) const;
+ void setFontFromControlSize(RenderStyle&, NSControlSize) const;
void updateCheckedState(NSCell*, const RenderObject*);
void updateEnabledState(NSCell*, const RenderObject*);
@@ -151,7 +151,7 @@ private:
const IntSize* cancelButtonSizes() const;
const IntSize* resultsButtonSizes() const;
void setSearchCellState(RenderObject*, const IntRect&);
- void setSearchFieldSize(RenderStyle*) const;
+ void setSearchFieldSize(RenderStyle&) const;
NSPopUpButtonCell* popupButton() const;
NSSearchFieldCell* search() const;
@@ -160,12 +160,12 @@ private:
NSLevelIndicatorStyle levelIndicatorStyleFor(ControlPart) const;
NSLevelIndicatorCell* levelIndicatorFor(const RenderMeter*) const;
- int minimumProgressBarHeight(RenderStyle*) const;
+ int minimumProgressBarHeight(RenderStyle&) const;
const IntSize* progressBarSizes() const;
const int* progressBarMargins(NSControlSize) const;
protected:
- virtual void adjustMediaSliderThumbSize(RenderStyle*) const;
+ virtual void adjustMediaSliderThumbSize(RenderStyle&) const;
virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&) override;
virtual bool paintMediaOverlayPlayButton(RenderObject*, const PaintInfo&, const IntRect&) override;
virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&) override;
@@ -186,7 +186,7 @@ protected:
// A view associated to the contained document. Subclasses may not have such a view and return a fake.
NSView* documentViewFor(RenderObject*) const;
- virtual bool shouldUseFallbackTheme(RenderStyle*) const override;
+ virtual bool shouldUseFallbackTheme(const RenderStyle&) const override;
private:
virtual void updateActiveState(NSCell*, const RenderObject*);
« Source/core/layout/LayoutTheme.cpp ('K') | « Source/core/layout/LayoutThemeChromiumDefault.cpp ('k') | Source/core/layout/LayoutThemeChromiumMac.mm » ('j') | Source/core/layout/LayoutThemeChromiumMac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698