Clear button for date/time inputs should be zoomable

Source/core/rendering/RenderThemeChromiumMac.mm

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 719 matching lines @@
 
     // Reset line height
     style->setLineHeight(RenderStyle::initialLineHeight());
 
     if (style->setFontDescription(fontDescription))
         style->font().update(0);
 }
 
 NSControlSize RenderThemeChromiumMac::controlSizeForSystemFont(RenderStyle* style) const
 {
-    int fontSize = style->fontSize();
+    float fontSize = style->fontSize();
+    float zoomLevel = style->effectiveZoom();
+    if (zoomLevel != 1.0)

[tkent, 2013/06/13 21:54:23]

1.0 should be 1.

[keishi, 2013/06/14 05:17:01]

Done.

+        fontSize /= zoomLevel;
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSRegularControlSize])
         return NSRegularControlSize;
     if (fontSize >= [NSFont systemFontSizeForControlSize:NSSmallControlSize])
         return NSSmallControlSize;
     return NSMiniControlSize;
 }
 
 bool RenderThemeChromiumMac::paintTextField(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     LocalCurrentGraphicsContext localContext(paintInfo.context);
@@ skipping 811 matching lines @@
     updateEnabledState(search, o);
     updateFocusedState(search, o);
 }
 
 const IntSize* RenderThemeChromiumMac::searchFieldSizes() const
 {
     static const IntSize sizes[3] = { IntSize(0, 22), IntSize(0, 19), IntSize(0, 17) };
     return sizes;
 }
 
