Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

Unified Diff: Source/core/platform/graphics/chromium/FontChromiumWin.cpp

Issue 24422003: Merge FontPlatformData::setupPaint and setupPaintForFont on Win (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: w/gdi fix Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/chromium/FontChromiumWin.cpp
diff --git a/Source/core/platform/graphics/chromium/FontChromiumWin.cpp b/Source/core/platform/graphics/chromium/FontChromiumWin.cpp
index 814ff39aa70b914568b2197a4d8c3937898c5ab8..b78fca7869573aed639d61770aa59f414da6fee7 100644
--- a/Source/core/platform/graphics/chromium/FontChromiumWin.cpp
+++ b/Source/core/platform/graphics/chromium/FontChromiumWin.cpp
@@ -177,8 +177,8 @@ FloatRect Font::selectionRectForComplexText(const TextRun& run,
}
void Font::drawComplexText(GraphicsContext* graphicsContext,
- const TextRunPaintInfo& runInfo,
- const FloatPoint& point) const
+ const TextRunPaintInfo& runInfo,
+ const FloatPoint& point) const
{
UniscribeHelperTextRun state(runInfo.run, *this);
@@ -191,7 +191,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext,
HDC hdc = 0;
// Uniscribe counts the coordinates from the upper left, while WebKit uses
// the baseline, so we have to subtract off the ascent.
- state.draw(graphicsContext, hdc, lroundf(point.x()), lroundf(point.y() - fontMetrics().ascent()), runInfo.bounds, runInfo.from, runInfo.to);
+ state.draw(graphicsContext, primaryFont()->platformData(), hdc, lroundf(point.x()), lroundf(point.y() - fontMetrics().ascent()), runInfo.bounds, runInfo.from, runInfo.to);
}
void Font::drawEmphasisMarksForComplexText(GraphicsContext* /* context */, const TextRunPaintInfo& /* runInfo */, const AtomicString& /* mark */, const FloatPoint& /* point */) const
« no previous file with comments | « no previous file | Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698