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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2454543002: Correct the initial value of CSS independent transform properties (Closed)
Patch Set: git cl format 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 static float initialTransformOriginZ() { return 0; } 1693 static float initialTransformOriginZ() { return 0; }
1694 float transformOriginZ() const { return transformOrigin().z(); } 1694 float transformOriginZ() const { return transformOrigin().z(); }
1695 void setTransformOriginZ(float f) { 1695 void setTransformOriginZ(float f) {
1696 setTransformOrigin( 1696 setTransformOrigin(
1697 TransformOrigin(transformOriginX(), transformOriginY(), f)); 1697 TransformOrigin(transformOriginX(), transformOriginY(), f));
1698 } 1698 }
1699 1699
1700 // Independent transform properties. 1700 // Independent transform properties.
1701 // translate 1701 // translate
1702 static PassRefPtr<TranslateTransformOperation> initialTranslate() { 1702 static PassRefPtr<TranslateTransformOperation> initialTranslate() {
1703 return TranslateTransformOperation::create( 1703 return nullptr;
1704 Length(0, Fixed), Length(0, Fixed), 0, TransformOperation::Translate3D);
1705 } 1704 }
1706 TranslateTransformOperation* translate() const { 1705 TranslateTransformOperation* translate() const {
1707 return m_rareNonInheritedData->m_transform->m_translate.get(); 1706 return m_rareNonInheritedData->m_transform->m_translate.get();
1708 } 1707 }
1709 void setTranslate(PassRefPtr<TranslateTransformOperation> v) { 1708 void setTranslate(PassRefPtr<TranslateTransformOperation> v) {
1710 m_rareNonInheritedData.access()->m_transform.access()->m_translate = v; 1709 m_rareNonInheritedData.access()->m_transform.access()->m_translate = v;
1711 } 1710 }
1712 1711
1713 // rotate 1712 // rotate
1714 static PassRefPtr<RotateTransformOperation> initialRotate() { 1713 static PassRefPtr<RotateTransformOperation> initialRotate() {
1715 return RotateTransformOperation::create(0, 0, 1, 0, 1714 return nullptr;
1716 TransformOperation::Rotate3D);
1717 } 1715 }
1718 RotateTransformOperation* rotate() const { 1716 RotateTransformOperation* rotate() const {
1719 return m_rareNonInheritedData->m_transform->m_rotate.get(); 1717 return m_rareNonInheritedData->m_transform->m_rotate.get();
1720 } 1718 }
1721 void setRotate(PassRefPtr<RotateTransformOperation> v) { 1719 void setRotate(PassRefPtr<RotateTransformOperation> v) {
1722 m_rareNonInheritedData.access()->m_transform.access()->m_rotate = v; 1720 m_rareNonInheritedData.access()->m_transform.access()->m_rotate = v;
1723 } 1721 }
1724 1722
1725 // scale 1723 // scale
1726 static PassRefPtr<ScaleTransformOperation> initialScale() { 1724 static PassRefPtr<ScaleTransformOperation> initialScale() { return nullptr; }
1727 return ScaleTransformOperation::create(1, 1, 1,
1728 TransformOperation::Scale3D);
1729 }
1730 ScaleTransformOperation* scale() const { 1725 ScaleTransformOperation* scale() const {
1731 return m_rareNonInheritedData->m_transform->m_scale.get(); 1726 return m_rareNonInheritedData->m_transform->m_scale.get();
1732 } 1727 }
1733 void setScale(PassRefPtr<ScaleTransformOperation> v) { 1728 void setScale(PassRefPtr<ScaleTransformOperation> v) {
1734 m_rareNonInheritedData.access()->m_transform.access()->m_scale = v; 1729 m_rareNonInheritedData.access()->m_transform.access()->m_scale = v;
1735 } 1730 }
1736 1731
1737 // Scroll properties. 1732 // Scroll properties.
1738 // scroll-behavior 1733 // scroll-behavior
1739 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorAuto; } 1734 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorAuto; }
(...skipping 2383 matching lines...) Expand 10 before | Expand all | Expand 10 after
4123 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4118 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4124 } 4119 }
4125 4120
4126 inline bool ComputedStyle::hasPseudoElementStyle() const { 4121 inline bool ComputedStyle::hasPseudoElementStyle() const {
4127 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4122 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4128 } 4123 }
4129 4124
4130 } // namespace blink 4125 } // namespace blink
4131 4126
4132 #endif // ComputedStyle_h 4127 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698