Add support for arbitrarily transformed Windows buttons text field...

webkit/port/rendering/RenderThemeWin.cpp

 /*
  * This file is part of the WebKit project.
  *
  * Copyright (C) 2006 Apple Computer, 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 15 matching lines @@
 #include <windows.h>
 #include <uxtheme.h>
 #include <vssym32.h>
 
 #include "CSSValueKeywords.h"
 #include "Document.h"
 #include "FontSelector.h"
 #include "GraphicsContext.h"
 #include "ScrollbarTheme.h"
 #include "SkiaUtils.h"
+#include "ThemeHelperWin.h"
 
 #include "base/gfx/native_theme.h"
 #include "base/gfx/font_utils.h"
 #include "base/gfx/skia_utils.h"
 #include "base/win_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 // These enums correspond to similarly named values defined by SafariTheme.h
 enum ControlSize {
     RegularControlSize,
@@ skipping 429 matching lines @@
 
     return result;
 }
 
 bool RenderThemeWin::paintButton(RenderObject* o,
                                  const RenderObject::PaintInfo& i,
                                  const IntRect& r)
 {
     const ThemeData& themeData = getThemeData(o);
 
-    RECT rect;
-    rect.left = r.x();
-    rect.top = r.y();
-    rect.right = r.right();
-    rect.bottom = r.bottom();
+    WebCore::ThemeHelperWin helper(i.context, r);
+    gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
 
-    HDC hdc = i.context->platformContext()->canvas()->beginPlatformPaint();
+    HDC hdc = canvas->beginPlatformPaint();
     int state = themeData.m_state;
+    RECT renderRect = helper.rect();
+
     gfx::NativeTheme::instance()->PaintButton(hdc,
                                               themeData.m_part,
                                               state,
                                               themeData.m_classicState,
-                                              &rect);
-    i.context->platformContext()->canvas()->endPlatformPaint();
+                                              &renderRect);
+    canvas->endPlatformPaint();
     return false;
 }
 
 static void setSizeIfAuto(RenderStyle* style, const IntSize& size)
 {
     if (style->width().isIntrinsicOrAuto())
         style->setWidth(Length(size.width(), Fixed));
     if (style->height().isAuto())
         style->setHeight(Length(size.height(), Fixed));
 }
@@ skipping 58 matching lines @@
     // border-radius. Webkit paints elements with border-radius for us.
     // TODO(ojan): Get rid of this if-check once we can properly clip rounded
     // borders: http://b/1112604 and http://b/1108635
     // TODO(ojan): make sure we do the right thing if css background-clip is
     // set.
     if (o->style()->hasBorderRadius())
         return false;
 
     const ThemeData& themeData = getThemeData(o);
 
-    RECT rect;
-    rect.left = r.x();
-    rect.top = r.y();
-    rect.right = r.right();
-    rect.bottom = r.bottom();
+    WebCore::ThemeHelperWin helper(i.context, r);
+    gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
 
-    HDC hdc = i.context->platformContext()->canvas()->beginPlatformPaint();
+    HDC hdc = canvas->beginPlatformPaint();
     COLORREF clr = gfx::SkColorToCOLORREF(o->style()->backgroundColor().rgb());
+    RECT renderRect = helper.rect();
+
     gfx::NativeTheme::instance()->PaintTextField(hdc,
                                                  themeData.m_part,
                                                  themeData.m_state,
                                                  themeData.m_classicState,
-                                                 &rect,
+                                                 &renderRect,
                                                  clr,
                                                  true,
                                                  drawEdges);
-    i.context->platformContext()->canvas()->endPlatformPaint();
+    canvas->endPlatformPaint();
     return false;
 }
 
 bool RenderThemeWin::paintSearchField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
     return paintTextField(o, i, r);
 }
 
 void RenderThemeWin::adjustMenuListStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
@@ skipping 51 matching lines @@
     int spacingTop = borderTop + o->paddingTop();
     int spacingBottom = borderBottom + o->paddingBottom();
 
     int buttonX;
     if (r.right() - r.x() < buttonWidth) {
         buttonX = r.x();
     } else {
         buttonX = o->style()->direction() == LTR ? r.right() - spacingRight - buttonWidth : r.x() + spacingLeft;
     }
 
-    // Compute the Windows rectangle of the button.
-    RECT rect;
-    rect.left = buttonX;
-    rect.top = r.y() + spacingTop;
-    rect.right = rect.left + std::min(buttonWidth, r.right() - r.x());
-    rect.bottom = rect.top + r.height() - (spacingTop + spacingBottom);
+    // Compute the rectangle of the button in the destination image.
+    IntRect rect(buttonX,
+                 r.y() + spacingTop,
+                 std::min(buttonWidth, r.right() - r.x()),
+                 r.height() - (spacingTop + spacingBottom));
 
     // Get the correct theme data for a textfield and paint the menu.
-    HDC hdc = i.context->platformContext()->canvas()->beginPlatformPaint();
+    WebCore::ThemeHelperWin helper(i.context, rect);
+    gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
+    HDC hdc = canvas->beginPlatformPaint();
+    RECT renderRect = helper.rect();
     gfx::NativeTheme::instance()->PaintMenuList(hdc,
                                                 CP_DROPDOWNBUTTON,
                                                 determineState(o),
                                                 determineClassicState(o),
-                                                &rect);
-    i.context->platformContext()->canvas()->endPlatformPaint();
+                                                &renderRect);
+    canvas->endPlatformPaint();
     return false;
 }
 
 // Used to paint styled menulists (i.e. with a non-default border)
 bool RenderThemeWin::paintMenuListButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
     return paintMenuList(o, i, r);
 }
 
 int RenderThemeWin::popupInternalPaddingLeft(RenderStyle* style) const
@@ skipping 208 matching lines @@
 
 // static
 void RenderThemeWin::setDefaultFontSize(int fontSize) {
     DefaultFontSize = static_cast<float>(fontSize);
 
     // Reset cached fonts.
     SmallSystemFont = MenuFont = LabelFont = FontDescription();
 }
 
 }