corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1286468 - Rename line related typedefs in nsBlockFrame. r=TYLin

Browse Source 
MozReview-Commit-ID: Cz9R3D4NzMc
This commit is contained in:
Jeremy Chen
2016-10-22 19:41:04 +08:00
parent d564bdfef4
commit a63dddda2b
8 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/generic/nsFrame.cpp
View File

@@ -3977,7 +3977,7 @@ static FrameTarget DrillDownToSelectionFrame(nsIFrame* aFrame,
// no valid FrameTarget on the line, it returns a null FrameTarget
static FrameTarget GetSelectionClosestFrameForLine(
nsBlockFrame* aParent,
nsBlockFrame::line_iterator aLine,
nsBlockFrame::LineIterator aLine,
nsPoint aPoint,
uint32_t aFlags)
{
@@ -4044,8 +4044,8 @@ static FrameTarget GetSelectionClosestFrameForBlock(nsIFrame* aFrame,
return FrameTarget::Null();
// This code searches for the correct line
nsBlockFrame::line_iterator firstLine = bf->begin_lines();
nsBlockFrame::line_iterator end = bf->end_lines();
nsBlockFrame::LineIterator firstLine = bf->begin_lines();
nsBlockFrame::LineIterator end = bf->end_lines();
if (firstLine == end) {
nsIContent *blockContent = aFrame->GetContent();
if (blockContent) {
@@ -4054,8 +4054,8 @@ static FrameTarget GetSelectionClosestFrameForBlock(nsIFrame* aFrame,
}
return FrameTarget::Null();
}
nsBlockFrame::line_iterator curLine = firstLine;
nsBlockFrame::line_iterator closestLine = end;
nsBlockFrame::LineIterator curLine = firstLine;
nsBlockFrame::LineIterator closestLine = end;
// Convert aPoint into a LogicalPoint in the writing-mode of this block
WritingMode wm = curLine->mWritingMode;
LogicalPoint pt(wm, aPoint, curLine->mContainerSize);
@@ -4073,8 +4073,8 @@ static FrameTarget GetSelectionClosestFrameForBlock(nsIFrame* aFrame,
}
if (closestLine == end) {
nsBlockFrame::line_iterator prevLine = curLine.prev();
nsBlockFrame::line_iterator nextLine = curLine;
nsBlockFrame::LineIterator prevLine = curLine.prev();
nsBlockFrame::LineIterator nextLine = curLine;
// Avoid empty lines
while (nextLine != end && nextLine->IsEmpty())
++nextLine;