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

Side by Side Diff: cc/math_util.cc

Issue 10915313: cc: Apply the layer's initial CSS scale to the contentsScale to render text at the right resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/math_util.h ('k') | cc/occlusion_tracker_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCMathUtil.h" 7 #include "CCMathUtil.h"
8 8
9 #include "FloatPoint.h" 9 #include "FloatPoint.h"
10 #include "FloatQuad.h" 10 #include "FloatQuad.h"
11 #include "IntRect.h" 11 #include "IntRect.h"
12 #include <cmath>
12 #include <public/WebTransformationMatrix.h> 13 #include <public/WebTransformationMatrix.h>
13 14
14 using WebKit::WebTransformationMatrix; 15 using WebKit::WebTransformationMatrix;
15 16
16 namespace cc { 17 namespace cc {
17 18
18 static HomogeneousCoordinate projectHomogeneousPoint(const WebTransformationMatr ix& transform, const FloatPoint& p) 19 static HomogeneousCoordinate projectHomogeneousPoint(const WebTransformationMatr ix& transform, const FloatPoint& p)
19 { 20 {
20 // In this case, the layer we are trying to project onto is perpendicular to ray 21 // In this case, the layer we are trying to project onto is perpendicular to ray
21 // (point p and z-axis direction) that we are trying to project. This happen s when the 22 // (point p and z-axis direction) that we are trying to project. This happen s when the
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 // 355 //
355 transform.setM13(0); 356 transform.setM13(0);
356 transform.setM23(0); 357 transform.setM23(0);
357 transform.setM31(0); 358 transform.setM31(0);
358 transform.setM32(0); 359 transform.setM32(0);
359 transform.setM33(1); 360 transform.setM33(1);
360 transform.setM34(0); 361 transform.setM34(0);
361 transform.setM43(0); 362 transform.setM43(0);
362 } 363 }
363 364
365 static inline float scaleOnAxis(double a, double b, double c)
366 {
367 return std::sqrt(a * a + b * b + c * c);
368 }
369
370 FloatPoint CCMathUtil::computeTransform2dScaleComponents(const WebTransformation Matrix& transform)
371 {
372 if (transform.hasPerspective())
373 return FloatPoint(1, 1);
374 float xScale = scaleOnAxis(transform.m11(), transform.m12(), transform.m13() );
375 float yScale = scaleOnAxis(transform.m21(), transform.m22(), transform.m23() );
376 return FloatPoint(xScale, yScale);
377 }
378
364 float CCMathUtil::smallestAngleBetweenVectors(const FloatSize& v1, const FloatSi ze& v2) 379 float CCMathUtil::smallestAngleBetweenVectors(const FloatSize& v1, const FloatSi ze& v2)
365 { 380 {
366 float dotProduct = (v1.width() * v2.width() + v1.height() * v2.height()) / ( v1.diagonalLength() * v2.diagonalLength()); 381 float dotProduct = (v1.width() * v2.width() + v1.height() * v2.height()) / ( v1.diagonalLength() * v2.diagonalLength());
367 // Clamp to compensate for rounding errors. 382 // Clamp to compensate for rounding errors.
368 dotProduct = std::max(-1.f, std::min(1.f, dotProduct)); 383 dotProduct = std::max(-1.f, std::min(1.f, dotProduct));
369 return rad2deg(acosf(dotProduct)); 384 return rad2deg(acosf(dotProduct));
370 } 385 }
371 386
372 FloatSize CCMathUtil::projectVector(const FloatSize& source, const FloatSize& de stination) 387 FloatSize CCMathUtil::projectVector(const FloatSize& source, const FloatSize& de stination)
373 { 388 {
374 float sourceDotDestination = source.width() * destination.width() + source.h eight() * destination.height(); 389 float sourceDotDestination = source.width() * destination.width() + source.h eight() * destination.height();
375 float projectedLength = sourceDotDestination / destination.diagonalLengthSqu ared(); 390 float projectedLength = sourceDotDestination / destination.diagonalLengthSqu ared();
376 return FloatSize(projectedLength * destination.width(), projectedLength * de stination.height()); 391 return FloatSize(projectedLength * destination.width(), projectedLength * de stination.height());
377 } 392 }
378 393
379 } // namespace cc 394 } // namespace cc
OLDNEW
« no previous file with comments | « cc/math_util.h ('k') | cc/occlusion_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698