wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 779684 - Move FrameIteratorFlags to nsFrameIterator class. r=roc

Browse Source
This commit is contained in:
Jan Varga 2012-08-06 20:27:04 -04:00
parent 886d2d2455
commit c89ae3e144
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsFocusManager.cpp
View File

@ -2272,7 +2272,7 @@ nsFocusManager::GetSelectionLocation(nsIDocument* aDocument,
startContent != aDocument->GetRootElement()) {
// Yes, indeed we were at the end of the last node
nsFrameIterator frameTraversal(presContext, startFrame,
eLeaf, FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW);
eLeaf, nsFrameIterator::FLAG_FOLLOW_OUT_OF_FLOW);
nsIFrame *newCaretFrame = nullptr;
nsCOMPtr<nsIContent> newCaretContent = startContent;
@ -2698,7 +2698,7 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
}
nsFrameIterator frameTraversal(presContext, startFrame,
ePreOrder, FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW);
ePreOrder, nsFrameIterator::FLAG_FOLLOW_OUT_OF_FLOW);
if (iterStartContent == aRootContent) {
if (!aForward) {

6
layout/base/nsFrameIterator.cpp
View File

@ -14,9 +14,9 @@ nsFrameIterator::nsFrameIterator(nsPresContext* aPresContext, nsIFrame *aStart,
, mOffEdge(0)
, mType(aType)
{
mFollowOOFs = (aFlags & FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW) != 0;
mLockScroll = (aFlags & FrameIteratorFlags::FLAG_LOCK_SCROLL) != 0;
mVisual = (aFlags & FrameIteratorFlags::FLAG_VISUAL) != 0;
mFollowOOFs = (aFlags & FLAG_FOLLOW_OUT_OF_FLOW) != 0;
mLockScroll = (aFlags & FLAG_LOCK_SCROLL) != 0;
mVisual = (aFlags & FLAG_VISUAL) != 0;
if (mFollowOOFs && aStart)
aStart = nsPlaceholderFrame::GetRealFrameFor(aStart);
setStart(aStart);

14
layout/base/nsFrameIterator.h
View File

@ -16,13 +16,6 @@ enum nsIteratorType {
ePostOrder
};
enum FrameIteratorFlags {
FLAG_NONE = 0,
FLAG_LOCK_SCROLL = 1 << 1,
FLAG_FOLLOW_OUT_OF_FLOW = 1 << 2,
FLAG_VISUAL = 1 << 3
};
class nsFrameIterator
{
public:
@ -38,6 +31,13 @@ public:
void Last();
void Prev();
enum FrameIteratorFlags {
FLAG_NONE = 0,
FLAG_LOCK_SCROLL = 1 << 1,
FLAG_FOLLOW_OUT_OF_FLOW = 1 << 2,
FLAG_VISUAL = 1 << 3
};
protected:
void setCurrent(nsIFrame *aFrame){mCurrent = aFrame;}
nsIFrame *getCurrent(){return mCurrent;}

14
layout/generic/nsFrame.cpp
View File

@ -5782,9 +5782,9 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
//resultFrame is not a block frame
result = NS_ERROR_FAILURE;
PRUint32 flags = FrameIteratorFlags::FLAG_NONE;
PRUint32 flags = nsFrameIterator::FLAG_NONE;
if (aPos->mScrollViewStop) {
flags |= FrameIteratorFlags::FLAG_LOCK_SCROLL;
flags |= nsFrameIterator::FLAG_LOCK_SCROLL;
}
nsFrameIterator frameTraversal(aPresContext, resultFrame,
ePostOrder, flags);
@ -5873,9 +5873,9 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
if (!found){
resultFrame = storeOldResultFrame;
PRUint32 flags = FrameIteratorFlags::FLAG_NONE;
PRUint32 flags = nsFrameIterator::FLAG_NONE;
if (aPos->mScrollViewStop) {
flags |= FrameIteratorFlags::FLAG_LOCK_SCROLL;
flags |= nsFrameIterator::FLAG_LOCK_SCROLL;
}
frameTraversal = nsFrameIterator(aPresContext, resultFrame,
eLeaf, flags);
@ -6634,12 +6634,12 @@ nsIFrame::GetFrameFromDirection(nsDirection aDirection, bool aVisual,
return NS_ERROR_FAILURE; //we are done. cannot jump lines
}
PRUint32 flags = FrameIteratorFlags::FLAG_FOLLOW_OUT_OF_FLOW;
PRUint32 flags = nsFrameIterator::FLAG_FOLLOW_OUT_OF_FLOW;
if (aScrollViewStop) {
flags |= FrameIteratorFlags::FLAG_LOCK_SCROLL;
flags |= nsFrameIterator::FLAG_LOCK_SCROLL;
}
if (aVisual && presContext->BidiEnabled()) {
flags |= FrameIteratorFlags::FLAG_VISUAL;
flags |= nsFrameIterator::FLAG_VISUAL;
}
nsFrameIterator frameTraversal(presContext, traversedFrame,
eLeaf, flags);

2
layout/generic/nsSelection.cpp
View File

@ -1228,7 +1228,7 @@ nsFrameSelection::GetFrameFromLevel(nsIFrame *aFrameIn,
nsIFrame *foundFrame = aFrameIn;
nsFrameIterator frameTraversal(mShell->GetPresContext(), aFrameIn,
eLeaf, FrameIteratorFlags::FLAG_NONE);
eLeaf, nsFrameIterator::FLAG_NONE);
do {
*aFrameOut = foundFrame;

2
toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
View File

@ -1115,7 +1115,7 @@ nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell,
// view port. Move range forward to first visible point,
// this speeds us up a lot in long documents
nsFrameIterator frameTraversal(aPresContext, frame,
eLeaf, FrameIteratorFlags::FLAG_NONE);
eLeaf, nsFrameIterator::FLAG_NONE);
while (rectVisibility == nsRectVisibility_kAboveViewport) {
frameTraversal.Next();