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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix a crashers (everything is building!) Created 5 years, 11 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
Index: Source/core/layout/LayoutThemeChromiumMac.h
diff --git a/Source/core/layout/LayoutThemeChromiumMac.h b/Source/core/layout/LayoutThemeChromiumMac.h
index 65845e720a4c55af026bde9f9d502ed6e39ff88f..3d2adb425c26befd0e408e54271e2fc0c50e56c8 100644
--- a/Source/core/layout/LayoutThemeChromiumMac.h
+++ b/Source/core/layout/LayoutThemeChromiumMac.h
@@ -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 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;
@@ -126,12 +126,12 @@ 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(const RenderStyle*) const;
+ NSControlSize controlSizeForSystemFont(const 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;
+ 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*);
@@ -160,7 +160,7 @@ private:
NSLevelIndicatorStyle levelIndicatorStyleFor(ControlPart) const;
NSLevelIndicatorCell* levelIndicatorFor(const RenderMeter*) const;
- int minimumProgressBarHeight(RenderStyle*) const;
+ int minimumProgressBarHeight(const RenderStyle*) const;
const IntSize* progressBarSizes() const;
const int* progressBarMargins(NSControlSize) const;
@@ -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*);

Powered by Google App Engine
This is Rietveld 408576698