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

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

Issue 264963004: Mark when we may have been invalidated to early out on repaintTreeAfterLayout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: With expectations. Created 6 years, 7 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 | « LayoutTests/TestExpectations ('k') | Source/core/rendering/RenderBlockFlow.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) 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 Vector<ImageResource*> images; 355 Vector<ImageResource*> images;
356 appendImagesFromStyle(images, *newStyle); 356 appendImagesFromStyle(images, *newStyle);
357 if (images.isEmpty()) 357 if (images.isEmpty())
358 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRe nderObject(this); 358 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRe nderObject(this);
359 else 359 else
360 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRende rObject(this); 360 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRende rObject(this);
361 } 361 }
362 362
363 void RenderBlock::repaintTreeAfterLayout() 363 void RenderBlock::repaintTreeAfterLayout()
364 { 364 {
365 if (!shouldCheckForInvalidationAfterLayout())
366 return;
367
365 RenderBox::repaintTreeAfterLayout(); 368 RenderBox::repaintTreeAfterLayout();
366 369
367 // Take care of positioned objects. This is required as LayoutState keeps a single clip rect. 370 // Take care of positioned objects. This is required as LayoutState keeps a single clip rect.
368 if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects( )) { 371 if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects( )) {
369 TrackedRendererListHashSet::iterator end = positionedObjects->end(); 372 TrackedRendererListHashSet::iterator end = positionedObjects->end();
370 LayoutStateMaintainer statePusher(*this, isTableRow() ? LayoutSize() : l ocationOffset()); 373 LayoutStateMaintainer statePusher(*this, isTableRow() ? LayoutSize() : l ocationOffset());
371 for (TrackedRendererListHashSet::iterator it = positionedObjects->begin( ); it != end; ++it) 374 for (TrackedRendererListHashSet::iterator it = positionedObjects->begin( ); it != end; ++it)
372 (*it)->repaintTreeAfterLayout(); 375 (*it)->repaintTreeAfterLayout();
373 } 376 }
374 } 377 }
(...skipping 4598 matching lines...) Expand 10 before | Expand all | Expand 10 after
4973 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4976 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4974 { 4977 {
4975 showRenderObject(); 4978 showRenderObject();
4976 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4979 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4977 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4980 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4978 } 4981 }
4979 4982
4980 #endif 4983 #endif
4981 4984
4982 } // namespace WebCore 4985 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698