Fix decoration position in search input field....

rendering/RenderThemeChromiumSkia.cpp

 /*
  * Copyright (C) 2007 Apple Inc.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Collabora Ltd.
  * 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.
@@ skipping 354 matching lines @@
 
 void RenderThemeChromiumSkia::adjustSearchFieldCancelButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
     // Scale the button size based on the font size
     float fontScale = style->fontSize() / defaultControlFontPixelSize;
     int cancelButtonSize = lroundf(std::min(std::max(minCancelButtonSize, defaultCancelButtonSize * fontScale), maxCancelButtonSize));
     style->setWidth(Length(cancelButtonSize, Fixed));
     style->setHeight(Length(cancelButtonSize, Fixed));
 }
 
+IntRect RenderThemeChromiumSkia::calculateParentBoxOfSearchFieldItem(RenderObject* o, const IntRect& r)
+{
+    ASSERT(o->parent());
+    if (!o->isBox() || !o->parent() || !o->parent()->isBox())
+        return IntRect();
+
+    RenderBox* renderBox = toRenderBox(o);
+    RenderBox* parentRenderBox = toRenderBox(o->parent());
+
+    IntPoint parentBoxPoint = r.location();
+    parentBoxPoint.move(-renderBox->x(), -renderBox->y());  // Restore parent box's location from r.
+    IntRect parentBox(parentBoxPoint, parentRenderBox->contentBoxRect().size());
+    return parentBox;
+}
+
 bool RenderThemeChromiumSkia::paintSearchFieldCancelButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
     IntRect bounds = r;
-    ASSERT(o->parent());
-    if (!o->parent() || !o->parent()->isBox())
+    IntRect parentBox = calculateParentBoxOfSearchFieldItem(o, r);
+    if (parentBox.isEmpty())
         return false;
 
-    RenderBox* parentRenderBox = toRenderBox(o->parent());
-
-    IntRect parentBox = parentRenderBox->absoluteContentBox();
-
     // Make sure the scaled button stays square and will fit in its parent's box
     bounds.setHeight(std::min(parentBox.width(), std::min(parentBox.height(), bounds.height())));
     bounds.setWidth(bounds.height());
 
     // Center the button vertically.  Round up though, so if it has to be one pixel off-center, it will
     // be one pixel closer to the bottom of the field.  This tends to look better with the text.
     bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
 
     static Image* cancelImage = Image::loadPlatformResource("searchCancel").releaseRef();
     static Image* cancelPressedImage = Image::loadPlatformResource("searchCancelPressed").releaseRef();
@@ skipping 14 matching lines @@
     float fontScale = style->fontSize() / defaultControlFontPixelSize;
     int magnifierSize = lroundf(std::min(std::max(minSearchFieldResultsDecorationSize, defaultSearchFieldResultsDecorationSize * fontScale),
                                          maxSearchFieldResultsDecorationSize));
     style->setWidth(Length(magnifierSize, Fixed));
     style->setHeight(Length(magnifierSize, Fixed));
 }
 
 bool RenderThemeChromiumSkia::paintSearchFieldResultsDecoration(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
     IntRect bounds = r;
-    ASSERT(o->parent());
-    if (!o->parent() || !o->parent()->isBox())
+    IntRect parentBox = calculateParentBoxOfSearchFieldItem(o, r);
+    if (parentBox.isEmpty())
         return false;
 
-    RenderBox* parentRenderBox = toRenderBox(o->parent());
-    IntRect parentBox = parentRenderBox->absoluteContentBox();
-
     // Make sure the scaled decoration stays square and will fit in its parent's box
     bounds.setHeight(std::min(parentBox.width(), std::min(parentBox.height(), bounds.height())));
     bounds.setWidth(bounds.height());
 
     // Center the decoration vertically.  Round up though, so if it has to be one pixel off-center, it will
     // be one pixel closer to the bottom of the field.  This tends to look better with the text.
     bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
 
     static Image* magnifierImage = Image::loadPlatformResource("searchMagnifier").releaseRef();
     i.context->drawImage(magnifierImage, bounds);
     return false;
 }
 
 void RenderThemeChromiumSkia::adjustSearchFieldResultsButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
     // Scale the button size based on the font size
     float fontScale = style->fontSize() / defaultControlFontPixelSize;
     int magnifierHeight = lroundf(std::min(std::max(minSearchFieldResultsDecorationSize, defaultSearchFieldResultsDecorationSize * fontScale),
                                            maxSearchFieldResultsDecorationSize));
     int magnifierWidth = lroundf(magnifierHeight * defaultSearchFieldResultsButtonWidth / defaultSearchFieldResultsDecorationSize);
     style->setWidth(Length(magnifierWidth, Fixed));
     style->setHeight(Length(magnifierHeight, Fixed));
 }
 
 bool RenderThemeChromiumSkia::paintSearchFieldResultsButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
     IntRect bounds = r;
-    ASSERT(o->parent());
-    if (!o->parent())
+    IntRect parentBox = calculateParentBoxOfSearchFieldItem(o, r);
+    if (parentBox.isEmpty())
         return false;
-    if (!o->parent() || !o->parent()->isBox())
-        return false;
-
-    RenderBox* parentRenderBox = toRenderBox(o->parent());
-    IntRect parentBox = parentRenderBox->absoluteContentBox();
 
     // Make sure the scaled decoration will fit in its parent's box
     bounds.setHeight(std::min(parentBox.height(), bounds.height()));
     bounds.setWidth(std::min(parentBox.width(), static_cast<int>(bounds.height() * defaultSearchFieldResultsButtonWidth / defaultSearchFieldResultsDecorationSize)));
 
     // Center the button vertically.  Round up though, so if it has to be one pixel off-center, it will
     // be one pixel closer to the bottom of the field.  This tends to look better with the text.
     bounds.setY(parentBox.y() + (parentBox.height() - bounds.height() + 1) / 2);
 
     static Image* magnifierImage = Image::loadPlatformResource("searchMagnifierResults").releaseRef();
@@ skipping 267 matching lines @@
     // If the MenuList actually has appearance "NoAppearance", then that means
     // we don't draw a button, so don't reserve space for it.
     const int barType = style->direction() == LTR ? RightPadding : LeftPadding;
     if (paddingType == barType && style->appearance() != NoControlPart)
         padding += ScrollbarTheme::nativeTheme()->scrollbarThickness();
 
     return padding;
 }
 
 } // namespace WebCore