| 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 PaintInvalidationReason reason = | 149 PaintInvalidationReason reason = |
| 150 LayoutPart::invalidatePaintIfNeeded(paintInvalidationState, newPaintInva
lidationContainer); | 150 LayoutPart::invalidatePaintIfNeeded(paintInvalidationState, newPaintInva
lidationContainer); |
| 151 | 151 |
| 152 Widget* widget = this->widget(); | 152 Widget* widget = this->widget(); |
| 153 if (widget && widget->isPluginView()) | 153 if (widget && widget->isPluginView()) |
| 154 toPluginView(widget)->invalidatePaintIfNeeded(); | 154 toPluginView(widget)->invalidatePaintIfNeeded(); |
| 155 | 155 |
| 156 return reason; | 156 return reason; |
| 157 } | 157 } |
| 158 | 158 |
| 159 ScrollResultOneDimensional LayoutEmbeddedObject::scroll(ScrollDirectionPhysical
direction, ScrollGranularity granularity, float) | 159 ScrollResult LayoutEmbeddedObject::scroll(ScrollGranularity granularity, const F
loatSize&) |
| 160 { | 160 { |
| 161 return ScrollResultOneDimensional(false); | 161 return ScrollResult(); |
| 162 } | 162 } |
| 163 | 163 |
| 164 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const | 164 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const |
| 165 { | 165 { |
| 166 if (requiresAcceleratedCompositing()) | 166 if (requiresAcceleratedCompositing()) |
| 167 return CompositingReasonPlugin; | 167 return CompositingReasonPlugin; |
| 168 return CompositingReasonNone; | 168 return CompositingReasonNone; |
| 169 } | 169 } |
| 170 | 170 |
| 171 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const | 171 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const |
| 172 { | 172 { |
| 173 if (!node() || !widget() || !widget()->isFrameView()) | 173 if (!node() || !widget() || !widget()->isFrameView()) |
| 174 return nullptr; | 174 return nullptr; |
| 175 return toFrameView(widget())->embeddedContentBox(); | 175 return toFrameView(widget())->embeddedContentBox(); |
| 176 } | 176 } |
| 177 | 177 |
| 178 } // namespace blink | 178 } // namespace blink |
| OLD | NEW |