| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 | 205 |
| 206 disposeAutoSizeInfo(); | 206 disposeAutoSizeInfo(); |
| 207 #if ENABLE(OILPAN) && ENABLE(ASSERT) | 207 #if ENABLE(OILPAN) && ENABLE(ASSERT) |
| 208 m_hasBeenDisposed = true; | 208 m_hasBeenDisposed = true; |
| 209 #endif | 209 #endif |
| 210 } | 210 } |
| 211 | 211 |
| 212 void FrameView::trace(Visitor* visitor) | 212 void FrameView::trace(Visitor* visitor) |
| 213 { | 213 { |
| 214 #if ENABLE(OILPAN) | 214 #if ENABLE(OILPAN) |
| 215 visitor->trace(m_partUpdateSet); | |
| 216 visitor->trace(m_parts); | |
| 217 visitor->trace(m_frame); | 215 visitor->trace(m_frame); |
| 218 visitor->trace(m_nodeToDraw); | 216 visitor->trace(m_nodeToDraw); |
| 219 visitor->trace(m_maintainScrollPositionAnchor); | 217 visitor->trace(m_maintainScrollPositionAnchor); |
| 220 visitor->trace(m_scrollCorner); | |
| 221 visitor->trace(m_autoSizeInfo); | 218 visitor->trace(m_autoSizeInfo); |
| 222 visitor->trace(m_horizontalScrollbar); | 219 visitor->trace(m_horizontalScrollbar); |
| 223 visitor->trace(m_verticalScrollbar); | 220 visitor->trace(m_verticalScrollbar); |
| 224 visitor->trace(m_children); | 221 visitor->trace(m_children); |
| 225 #endif | 222 #endif |
| 226 Widget::trace(visitor); | 223 Widget::trace(visitor); |
| 227 } | 224 } |
| 228 | 225 |
| 229 void FrameView::reset() | 226 void FrameView::reset() |
| 230 { | 227 { |
| (...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1155 m_parts.add(object); | 1152 m_parts.add(object); |
| 1156 } | 1153 } |
| 1157 | 1154 |
| 1158 void FrameView::removePart(RenderPart* object) | 1155 void FrameView::removePart(RenderPart* object) |
| 1159 { | 1156 { |
| 1160 m_parts.remove(object); | 1157 m_parts.remove(object); |
| 1161 } | 1158 } |
| 1162 | 1159 |
| 1163 void FrameView::updateWidgetPositions() | 1160 void FrameView::updateWidgetPositions() |
| 1164 { | 1161 { |
| 1165 WillBeHeapVector<RefPtrWillBeMember<RenderPart>> parts; | 1162 Vector<RefPtr<RenderPart>> parts; |
| 1166 copyToVector(m_parts, parts); | 1163 copyToVector(m_parts, parts); |
| 1167 | 1164 |
| 1168 // Script or plugins could detach the frame so abort processing if that happ
ens. | 1165 // Script or plugins could detach the frame so abort processing if that happ
ens. |
| 1169 | 1166 |
| 1170 for (size_t i = 0; i < parts.size() && renderView(); ++i) | 1167 for (size_t i = 0; i < parts.size() && renderView(); ++i) |
| 1171 parts[i]->updateWidgetPosition(); | 1168 parts[i]->updateWidgetPosition(); |
| 1172 | 1169 |
| 1173 for (size_t i = 0; i < parts.size() && renderView(); ++i) | 1170 for (size_t i = 0; i < parts.size() && renderView(); ++i) |
| 1174 parts[i]->widgetPositionsUpdated(); | 1171 parts[i]->widgetPositionsUpdated(); |
| 1175 } | 1172 } |
| (...skipping 2862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4038 { | 4035 { |
| 4039 Settings* settings = frame().settings(); | 4036 Settings* settings = frame().settings(); |
| 4040 if (!settings || !settings->rootLayerScrolls()) | 4037 if (!settings || !settings->rootLayerScrolls()) |
| 4041 return this; | 4038 return this; |
| 4042 | 4039 |
| 4043 RenderView* renderView = this->renderView(); | 4040 RenderView* renderView = this->renderView(); |
| 4044 return renderView ? renderView->scrollableArea() : nullptr; | 4041 return renderView ? renderView->scrollableArea() : nullptr; |
| 4045 } | 4042 } |
| 4046 | 4043 |
| 4047 } // namespace blink | 4044 } // namespace blink |
| OLD | NEW |