Chromium Code Reviews| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 127 updateLogicalWidth(); | 127 updateLogicalWidth(); |
| 128 updateLogicalHeight(); | 128 updateLogicalHeight(); |
| 129 | 129 |
| 130 m_overflow.clear(); | 130 m_overflow.clear(); |
| 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) { | 136 if (widget) { |
| 137 // TODO(chrishtr): remove this code. It's now called in FrameView::updat eStyleAndLayoutIfNeededRecursive. | |
| 137 if (widget->isPluginView()) | 138 if (widget->isPluginView()) |
| 138 toPluginView(widget)->layoutIfNeeded(); | 139 toPluginView(widget)->updateAllLifecyclePhases(); |
|
chrishtr
2016/03/07 21:49:24
I'm leaving this in here out of caution, since thi
| |
| 139 } else if (frameView()) { | 140 } else if (frameView()) { |
| 140 frameView()->addPartToUpdate(*this); | 141 frameView()->addPartToUpdate(*this); |
| 141 } | 142 } |
| 142 | 143 |
| 143 clearNeedsLayout(); | 144 clearNeedsLayout(); |
| 144 } | 145 } |
| 145 | 146 |
| 146 PaintInvalidationReason LayoutEmbeddedObject::invalidatePaintIfNeeded( | 147 PaintInvalidationReason LayoutEmbeddedObject::invalidatePaintIfNeeded( |
| 147 PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& newPaintInvalidationContainer) | 148 PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& newPaintInvalidationContainer) |
| 148 { | 149 { |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 169 } | 170 } |
| 170 | 171 |
| 171 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const | 172 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const |
| 172 { | 173 { |
| 173 if (!node() || !widget() || !widget()->isFrameView()) | 174 if (!node() || !widget() || !widget()->isFrameView()) |
| 174 return nullptr; | 175 return nullptr; |
| 175 return toFrameView(widget())->embeddedContentBox(); | 176 return toFrameView(widget())->embeddedContentBox(); |
| 176 } | 177 } |
| 177 | 178 |
| 178 } // namespace blink | 179 } // namespace blink |
| OLD | NEW |