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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); | 237 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); |
238 | 238 |
239 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we
lose the connection to the HostWindow. | 239 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we
lose the connection to the HostWindow. |
240 setHasVerticalScrollbar(false); | 240 setHasVerticalScrollbar(false); |
241 | 241 |
242 ASSERT(!m_scrollCorner); | 242 ASSERT(!m_scrollCorner); |
243 ASSERT(m_overflowEventQueue.isEmpty()); | 243 ASSERT(m_overflowEventQueue.isEmpty()); |
244 | 244 |
245 ASSERT(m_frame); | 245 ASSERT(m_frame); |
246 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); | 246 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); |
247 RenderPart* renderer = m_frame->ownerRenderer(); | |
248 if (renderer && renderer->widget() == this) | |
249 renderer->setWidget(0); | |
250 } | 247 } |
251 | 248 |
252 void FrameView::reset() | 249 void FrameView::reset() |
253 { | 250 { |
254 m_cannotBlitToWindow = false; | 251 m_cannotBlitToWindow = false; |
255 m_isOverlapped = false; | 252 m_isOverlapped = false; |
256 m_contentIsOpaque = false; | 253 m_contentIsOpaque = false; |
257 m_borderX = 30; | 254 m_borderX = 30; |
258 m_borderY = 30; | 255 m_borderY = 30; |
259 m_layoutTimer.stop(); | 256 m_layoutTimer.stop(); |
(...skipping 3255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3515 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3512 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3516 { | 3513 { |
3517 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3514 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3518 if (AXObjectCache* cache = axObjectCache()) { | 3515 if (AXObjectCache* cache = axObjectCache()) { |
3519 cache->remove(scrollbar); | 3516 cache->remove(scrollbar); |
3520 cache->handleScrollbarUpdate(this); | 3517 cache->handleScrollbarUpdate(this); |
3521 } | 3518 } |
3522 } | 3519 } |
3523 | 3520 |
3524 } // namespace WebCore | 3521 } // namespace WebCore |
OLD | NEW |