| OLD | NEW |
| 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. |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 } | 141 } |
| 142 | 142 |
| 143 if (paddingBounds.xInterceptsAtY(y2, minXIntercept, maxXIntercept)) { | 143 if (paddingBounds.xInterceptsAtY(y2, minXIntercept, maxXIntercept)) { |
| 144 x1 = std::max<float>(x1, minXIntercept); | 144 x1 = std::max<float>(x1, minXIntercept); |
| 145 x2 = std::min<float>(x2, maxXIntercept); | 145 x2 = std::min<float>(x2, maxXIntercept); |
| 146 } | 146 } |
| 147 | 147 |
| 148 result.append(LineSegment(x1, x2)); | 148 result.append(LineSegment(x1, x2)); |
| 149 } | 149 } |
| 150 | 150 |
| 151 bool BoxShape::firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTop,
const LayoutSize&, LayoutUnit& result) const | 151 bool BoxShape::firstIncludedIntervalLogicalTop(LayoutUnit minLogicalIntervalTop,
const FloatSize&, LayoutUnit& result) const |
| 152 { | 152 { |
| 153 // FIXME: this method is only a stub, https://bugs.webkit.org/show_bug.cgi?i
d=124606. | 153 // FIXME: this method is only a stub, https://bugs.webkit.org/show_bug.cgi?i
d=124606. |
| 154 | 154 |
| 155 result = minLogicalIntervalTop; | 155 result = minLogicalIntervalTop; |
| 156 return true; | 156 return true; |
| 157 } | 157 } |
| 158 | 158 |
| 159 } // namespace WebCore | 159 } // namespace WebCore |
| OLD | NEW |