Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar() ); 234 ASSERT(!horizontalScrollbar() || !horizontalScrollbar()->isCustomScrollbar() );
235 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar()); 235 ASSERT(!verticalScrollbar() || !verticalScrollbar()->isCustomScrollbar());
236 236
237 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we lose the connection to the HostWindow. 237 setHasHorizontalScrollbar(false); // Remove native scrollbars now before we lose the connection to the HostWindow.
238 setHasVerticalScrollbar(false); 238 setHasVerticalScrollbar(false);
239 239
240 ASSERT(!m_scrollCorner); 240 ASSERT(!m_scrollCorner);
241 241
242 ASSERT(m_frame); 242 ASSERT(m_frame);
243 ASSERT(m_frame->view() != this || !m_frame->contentRenderer()); 243 ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
244 RenderPart* renderer = m_frame->ownerRenderer(); 244 HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement();
245 if (renderer && renderer->widget() == this) 245 if (ownerElement && ownerElement->widget() == this)
eseidel 2013/12/24 00:02:04 I woudl just ASSERT(ownerElement->widget() == this
wjmaclean 2013/12/24 00:14:32 Done.
246 renderer->setWidget(0); 246 ownerElement->setWidget(0);
247 } 247 }
248 248
249 void FrameView::reset() 249 void FrameView::reset()
250 { 250 {
251 m_cannotBlitToWindow = false; 251 m_cannotBlitToWindow = false;
252 m_isOverlapped = false; 252 m_isOverlapped = false;
253 m_contentIsOpaque = false; 253 m_contentIsOpaque = false;
254 m_borderX = 30; 254 m_borderX = 30;
255 m_borderY = 30; 255 m_borderY = 30;
256 m_layoutTimer.stop(); 256 m_layoutTimer.stop();
(...skipping 3224 matching lines...) Expand 10 before | Expand all | Expand 10 after
3481 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3481 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3482 { 3482 {
3483 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3483 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3484 if (AXObjectCache* cache = axObjectCache()) { 3484 if (AXObjectCache* cache = axObjectCache()) {
3485 cache->remove(scrollbar); 3485 cache->remove(scrollbar);
3486 cache->handleScrollbarUpdate(this); 3486 cache->handleScrollbarUpdate(this);
3487 } 3487 }
3488 } 3488 }
3489 3489
3490 } // namespace WebCore 3490 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698