third_party/WebKit/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp - Issue 21184: WebKit merge 40722:40785 (part 1)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 11 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

===================================================================

--- third_party/WebKit/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (revision 9391)

+++ third_party/WebKit/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (working copy)

@@ -106,7 +106,7 @@

cairo_t* cr = platformContext();

cairo_matrix_t m;

cairo_get_matrix(cr, &m);

- return m;

+ return TransformationMatrix(m.xx, m.yx, m.xy, m.yy, m.x0, m.y0);

}

cairo_t* GraphicsContext::platformContext() const

@@ -732,8 +732,8 @@

return;

cairo_t* cr = m_data->cr;

- const cairo_matrix_t* matrix = reinterpret_cast<const cairo_matrix_t*>(&transform);

- cairo_transform(cr, matrix);

+ const cairo_matrix_t matrix = cairo_matrix_t(transform);

+ cairo_transform(cr, &matrix);

m_data->concatCTM(transform);

}