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

Side by Side Diff: Source/core/rendering/shapes/ShapeInfo.cpp

Issue 220023003: Rename LayoutBox to CSSBoxType (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 case ShapeValue::Image: { 126 case ShapeValue::Image: {
127 Image* image; 127 Image* image;
128 LayoutRect imageRect; 128 LayoutRect imageRect;
129 getShapeImageAndRect(shapeValue, &m_renderer, m_referenceBoxLogicalSize, image, imageRect); 129 getShapeImageAndRect(shapeValue, &m_renderer, m_referenceBoxLogicalSize, image, imageRect);
130 const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_ref erenceBoxLogicalSize); 130 const LayoutRect& marginRect = getShapeImageMarginRect(m_renderer, m_ref erenceBoxLogicalSize);
131 m_shape = Shape::createRasterShape(image, shapeImageThreshold, imageRect , marginRect, writingMode, margin, padding); 131 m_shape = Shape::createRasterShape(image, shapeImageThreshold, imageRect , marginRect, writingMode, margin, padding);
132 break; 132 break;
133 } 133 }
134 case ShapeValue::Box: { 134 case ShapeValue::Box: {
135 const RoundedRect& shapeRect = m_renderer.style()->getRoundedBorderFor(L ayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer.view()); 135 const RoundedRect& shapeRect = m_renderer.style()->getRoundedBorderFor(L ayoutRect(LayoutPoint(), m_referenceBoxLogicalSize), m_renderer.view());
136 m_shape = Shape::createLayoutBoxShape(shapeRect, writingMode, margin, pa dding); 136 m_shape = Shape::createBoxShape(shapeRect, writingMode, margin, padding) ;
137 break; 137 break;
138 } 138 }
139 case ShapeValue::Outside: 139 case ShapeValue::Outside:
140 // Outside should have already resolved to a different shape value. 140 // Outside should have already resolved to a different shape value.
141 ASSERT_NOT_REACHED(); 141 ASSERT_NOT_REACHED();
142 } 142 }
143 143
144 ASSERT(m_shape); 144 ASSERT(m_shape);
145 return *m_shape; 145 return *m_shape;
146 } 146 }
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 case BoxMissing: break; 245 case BoxMissing: break;
246 } 246 }
247 247
248 ASSERT_NOT_REACHED(); 248 ASSERT_NOT_REACHED();
249 return LayoutUnit(); 249 return LayoutUnit();
250 } 250 }
251 251
252 template class ShapeInfo<RenderBlock>; 252 template class ShapeInfo<RenderBlock>;
253 template class ShapeInfo<RenderBox>; 253 template class ShapeInfo<RenderBox>;
254 } 254 }
OLDNEW
« no previous file with comments | « Source/core/rendering/shapes/ShapeInfo.h ('k') | Source/core/rendering/shapes/ShapeOutsideInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698