| Index: trunk/Source/core/platform/graphics/GraphicsContext.cpp
|
| ===================================================================
|
| --- trunk/Source/core/platform/graphics/GraphicsContext.cpp (revision 156736)
|
| +++ trunk/Source/core/platform/graphics/GraphicsContext.cpp (working copy)
|
| @@ -282,18 +282,18 @@
|
| return;
|
| }
|
|
|
| - RefPtr<DrawLooper> drawLooper = adoptRef(new DrawLooper);
|
| - drawLooper->addShadow(offset, blur, color, shadowTransformMode, shadowAlphaMode);
|
| - drawLooper->addUnmodifiedContent();
|
| - setDrawLooper(drawLooper.release());
|
| + DrawLooper drawLooper;
|
| + drawLooper.addShadow(offset, blur, color, shadowTransformMode, shadowAlphaMode);
|
| + drawLooper.addUnmodifiedContent();
|
| + setDrawLooper(drawLooper);
|
| }
|
|
|
| -void GraphicsContext::setDrawLooper(PassRefPtr<DrawLooper> drawLooper)
|
| +void GraphicsContext::setDrawLooper(const DrawLooper& drawLooper)
|
| {
|
| if (paintingDisabled())
|
| return;
|
|
|
| - m_state->m_looper = drawLooper;
|
| + m_state->m_looper = drawLooper.skDrawLooper();
|
| }
|
|
|
| void GraphicsContext::clearDrawLooper()
|
| @@ -638,8 +638,8 @@
|
| clip(rect.rect());
|
| }
|
|
|
| - RefPtr<DrawLooper> drawLooper = adoptRef(new DrawLooper);
|
| - drawLooper->addShadow(shadowOffset, shadowBlur, shadowColor,
|
| + DrawLooper drawLooper;
|
| + drawLooper.addShadow(shadowOffset, shadowBlur, shadowColor,
|
| DrawLooper::ShadowRespectsTransforms, DrawLooper::ShadowIgnoresAlpha);
|
| setDrawLooper(drawLooper);
|
| fillRectWithRoundedHole(outerRect, roundedHole, fillColor);
|
| @@ -1718,7 +1718,7 @@
|
|
|
| paint->setAntiAlias(m_state->m_shouldAntialias);
|
| paint->setXfermodeMode(m_state->m_xferMode);
|
| - paint->setLooper(m_state->m_looper ? m_state->m_looper->skDrawLooper() : 0);
|
| + paint->setLooper(m_state->m_looper.get());
|
| }
|
|
|
| void GraphicsContext::drawOuterPath(const SkPath& path, SkPaint& paint, int width)
|
|
|