commit 93ac45cfc74041c8ae536ce58a9534d46db2024e
author Torne (Richard Coles) <torne@google.com> Wed May 29 14:40:20 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 29 14:40:20 2013 +0100
tree 9beee68abb4b6c4c0898231f4037a4264e7c2fd8
parent 2fc993d4600e7917ccca616e2e62605780ceabb9

Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: I5b225b76b2157384357897051ee5866dd4bb23a8

Source/core/rendering/RenderFileUploadControl.cpp

diff --git a/Source/core/rendering/RenderFileUploadControl.cpp b/Source/core/rendering/RenderFileUploadControl.cpp
index a8dc63f..e25a9cf 100644
--- a/Source/core/rendering/RenderFileUploadControl.cpp
+++ b/Source/core/rendering/RenderFileUploadControl.cpp
@@ -28,14 +28,12 @@
 #include "core/editing/VisiblePosition.h"
 #include "core/fileapi/FileList.h"
 #include "core/html/HTMLInputElement.h"
-#include "core/platform/LocalizedStrings.h"
 #include "core/platform/graphics/Font.h"
 #include "core/platform/graphics/GraphicsContextStateSaver.h"
 #include "core/platform/graphics/Icon.h"
 #include "core/platform/graphics/TextRun.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderButton.h"
-#include "core/rendering/RenderText.h"
 #include "core/rendering/RenderTheme.h"
 
 using namespace std;
@@ -131,11 +129,12 @@
         LayoutUnit buttonWidth = nodeWidth(button);
         LayoutUnit buttonAndIconWidth = buttonWidth + afterButtonSpacing
             + (input->icon() ? iconWidth + iconFilenameSpacing : 0);
+        float textWidth = font.width(textRun);
         LayoutUnit textX;
         if (style()->isLeftToRightDirection())
             textX = contentLeft + buttonAndIconWidth;
         else
-            textX = contentLeft + contentWidth() - buttonAndIconWidth - font.width(textRun);
+            textX = contentLeft + contentWidth() - buttonAndIconWidth - textWidth;
 
         LayoutUnit textY = 0;
         // We want to match the button's baseline
@@ -144,11 +143,16 @@
             textY = paintOffset.y() + borderTop() + paddingTop() + buttonRenderer->baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
         else
             textY = baselinePosition(AlphabeticBaseline, true, HorizontalLine, PositionOnContainingLine);
+        TextRunPaintInfo textRunPaintInfo(textRun);
+        textRunPaintInfo.bounds = FloatRect(textX,
+                                            textY - style()->fontMetrics().ascent(),
+                                            textWidth,
+                                            style()->fontMetrics().height());
 
         paintInfo.context->setFillColor(style()->visitedDependentColor(CSSPropertyColor), style()->colorSpace());
         
         // Draw the filename
-        paintInfo.context->drawBidiText(font, textRun, IntPoint(roundToInt(textX), roundToInt(textY)));
+        paintInfo.context->drawBidiText(font, textRunPaintInfo, IntPoint(roundToInt(textX), roundToInt(textY)));
         
         if (input->icon()) {
             // Determine where the icon should be placed