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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar()
); | 198 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar()
); |
199 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); | 199 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); |
200 | 200 |
201 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we
lose the connection to the HostWindow. | 201 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we
lose the connection to the HostWindow. |
202 setHasVerticalScrollbar(false); | 202 setHasVerticalScrollbar(false); |
203 | 203 |
204 ASSERT(!m_scrollCorner); | 204 ASSERT(!m_scrollCorner); |
205 | 205 |
206 ASSERT(m_frame); | 206 ASSERT(m_frame); |
207 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); | 207 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); |
208 RenderPart* renderer = m_frame->ownerRenderer(); | 208 HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement(); |
209 if (renderer && renderer->widget() == this) | 209 if (ownerElement && ownerElement->ownedWidget() == this) |
210 renderer->setWidget(nullptr); | 210 ownerElement->setWidget(nullptr); |
211 } | 211 } |
212 | 212 |
213 void FrameView::reset() | 213 void FrameView::reset() |
214 { | 214 { |
215 m_cannotBlitToWindow = false; | 215 m_cannotBlitToWindow = false; |
216 m_isOverlapped = false; | 216 m_isOverlapped = false; |
217 m_contentIsOpaque = false; | 217 m_contentIsOpaque = false; |
218 m_hasPendingLayout = false; | 218 m_hasPendingLayout = false; |
219 m_layoutSubtreeRoot = 0; | 219 m_layoutSubtreeRoot = 0; |
220 m_doFullRepaint = false; | 220 m_doFullRepaint = false; |
(...skipping 3061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3282 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3282 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3283 { | 3283 { |
3284 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3284 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3285 if (AXObjectCache* cache = axObjectCache()) { | 3285 if (AXObjectCache* cache = axObjectCache()) { |
3286 cache->remove(scrollbar); | 3286 cache->remove(scrollbar); |
3287 cache->handleScrollbarUpdate(this); | 3287 cache->handleScrollbarUpdate(this); |
3288 } | 3288 } |
3289 } | 3289 } |
3290 | 3290 |
3291 } // namespace WebCore | 3291 } // namespace WebCore |
OLD | NEW |