third_party/WebKit/WebCore/platform/graphics/qt/GraphicsContextQt.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/qt/GraphicsContextQt.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/qt/GraphicsContextQt.cpp

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

--- third_party/WebKit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (revision 9391)

+++ third_party/WebKit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (working copy)

@@ -266,7 +266,8 @@

TransformationMatrix GraphicsContext::getCTM() const

{

- return platformContext()->combinedMatrix();

+ QMatrix matrix(platformContext()->combinedMatrix());

+ return TransformationMatrix(matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), matrix.dx(), matrix.dy());

}

void GraphicsContext::savePlatformState()

@@ -956,7 +957,7 @@

if (!m_data->currentPath.isEmpty()) {

QMatrix matrix;

m_data->currentPath = m_data->currentPath * matrix.scale(1 / s.width(), 1 / s.height());

- m_common->state.pathTransform.scale(s.width(), s.height());

+ m_common->state.pathTransform.scaleNonUniform(s.width(), s.height());

}