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 Apple Inc. All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
7 * Copyright (C) 2010 Google Inc. All rights reserved. | 7 * Copyright (C) 2010 Google Inc. 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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 rects.append(rect); | 384 rects.append(rect); |
385 } | 385 } |
386 } | 386 } |
387 } | 387 } |
388 } | 388 } |
389 | 389 |
390 | 390 |
391 bool LayoutBoxModelObject::calculateHasBoxDecorations() const | 391 bool LayoutBoxModelObject::calculateHasBoxDecorations() const |
392 { | 392 { |
393 const ComputedStyle& styleToUse = styleRef(); | 393 const ComputedStyle& styleToUse = styleRef(); |
394 return hasBackground() || styleToUse.hasBorder() || styleToUse.hasAppearance
() || styleToUse.boxShadow(); | 394 return hasBackground() || styleToUse.hasBorderDecoration() || styleToUse.has
Appearance() || styleToUse.boxShadow(); |
395 } | 395 } |
396 | 396 |
397 void LayoutBoxModelObject::updateFromStyle() | 397 void LayoutBoxModelObject::updateFromStyle() |
398 { | 398 { |
399 const ComputedStyle& styleToUse = styleRef(); | 399 const ComputedStyle& styleToUse = styleRef(); |
400 setHasBoxDecorationBackground(calculateHasBoxDecorations()); | 400 setHasBoxDecorationBackground(calculateHasBoxDecorations()); |
401 setInline(styleToUse.isDisplayInlineType()); | 401 setInline(styleToUse.isDisplayInlineType()); |
402 setPositionState(styleToUse.position()); | 402 setPositionState(styleToUse.position()); |
403 setHorizontalWritingMode(styleToUse.isHorizontalWritingMode()); | 403 setHorizontalWritingMode(styleToUse.isHorizontalWritingMode()); |
404 } | 404 } |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); | 938 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); |
939 for (LayoutObject* child = startChild; child && child != endChild; ) { | 939 for (LayoutObject* child = startChild; child && child != endChild; ) { |
940 // Save our next sibling as moveChildTo will clear it. | 940 // Save our next sibling as moveChildTo will clear it. |
941 LayoutObject* nextSibling = child->nextSibling(); | 941 LayoutObject* nextSibling = child->nextSibling(); |
942 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); | 942 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); |
943 child = nextSibling; | 943 child = nextSibling; |
944 } | 944 } |
945 } | 945 } |
946 | 946 |
947 } // namespace blink | 947 } // namespace blink |
OLD | NEW |