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

Side by Side Diff: sky/engine/platform/geometry/FloatRoundedRect.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 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 "sky/engine/config.h"
31 #include "sky/engine/platform/geometry/FloatRoundedRect.h" 30 #include "sky/engine/platform/geometry/FloatRoundedRect.h"
32 31
33 #include <algorithm> 32 #include <algorithm>
34 33
35 namespace blink { 34 namespace blink {
36 35
37 FloatRoundedRect::FloatRoundedRect(float x, float y, float width, float height) 36 FloatRoundedRect::FloatRoundedRect(float x, float y, float width, float height)
38 : m_rect(x, y, width, height) 37 : m_rect(x, y, width, height)
39 { 38 {
40 } 39 }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 maxXIntercept = topRightRect.x() + cornerRectIntercept(topRightRect.maxY () - y, topRightRect); 130 maxXIntercept = topRightRect.x() + cornerRectIntercept(topRightRect.maxY () - y, topRightRect);
132 else if (!bottomRightRect.isEmpty() && y >= bottomRightRect.y() && y <= bott omRightRect.maxY()) 131 else if (!bottomRightRect.isEmpty() && y >= bottomRightRect.y() && y <= bott omRightRect.maxY())
133 maxXIntercept = bottomRightRect.x() + cornerRectIntercept(y - bottomRigh tRect.y(), bottomRightRect); 132 maxXIntercept = bottomRightRect.x() + cornerRectIntercept(y - bottomRigh tRect.y(), bottomRightRect);
134 else 133 else
135 maxXIntercept = m_rect.maxX(); 134 maxXIntercept = m_rect.maxX();
136 135
137 return true; 136 return true;
138 } 137 }
139 138
140 } // namespace blink 139 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/platform/geometry/FloatRect.cpp ('k') | sky/engine/platform/geometry/FloatRoundedRectTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698