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

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

Issue 16690004: [CSS Regions] Rename region-overflow to region-fragment (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch Created 7 years, 6 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/page/UseCounter.cpp ('k') | Source/core/rendering/RenderRegion.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 7221 matching lines...) Expand 10 before | Expand all | Expand 10 after
7232 RenderFlowThread* flowThread = flowThreadContainingBlock(); 7232 RenderFlowThread* flowThread = flowThreadContainingBlock();
7233 if (!flowThread) 7233 if (!flowThread)
7234 return true; // Printing and multi-column both make new pages to accommo date content. 7234 return true; // Printing and multi-column both make new pages to accommo date content.
7235 7235
7236 // See if we're in the last region. 7236 // See if we're in the last region.
7237 LayoutUnit pageOffset = offsetFromLogicalTopOfFirstPage() + logicalOffset; 7237 LayoutUnit pageOffset = offsetFromLogicalTopOfFirstPage() + logicalOffset;
7238 RenderRegion* region = flowThread->regionAtBlockOffset(pageOffset, this); 7238 RenderRegion* region = flowThread->regionAtBlockOffset(pageOffset, this);
7239 if (!region) 7239 if (!region)
7240 return false; 7240 return false;
7241 if (region->isLastRegion()) 7241 if (region->isLastRegion())
7242 return region->isRenderRegionSet() || region->style()->regionOverflow() == BreakRegionOverflow 7242 return region->isRenderRegionSet() || region->style()->regionFragment() == BreakRegionFragment
7243 || (pageBoundaryRule == IncludePageBoundary && pageOffset == region- >logicalTopForFlowThreadContent()); 7243 || (pageBoundaryRule == IncludePageBoundary && pageOffset == region- >logicalTopForFlowThreadContent());
7244 return true; 7244 return true;
7245 } 7245 }
7246 7246
7247 LayoutUnit RenderBlock::nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundar yRule pageBoundaryRule) const 7247 LayoutUnit RenderBlock::nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundar yRule pageBoundaryRule) const
7248 { 7248 {
7249 LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset); 7249 LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset);
7250 if (!pageLogicalHeight) 7250 if (!pageLogicalHeight)
7251 return logicalOffset; 7251 return logicalOffset;
7252 7252
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
8101 { 8101 {
8102 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures); 8102 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures);
8103 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures); 8103 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures);
8104 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures); 8104 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures);
8105 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures); 8105 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures);
8106 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures); 8106 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures);
8107 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures); 8107 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures);
8108 } 8108 }
8109 8109
8110 } // namespace WebCore 8110 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/UseCounter.cpp ('k') | Source/core/rendering/RenderRegion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698