| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Simon Hausmann <hausmann@kde.org> | 3 * (C) 2000 Simon Hausmann <hausmann@kde.org> |
| 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
| 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 } | 120 } |
| 121 | 121 |
| 122 void LayoutEmbeddedObject::layout() | 122 void LayoutEmbeddedObject::layout() |
| 123 { | 123 { |
| 124 ASSERT(needsLayout()); | 124 ASSERT(needsLayout()); |
| 125 LayoutAnalyzer::Scope analyzer(*this); | 125 LayoutAnalyzer::Scope analyzer(*this); |
| 126 | 126 |
| 127 updateLogicalWidth(); | 127 updateLogicalWidth(); |
| 128 updateLogicalHeight(); | 128 updateLogicalHeight(); |
| 129 | 129 |
| 130 m_overflow.clear(); | 130 m_overflow.reset(); |
| 131 addVisualEffectOverflow(); | 131 addVisualEffectOverflow(); |
| 132 | 132 |
| 133 updateLayerTransformAfterLayout(); | 133 updateLayerTransformAfterLayout(); |
| 134 | 134 |
| 135 Widget* widget = this->widget(); | 135 Widget* widget = this->widget(); |
| 136 if (!widget && frameView()) | 136 if (!widget && frameView()) |
| 137 frameView()->addPartToUpdate(*this); | 137 frameView()->addPartToUpdate(*this); |
| 138 | 138 |
| 139 clearNeedsLayout(); | 139 clearNeedsLayout(); |
| 140 } | 140 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 163 } | 163 } |
| 164 | 164 |
| 165 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const | 165 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const |
| 166 { | 166 { |
| 167 if (!node() || !widget() || !widget()->isFrameView()) | 167 if (!node() || !widget() || !widget()->isFrameView()) |
| 168 return nullptr; | 168 return nullptr; |
| 169 return toFrameView(widget())->embeddedReplacedContent(); | 169 return toFrameView(widget())->embeddedReplacedContent(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace blink | 172 } // namespace blink |
| OLD | NEW |