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

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

Issue 463633002: Revert "Cleanup deadcode in Rendering" (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/RenderRegion.h ('k') | no next file » | 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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Put the region rect into the region's physical coordinate space. 137 // Put the region rect into the region's physical coordinate space.
138 clippedRect.setLocation(regionLocation + (clippedRect.location() - flippedFl owThreadPortionRect.location())); 138 clippedRect.setLocation(regionLocation + (clippedRect.location() - flippedFl owThreadPortionRect.location()));
139 139
140 // Now switch to the region's writing mode coordinate space and let it repai nt itself. 140 // Now switch to the region's writing mode coordinate space and let it repai nt itself.
141 flipForWritingMode(clippedRect); 141 flipForWritingMode(clippedRect);
142 142
143 // Issue the repaint. 143 // Issue the repaint.
144 invalidatePaintRectangle(clippedRect); 144 invalidatePaintRectangle(clippedRect);
145 } 145 }
146 146
147 LayoutUnit RenderRegion::logicalTopOfFlowThreadContentRect(const LayoutRect& rec t) const
148 {
149 ASSERT(isValid());
150 return flowThread()->isHorizontalWritingMode() ? rect.y() : rect.x();
151 }
152
153 LayoutUnit RenderRegion::logicalBottomOfFlowThreadContentRect(const LayoutRect& rect) const
154 {
155 ASSERT(isValid());
156 return flowThread()->isHorizontalWritingMode() ? rect.maxY() : rect.maxX();
157 }
158
147 void RenderRegion::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, La youtUnit& maxLogicalWidth) const 159 void RenderRegion::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, La youtUnit& maxLogicalWidth) const
148 { 160 {
149 if (!isValid()) { 161 if (!isValid()) {
150 RenderBlockFlow::computeIntrinsicLogicalWidths(minLogicalWidth, maxLogic alWidth); 162 RenderBlockFlow::computeIntrinsicLogicalWidths(minLogicalWidth, maxLogic alWidth);
151 return; 163 return;
152 } 164 }
153 165
154 minLogicalWidth = m_flowThread->minPreferredLogicalWidth(); 166 minLogicalWidth = m_flowThread->minPreferredLogicalWidth();
155 maxLogicalWidth = m_flowThread->maxPreferredLogicalWidth(); 167 maxLogicalWidth = m_flowThread->maxPreferredLogicalWidth();
156 } 168 }
157 169
158 } // namespace blink 170 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderRegion.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698