| 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 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 | 412 |
| 413 RenderStyle* styleToUse = style(); | 413 RenderStyle* styleToUse = style(); |
| 414 bool isRootObject = isRoot(); | 414 bool isRootObject = isRoot(); |
| 415 bool isViewObject = isRenderView(); | 415 bool isViewObject = isRenderView(); |
| 416 | 416 |
| 417 // The root and the RenderView always paint their backgrounds/borders. | 417 // The root and the RenderView always paint their backgrounds/borders. |
| 418 if (isRootObject || isViewObject) | 418 if (isRootObject || isViewObject) |
| 419 setHasBoxDecorations(true); | 419 setHasBoxDecorations(true); |
| 420 | 420 |
| 421 setPositioned(styleToUse->isPositioned()); | 421 setPositioned(styleToUse->isPositioned()); |
| 422 setFloating(styleToUse->isFloating() && (!isPositioned() || styleToUse->floa
ting() == PositionedFloat)); | 422 setFloating(!isPositioned() && styleToUse->isFloating()); |
| 423 | 423 |
| 424 // We also handle <body> and <html>, whose overflow applies to the viewport. | 424 // We also handle <body> and <html>, whose overflow applies to the viewport. |
| 425 if (styleToUse->overflowX() != OVISIBLE && !isRootObject && (isRenderBlock()
|| isTableRow() || isTableSection())) { | 425 if (styleToUse->overflowX() != OVISIBLE && !isRootObject && (isRenderBlock()
|| isTableRow() || isTableSection())) { |
| 426 bool boxHasOverflowClip = true; | 426 bool boxHasOverflowClip = true; |
| 427 if (isBody()) { | 427 if (isBody()) { |
| 428 // Overflow on the body can propagate to the viewport under the foll
owing conditions. | 428 // Overflow on the body can propagate to the viewport under the foll
owing conditions. |
| 429 // (1) The root element is <html>. | 429 // (1) The root element is <html>. |
| 430 // (2) We are the primary <body> (can be checked by looking at docum
ent.body). | 430 // (2) We are the primary <body> (can be checked by looking at docum
ent.body). |
| 431 // (3) The root element has visible overflow. | 431 // (3) The root element has visible overflow. |
| 432 if (document()->documentElement()->hasTagName(htmlTag) && | 432 if (document()->documentElement()->hasTagName(htmlTag) && |
| (...skipping 3689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4122 } | 4122 } |
| 4123 | 4123 |
| 4124 if (didSplitParentAnonymousBoxes) | 4124 if (didSplitParentAnonymousBoxes) |
| 4125 markBoxForRelayoutAfterSplit(this); | 4125 markBoxForRelayoutAfterSplit(this); |
| 4126 | 4126 |
| 4127 ASSERT(beforeChild->parent() == this); | 4127 ASSERT(beforeChild->parent() == this); |
| 4128 return beforeChild; | 4128 return beforeChild; |
| 4129 } | 4129 } |
| 4130 | 4130 |
| 4131 } // namespace WebCore | 4131 } // namespace WebCore |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10368021:
Merge 115668 - Source/WebCore: Remove positioned float code. (Closed)
Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/