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

Side by Side Diff: Source/core/css/resolver/StyleBuilderConverter.cpp

Issue 648193002: Oilpan: fix build after r183596. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * * Redistributions of source code must retain the above copyright 4 * * Redistributions of source code must retain the above copyright
5 * notice, this list of conditions and the following disclaimer. 5 * notice, this list of conditions and the following disclaimer.
6 * * Redistributions in binary form must reproduce the above 6 * * Redistributions in binary form must reproduce the above
7 * copyright notice, this list of conditions and the following disclaimer 7 * copyright notice, this list of conditions and the following disclaimer
8 * in the documentation and/or other materials provided with the 8 * in the documentation and/or other materials provided with the
9 * distribution. 9 * distribution.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 582
583 float StyleBuilderConverter::convertPerspective(StyleResolverState& state, CSSVa lue* value) 583 float StyleBuilderConverter::convertPerspective(StyleResolverState& state, CSSVa lue* value)
584 { 584 {
585 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 585 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
586 586
587 if (primitiveValue->getValueID() == CSSValueNone) 587 if (primitiveValue->getValueID() == CSSValueNone)
588 return RenderStyle::initialPerspective(); 588 return RenderStyle::initialPerspective();
589 589
590 // CSSPropertyWebkitPerspective accepts unitless numbers. 590 // CSSPropertyWebkitPerspective accepts unitless numbers.
591 if (primitiveValue->isNumber()) { 591 if (primitiveValue->isNumber()) {
592 RefPtr<CSSPrimitiveValue> px = CSSPrimitiveValue::create(primitiveValue- >getDoubleValue(), CSSPrimitiveValue::CSS_PX); 592 RefPtrWillBeRawPtr<CSSPrimitiveValue> px = CSSPrimitiveValue::create(pri mitiveValue->getDoubleValue(), CSSPrimitiveValue::CSS_PX);
593 return convertPerspectiveLength(state, px.get()); 593 return convertPerspectiveLength(state, px.get());
594 } 594 }
595 595
596 return convertPerspectiveLength(state, primitiveValue); 596 return convertPerspectiveLength(state, primitiveValue);
597 } 597 }
598 598
599 template <CSSValueID cssValueFor0, CSSValueID cssValueFor100> 599 template <CSSValueID cssValueFor0, CSSValueID cssValueFor100>
600 static Length convertOriginLength(StyleResolverState& state, CSSPrimitiveValue* primitiveValue) 600 static Length convertOriginLength(StyleResolverState& state, CSSPrimitiveValue* primitiveValue)
601 { 601 {
602 if (primitiveValue->isValueID()) { 602 if (primitiveValue->isValueID()) {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 { 774 {
775 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 775 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
776 if (primitiveValue->getValueID()) { 776 if (primitiveValue->getValueID()) {
777 float multiplier = convertLineWidth<float>(state, value); 777 float multiplier = convertLineWidth<float>(state, value);
778 return CSSPrimitiveValue::create(multiplier / 48, CSSPrimitiveValue::CSS _EMS)->computeLength<float>(state.cssToLengthConversionData()); 778 return CSSPrimitiveValue::create(multiplier / 48, CSSPrimitiveValue::CSS _EMS)->computeLength<float>(state.cssToLengthConversionData());
779 } 779 }
780 return primitiveValue->computeLength<float>(state.cssToLengthConversionData( )); 780 return primitiveValue->computeLength<float>(state.cssToLengthConversionData( ));
781 } 781 }
782 782
783 } // namespace blink 783 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698