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

Side by Side Diff: sky/engine/core/css/CSSValuePool.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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
« no previous file with comments | « sky/engine/core/css/CSSValuePool.h ('k') | sky/engine/core/css/FontSize.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 if (!m_numberValueCache[intValue]) 115 if (!m_numberValueCache[intValue])
116 m_numberValueCache[intValue] = CSSPrimitiveValue::create(value, type ); 116 m_numberValueCache[intValue] = CSSPrimitiveValue::create(value, type );
117 return m_numberValueCache[intValue]; 117 return m_numberValueCache[intValue];
118 default: 118 default:
119 return CSSPrimitiveValue::create(value, type); 119 return CSSPrimitiveValue::create(value, type);
120 } 120 }
121 } 121 }
122 122
123 PassRefPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length& value, con st RenderStyle& style) 123 PassRefPtr<CSSPrimitiveValue> CSSValuePool::createValue(const Length& value, con st RenderStyle& style)
124 { 124 {
125 return CSSPrimitiveValue::create(value, style.effectiveZoom()); 125 return CSSPrimitiveValue::create(value);
126 } 126 }
127 127
128 PassRefPtr<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyName) 128 PassRefPtr<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyName)
129 { 129 {
130 RefPtr<CSSPrimitiveValue>& value = m_fontFamilyValueCache.add(familyName, nu llptr).storedValue->value; 130 RefPtr<CSSPrimitiveValue>& value = m_fontFamilyValueCache.add(familyName, nu llptr).storedValue->value;
131 if (!value) 131 if (!value)
132 value = CSSPrimitiveValue::create(familyName, CSSPrimitiveValue::CSS_STR ING); 132 value = CSSPrimitiveValue::create(familyName, CSSPrimitiveValue::CSS_STR ING);
133 return value; 133 return value;
134 } 134 }
135 135
(...skipping 23 matching lines...) Expand all
159 visitor->trace(m_colorBlack); 159 visitor->trace(m_colorBlack);
160 visitor->trace(m_pixelValueCache); 160 visitor->trace(m_pixelValueCache);
161 visitor->trace(m_percentValueCache); 161 visitor->trace(m_percentValueCache);
162 visitor->trace(m_numberValueCache); 162 visitor->trace(m_numberValueCache);
163 visitor->trace(m_fontFaceValueCache); 163 visitor->trace(m_fontFaceValueCache);
164 visitor->trace(m_fontFamilyValueCache); 164 visitor->trace(m_fontFamilyValueCache);
165 #endif 165 #endif
166 } 166 }
167 167
168 } 168 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSValuePool.h ('k') | sky/engine/core/css/FontSize.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698