diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/third_party/pdfium/core/fxge/agg/fx_agg_driver.cpp | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/pdfium/core/fxge/agg/fx_agg_driver.cpp')
| -rw-r--r-- | chromium/third_party/pdfium/core/fxge/agg/fx_agg_driver.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chromium/third_party/pdfium/core/fxge/agg/fx_agg_driver.cpp b/chromium/third_party/pdfium/core/fxge/agg/fx_agg_driver.cpp index 6174f6e18f4..846920240e3 100644 --- a/chromium/third_party/pdfium/core/fxge/agg/fx_agg_driver.cpp +++ b/chromium/third_party/pdfium/core/fxge/agg/fx_agg_driver.cpp @@ -10,12 +10,12 @@ #include <utility> #include "core/fxcodec/fx_codec.h" +#include "core/fxge/cfx_cliprgn.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/dib/cfx_imagerenderer.h" #include "core/fxge/dib/cfx_imagestretcher.h" -#include "core/fxge/ge/cfx_cliprgn.h" #include "third_party/agg23/agg_conv_dash.h" #include "third_party/agg23/agg_conv_stroke.h" #include "third_party/agg23/agg_curves.h" @@ -438,7 +438,7 @@ class CFX_Renderer { CFX_RetainPtr<CFX_DIBitmap> m_pOriDevice; CFX_RetainPtr<CFX_DIBitmap> m_pClipMask; CFX_RetainPtr<CFX_DIBitmap> m_pDevice; - const CFX_ClipRgn* m_pClipRgn; + CFX_UnownedPtr<const CFX_ClipRgn> m_pClipRgn; }; void CFX_Renderer::CompositeSpan(uint8_t* dest_scan, @@ -1349,10 +1349,8 @@ bool CFX_AggDeviceDriver::DrawPath(const CFX_PathData* pPathData, pObject2Device->a / matrix1.a, pObject2Device->b / matrix1.a, pObject2Device->c / matrix1.d, pObject2Device->d / matrix1.d, 0, 0); - CFX_Matrix mtRervese; - mtRervese.SetReverse(matrix2); matrix1 = *pObject2Device; - matrix1.Concat(mtRervese); + matrix1.Concat(matrix2.GetInverse()); } CAgg_PathData path_data; @@ -1548,9 +1546,9 @@ bool CFX_AggDeviceDriver::StartDIBits( if (!m_pBitmap->GetBuffer()) return true; - *handle = pdfium::MakeUnique<CFX_ImageRenderer>(); - (*handle)->Start(m_pBitmap, m_pClipRgn.get(), pSource, bitmap_alpha, argb, - pMatrix, render_flags, m_bRgbByteOrder); + *handle = pdfium::MakeUnique<CFX_ImageRenderer>( + m_pBitmap, m_pClipRgn.get(), pSource, bitmap_alpha, argb, pMatrix, + render_flags, m_bRgbByteOrder); return true; } |