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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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
« no previous file with comments | « Source/core/layout/LayoutThemeDefault.cpp ('k') | Source/core/layout/LayoutThemeMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutThemeMac.h
diff --git a/Source/core/layout/LayoutThemeMac.h b/Source/core/layout/LayoutThemeMac.h
index eedce33277e63c78ef34dc5d1744ac9ebb710ec3..908fb6e2261549a840c4b8bb7ab14ebcfa8f3c0a 100644
--- a/Source/core/layout/LayoutThemeMac.h
+++ b/Source/core/layout/LayoutThemeMac.h
@@ -38,7 +38,7 @@ public:
virtual void adjustPaintInvalidationRect(const LayoutObject*, IntRect&) override;
- virtual bool isControlStyled(const LayoutStyle&, const AuthorStyleInfo&) const override;
+ virtual bool isControlStyled(const ComputedStyle&, const AuthorStyleInfo&) 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(const LayoutStyle&) const override;
+ virtual int minimumMenuListSize(const ComputedStyle&) const override;
- virtual void adjustSliderThumbSize(LayoutStyle&, Element*) const override;
+ virtual void adjustSliderThumbSize(ComputedStyle&, Element*) const override;
virtual IntSize sliderTickSize() const override;
virtual int sliderTickOffsetFromTrackCenter() const override;
- virtual int popupInternalPaddingLeft(const LayoutStyle&) const override;
- virtual int popupInternalPaddingRight(const LayoutStyle&) const override;
- virtual int popupInternalPaddingTop(const LayoutStyle&) const override;
- virtual int popupInternalPaddingBottom(const LayoutStyle&) const override;
+ virtual int popupInternalPaddingLeft(const ComputedStyle&) const override;
+ virtual int popupInternalPaddingRight(const ComputedStyle&) const override;
+ virtual int popupInternalPaddingTop(const ComputedStyle&) const override;
+ virtual int popupInternalPaddingBottom(const ComputedStyle&) const override;
virtual bool paintCapsLockIndicator(LayoutObject*, const PaintInfo&, const IntRect&) override;
@@ -97,10 +97,10 @@ protected:
virtual bool paintTextArea(LayoutObject*, const PaintInfo&, const IntRect&) override;
virtual bool paintMenuList(LayoutObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustMenuListStyle(LayoutStyle&, Element*) const override;
+ virtual void adjustMenuListStyle(ComputedStyle&, Element*) const override;
virtual bool paintMenuListButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustMenuListButtonStyle(LayoutStyle&, Element*) const override;
+ virtual void adjustMenuListButtonStyle(ComputedStyle&, Element*) const override;
virtual bool paintProgressBar(LayoutObject*, const PaintInfo&, const IntRect&) override;
@@ -109,15 +109,15 @@ protected:
virtual bool paintSliderThumb(LayoutObject*, const PaintInfo&, const IntRect&) override;
virtual bool paintSearchField(LayoutObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustSearchFieldStyle(LayoutStyle&, Element*) const override;
+ virtual void adjustSearchFieldStyle(ComputedStyle&, Element*) const override;
- virtual void adjustSearchFieldCancelButtonStyle(LayoutStyle&, Element*) const override;
+ virtual void adjustSearchFieldCancelButtonStyle(ComputedStyle&, Element*) const override;
virtual bool paintSearchFieldCancelButton(LayoutObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustSearchFieldDecorationStyle(LayoutStyle&, Element*) const override;
+ virtual void adjustSearchFieldDecorationStyle(ComputedStyle&, Element*) const override;
virtual bool paintSearchFieldDecoration(LayoutObject*, const PaintInfo&, const IntRect&) override;
- virtual void adjustSearchFieldResultsDecorationStyle(LayoutStyle&, Element*) const override;
+ virtual void adjustSearchFieldResultsDecorationStyle(ComputedStyle&, Element*) const override;
virtual bool paintSearchFieldResultsDecoration(LayoutObject*, const PaintInfo&, const IntRect&) override;
private:
@@ -126,13 +126,13 @@ private:
FloatRect convertToPaintingRect(const LayoutObject* inputRenderer, const LayoutObject* 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(const LayoutStyle&) const;
- NSControlSize controlSizeForSystemFont(const LayoutStyle&) const;
+ NSControlSize controlSizeForFont(const ComputedStyle&) const;
+ NSControlSize controlSizeForSystemFont(const ComputedStyle&) const;
void setControlSize(NSCell*, const IntSize* sizes, const IntSize& minSize, float zoomLevel = 1.0f);
- void setSizeFromFont(LayoutStyle&, const IntSize* sizes) const;
- IntSize sizeForFont(const LayoutStyle&, const IntSize* sizes) const;
- IntSize sizeForSystemFont(const LayoutStyle&, const IntSize* sizes) const;
- void setFontFromControlSize(LayoutStyle&, NSControlSize) const;
+ void setSizeFromFont(ComputedStyle&, const IntSize* sizes) const;
+ IntSize sizeForFont(const ComputedStyle&, const IntSize* sizes) const;
+ IntSize sizeForSystemFont(const ComputedStyle&, const IntSize* sizes) const;
+ void setFontFromControlSize(ComputedStyle&, NSControlSize) const;
void updateCheckedState(NSCell*, const LayoutObject*);
void updateEnabledState(NSCell*, const LayoutObject*);
@@ -151,7 +151,7 @@ private:
const IntSize* cancelButtonSizes() const;
const IntSize* resultsButtonSizes() const;
void setSearchCellState(LayoutObject*, const IntRect&);
- void setSearchFieldSize(LayoutStyle&) const;
+ void setSearchFieldSize(ComputedStyle&) const;
NSPopUpButtonCell* popupButton() const;
NSSearchFieldCell* search() const;
@@ -160,12 +160,12 @@ private:
NSLevelIndicatorStyle levelIndicatorStyleFor(ControlPart) const;
NSLevelIndicatorCell* levelIndicatorFor(const LayoutMeter*) const;
- int minimumProgressBarHeight(const LayoutStyle&) const;
+ int minimumProgressBarHeight(const ComputedStyle&) const;
const IntSize* progressBarSizes() const;
const int* progressBarMargins(NSControlSize) const;
protected:
- virtual void adjustMediaSliderThumbSize(LayoutStyle&) const;
+ virtual void adjustMediaSliderThumbSize(ComputedStyle&) const;
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;
@@ -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(LayoutObject*) const;
- virtual bool shouldUseFallbackTheme(const LayoutStyle&) const override;
+ virtual bool shouldUseFallbackTheme(const ComputedStyle&) const override;
private:
virtual void updateActiveState(NSCell*, const LayoutObject*);
« no previous file with comments | « Source/core/layout/LayoutThemeDefault.cpp ('k') | Source/core/layout/LayoutThemeMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698