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

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

Issue 247803003: Remove assumption that null containerForRepaint assumes RenderView (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 months 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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 699
700 bool FrameView::hasCompositedContent() const 700 bool FrameView::hasCompositedContent() const
701 { 701 {
702 if (RenderView* renderView = this->renderView()) 702 if (RenderView* renderView = this->renderView())
703 return renderView->compositor()->inCompositingMode(); 703 return renderView->compositor()->inCompositingMode();
704 return false; 704 return false;
705 } 705 }
706 706
707 bool FrameView::isEnclosedInCompositingLayer() const 707 bool FrameView::isEnclosedInCompositingLayer() const
708 { 708 {
709 // FIXME: It's a bug that compositing state isn't always up to date when thi s is called.
ojan 2014/04/23 02:07:31 Can you add to this comment a test that fails when
710 DisableCompositingQueryAsserts disabler;
711
709 RenderObject* frameOwnerRenderer = m_frame->ownerRenderer(); 712 RenderObject* frameOwnerRenderer = m_frame->ownerRenderer();
710 if (frameOwnerRenderer && frameOwnerRenderer->containerForRepaint()) 713 if (frameOwnerRenderer && frameOwnerRenderer->enclosingLayer()->enclosingCom positingLayerForRepaint())
711 return true; 714 return true;
712 715
713 if (FrameView* parentView = parentFrameView()) 716 if (FrameView* parentView = parentFrameView())
714 return parentView->isEnclosedInCompositingLayer(); 717 return parentView->isEnclosedInCompositingLayer();
715 718
716 return false; 719 return false;
717 } 720 }
718 721
719 RenderObject* FrameView::layoutRoot(bool onlyDuringLayout) const 722 RenderObject* FrameView::layoutRoot(bool onlyDuringLayout) const
720 { 723 {
(...skipping 2518 matching lines...) Expand 10 before | Expand all | Expand 10 after
3239 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3242 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3240 { 3243 {
3241 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3244 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3242 if (AXObjectCache* cache = axObjectCache()) { 3245 if (AXObjectCache* cache = axObjectCache()) {
3243 cache->remove(scrollbar); 3246 cache->remove(scrollbar);
3244 cache->handleScrollbarUpdate(this); 3247 cache->handleScrollbarUpdate(this);
3245 } 3248 }
3246 } 3249 }
3247 3250
3248 } // namespace WebCore 3251 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | Source/core/rendering/RenderObject.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698