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

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

Issue 2279133002: Remove CSSVariables RuntimeEnabledFeatures flag (status=stable) (Closed)
Patch Set: Created 4 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1423 if (m_inheritedData.m_textUnderline) { 1423 if (m_inheritedData.m_textUnderline) {
1424 DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, underline, (1, Applie dTextDecoration(TextDecorationUnderline))); 1424 DEFINE_STATIC_LOCAL(Vector<AppliedTextDecoration>, underline, (1, Applie dTextDecoration(TextDecorationUnderline)));
1425 return underline; 1425 return underline;
1426 } 1426 }
1427 1427
1428 return m_rareInheritedData->appliedTextDecorations->vector(); 1428 return m_rareInheritedData->appliedTextDecorations->vector();
1429 } 1429 }
1430 1430
1431 StyleVariableData* ComputedStyle::variables() const 1431 StyleVariableData* ComputedStyle::variables() const
1432 { 1432 {
1433 ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled());
1434 return m_rareInheritedData->variables.get(); 1433 return m_rareInheritedData->variables.get();
1435 } 1434 }
1436 1435
1437 void ComputedStyle::setVariable(const AtomicString& name, PassRefPtr<CSSVariable Data> value) 1436 void ComputedStyle::setVariable(const AtomicString& name, PassRefPtr<CSSVariable Data> value)
1438 { 1437 {
1439 RefPtr<StyleVariableData>& variables = m_rareInheritedData.access()->variabl es; 1438 RefPtr<StyleVariableData>& variables = m_rareInheritedData.access()->variabl es;
1440 if (!variables) 1439 if (!variables)
1441 variables = StyleVariableData::create(); 1440 variables = StyleVariableData::create();
1442 else if (!variables->hasOneRef()) 1441 else if (!variables->hasOneRef())
1443 variables = variables->copy(); 1442 variables = variables->copy();
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
2028 if (value < 0) 2027 if (value < 0)
2029 fvalue -= 0.5f; 2028 fvalue -= 0.5f;
2030 else 2029 else
2031 fvalue += 0.5f; 2030 fvalue += 0.5f;
2032 } 2031 }
2033 2032
2034 return roundForImpreciseConversion<int>(fvalue / zoomFactor); 2033 return roundForImpreciseConversion<int>(fvalue / zoomFactor);
2035 } 2034 }
2036 2035
2037 } // namespace blink 2036 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698