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

Side by Side Diff: Source/core/layout/shapes/Shape.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/layout/line/InlineTextBox.cpp ('k') | Source/core/layout/shapes/ShapeOutsideInfo.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) 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 20 matching lines...) Expand all
31 #include "core/layout/shapes/Shape.h" 31 #include "core/layout/shapes/Shape.h"
32 32
33 #include "core/css/BasicShapeFunctions.h" 33 #include "core/css/BasicShapeFunctions.h"
34 #include "core/dom/DOMArrayBuffer.h" 34 #include "core/dom/DOMArrayBuffer.h"
35 #include "core/dom/DOMTypedArray.h" 35 #include "core/dom/DOMTypedArray.h"
36 #include "core/fetch/ImageResource.h" 36 #include "core/fetch/ImageResource.h"
37 #include "core/layout/shapes/BoxShape.h" 37 #include "core/layout/shapes/BoxShape.h"
38 #include "core/layout/shapes/PolygonShape.h" 38 #include "core/layout/shapes/PolygonShape.h"
39 #include "core/layout/shapes/RasterShape.h" 39 #include "core/layout/shapes/RasterShape.h"
40 #include "core/layout/shapes/RectangleShape.h" 40 #include "core/layout/shapes/RectangleShape.h"
41 #include "core/layout/style/LayoutStyle.h" 41 #include "core/layout/style/ComputedStyle.h"
42 #include "core/svg/graphics/SVGImage.h" 42 #include "core/svg/graphics/SVGImage.h"
43 #include "platform/LengthFunctions.h" 43 #include "platform/LengthFunctions.h"
44 #include "platform/geometry/FloatRoundedRect.h" 44 #include "platform/geometry/FloatRoundedRect.h"
45 #include "platform/geometry/FloatSize.h" 45 #include "platform/geometry/FloatSize.h"
46 #include "platform/graphics/GraphicsContext.h" 46 #include "platform/graphics/GraphicsContext.h"
47 #include "platform/graphics/GraphicsTypes.h" 47 #include "platform/graphics/GraphicsTypes.h"
48 #include "platform/graphics/ImageBuffer.h" 48 #include "platform/graphics/ImageBuffer.h"
49 #include "wtf/ArrayBufferContents.h" 49 #include "wtf/ArrayBufferContents.h"
50 #include "wtf/MathExtras.h" 50 #include "wtf/MathExtras.h"
51 #include "wtf/OwnPtr.h" 51 #include "wtf/OwnPtr.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height() ); 245 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height() );
246 FloatRoundedRect bounds(rect, roundedRect.radii()); 246 FloatRoundedRect bounds(rect, roundedRect.radii());
247 OwnPtr<Shape> shape = createInsetShape(bounds); 247 OwnPtr<Shape> shape = createInsetShape(bounds);
248 shape->m_writingMode = writingMode; 248 shape->m_writingMode = writingMode;
249 shape->m_margin = margin; 249 shape->m_margin = margin;
250 250
251 return shape.release(); 251 return shape.release();
252 } 252 }
253 253
254 } // namespace blink 254 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/line/InlineTextBox.cpp ('k') | Source/core/layout/shapes/ShapeOutsideInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698