mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 855048 - nsRangeFrame shouldn't init the "nsReflowStatus frameStatus" that it passes into ReflowChild. r=dholbert

This commit is contained in:
Jonathan Watt 2013-03-29 09:49:53 +00:00
Родитель 3ab32e025b
Коммит f9c6b3c079
1 изменённых файлов: 3 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
layout/forms/nsRangeFrame.cpp
Просмотреть файл

@ -237,7 +237,7 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
trackX += aReflowState.mComputedBorderPadding.left; trackX += aReflowState.mComputedBorderPadding.left;
trackY += aReflowState.mComputedBorderPadding.top; trackY += aReflowState.mComputedBorderPadding.top;
nsReflowStatus frameStatus = NS_FRAME_COMPLETE; nsReflowStatus frameStatus;
nsHTMLReflowMetrics trackDesiredSize; nsHTMLReflowMetrics trackDesiredSize;
nsresult rv = ReflowChild(trackFrame, aPresContext, trackDesiredSize, nsresult rv = ReflowChild(trackFrame, aPresContext, trackDesiredSize,
trackReflowState, trackX, trackY, 0, frameStatus); trackReflowState, trackX, trackY, 0, frameStatus);
@ -259,7 +259,7 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
// Where we position the thumb depends on its size, so we first reflow // Where we position the thumb depends on its size, so we first reflow
// the thumb at {0,0} to obtain its size, then position it afterwards. // the thumb at {0,0} to obtain its size, then position it afterwards.
nsReflowStatus frameStatus = NS_FRAME_COMPLETE; nsReflowStatus frameStatus;
nsHTMLReflowMetrics thumbDesiredSize; nsHTMLReflowMetrics thumbDesiredSize;
nsresult rv = ReflowChild(thumbFrame, aPresContext, thumbDesiredSize, nsresult rv = ReflowChild(thumbFrame, aPresContext, thumbDesiredSize,
thumbReflowState, 0, 0, 0, frameStatus); thumbReflowState, 0, 0, 0, frameStatus);
@ -286,7 +286,7 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
// unadjusted dimensions, then we adjust it to so that the appropriate edge // unadjusted dimensions, then we adjust it to so that the appropriate edge
// ends at the thumb. // ends at the thumb.
nsReflowStatus frameStatus = NS_FRAME_COMPLETE; nsReflowStatus frameStatus;
nsHTMLReflowMetrics progressDesiredSize; nsHTMLReflowMetrics progressDesiredSize;
nsresult rv = ReflowChild(rangeProgressFrame, aPresContext, nsresult rv = ReflowChild(rangeProgressFrame, aPresContext,
progressDesiredSize, progressReflowState, 0, 0, progressDesiredSize, progressReflowState, 0, 0,