| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 if (preferredLogicalWidthsDirty()) { | 381 if (preferredLogicalWidthsDirty()) { |
| 382 #if ENABLE(ASSERT) | 382 #if ENABLE(ASSERT) |
| 383 SetLayoutNeededForbiddenScope layoutForbiddenScope(const_cast<RenderBox&
>(*this)); | 383 SetLayoutNeededForbiddenScope layoutForbiddenScope(const_cast<RenderBox&
>(*this)); |
| 384 #endif | 384 #endif |
| 385 const_cast<RenderBox*>(this)->computePreferredLogicalWidths(); | 385 const_cast<RenderBox*>(this)->computePreferredLogicalWidths(); |
| 386 } | 386 } |
| 387 | 387 |
| 388 return m_maxPreferredLogicalWidth; | 388 return m_maxPreferredLogicalWidth; |
| 389 } | 389 } |
| 390 | 390 |
| 391 void RenderBox::setMinPreferredLogicalWidth(LayoutUnit width) |
| 392 { |
| 393 m_minPreferredLogicalWidth = width; |
| 394 } |
| 395 |
| 396 void RenderBox::setMaxPreferredLogicalWidth(LayoutUnit width) |
| 397 { |
| 398 m_maxPreferredLogicalWidth = width; |
| 399 } |
| 400 |
| 391 bool RenderBox::hasOverrideHeight() const | 401 bool RenderBox::hasOverrideHeight() const |
| 392 { | 402 { |
| 393 return m_rareData && m_rareData->m_overrideLogicalContentHeight != -1; | 403 return m_rareData && m_rareData->m_overrideLogicalContentHeight != -1; |
| 394 } | 404 } |
| 395 | 405 |
| 396 bool RenderBox::hasOverrideWidth() const | 406 bool RenderBox::hasOverrideWidth() const |
| 397 { | 407 { |
| 398 return m_rareData && m_rareData->m_overrideLogicalContentWidth != -1; | 408 return m_rareData && m_rareData->m_overrideLogicalContentWidth != -1; |
| 399 } | 409 } |
| 400 | 410 |
| (...skipping 2654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3055 | 3065 |
| 3056 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) | 3066 RenderBox::BoxDecorationData::BoxDecorationData(const RenderStyle& style) |
| 3057 { | 3067 { |
| 3058 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); | 3068 backgroundColor = style.colorIncludingFallback(CSSPropertyBackgroundColor); |
| 3059 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); | 3069 hasBackground = backgroundColor.alpha() || style.hasBackgroundImage(); |
| 3060 ASSERT(hasBackground == style.hasBackground()); | 3070 ASSERT(hasBackground == style.hasBackground()); |
| 3061 hasBorder = style.hasBorder(); | 3071 hasBorder = style.hasBorder(); |
| 3062 } | 3072 } |
| 3063 | 3073 |
| 3064 } // namespace blink | 3074 } // namespace blink |
| OLD | NEW |