| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012, Google Inc. All rights reserved. | 2 * Copyright (c) 2012, Google Inc. 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 if ((widthScale > heightScale) != (fit == AspectRatioFitGrow)) | 141 if ((widthScale > heightScale) != (fit == AspectRatioFitGrow)) |
| 142 return LayoutSize(height() * aspectRatio.width() / aspectRatio.heigh
t(), height()); | 142 return LayoutSize(height() * aspectRatio.width() / aspectRatio.heigh
t(), height()); |
| 143 return LayoutSize(width(), width() * aspectRatio.height() / aspectRatio.
width()); | 143 return LayoutSize(width(), width() * aspectRatio.height() / aspectRatio.
width()); |
| 144 } | 144 } |
| 145 | 145 |
| 146 LayoutSize fraction() const | 146 LayoutSize fraction() const |
| 147 { | 147 { |
| 148 return LayoutSize(m_width.fraction(), m_height.fraction()); | 148 return LayoutSize(m_width.fraction(), m_height.fraction()); |
| 149 } | 149 } |
| 150 | 150 |
| 151 #ifndef NDEBUG | |
| 152 String toString() const; | 151 String toString() const; |
| 153 #endif | |
| 154 | 152 |
| 155 private: | 153 private: |
| 156 LayoutUnit m_width, m_height; | 154 LayoutUnit m_width, m_height; |
| 157 }; | 155 }; |
| 158 | 156 |
| 159 inline LayoutSize& operator+=(LayoutSize& a, const LayoutSize& b) | 157 inline LayoutSize& operator+=(LayoutSize& a, const LayoutSize& b) |
| 160 { | 158 { |
| 161 a.setWidth(a.width() + b.width()); | 159 a.setWidth(a.width() + b.width()); |
| 162 a.setHeight(a.height() + b.height()); | 160 a.setHeight(a.height() + b.height()); |
| 163 return a; | 161 return a; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 inline IntSize roundedIntSize(const LayoutSize& s) | 223 inline IntSize roundedIntSize(const LayoutSize& s) |
| 226 { | 224 { |
| 227 return IntSize(s.width().round(), s.height().round()); | 225 return IntSize(s.width().round(), s.height().round()); |
| 228 } | 226 } |
| 229 | 227 |
| 230 inline LayoutSize roundedLayoutSize(const FloatSize& s) | 228 inline LayoutSize roundedLayoutSize(const FloatSize& s) |
| 231 { | 229 { |
| 232 return LayoutSize(s); | 230 return LayoutSize(s); |
| 233 } | 231 } |
| 234 | 232 |
| 233 // Redeclared here to avoid ODR issues. |
| 234 // See platform/testing/GeometryPrinters.h. |
| 235 void PrintTo(const LayoutSize&, std::ostream*); |
| 236 |
| 235 } // namespace blink | 237 } // namespace blink |
| 236 | 238 |
| 237 #endif // LayoutSize_h | 239 #endif // LayoutSize_h |
| OLD | NEW |