| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 void RenderEmbeddedObject::layout() | 191 void RenderEmbeddedObject::layout() |
| 192 { | 192 { |
| 193 ASSERT(needsLayout()); | 193 ASSERT(needsLayout()); |
| 194 | 194 |
| 195 updateLogicalWidth(); | 195 updateLogicalWidth(); |
| 196 updateLogicalHeight(); | 196 updateLogicalHeight(); |
| 197 | 197 |
| 198 m_overflow.clear(); | 198 m_overflow.clear(); |
| 199 addVisualEffectOverflow(); | 199 addVisualEffectOverflow(); |
| 200 | 200 |
| 201 updateLayerTransform(); | 201 updateLayerTransformAfterLayout(); |
| 202 | 202 |
| 203 if (!widget() && frameView()) | 203 if (!widget() && frameView()) |
| 204 frameView()->addWidgetToUpdate(*this); | 204 frameView()->addWidgetToUpdate(*this); |
| 205 | 205 |
| 206 clearNeedsLayout(); | 206 clearNeedsLayout(); |
| 207 } | 207 } |
| 208 | 208 |
| 209 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g
ranularity, float) | 209 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g
ranularity, float) |
| 210 { | 210 { |
| 211 return false; | 211 return false; |
| 212 } | 212 } |
| 213 | 213 |
| 214 CompositingReasons RenderEmbeddedObject::additionalCompositingReasons(Compositin
gTriggerFlags triggers) const | 214 CompositingReasons RenderEmbeddedObject::additionalCompositingReasons(Compositin
gTriggerFlags triggers) const |
| 215 { | 215 { |
| 216 if (requiresAcceleratedCompositing()) | 216 if (requiresAcceleratedCompositing()) |
| 217 return CompositingReasonPlugin; | 217 return CompositingReasonPlugin; |
| 218 return CompositingReasonNone; | 218 return CompositingReasonNone; |
| 219 } | 219 } |
| 220 | 220 |
| 221 RenderBox* RenderEmbeddedObject::embeddedContentBox() const | 221 RenderBox* RenderEmbeddedObject::embeddedContentBox() const |
| 222 { | 222 { |
| 223 if (!node() || !widget() || !widget()->isFrameView()) | 223 if (!node() || !widget() || !widget()->isFrameView()) |
| 224 return 0; | 224 return 0; |
| 225 return toFrameView(widget())->embeddedContentBox(); | 225 return toFrameView(widget())->embeddedContentBox(); |
| 226 } | 226 } |
| 227 | 227 |
| 228 } | 228 } |
| OLD | NEW |