| 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. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. |
| 6 * All rights reserved. | 6 * All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 LayoutAnalyzer::Scope analyzer(*this); | 128 LayoutAnalyzer::Scope analyzer(*this); |
| 129 | 129 |
| 130 updateLogicalWidth(); | 130 updateLogicalWidth(); |
| 131 updateLogicalHeight(); | 131 updateLogicalHeight(); |
| 132 | 132 |
| 133 m_overflow.reset(); | 133 m_overflow.reset(); |
| 134 addVisualEffectOverflow(); | 134 addVisualEffectOverflow(); |
| 135 | 135 |
| 136 updateLayerTransformAfterLayout(); | 136 updateLayerTransformAfterLayout(); |
| 137 | 137 |
| 138 FrameViewBase* frameViewBase = this->widget(); | 138 FrameViewBase* frameViewBase = this->frameViewBase(); |
| 139 if (!frameViewBase && frameView()) | 139 if (!frameViewBase && frameView()) |
| 140 frameView()->addPartToUpdate(*this); | 140 frameView()->addPartToUpdate(*this); |
| 141 | 141 |
| 142 clearNeedsLayout(); | 142 clearNeedsLayout(); |
| 143 } | 143 } |
| 144 | 144 |
| 145 ScrollResult LayoutEmbeddedObject::scroll(ScrollGranularity granularity, | 145 ScrollResult LayoutEmbeddedObject::scroll(ScrollGranularity granularity, |
| 146 const FloatSize&) { | 146 const FloatSize&) { |
| 147 return ScrollResult(); | 147 return ScrollResult(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const { | 150 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const { |
| 151 if (requiresAcceleratedCompositing()) | 151 if (requiresAcceleratedCompositing()) |
| 152 return CompositingReasonPlugin; | 152 return CompositingReasonPlugin; |
| 153 return CompositingReasonNone; | 153 return CompositingReasonNone; |
| 154 } | 154 } |
| 155 | 155 |
| 156 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const { | 156 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const { |
| 157 if (!node() || !widget() || !widget()->isFrameView()) | 157 if (!node() || !frameViewBase() || !frameViewBase()->isFrameView()) |
| 158 return nullptr; | 158 return nullptr; |
| 159 return toFrameView(widget())->embeddedReplacedContent(); | 159 return toFrameView(frameViewBase())->embeddedReplacedContent(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 } // namespace blink | 162 } // namespace blink |
| OLD | NEW |