| Index: third_party/WebKit/Source/platform/DragImage.cpp
|
| diff --git a/third_party/WebKit/Source/platform/DragImage.cpp b/third_party/WebKit/Source/platform/DragImage.cpp
|
| index f96ea2af2d3b4825962d05e5a1bd1e328e501929..de3a48e934c39d9cd47aa46405587892f6e6f2de 100644
|
| --- a/third_party/WebKit/Source/platform/DragImage.cpp
|
| +++ b/third_party/WebKit/Source/platform/DragImage.cpp
|
| @@ -188,7 +188,7 @@ PassOwnPtr<DragImage> DragImage::create(const KURL& url, const String& inLabel,
|
| // First step is drawing the link drag image width.
|
| TextRun labelRun(label.impl());
|
| TextRun urlRun(urlString.impl());
|
| - IntSize labelSize(labelFont.width(labelRun), labelFont.fontMetrics().ascent() + labelFont.fontMetrics().descent());
|
| + IntSize labelSize(labelFont.width(labelRun), labelFont.getFontMetrics().ascent() + labelFont.getFontMetrics().descent());
|
|
|
| if (labelSize.width() > maxDragLabelStringWidthDIP) {
|
| labelSize.setWidth(maxDragLabelStringWidthDIP);
|
| @@ -200,7 +200,7 @@ PassOwnPtr<DragImage> DragImage::create(const KURL& url, const String& inLabel,
|
|
|
| if (drawURLString) {
|
| urlStringSize.setWidth(urlFont.width(urlRun));
|
| - urlStringSize.setHeight(urlFont.fontMetrics().ascent() + urlFont.fontMetrics().descent());
|
| + urlStringSize.setHeight(urlFont.getFontMetrics().ascent() + urlFont.getFontMetrics().descent());
|
| imageSize.setHeight(imageSize.height() + urlStringSize.height());
|
| if (urlStringSize.width() > maxDragLabelStringWidthDIP) {
|
| imageSize.setWidth(maxDragLabelStringWidthDIP);
|
| @@ -233,7 +233,7 @@ PassOwnPtr<DragImage> DragImage::create(const KURL& url, const String& inLabel,
|
| if (drawURLString) {
|
| if (clipURLString)
|
| urlString = StringTruncator::centerTruncate(urlString, imageSize.width() - (kDragLabelBorderX * 2.0f), urlFont);
|
| - IntPoint textPos(kDragLabelBorderX, imageSize.height() - (kLabelBorderYOffset + urlFont.fontMetrics().descent()));
|
| + IntPoint textPos(kDragLabelBorderX, imageSize.height() - (kLabelBorderYOffset + urlFont.getFontMetrics().descent()));
|
| TextRun textRun(urlString);
|
| urlFont.drawText(buffer->canvas(), TextRunPaintInfo(textRun), textPos, deviceScaleFactor, textPaint);
|
| }
|
| @@ -243,7 +243,7 @@ PassOwnPtr<DragImage> DragImage::create(const KURL& url, const String& inLabel,
|
|
|
| bool hasStrongDirectionality;
|
| TextRun textRun = textRunWithDirectionality(label, &hasStrongDirectionality);
|
| - IntPoint textPos(kDragLabelBorderX, kDragLabelBorderY + labelFont.fontDescription().computedPixelSize());
|
| + IntPoint textPos(kDragLabelBorderX, kDragLabelBorderY + labelFont.getFontDescription().computedPixelSize());
|
| if (hasStrongDirectionality && textRun.direction() == RTL) {
|
| float textWidth = labelFont.width(textRun);
|
| int availableWidth = imageSize.width() - kDragLabelBorderX * 2;
|
|
|