diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
| tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp | |
| parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
| download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 | |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp')
| -rw-r--r-- | Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp index 62c5793..e029128 100644 --- a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp +++ b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp @@ -57,6 +57,7 @@ #include "Settings.h" #include "StrokeStyleApplier.h" #include "TextMetrics.h" +#include "TextRun.h" #if ENABLE(ACCELERATED_2D_CANVAS) #include "Chrome.h" @@ -170,7 +171,7 @@ void CanvasRenderingContext2D::reset() m_path.clear(); #if ENABLE(ACCELERATED_2D_CANVAS) if (GraphicsContext* c = drawingContext()) { - if (m_context3D) { + if (m_context3D && m_drawingBuffer) { m_drawingBuffer->reset(IntSize(canvas()->width(), canvas()->height())); c->setSharedGraphicsContext3D(m_context3D.get(), m_drawingBuffer.get(), IntSize(canvas()->width(), canvas()->height())); } @@ -537,7 +538,7 @@ void CanvasRenderingContext2D::transform(float m11, float m12, float m21, float return; AffineTransform transform(m11, m12, m21, m22, dx, dy); - AffineTransform newTransform = transform * state().m_transform; + AffineTransform newTransform = state().m_transform * transform; if (!newTransform.isInvertible()) { state().m_invertibleCTM = false; return; @@ -562,7 +563,7 @@ void CanvasRenderingContext2D::setTransform(float m11, float m12, float m21, flo return; c->concatCTM(c->getCTM().inverse()); c->concatCTM(canvas()->baseTransform()); - state().m_transform.multiply(ctm.inverse()); + state().m_transform = ctm.inverse() * state().m_transform; m_path.transform(ctm); state().m_invertibleCTM = true; @@ -1895,7 +1896,7 @@ void CanvasRenderingContext2D::paintRenderingResultsToCanvas() #if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING) PlatformLayer* CanvasRenderingContext2D::platformLayer() const { - return m_drawingBuffer->platformLayer(); + return m_drawingBuffer ? m_drawingBuffer->platformLayer() : 0; } #endif |