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

Unified Diff: Source/core/layout/LayoutSliderContainer.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutSlider.cpp ('k') | Source/core/layout/LayoutState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutSliderContainer.cpp
diff --git a/Source/core/layout/LayoutSliderContainer.cpp b/Source/core/layout/LayoutSliderContainer.cpp
index 2cb1705b75955e837f17b15477a362e796947b17..72e3c8124d88101b710bd6e9a9c4fd6038d3ee77 100644
--- a/Source/core/layout/LayoutSliderContainer.cpp
+++ b/Source/core/layout/LayoutSliderContainer.cpp
@@ -84,7 +84,7 @@ void LayoutSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
// FIXME: The trackHeight should have been added before updateLogicalHeight was called to avoid this hack.
setIntrinsicContentLogicalHeight(trackHeight);
- RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues);
+ LayoutBox::computeLogicalHeight(trackHeight, logicalTop, computedValues);
return;
}
if (isVertical)
@@ -93,7 +93,7 @@ void LayoutSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
// FIXME: The trackHeight should have been added before updateLogicalHeight was called to avoid this hack.
setIntrinsicContentLogicalHeight(logicalHeight);
- RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
+ LayoutBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
}
void LayoutSliderContainer::layout()
@@ -111,8 +111,8 @@ void LayoutSliderContainer::layout()
Element* thumbElement = input->closedShadowRoot()->getElementById(ShadowElementNames::sliderThumb());
Element* trackElement = input->closedShadowRoot()->getElementById(ShadowElementNames::sliderTrack());
- RenderBox* thumb = thumbElement ? thumbElement->renderBox() : 0;
- RenderBox* track = trackElement ? trackElement->renderBox() : 0;
+ LayoutBox* thumb = thumbElement ? thumbElement->layoutBox() : 0;
+ LayoutBox* track = trackElement ? trackElement->layoutBox() : 0;
SubtreeLayoutScope layoutScope(*this);
// Force a layout to reset the position of the thumb so the code below doesn't move the thumb to the wrong place.
« no previous file with comments | « Source/core/layout/LayoutSlider.cpp ('k') | Source/core/layout/LayoutState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698