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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 433603004: Disentangle repaint-after-compositing from updateLayerPositionsAfterLayout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 years, 4 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/rendering/PaintInvalidationState.cpp ('k') | Source/core/rendering/RenderBox.h » ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 else 353 else
354 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRende rObject(this); 354 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRende rObject(this);
355 } 355 }
356 356
357 void RenderBlock::invalidateTreeIfNeeded(const PaintInvalidationState& paintInva lidationState) 357 void RenderBlock::invalidateTreeIfNeeded(const PaintInvalidationState& paintInva lidationState)
358 { 358 {
359 // Note, we don't want to early out here using shouldCheckForInvalidationAft erLayout as 359 // Note, we don't want to early out here using shouldCheckForInvalidationAft erLayout as
360 // we have to make sure we go through any positioned objects as they won't b e seen in 360 // we have to make sure we go through any positioned objects as they won't b e seen in
361 // the normal tree walk. 361 // the normal tree walk.
362 362
363 if (shouldCheckForPaintInvalidation()) 363 RenderBox::invalidateTreeIfNeeded(paintInvalidationState);
364 RenderBox::invalidateTreeIfNeeded(paintInvalidationState);
365 364
366 // Take care of positioned objects. This is required as PaintInvalidationSta te keeps a single clip rect. 365 // Take care of positioned objects. This is required as PaintInvalidationSta te keeps a single clip rect.
367 if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects( )) { 366 if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects( )) {
368 TrackedRendererListHashSet::iterator end = positionedObjects->end(); 367 TrackedRendererListHashSet::iterator end = positionedObjects->end();
369 bool establishesNewPaintInvalidationContainer = isPaintInvalidationConta iner(); 368 bool establishesNewPaintInvalidationContainer = isPaintInvalidationConta iner();
370 const RenderLayerModelObject& newPaintInvalidationContainer = *adjustCom positedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? t his : &paintInvalidationState.paintInvalidationContainer()); 369 const RenderLayerModelObject& newPaintInvalidationContainer = *adjustCom positedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? t his : &paintInvalidationState.paintInvalidationContainer());
371 PaintInvalidationState childPaintInvalidationState(paintInvalidationStat e, *this, newPaintInvalidationContainer); 370 PaintInvalidationState childPaintInvalidationState(paintInvalidationStat e, *this, newPaintInvalidationContainer);
372 for (TrackedRendererListHashSet::iterator it = positionedObjects->begin( ); it != end; ++it) { 371 for (TrackedRendererListHashSet::iterator it = positionedObjects->begin( ); it != end; ++it) {
373 RenderBox* box = *it; 372 RenderBox* box = *it;
374 373
(...skipping 4460 matching lines...) Expand 10 before | Expand all | Expand 10 after
4835 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4834 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4836 { 4835 {
4837 showRenderObject(); 4836 showRenderObject();
4838 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4837 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4839 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4838 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4840 } 4839 }
4841 4840
4842 #endif 4841 #endif
4843 4842
4844 } // namespace blink 4843 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/PaintInvalidationState.cpp ('k') | Source/core/rendering/RenderBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698