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

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

Issue 481333005: Remove column set range map from RenderFlowThread. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('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 1387 matching lines...) Expand 10 before | Expand all | Expand 10 after
1398 screenArea = viewBounds; 1398 screenArea = viewBounds;
1399 screenArea.intersect(objectBounds); 1399 screenArea.intersect(objectBounds);
1400 } 1400 }
1401 1401
1402 for (Vector<ImageResource*>::iterator it = images.begin(), end = images.end( ); it != end; ++it) 1402 for (Vector<ImageResource*>::iterator it = images.begin(), end = images.end( ); it != end; ++it)
1403 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->notifyIm ageResourceVisibility(*it, status, screenArea); 1403 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->notifyIm ageResourceVisibility(*it, status, screenArea);
1404 1404
1405 return true; 1405 return true;
1406 } 1406 }
1407 1407
1408 void RenderBlock::computeRegionRangeForBlock(RenderFlowThread* flowThread)
1409 {
1410 if (flowThread)
1411 flowThread->setRegionRangeForBox(this, offsetFromLogicalTopOfFirstPage() );
1412 }
1413
1414 bool RenderBlock::widthAvailableToChildrenHasChanged() 1408 bool RenderBlock::widthAvailableToChildrenHasChanged()
1415 { 1409 {
1416 bool widthAvailableToChildrenHasChanged = m_hasBorderOrPaddingLogicalWidthCh anged; 1410 bool widthAvailableToChildrenHasChanged = m_hasBorderOrPaddingLogicalWidthCh anged;
1417 m_hasBorderOrPaddingLogicalWidthChanged = false; 1411 m_hasBorderOrPaddingLogicalWidthChanged = false;
1418 1412
1419 // If we use border-box sizing, have percentage padding, and our parent has changed width then the width available to our children has changed even 1413 // If we use border-box sizing, have percentage padding, and our parent has changed width then the width available to our children has changed even
1420 // though our own width has remained the same. 1414 // though our own width has remained the same.
1421 widthAvailableToChildrenHasChanged |= style()->boxSizing() == BORDER_BOX && needsPreferredWidthsRecalculation() && view()->layoutState()->containingBlockLog icalWidthChanged(); 1415 widthAvailableToChildrenHasChanged |= style()->boxSizing() == BORDER_BOX && needsPreferredWidthsRecalculation() && view()->layoutState()->containingBlockLog icalWidthChanged();
1422 1416
1423 return widthAvailableToChildrenHasChanged; 1417 return widthAvailableToChildrenHasChanged;
(...skipping 3411 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 4829 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4836 { 4830 {
4837 showRenderObject(); 4831 showRenderObject();
4838 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4832 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4839 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4833 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4840 } 4834 }
4841 4835
4842 #endif 4836 #endif
4843 4837
4844 } // namespace blink 4838 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698