Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/TransformBuilder.cpp

Issue 2482753002: Fix matrix3d transform under page zoom (Closed)
Patch Set: Add a comment for zoom Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 toCSSPrimitiveValue(transformValue->item(2)).getDoubleValue(), 298 toCSSPrimitiveValue(transformValue->item(2)).getDoubleValue(),
299 toCSSPrimitiveValue(transformValue->item(3)).getDoubleValue(), 299 toCSSPrimitiveValue(transformValue->item(3)).getDoubleValue(),
300 toCSSPrimitiveValue(transformValue->item(4)).getDoubleValue(), 300 toCSSPrimitiveValue(transformValue->item(4)).getDoubleValue(),
301 toCSSPrimitiveValue(transformValue->item(5)).getDoubleValue(), 301 toCSSPrimitiveValue(transformValue->item(5)).getDoubleValue(),
302 toCSSPrimitiveValue(transformValue->item(6)).getDoubleValue(), 302 toCSSPrimitiveValue(transformValue->item(6)).getDoubleValue(),
303 toCSSPrimitiveValue(transformValue->item(7)).getDoubleValue(), 303 toCSSPrimitiveValue(transformValue->item(7)).getDoubleValue(),
304 toCSSPrimitiveValue(transformValue->item(8)).getDoubleValue(), 304 toCSSPrimitiveValue(transformValue->item(8)).getDoubleValue(),
305 toCSSPrimitiveValue(transformValue->item(9)).getDoubleValue(), 305 toCSSPrimitiveValue(transformValue->item(9)).getDoubleValue(),
306 toCSSPrimitiveValue(transformValue->item(10)).getDoubleValue(), 306 toCSSPrimitiveValue(transformValue->item(10)).getDoubleValue(),
307 toCSSPrimitiveValue(transformValue->item(11)).getDoubleValue(), 307 toCSSPrimitiveValue(transformValue->item(11)).getDoubleValue(),
308 zoomFactor * 308 toCSSPrimitiveValue(transformValue->item(12)).getDoubleValue(),
309 toCSSPrimitiveValue(transformValue->item(12)).getDoubleValue(), 309 toCSSPrimitiveValue(transformValue->item(13)).getDoubleValue(),
310 zoomFactor *
311 toCSSPrimitiveValue(transformValue->item(13)).getDoubleValue(),
312 toCSSPrimitiveValue(transformValue->item(14)).getDoubleValue(), 310 toCSSPrimitiveValue(transformValue->item(14)).getDoubleValue(),
313 toCSSPrimitiveValue(transformValue->item(15)).getDoubleValue()); 311 toCSSPrimitiveValue(transformValue->item(15)).getDoubleValue());
312 matrix.zoom(zoomFactor);
314 operations.operations().append( 313 operations.operations().append(
315 Matrix3DTransformOperation::create(matrix)); 314 Matrix3DTransformOperation::create(matrix));
316 break; 315 break;
317 } 316 }
318 case TransformOperation::Perspective: { 317 case TransformOperation::Perspective: {
319 double p = firstValue.computeLength<double>(conversionData); 318 double p = firstValue.computeLength<double>(conversionData);
320 ASSERT(p >= 0); 319 ASSERT(p >= 0);
321 operations.operations().append( 320 operations.operations().append(
322 PerspectiveTransformOperation::create(p)); 321 PerspectiveTransformOperation::create(p));
323 break; 322 break;
324 } 323 }
325 default: 324 default:
326 ASSERT_NOT_REACHED(); 325 ASSERT_NOT_REACHED();
327 break; 326 break;
328 } 327 }
329 } 328 }
330 return operations; 329 return operations;
331 } 330 }
332 331
333 } // namespace blink 332 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698