| Index: Source/core/platform/Theme.h
|
| diff --git a/Source/core/platform/Theme.h b/Source/core/platform/Theme.h
|
| index e8e91ecd23393ae133aad2ad6b2c0da88d395adc..f0a20f0ba017dcd87ed41d1919450f90a6eabdb3 100644
|
| --- a/Source/core/platform/Theme.h
|
| +++ b/Source/core/platform/Theme.h
|
| @@ -20,7 +20,7 @@
|
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| #ifndef Theme_h
|
| @@ -53,7 +53,7 @@ public:
|
|
|
| // A method asking if the control changes its appearance when the window is inactive.
|
| virtual bool controlHasInactiveAppearance(ControlPart) const { return false; }
|
| -
|
| +
|
| // General methods for whether or not any of the controls in the theme change appearance when the window is inactive or
|
| // when hovered over.
|
| virtual bool controlsCanHaveInactiveAppearance() const { return false; }
|
| @@ -67,11 +67,11 @@ public:
|
| // Methods for obtaining platform-specific colors.
|
| virtual Color selectionColor(ControlPart, ControlState, SelectionPart) const { return Color(); }
|
| virtual Color textSearchHighlightColor() const { return Color(); }
|
| -
|
| +
|
| // CSS system colors and fonts
|
| virtual Color systemColor(ThemeColor) const { return Color(); }
|
| virtual Font systemFont(ThemeFont, FontDescription&) const { return Font(); }
|
| -
|
| +
|
| // How fast the caret blinks in text fields.
|
| virtual double caretBlinkInterval() const { return 0.5; }
|
|
|
| @@ -79,20 +79,20 @@ public:
|
| virtual void themeChanged() { }
|
|
|
| // Methods used to adjust the RenderStyles of controls.
|
| -
|
| +
|
| // The font description result should have a zoomed font size.
|
| virtual FontDescription controlFont(ControlPart, const Font& font, float /*zoomFactor*/) const { return font.fontDescription(); }
|
| -
|
| +
|
| // The size here is in zoomed coordinates already. If a new size is returned, it also needs to be in zoomed coordinates.
|
| virtual LengthSize controlSize(ControlPart, const Font&, const LengthSize& zoomedSize, float /*zoomFactor*/) const { return zoomedSize; }
|
| -
|
| - // Returns the minimum size for a control in zoomed coordinates.
|
| +
|
| + // Returns the minimum size for a control in zoomed coordinates.
|
| virtual LengthSize minimumControlSize(ControlPart, const Font&, float /*zoomFactor*/) const { return LengthSize(Length(0, Fixed), Length(0, Fixed)); }
|
| -
|
| +
|
| // Allows the theme to modify the existing padding/border.
|
| virtual LengthBox controlPadding(ControlPart, const Font&, const LengthBox& zoomedBox, float zoomFactor) const;
|
| virtual LengthBox controlBorder(ControlPart, const Font&, const LengthBox& zoomedBox, float zoomFactor) const;
|
| -
|
| +
|
| // Whether or not whitespace: pre should be forced on always.
|
| virtual bool controlRequiresPreWhiteSpace(ControlPart) const { return false; }
|
|
|
| @@ -104,7 +104,7 @@ public:
|
| // The rect passed in is in zoomed coordinates, so the inflation should take that into account and make sure the inflation
|
| // amount is also scaled by the zoomFactor.
|
| virtual void inflateControlPaintRect(ControlPart, ControlStates, IntRect& /*zoomedRect*/, float /*zoomFactor*/) const { }
|
| -
|
| +
|
| // This method is called once, from RenderTheme::adjustDefaultStyleSheet(), to let each platform adjust
|
| // the default CSS rules in html.css.
|
| static String defaultStyleSheet();
|
|
|