| 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 LayoutAnalyzer::Scope analyzer(*this); | 131 LayoutAnalyzer::Scope analyzer(*this); |
| 132 | 132 |
| 133 UpdateLogicalWidth(); | 133 UpdateLogicalWidth(); |
| 134 UpdateLogicalHeight(); | 134 UpdateLogicalHeight(); |
| 135 | 135 |
| 136 overflow_.reset(); | 136 overflow_.reset(); |
| 137 AddVisualEffectOverflow(); | 137 AddVisualEffectOverflow(); |
| 138 | 138 |
| 139 UpdateLayerTransformAfterLayout(); | 139 UpdateLayerTransformAfterLayout(); |
| 140 | 140 |
| 141 FrameViewBase* frame_view_base = this->PluginOrFrame(); | 141 if (!GetFrameOrPlugin() && GetFrameView()) |
| 142 if (!frame_view_base && GetFrameView()) | |
| 143 GetFrameView()->AddPartToUpdate(*this); | 142 GetFrameView()->AddPartToUpdate(*this); |
| 144 | 143 |
| 145 ClearNeedsLayout(); | 144 ClearNeedsLayout(); |
| 146 } | 145 } |
| 147 | 146 |
| 148 ScrollResult LayoutEmbeddedObject::Scroll(ScrollGranularity granularity, | 147 ScrollResult LayoutEmbeddedObject::Scroll(ScrollGranularity granularity, |
| 149 const FloatSize&) { | 148 const FloatSize&) { |
| 150 return ScrollResult(); | 149 return ScrollResult(); |
| 151 } | 150 } |
| 152 | 151 |
| 153 CompositingReasons LayoutEmbeddedObject::AdditionalCompositingReasons() const { | 152 CompositingReasons LayoutEmbeddedObject::AdditionalCompositingReasons() const { |
| 154 if (RequiresAcceleratedCompositing()) | 153 if (RequiresAcceleratedCompositing()) |
| 155 return kCompositingReasonPlugin; | 154 return kCompositingReasonPlugin; |
| 156 return kCompositingReasonNone; | 155 return kCompositingReasonNone; |
| 157 } | 156 } |
| 158 | 157 |
| 159 LayoutReplaced* LayoutEmbeddedObject::EmbeddedReplacedContent() const { | 158 LayoutReplaced* LayoutEmbeddedObject::EmbeddedReplacedContent() const { |
| 160 if (FrameView* frame_view = ChildFrameView()) | 159 if (FrameView* frame_view = ChildFrameView()) |
| 161 return frame_view->EmbeddedReplacedContent(); | 160 return frame_view->EmbeddedReplacedContent(); |
| 162 return nullptr; | 161 return nullptr; |
| 163 } | 162 } |
| 164 | 163 |
| 165 } // namespace blink | 164 } // namespace blink |
| OLD | NEW |