diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp b/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp index 7b1c27b..19683df 100644 --- a/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp +++ b/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp @@ -206,11 +206,16 @@ public: m_transform.rotate(rad2deg(radians)); } - void concatCTM(const AffineTransform& transform) + void concatCTM(const AffineTransform& transform) { m_transform *= transform; } + void setCTM(const AffineTransform& transform) + { + m_transform = transform; + } + IntRect mapRect(const IntRect& rect) const { return m_transform.mapRect(rect); @@ -1016,18 +1021,18 @@ void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int width, int DrawFocusRect(dc, &rect); } -void GraphicsContext::drawLineForText(const IntPoint& origin, int width, bool printing) +void GraphicsContext::drawLineForText(const FloatPoint& origin, float width, bool printing) { if (paintingDisabled()) return; StrokeStyle oldStyle = strokeStyle(); setStrokeStyle(SolidStroke); - drawLine(origin, origin + IntSize(width, 0)); + drawLine(roundedIntPoint(origin), roundedIntPoint(origin + FloatSize(width, 0))); setStrokeStyle(oldStyle); } -void GraphicsContext::drawLineForTextChecking(const IntPoint&, int width, TextCheckingLineStyle style) +void GraphicsContext::drawLineForTextChecking(const FloatPoint&, float width, TextCheckingLineStyle style) { notImplemented(); } @@ -1124,6 +1129,11 @@ void GraphicsContext::concatCTM(const AffineTransform& transform) m_data->concatCTM(transform); } +void GraphicsContext::setCTM(const AffineTransform& transform) +{ + m_data->setCTM(transform); +} + AffineTransform& GraphicsContext::affineTransform() { return m_data->m_transform; @@ -1520,7 +1530,7 @@ static inline bool isCharVisible(UChar c) return c && c != zeroWidthSpace; } -void GraphicsContext::drawText(const Font& font, const TextRun& run, const IntPoint& point, int from, int to) +void GraphicsContext::drawText(const Font& font, const TextRun& run, const FloatPoint& point, int from, int to) { if (paintingDisabled() || !fillColor().alpha() || !m_data->m_opacity) return; |