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

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

Issue 208313016: Remove DisableCompositingQueryAsserts in FV::scrollbarExistenceDidChange (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | no next file » | 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 1750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 // Note that simply having overlay scrollbars is not sufficient to be 1761 // Note that simply having overlay scrollbars is not sufficient to be
1762 // certain that scrollbars' presence does not impact layout. This should 1762 // certain that scrollbars' presence does not impact layout. This should
1763 // also check if custom scrollbars (as reported by shouldUseCustomScrollbars ) 1763 // also check if custom scrollbars (as reported by shouldUseCustomScrollbars )
1764 // are in use as well. 1764 // are in use as well.
1765 // http://crbug.com/269692 1765 // http://crbug.com/269692
1766 bool useOverlayScrollbars = ScrollbarTheme::theme()->usesOverlayScrollbars() ; 1766 bool useOverlayScrollbars = ScrollbarTheme::theme()->usesOverlayScrollbars() ;
1767 1767
1768 if (!useOverlayScrollbars && needsLayout()) 1768 if (!useOverlayScrollbars && needsLayout())
1769 layout(); 1769 layout();
1770 1770
1771 // FIXME: Rather than updating this state synchronously, we should set some dirty bits
1772 // and clean them out when updating compositing.
1773 // https://code.google.com/p/chromium/issues/detail?id=343756
1774 DisableCompositingQueryAsserts disabler;
1775 if (renderView() && renderView()->usesCompositing()) { 1771 if (renderView() && renderView()->usesCompositing()) {
1776 renderView()->compositor()->frameViewScrollbarsExistenceDidChange(); 1772 renderView()->compositor()->frameViewScrollbarsExistenceDidChange();
1777 1773
1778 if (!useOverlayScrollbars) 1774 if (!useOverlayScrollbars)
1779 renderView()->compositor()->frameViewDidChangeSize(); 1775 renderView()->compositor()->frameViewDidChangeSize();
1780 } 1776 }
1781 } 1777 }
1782 1778
1783 void FrameView::handleLoadCompleted() 1779 void FrameView::handleLoadCompleted()
1784 { 1780 {
(...skipping 1434 matching lines...) Expand 10 before | Expand all | Expand 10 after
3219 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3215 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3220 { 3216 {
3221 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3217 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3222 if (AXObjectCache* cache = axObjectCache()) { 3218 if (AXObjectCache* cache = axObjectCache()) {
3223 cache->remove(scrollbar); 3219 cache->remove(scrollbar);
3224 cache->handleScrollbarUpdate(this); 3220 cache->handleScrollbarUpdate(this);
3225 } 3221 }
3226 } 3222 }
3227 3223
3228 } // namespace WebCore 3224 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698