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

Side by Side Diff: third_party/WebKit/Source/core/layout/shapes/Shape.cpp

Issue 2469873002: [ImageResource 4] Split ImageResource into Resource and Image parts (Closed)
Patch Set: Rebase Created 4 years 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 14 matching lines...) Expand all
25 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
27 * OF THE POSSIBILITY OF SUCH DAMAGE. 27 * OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30 #include "core/layout/shapes/Shape.h" 30 #include "core/layout/shapes/Shape.h"
31 31
32 #include "core/css/BasicShapeFunctions.h" 32 #include "core/css/BasicShapeFunctions.h"
33 #include "core/dom/DOMArrayBuffer.h" 33 #include "core/dom/DOMArrayBuffer.h"
34 #include "core/dom/DOMTypedArray.h" 34 #include "core/dom/DOMTypedArray.h"
35 #include "core/fetch/ImageResource.h"
36 #include "core/layout/shapes/BoxShape.h" 35 #include "core/layout/shapes/BoxShape.h"
37 #include "core/layout/shapes/PolygonShape.h" 36 #include "core/layout/shapes/PolygonShape.h"
38 #include "core/layout/shapes/RasterShape.h" 37 #include "core/layout/shapes/RasterShape.h"
39 #include "core/layout/shapes/RectangleShape.h" 38 #include "core/layout/shapes/RectangleShape.h"
40 #include "core/style/ComputedStyle.h" 39 #include "core/style/ComputedStyle.h"
41 #include "core/svg/graphics/SVGImage.h" 40 #include "core/svg/graphics/SVGImage.h"
42 #include "platform/LengthFunctions.h" 41 #include "platform/LengthFunctions.h"
43 #include "platform/geometry/FloatRoundedRect.h" 42 #include "platform/geometry/FloatRoundedRect.h"
44 #include "platform/geometry/FloatSize.h" 43 #include "platform/geometry/FloatSize.h"
45 #include "platform/graphics/GraphicsTypes.h" 44 #include "platform/graphics/GraphicsTypes.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height()); 295 FloatRect rect(0, 0, roundedRect.rect().width(), roundedRect.rect().height());
297 FloatRoundedRect bounds(rect, roundedRect.getRadii()); 296 FloatRoundedRect bounds(rect, roundedRect.getRadii());
298 std::unique_ptr<Shape> shape = createInsetShape(bounds); 297 std::unique_ptr<Shape> shape = createInsetShape(bounds);
299 shape->m_writingMode = writingMode; 298 shape->m_writingMode = writingMode;
300 shape->m_margin = margin; 299 shape->m_margin = margin;
301 300
302 return shape; 301 return shape;
303 } 302 }
304 303
305 } // namespace blink 304 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698