+static const int* searchFieldHorizontalPaddings()
+{
+    static const int sizes[3] = { 3, 2, 1 };
+    return sizes;
+}
+
 void RenderThemeChromiumMac::setSearchFieldSize(RenderStyle* style) const
 {
     // If the width and height are both specified, then we have nothing to do.
     if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
         return;
 
     // Use the font size to determine the intrinsic width of the control.
     setSizeFromFont(style, searchFieldSizes());
 }
 
 void RenderThemeChromiumMac::adjustSearchFieldStyle(RenderStyle* style, Element*) const
 {
     // Override border.
     style->resetBorder();
     const short borderWidth = 2 * style->effectiveZoom();
     style->setBorderLeftWidth(borderWidth);
     style->setBorderLeftStyle(INSET);
     style->setBorderRightWidth(borderWidth);
     style->setBorderRightStyle(INSET);
     style->setBorderBottomWidth(borderWidth);
     style->setBorderBottomStyle(INSET);
     style->setBorderTopWidth(borderWidth);
     style->setBorderTopStyle(INSET);
 
     // Override height.
     style->setHeight(Length(Auto));
     setSearchFieldSize(style);
 
+    NSControlSize controlSize = controlSizeForFont(style);
+
     // Override padding size to match AppKit text positioning.
-    const int padding = 1 * style->effectiveZoom();
-    style->setPaddingLeft(Length(padding, Fixed));
-    style->setPaddingRight(Length(padding, Fixed));
-    style->setPaddingTop(Length(padding, Fixed));
-    style->setPaddingBottom(Length(padding, Fixed));
+    const int verticalPadding = 1 * style->effectiveZoom();
+    const int horizontalPadding = searchFieldHorizontalPaddings()[controlSize] * style->effectiveZoom();
+    style->setPaddingLeft(Length(horizontalPadding, Fixed));
+    style->setPaddingRight(Length(horizontalPadding, Fixed));
+    style->setPaddingTop(Length(verticalPadding, Fixed));
+    style->setPaddingBottom(Length(verticalPadding, Fixed));
 
-    NSControlSize controlSize = controlSizeForFont(style);
     setFontFromControlSize(style, controlSize);
 
     style->setBoxShadow(nullptr);
 }
 
 bool RenderThemeChromiumMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
 {
     Element* input = o->node()->shadowHost();
     if (!input)
         input = toElement(o->node());
 
     if (!input->renderer()->isBox())
         return false;
 
-    LocalCurrentGraphicsContext localContext(paintInfo.context);
-
-    NSSearchFieldCell* search = this->search();
-    setSearchCellState(input->renderer(), r);
-    [search setControlSize:cancelButtonControlSizeForFont(o->style())];
-
-    if (!input->isDisabledFormControl() && (input->isTextFormControl() && !toHTMLTextFormControlElement(input)->isReadOnly())) {
-        updateActiveState([search cancelButtonCell], o);
-        updatePressedState([search cancelButtonCell], o);
-    }
-    else if ([[search cancelButtonCell] isHighlighted])
-        [[search cancelButtonCell] setHighlighted:NO];
-
     GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
     float zoomLevel = o->style()->effectiveZoom();
     FloatRect unzoomedRect(r);
     if (zoomLevel != 1.0f) {
         unzoomedRect.setWidth(unzoomedRect.width() / zoomLevel);
         unzoomedRect.setHeight(unzoomedRect.height() / zoomLevel);
         paintInfo.context->translate(unzoomedRect.x(), unzoomedRect.y());
         paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
         paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
 
-    [[search cancelButtonCell] drawWithFrame:unzoomedRect inView:documentViewFor(o)];
-    [[search cancelButtonCell] setControlView:nil];
+    Color fillColor(200, 200, 200);
+
+    if (isPressed(o)) {
+        Color tintColor(0, 0, 0, 32);
+        fillColor = fillColor.blend(tintColor);
+    }
+
+    float centerX = unzoomedRect.x() + unzoomedRect.width() / 2.0;

[tkent, 2013/06/13 21:54:23]

2.0 should be 2.

[keishi, 2013/06/14 05:17:01]

Done.

+    float centerY = unzoomedRect.y() + unzoomedRect.height() / 2.0;

[tkent, 2013/06/13 21:54:23]

ditto.

[keishi, 2013/06/14 05:17:01]

Done.

+    // The line width is 3px on a regular sized, high DPI NSCancelButtonCell
+    // (which is 28px wide).
+    float lineWidth = unzoomedRect.width() * 3 / 28;
+    // The line length is 16.5px on a regular sized, high DPI NSCancelButtonCell.
+    float lineLength = unzoomedRect.width() * 16 / 28;

[tkent, 2013/06/13 21:54:23]

Why isn't it 16.5?

[keishi, 2013/06/14 05:17:01]

16.5px looked best in my vector illustration program, but Skia seems to draw
16px and 16.5 px the same. I've changed the comment to 16.5.

+
+    Path xPath;
+    FloatSize lineRectRadius(lineWidth / 2, lineWidth / 2);
+    xPath.addRoundedRect(FloatRect(-lineLength / 2, -lineWidth / 2, lineLength, lineWidth),
+        lineRectRadius, lineRectRadius, lineRectRadius, lineRectRadius);
+    xPath.addRoundedRect(FloatRect(-lineWidth / 2, -lineLength / 2, lineWidth, lineLength),
+        lineRectRadius, lineRectRadius, lineRectRadius, lineRectRadius);
+
+    paintInfo.context->translate(centerX, centerY);
+    paintInfo.context->rotate(deg2rad(45.0));
+    paintInfo.context->clipOut(xPath);
+    paintInfo.context->rotate(deg2rad(-45.0));
+    paintInfo.context->translate(-centerX, -centerY);
+
+    paintInfo.context->setFillColor(fillColor);
+    paintInfo.context->fillEllipse(unzoomedRect);
+
     return false;
 }
 
 const IntSize* RenderThemeChromiumMac::cancelButtonSizes() const
 {
-    static const IntSize sizes[3] = { IntSize(16, 14), IntSize(13, 11), IntSize(13, 9) };
+    static const IntSize sizes[3] = { IntSize(14, 14), IntSize(11, 11), IntSize(9, 9) };
     return sizes;
 }
 
 void RenderThemeChromiumMac::adjustSearchFieldCancelButtonStyle(RenderStyle* style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, cancelButtonSizes());
     style->setWidth(Length(size.width(), Fixed));
     style->setHeight(Length(size.height(), Fixed));
     style->setBoxShadow(nullptr);
 }
 
 const IntSize* RenderThemeChromiumMac::resultsButtonSizes() const
 {
-    static const IntSize sizes[3] = { IntSize(19, 13), IntSize(17, 11), IntSize(17, 9) };
+    static const IntSize sizes[3] = { IntSize(16, 13), IntSize(16, 11), IntSize(16, 9) };
     return sizes;
 }
 
 const int emptyResultsOffset = 9;
 void RenderThemeChromiumMac::adjustSearchFieldDecorationStyle(RenderStyle* style, Element*) const
 {
     IntSize size = sizeForSystemFont(style, resultsButtonSizes());
     style->setWidth(Length(size.width() - emptyResultsOffset, Fixed));
     style->setHeight(Length(size.height(), Fixed));
     style->setBoxShadow(nullptr);
@@ skipping 286 matching lines @@
 
 bool RenderThemeChromiumMac::shouldUseFallbackTheme(RenderStyle* style) const
 {
     ControlPart part = style->appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style->effectiveZoom() != 1;
     return false;
 }
 
 } // namespace WebCore