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