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

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: Fix zee nits 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 662 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 673
674 bool FrameView::hasCompositedContent() const 674 bool FrameView::hasCompositedContent() const
675 { 675 {
676 if (RenderView* renderView = this->renderView()) 676 if (RenderView* renderView = this->renderView())
677 return renderView->compositor()->staleInCompositingMode(); 677 return renderView->compositor()->staleInCompositingMode();
678 return false; 678 return false;
679 } 679 }
680 680
681 bool FrameView::isEnclosedInCompositingLayer() const 681 bool FrameView::isEnclosedInCompositingLayer() const
682 { 682 {
683 // FIXME: It's a bug that compositing state isn't always up to date when thi s is called. crbug.com/366314
684 DisableCompositingQueryAsserts disabler;
685
683 RenderObject* frameOwnerRenderer = m_frame->ownerRenderer(); 686 RenderObject* frameOwnerRenderer = m_frame->ownerRenderer();
684 if (frameOwnerRenderer && frameOwnerRenderer->containerForRepaint()) 687 if (frameOwnerRenderer && frameOwnerRenderer->enclosingLayer()->enclosingCom positingLayerForRepaint())
685 return true; 688 return true;
686 689
687 if (FrameView* parentView = parentFrameView()) 690 if (FrameView* parentView = parentFrameView())
688 return parentView->isEnclosedInCompositingLayer(); 691 return parentView->isEnclosedInCompositingLayer();
689 692
690 return false; 693 return false;
691 } 694 }
692 695
693 RenderObject* FrameView::layoutRoot(bool onlyDuringLayout) const 696 RenderObject* FrameView::layoutRoot(bool onlyDuringLayout) const
694 { 697 {
(...skipping 2521 matching lines...) Expand 10 before | Expand all | Expand 10 after
3216 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3219 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3217 { 3220 {
3218 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3221 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3219 if (AXObjectCache* cache = axObjectCache()) { 3222 if (AXObjectCache* cache = axObjectCache()) {
3220 cache->remove(scrollbar); 3223 cache->remove(scrollbar);
3221 cache->handleScrollbarUpdate(this); 3224 cache->handleScrollbarUpdate(this);
3222 } 3225 }
3223 } 3226 }
3224 3227
3225 } // namespace WebCore 3228 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698