| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 } | 305 } |
| 306 } | 306 } |
| 307 } | 307 } |
| 308 | 308 |
| 309 static EFillBox clipMax(EFillBox clipA, EFillBox clipB) | 309 static EFillBox clipMax(EFillBox clipA, EFillBox clipB) |
| 310 { | 310 { |
| 311 if (clipA == BorderFillBox || clipB == BorderFillBox) | 311 if (clipA == BorderFillBox || clipB == BorderFillBox) |
| 312 return BorderFillBox; | 312 return BorderFillBox; |
| 313 if (clipA == PaddingFillBox || clipB == PaddingFillBox) | 313 if (clipA == PaddingFillBox || clipB == PaddingFillBox) |
| 314 return PaddingFillBox; | 314 return PaddingFillBox; |
| 315 if (clipA == ContentFillBox || clipB == ContentFillBox) | 315 return ContentFillBox; |
| 316 return ContentFillBox; | |
| 317 return TextFillBox; | |
| 318 } | 316 } |
| 319 | 317 |
| 320 void FillLayer::computeClipMax() const | 318 void FillLayer::computeClipMax() const |
| 321 { | 319 { |
| 322 if (m_next) { | 320 if (m_next) { |
| 323 m_next->computeClipMax(); | 321 m_next->computeClipMax(); |
| 324 m_clipMax = clipMax(clip(), m_next->clip()); | 322 m_clipMax = clipMax(clip(), m_next->clip()); |
| 325 } else | 323 } else |
| 326 m_clipMax = m_clip; | 324 m_clipMax = m_clip; |
| 327 } | 325 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 | 369 |
| 372 return false; | 370 return false; |
| 373 } | 371 } |
| 374 | 372 |
| 375 bool FillLayer::hasRepeatXY() const | 373 bool FillLayer::hasRepeatXY() const |
| 376 { | 374 { |
| 377 return m_repeatX == RepeatFill && m_repeatY == RepeatFill; | 375 return m_repeatX == RepeatFill && m_repeatY == RepeatFill; |
| 378 } | 376 } |
| 379 | 377 |
| 380 } // namespace blink | 378 } // namespace blink |
| OLD | NEW |