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

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

Issue 1387113002: Change StyleResolverState.styleImage() to take a const CSSValue& (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODOs to replace the members with const members Created 5 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
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 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 } 801 }
802 802
803 PassRefPtrWillBeRawPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(Styl eResolverState& state, CSSValue* value) 803 PassRefPtrWillBeRawPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(Styl eResolverState& state, CSSValue* value)
804 { 804 {
805 if (value->isPrimitiveValue()) { 805 if (value->isPrimitiveValue()) {
806 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone); 806 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
807 return nullptr; 807 return nullptr;
808 } 808 }
809 809
810 if (value->isImageValue() || value->isImageGeneratorValue() || value->isImag eSetValue()) 810 if (value->isImageValue() || value->isImageGeneratorValue() || value->isImag eSetValue())
811 return ShapeValue::createImageValue(state.styleImage(CSSPropertyShapeOut side, value)); 811 return ShapeValue::createImageValue(state.styleImage(CSSPropertyShapeOut side, *value));
812 812
813 RefPtr<BasicShape> shape; 813 RefPtr<BasicShape> shape;
814 CSSBoxType cssBox = BoxMissing; 814 CSSBoxType cssBox = BoxMissing;
815 CSSValueList* valueList = toCSSValueList(value); 815 CSSValueList* valueList = toCSSValueList(value);
816 for (unsigned i = 0; i < valueList->length(); ++i) { 816 for (unsigned i = 0; i < valueList->length(); ++i) {
817 const CSSValue& value = *valueList->item(i); 817 const CSSValue& value = *valueList->item(i);
818 if (value.isBasicShapeValue()) { 818 if (value.isBasicShapeValue()) {
819 shape = basicShapeForValue(state, value); 819 shape = basicShapeForValue(state, value);
820 } else { 820 } else {
821 cssBox = CSSBoxType(toCSSPrimitiveValue(value)); 821 cssBox = CSSBoxType(toCSSPrimitiveValue(value));
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 return ScaleTransformOperation::create(sx, sy, sz, TransformOperation::Scale 3D); 968 return ScaleTransformOperation::create(sx, sy, sz, TransformOperation::Scale 3D);
969 } 969 }
970 970
971 RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(Style ResolverState& state, CSSValue* value) 971 RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(Style ResolverState& state, CSSValue* value)
972 { 972 {
973 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 973 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
974 return primitiveValue->getValueID() == CSSValueFromImage ? RespectImageOrien tation : DoNotRespectImageOrientation; 974 return primitiveValue->getValueID() == CSSValueFromImage ? RespectImageOrien tation : DoNotRespectImageOrientation;
975 } 975 }
976 976
977 } // namespace blink 977 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698