From 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 11 Aug 2009 17:01:47 +0100 Subject: Merge in WebKit r47029. --- WebCore/rendering/RenderThemeChromiumMac.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'WebCore/rendering/RenderThemeChromiumMac.h') diff --git a/WebCore/rendering/RenderThemeChromiumMac.h b/WebCore/rendering/RenderThemeChromiumMac.h index f072000..ffb2548 100644 --- a/WebCore/rendering/RenderThemeChromiumMac.h +++ b/WebCore/rendering/RenderThemeChromiumMac.h @@ -3,6 +3,7 @@ * * Copyright (C) 2005 Apple Computer, Inc. * Copyright (C) 2008, 2009 Google, Inc. + * Copyright (C) 2009 Kenneth Rohde Christiansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -41,8 +42,7 @@ namespace WebCore { class RenderThemeChromiumMac : public RenderTheme { public: - RenderThemeChromiumMac(); - virtual ~RenderThemeChromiumMac(); + static PassRefPtr create(); // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of @@ -62,7 +62,9 @@ namespace WebCore { virtual Color platformActiveSelectionBackgroundColor() const; virtual Color platformInactiveSelectionBackgroundColor() const; - virtual Color activeListBoxSelectionBackgroundColor() const; + virtual Color platformActiveListBoxSelectionBackgroundColor() const; + + virtual Color platformFocusRingColor() const; virtual void platformColorsDidChange(); @@ -140,6 +142,9 @@ namespace WebCore { virtual bool paintMediaSliderThumb(RenderObject*, const RenderObject::PaintInfo&, const IntRect&); private: + RenderThemeChromiumMac(); + virtual ~RenderThemeChromiumMac(); + IntRect inflateRect(const IntRect&, const IntSize&, const int* margins, float zoomLevel = 1.0f) const; // Get the control size based off the font. Used by some of the controls (like buttons). -- cgit v1.1