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

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

Issue 506553004: Make the compositing assert disabler for paint invalidation more targeted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix. Created 6 years, 3 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 | « Source/core/editing/Caret.cpp ('k') | Source/core/html/HTMLCanvasElement.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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 setScrollbarsSuppressed(true); 287 setScrollbarsSuppressed(true);
288 } 288 }
289 289
290 bool FrameView::didFirstLayout() const 290 bool FrameView::didFirstLayout() const
291 { 291 {
292 return !m_firstLayout; 292 return !m_firstLayout;
293 } 293 }
294 294
295 void FrameView::invalidateRect(const IntRect& rect) 295 void FrameView::invalidateRect(const IntRect& rect)
296 { 296 {
297 // For querying RenderLayer::compositingState() when invalidating scrollbars .
298 // FIXME: do all scrollbar invalidations after layout of all frames is compl ete. It's currently not recursively true.
299 DisableCompositingQueryAsserts disabler;
297 if (!parent()) { 300 if (!parent()) {
298 if (HostWindow* window = hostWindow()) 301 if (HostWindow* window = hostWindow())
299 window->invalidateContentsAndRootView(rect); 302 window->invalidateContentsAndRootView(rect);
300 return; 303 return;
301 } 304 }
302 305
303 RenderPart* renderer = m_frame->ownerRenderer(); 306 RenderPart* renderer = m_frame->ownerRenderer();
304 if (!renderer) 307 if (!renderer)
305 return; 308 return;
306 309
(...skipping 2693 matching lines...) Expand 10 before | Expand all | Expand 10 after
3000 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3003 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3001 { 3004 {
3002 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3005 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3003 if (AXObjectCache* cache = axObjectCache()) { 3006 if (AXObjectCache* cache = axObjectCache()) {
3004 cache->remove(scrollbar); 3007 cache->remove(scrollbar);
3005 cache->handleScrollbarUpdate(this); 3008 cache->handleScrollbarUpdate(this);
3006 } 3009 }
3007 } 3010 }
3008 3011
3009 } // namespace blink 3012 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/Caret.cpp ('k') | Source/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698