| 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 path.addRoundedRect(replacementTextRect, FloatSize(replacementTextRoundedRec
tRadius, replacementTextRoundedRectRadius)); | 184 path.addRoundedRect(replacementTextRect, FloatSize(replacementTextRoundedRec
tRadius, replacementTextRoundedRectRadius)); |
| 185 | 185 |
| 186 return true; | 186 return true; |
| 187 } | 187 } |
| 188 | 188 |
| 189 void RenderEmbeddedObject::layout() | 189 void RenderEmbeddedObject::layout() |
| 190 { | 190 { |
| 191 ASSERT(needsLayout()); | 191 ASSERT(needsLayout()); |
| 192 | 192 |
| 193 setMayNeedInvalidation(true); |
| 194 |
| 193 updateLogicalWidth(); | 195 updateLogicalWidth(); |
| 194 updateLogicalHeight(); | 196 updateLogicalHeight(); |
| 195 | 197 |
| 196 m_overflow.clear(); | 198 m_overflow.clear(); |
| 197 addVisualEffectOverflow(); | 199 addVisualEffectOverflow(); |
| 198 | 200 |
| 199 updateLayerTransform(); | 201 updateLayerTransform(); |
| 200 | 202 |
| 201 if (!widget() && frameView()) | 203 if (!widget() && frameView()) |
| 202 frameView()->addWidgetToUpdate(*this); | 204 frameView()->addWidgetToUpdate(*this); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 217 } | 219 } |
| 218 | 220 |
| 219 RenderBox* RenderEmbeddedObject::embeddedContentBox() const | 221 RenderBox* RenderEmbeddedObject::embeddedContentBox() const |
| 220 { | 222 { |
| 221 if (!node() || !widget() || !widget()->isFrameView()) | 223 if (!node() || !widget() || !widget()->isFrameView()) |
| 222 return 0; | 224 return 0; |
| 223 return toFrameView(widget())->embeddedContentBox(); | 225 return toFrameView(widget())->embeddedContentBox(); |
| 224 } | 226 } |
| 225 | 227 |
| 226 } | 228 } |
| OLD | NEW |