diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/platform/graphics/qt/PatternQt.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/platform/graphics/qt/PatternQt.cpp')
| -rw-r--r-- | WebCore/platform/graphics/qt/PatternQt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/qt/PatternQt.cpp b/WebCore/platform/graphics/qt/PatternQt.cpp index 5b76841..b261613 100644 --- a/WebCore/platform/graphics/qt/PatternQt.cpp +++ b/WebCore/platform/graphics/qt/PatternQt.cpp @@ -31,14 +31,15 @@ namespace WebCore { -QBrush Pattern::createPlatformPattern(const TransformationMatrix& transform) const +QBrush Pattern::createPlatformPattern(const TransformationMatrix&) const { QPixmap* pixmap = tileImage()->nativeImageForCurrentFrame(); if (!pixmap) return QBrush(); + // Qt merges patter space and user space itself QBrush brush(*pixmap); - brush.setMatrix(transform); + brush.setTransform(m_patternSpaceTransformation); return brush; } |