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

Side by Side Diff: Source/core/css/BasicShapeFunctions.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/BasicShapeFunctions.h ('k') | Source/core/css/CSSCalculationValueTest.cpp » ('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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 18 matching lines...) Expand all
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "core/css/BasicShapeFunctions.h" 31 #include "core/css/BasicShapeFunctions.h"
32 32
33 #include "core/css/CSSBasicShapes.h" 33 #include "core/css/CSSBasicShapes.h"
34 #include "core/css/CSSPrimitiveValueMappings.h" 34 #include "core/css/CSSPrimitiveValueMappings.h"
35 #include "core/css/CSSValuePool.h" 35 #include "core/css/CSSValuePool.h"
36 #include "core/css/Pair.h" 36 #include "core/css/Pair.h"
37 #include "core/css/resolver/StyleResolverState.h" 37 #include "core/css/resolver/StyleResolverState.h"
38 #include "core/layout/style/BasicShapes.h" 38 #include "core/layout/style/BasicShapes.h"
39 #include "core/layout/style/LayoutStyle.h" 39 #include "core/layout/style/ComputedStyle.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForCenterCoordinate(CSSVal uePool& pool, const LayoutStyle& style, const BasicShapeCenterCoordinate& center , EBoxOrient orientation) 43 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForCenterCoordinate(CSSVal uePool& pool, const ComputedStyle& style, const BasicShapeCenterCoordinate& cent er, EBoxOrient orientation)
44 { 44 {
45 if (center.direction() == BasicShapeCenterCoordinate::TopLeft) 45 if (center.direction() == BasicShapeCenterCoordinate::TopLeft)
46 return pool.createValue(center.length(), style); 46 return pool.createValue(center.length(), style);
47 47
48 CSSValueID keyword = orientation == HORIZONTAL ? CSSValueRight : CSSValueBot tom; 48 CSSValueID keyword = orientation == HORIZONTAL ? CSSValueRight : CSSValueBot tom;
49 49
50 return pool.createValue(Pair::create(pool.createIdentifierValue(keyword), po ol.createValue(center.length(), style), Pair::DropIdenticalValues)); 50 return pool.createValue(Pair::create(pool.createIdentifierValue(keyword), po ol.createValue(center.length(), style), Pair::DropIdenticalValues));
51 } 51 }
52 52
53 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> basicShapeRadiusToCSSValue(CSSV aluePool& pool, const LayoutStyle& style, const BasicShapeRadius& radius) 53 static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> basicShapeRadiusToCSSValue(CSSV aluePool& pool, const ComputedStyle& style, const BasicShapeRadius& radius)
54 { 54 {
55 switch (radius.type()) { 55 switch (radius.type()) {
56 case BasicShapeRadius::Value: 56 case BasicShapeRadius::Value:
57 return pool.createValue(radius.value(), style); 57 return pool.createValue(radius.value(), style);
58 case BasicShapeRadius::ClosestSide: 58 case BasicShapeRadius::ClosestSide:
59 return pool.createIdentifierValue(CSSValueClosestSide); 59 return pool.createIdentifierValue(CSSValueClosestSide);
60 case BasicShapeRadius::FarthestSide: 60 case BasicShapeRadius::FarthestSide:
61 return pool.createIdentifierValue(CSSValueFarthestSide); 61 return pool.createIdentifierValue(CSSValueFarthestSide);
62 } 62 }
63 63
64 ASSERT_NOT_REACHED(); 64 ASSERT_NOT_REACHED();
65 return nullptr; 65 return nullptr;
66 } 66 }
67 67
68 PassRefPtrWillBeRawPtr<CSSValue> valueForBasicShape(const LayoutStyle& style, co nst BasicShape* basicShape) 68 PassRefPtrWillBeRawPtr<CSSValue> valueForBasicShape(const ComputedStyle& style, const BasicShape* basicShape)
69 { 69 {
70 CSSValuePool& pool = cssValuePool(); 70 CSSValuePool& pool = cssValuePool();
71 71
72 RefPtrWillBeRawPtr<CSSBasicShape> basicShapeValue = nullptr; 72 RefPtrWillBeRawPtr<CSSBasicShape> basicShapeValue = nullptr;
73 switch (basicShape->type()) { 73 switch (basicShape->type()) {
74 case BasicShape::BasicShapeCircleType: { 74 case BasicShape::BasicShapeCircleType: {
75 const BasicShapeCircle* circle = toBasicShapeCircle(basicShape); 75 const BasicShapeCircle* circle = toBasicShapeCircle(basicShape);
76 RefPtrWillBeRawPtr<CSSBasicShapeCircle> circleValue = CSSBasicShapeCircl e::create(); 76 RefPtrWillBeRawPtr<CSSBasicShapeCircle> circleValue = CSSBasicShapeCircl e::create();
77 77
78 circleValue->setCenterX(valueForCenterCoordinate(pool, style, circle->ce nterX(), HORIZONTAL)); 78 circleValue->setCenterX(valueForCenterCoordinate(pool, style, circle->ce nterX(), HORIZONTAL));
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 } 268 }
269 269
270 FloatPoint floatPointForCenterCoordinate(const BasicShapeCenterCoordinate& cente rX, const BasicShapeCenterCoordinate& centerY, FloatSize boxSize) 270 FloatPoint floatPointForCenterCoordinate(const BasicShapeCenterCoordinate& cente rX, const BasicShapeCenterCoordinate& centerY, FloatSize boxSize)
271 { 271 {
272 float x = floatValueForLength(centerX.computedLength(), boxSize.width()); 272 float x = floatValueForLength(centerX.computedLength(), boxSize.width());
273 float y = floatValueForLength(centerY.computedLength(), boxSize.height()); 273 float y = floatValueForLength(centerY.computedLength(), boxSize.height());
274 return FloatPoint(x, y); 274 return FloatPoint(x, y);
275 } 275 }
276 276
277 } 277 }
OLDNEW
« no previous file with comments | « Source/core/css/BasicShapeFunctions.h ('k') | Source/core/css/CSSCalculationValueTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698