| 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 | 191 |
| 192 updateLogicalWidth(); | 192 updateLogicalWidth(); |
| 193 updateLogicalHeight(); | 193 updateLogicalHeight(); |
| 194 | 194 |
| 195 m_overflow.clear(); | 195 m_overflow.clear(); |
| 196 addVisualEffectOverflow(); | 196 addVisualEffectOverflow(); |
| 197 | 197 |
| 198 updateLayerTransformAfterLayout(); | 198 updateLayerTransformAfterLayout(); |
| 199 | 199 |
| 200 if (!widget() && frameView()) | 200 if (!widget() && frameView()) |
| 201 frameView()->addWidgetToUpdate(*this); | 201 frameView()->addPartToUpdate(*this); |
| 202 | 202 |
| 203 clearNeedsLayout(); | 203 clearNeedsLayout(); |
| 204 } | 204 } |
| 205 | 205 |
| 206 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g
ranularity, float) | 206 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g
ranularity, float) |
| 207 { | 207 { |
| 208 return false; | 208 return false; |
| 209 } | 209 } |
| 210 | 210 |
| 211 CompositingReasons RenderEmbeddedObject::additionalCompositingReasons() const | 211 CompositingReasons RenderEmbeddedObject::additionalCompositingReasons() const |
| 212 { | 212 { |
| 213 if (requiresAcceleratedCompositing()) | 213 if (requiresAcceleratedCompositing()) |
| 214 return CompositingReasonPlugin; | 214 return CompositingReasonPlugin; |
| 215 return CompositingReasonNone; | 215 return CompositingReasonNone; |
| 216 } | 216 } |
| 217 | 217 |
| 218 RenderBox* RenderEmbeddedObject::embeddedContentBox() const | 218 RenderBox* RenderEmbeddedObject::embeddedContentBox() const |
| 219 { | 219 { |
| 220 if (!node() || !widget() || !widget()->isFrameView()) | 220 if (!node() || !widget() || !widget()->isFrameView()) |
| 221 return 0; | 221 return 0; |
| 222 return toFrameView(widget())->embeddedContentBox(); | 222 return toFrameView(widget())->embeddedContentBox(); |
| 223 } | 223 } |
| 224 | 224 |
| 225 } // namespace blink | 225 } // namespace blink |
| OLD | NEW |