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

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

Issue 2531753002: CSS Independent Transform Properties: support rotate: <axes> <angle> (Closed)
Patch Set: tests Created 4 years 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 3534 matching lines...) Expand 10 before | Expand all | Expand 10 after
3545 list->append(*zoomAdjustedPixelValue(style.translate()->z(), style)); 3545 list->append(*zoomAdjustedPixelValue(style.translate()->z(), style));
3546 3546
3547 return list; 3547 return list;
3548 } 3548 }
3549 case CSSPropertyRotate: { 3549 case CSSPropertyRotate: {
3550 if (!style.rotate()) 3550 if (!style.rotate())
3551 return CSSPrimitiveValue::create(0, 3551 return CSSPrimitiveValue::create(0,
3552 CSSPrimitiveValue::UnitType::Degrees); 3552 CSSPrimitiveValue::UnitType::Degrees);
3553 3553
3554 CSSValueList* list = CSSValueList::createSpaceSeparated(); 3554 CSSValueList* list = CSSValueList::createSpaceSeparated();
3555 list->append(*CSSPrimitiveValue::create(
3556 style.rotate()->angle(), CSSPrimitiveValue::UnitType::Degrees));
3557 if (style.rotate()->x() != 0 || style.rotate()->y() != 0 || 3555 if (style.rotate()->x() != 0 || style.rotate()->y() != 0 ||
3558 style.rotate()->z() != 1) { 3556 style.rotate()->z() != 1) {
3559 list->append(*CSSPrimitiveValue::create( 3557 list->append(*CSSPrimitiveValue::create(
3560 style.rotate()->x(), CSSPrimitiveValue::UnitType::Number)); 3558 style.rotate()->x(), CSSPrimitiveValue::UnitType::Number));
3561 list->append(*CSSPrimitiveValue::create( 3559 list->append(*CSSPrimitiveValue::create(
3562 style.rotate()->y(), CSSPrimitiveValue::UnitType::Number)); 3560 style.rotate()->y(), CSSPrimitiveValue::UnitType::Number));
3563 list->append(*CSSPrimitiveValue::create( 3561 list->append(*CSSPrimitiveValue::create(
3564 style.rotate()->z(), CSSPrimitiveValue::UnitType::Number)); 3562 style.rotate()->z(), CSSPrimitiveValue::UnitType::Number));
3565 } 3563 }
3564 list->append(*CSSPrimitiveValue::create(
3565 style.rotate()->angle(), CSSPrimitiveValue::UnitType::Degrees));
3566 return list; 3566 return list;
3567 } 3567 }
3568 case CSSPropertyScale: { 3568 case CSSPropertyScale: {
3569 if (!style.scale()) 3569 if (!style.scale())
3570 return CSSPrimitiveValue::create(1, 3570 return CSSPrimitiveValue::create(1,
3571 CSSPrimitiveValue::UnitType::Number); 3571 CSSPrimitiveValue::UnitType::Number);
3572 CSSValueList* list = CSSValueList::createSpaceSeparated(); 3572 CSSValueList* list = CSSValueList::createSpaceSeparated();
3573 list->append(*CSSPrimitiveValue::create( 3573 list->append(*CSSPrimitiveValue::create(
3574 style.scale()->x(), CSSPrimitiveValue::UnitType::Number)); 3574 style.scale()->x(), CSSPrimitiveValue::UnitType::Number));
3575 if (style.scale()->y() == 1 && style.scale()->z() == 1) 3575 if (style.scale()->y() == 1 && style.scale()->z() == 1)
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
3620 case CSSPropertyAll: 3620 case CSSPropertyAll:
3621 return nullptr; 3621 return nullptr;
3622 default: 3622 default:
3623 break; 3623 break;
3624 } 3624 }
3625 ASSERT_NOT_REACHED(); 3625 ASSERT_NOT_REACHED();
3626 return nullptr; 3626 return nullptr;
3627 } 3627 }
3628 3628
3629 } // namespace blink 3629 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698