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

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

Issue 1541793002: Remove config.h inclusion from third_party/WebKit/Source/core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2013 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.
11 * 2. Redistributions in binary form must reproduce the above 11 * 2. Redistributions in binary form must reproduce the above
12 * copyright notice, this list of conditions and the following 12 * copyright notice, this list of conditions and the following
13 * disclaimer in the documentation and/or other materials 13 * disclaimer in the documentation and/or other materials
14 * provided with the distribution. 14 * provided with the distribution.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
17 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
18 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 18 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
19 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 19 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
20 * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 20 * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
21 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 21 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
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 "config.h"
31 #include "core/layout/shapes/BoxShape.h" 30 #include "core/layout/shapes/BoxShape.h"
32 31
33 #include "wtf/MathExtras.h" 32 #include "wtf/MathExtras.h"
34 33
35 namespace blink { 34 namespace blink {
36 35
37 LayoutRect BoxShape::shapeMarginLogicalBoundingBox() const 36 LayoutRect BoxShape::shapeMarginLogicalBoundingBox() const
38 { 37 {
39 FloatRect marginBounds(m_bounds.rect()); 38 FloatRect marginBounds(m_bounds.rect());
40 if (shapeMargin() > 0) 39 if (shapeMargin() > 0)
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 } 96 }
98 97
99 void BoxShape::buildDisplayPaths(DisplayPaths& paths) const 98 void BoxShape::buildDisplayPaths(DisplayPaths& paths) const
100 { 99 {
101 paths.shape.addRoundedRect(m_bounds.rect(), m_bounds.radii().topLeft(), m_bo unds.radii().topRight(), m_bounds.radii().bottomLeft(), m_bounds.radii().bottomR ight()); 100 paths.shape.addRoundedRect(m_bounds.rect(), m_bounds.radii().topLeft(), m_bo unds.radii().topRight(), m_bounds.radii().bottomLeft(), m_bounds.radii().bottomR ight());
102 if (shapeMargin()) 101 if (shapeMargin())
103 paths.marginShape.addRoundedRect(shapeMarginBounds().rect(), shapeMargin Bounds().radii().topLeft(), shapeMarginBounds().radii().topRight(), shapeMarginB ounds().radii().bottomLeft(), shapeMarginBounds().radii().bottomRight()); 102 paths.marginShape.addRoundedRect(shapeMarginBounds().rect(), shapeMargin Bounds().radii().topLeft(), shapeMarginBounds().radii().topRight(), shapeMarginB ounds().radii().bottomLeft(), shapeMarginBounds().radii().bottomRight());
104 } 103 }
105 104
106 } // namespace blink 105 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698