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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar()
); | 233 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar()
); |
234 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); | 234 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); |
235 | 235 |
236 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we
lose the connection to the HostWindow. | 236 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we
lose the connection to the HostWindow. |
237 setHasVerticalScrollbar(false); | 237 setHasVerticalScrollbar(false); |
238 | 238 |
239 ASSERT(!m_scrollCorner); | 239 ASSERT(!m_scrollCorner); |
240 | 240 |
241 ASSERT(m_frame); | 241 ASSERT(m_frame); |
242 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); | 242 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); |
243 RenderPart* renderer = m_frame->ownerRenderer(); | 243 HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement(); |
244 if (renderer && renderer->widget() == this) | 244 if (ownerElement && ownerElement->widget() == this) |
245 renderer->setWidget(0); | 245 ownerElement->setWidget(0); |
246 } | 246 } |
247 | 247 |
248 void FrameView::reset() | 248 void FrameView::reset() |
249 { | 249 { |
250 m_cannotBlitToWindow = false; | 250 m_cannotBlitToWindow = false; |
251 m_isOverlapped = false; | 251 m_isOverlapped = false; |
252 m_contentIsOpaque = false; | 252 m_contentIsOpaque = false; |
253 m_borderX = 30; | 253 m_borderX = 30; |
254 m_borderY = 30; | 254 m_borderY = 30; |
255 m_layoutTimer.stop(); | 255 m_layoutTimer.stop(); |
(...skipping 3234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3490 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3490 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3491 { | 3491 { |
3492 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3492 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3493 if (AXObjectCache* cache = axObjectCache()) { | 3493 if (AXObjectCache* cache = axObjectCache()) { |
3494 cache->remove(scrollbar); | 3494 cache->remove(scrollbar); |
3495 cache->handleScrollbarUpdate(this); | 3495 cache->handleScrollbarUpdate(this); |
3496 } | 3496 } |
3497 } | 3497 } |
3498 | 3498 |
3499 } // namespace WebCore | 3499 } // namespace WebCore |
OLD | NEW |