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

smoketest fix 115791

This commit is contained in:
mjudge%netscape.com 2001-12-18 21:05:55 +00:00
Родитель 725ccfac9a
Коммит 3a7ddd351a
4 изменённых файлов: 14 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
layout/base/nsPresShell.cpp
Просмотреть файл

@ -1199,7 +1199,7 @@ protected:
nsCOMPtr<nsIFrameSelection> mSelection;
nsCOMPtr<nsICaret> mCaret;
PRPackedBool mDisplayNonTextSelection;
PRInt16 mSelectionFlags;
PRPackedBool mScrollingEnabled; //used to disable programmable scrolling from outside
PRPackedBool mPendingReflowEvent;
PRPackedBool mBatchReflows; // When set to true, the pres shell batches reflow commands.
@ -1452,6 +1452,7 @@ PresShell::PresShell():
if (! gLog)
gLog = PR_NewLogModule("PresShell");
#endif
mSelectionFlags = nsISelectionDisplay::DISPLAY_TEXT;
}
NS_IMPL_ADDREF(PresShell)
@ -3059,7 +3060,7 @@ NS_IMETHODIMP PresShell::GetCaretEnabled(PRBool *aOutEnabled)
NS_IMETHODIMP PresShell::SetSelectionFlags(PRInt16 aInEnable)
{
mDisplayNonTextSelection = aInEnable;
mSelectionFlags = aInEnable;
return NS_OK;
}
@ -3067,7 +3068,7 @@ NS_IMETHODIMP PresShell::GetSelectionFlags(PRInt16 *aOutEnable)
{
if (!aOutEnable)
return NS_ERROR_INVALID_ARG;
*aOutEnable = mDisplayNonTextSelection;
*aOutEnable = mSelectionFlags;
return NS_OK;
}
@ -5842,7 +5843,7 @@ PresShell::HandleEvent(nsIView *aView,
/* if (mSelection && aEvent->eventStructType == NS_KEY_EVENT)
{//KEY HANDLERS WILL GET RID OF THIS
if (mDisplayNonTextSelection && NS_SUCCEEDED(mSelection->HandleKeyEvent(mPresContext, aEvent)))
if (mSelectionFlags && NS_SUCCEEDED(mSelection->HandleKeyEvent(mPresContext, aEvent)))
{
return NS_OK;
}

4
layout/generic/nsFrame.cpp
Просмотреть файл

@ -612,12 +612,12 @@ nsFrame::Paint(nsIPresContext* aPresContext,
return result;
PRInt16 displaySelection = nsISelectionDisplay::DISPLAY_ALL;
if (aFlags != nsISelectionDisplay::DISPLAY_IMAGES)
if (!(aFlags & nsISelectionDisplay::DISPLAY_IMAGES))
{
result = shell->GetSelectionFlags(&displaySelection);
if (NS_FAILED(result))
return result;
if (!(displaySelection == nsISelectionDisplay::DISPLAY_FRAMES))
if (!(displaySelection &= nsISelectionDisplay::DISPLAY_FRAMES))
return NS_OK;
}

4
layout/html/base/src/nsFrame.cpp
Просмотреть файл

@ -612,12 +612,12 @@ nsFrame::Paint(nsIPresContext* aPresContext,
return result;
PRInt16 displaySelection = nsISelectionDisplay::DISPLAY_ALL;
if (aFlags != nsISelectionDisplay::DISPLAY_IMAGES)
if (!(aFlags & nsISelectionDisplay::DISPLAY_IMAGES))
{
result = shell->GetSelectionFlags(&displaySelection);
if (NS_FAILED(result))
return result;
if (!(displaySelection == nsISelectionDisplay::DISPLAY_FRAMES))
if (!(displaySelection &= nsISelectionDisplay::DISPLAY_FRAMES))
return NS_OK;
}

9
layout/html/base/src/nsPresShell.cpp
Просмотреть файл

@ -1199,7 +1199,7 @@ protected:
nsCOMPtr<nsIFrameSelection> mSelection;
nsCOMPtr<nsICaret> mCaret;
PRPackedBool mDisplayNonTextSelection;
PRInt16 mSelectionFlags;
PRPackedBool mScrollingEnabled; //used to disable programmable scrolling from outside
PRPackedBool mPendingReflowEvent;
PRPackedBool mBatchReflows; // When set to true, the pres shell batches reflow commands.
@ -1452,6 +1452,7 @@ PresShell::PresShell():
if (! gLog)
gLog = PR_NewLogModule("PresShell");
#endif
mSelectionFlags = nsISelectionDisplay::DISPLAY_TEXT;
}
NS_IMPL_ADDREF(PresShell)
@ -3059,7 +3060,7 @@ NS_IMETHODIMP PresShell::GetCaretEnabled(PRBool *aOutEnabled)
NS_IMETHODIMP PresShell::SetSelectionFlags(PRInt16 aInEnable)
{
mDisplayNonTextSelection = aInEnable;
mSelectionFlags = aInEnable;
return NS_OK;
}
@ -3067,7 +3068,7 @@ NS_IMETHODIMP PresShell::GetSelectionFlags(PRInt16 *aOutEnable)
{
if (!aOutEnable)
return NS_ERROR_INVALID_ARG;
*aOutEnable = mDisplayNonTextSelection;
*aOutEnable = mSelectionFlags;
return NS_OK;
}
@ -5842,7 +5843,7 @@ PresShell::HandleEvent(nsIView *aView,
/* if (mSelection && aEvent->eventStructType == NS_KEY_EVENT)
{//KEY HANDLERS WILL GET RID OF THIS
if (mDisplayNonTextSelection && NS_SUCCEEDED(mSelection->HandleKeyEvent(mPresContext, aEvent)))
if (mSelectionFlags && NS_SUCCEEDED(mSelection->HandleKeyEvent(mPresContext, aEvent)))
{
return NS_OK;
}