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

Fix to content sink's handling of anchors. Flushes reflows before scrolling and uses the pres shell's scrolling code. b=56285, sr=vidur@netscape.com

This commit is contained in:
locka%iol.ie 2000-10-18 20:37:54 +00:00
Родитель 41094187c0
Коммит 5947aa93c8
2 изменённых файлов: 14 добавлений и 98 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

56
content/html/document/src/nsHTMLContentSink.cpp
Просмотреть файл

@ -2396,6 +2396,7 @@ HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
("HTMLContentSink::DidBuildModel: layout final content"));
mCurrentContext->FlushTags(PR_TRUE);
}
ScrollToRef();
mDocument->EndLoad();
@ -3552,45 +3553,15 @@ HTMLContentSink::StartLayout()
void
HTMLContentSink::ScrollToRef()
{
if (mNotAtRef && (nsnull != mRef) && (nsnull != mRefContent)) {
// See if the ref content has been reflowed by finding its frame
if (mRef && mRef->Length() > 0)
{
PRInt32 i, ns = mDocument->GetNumberOfShells();
for (i = 0; i < ns; i++) {
nsCOMPtr<nsIPresShell> shell( dont_AddRef(mDocument->GetShellAt(i)) );
nsCOMPtr<nsIPresShell> shell(dont_AddRef(mDocument->GetShellAt(i)));
if (shell) {
nsIFrame* frame;
shell->GetPrimaryFrameFor(mRefContent, &frame);
if (nsnull != frame) {
nsCOMPtr<nsIViewManager> vm;
shell->GetViewManager(getter_AddRefs(vm));
if (vm) {
nsIScrollableView* sview = nsnull;
vm->GetRootScrollableView(&sview);
if (sview) {
// Determine the x,y scroll offsets for the given
// frame. The offsets are relative to the
// ScrollableView's upper left corner so we need frame
// coordinates that are relative to that.
nsPoint offset;
nsIView* view;
nsCOMPtr<nsIPresContext> presContext;
shell->GetPresContext(getter_AddRefs(presContext));
frame->GetOffsetFromView(presContext, offset, &view);
nscoord x = 0;
nscoord y = offset.y;
sview->SetScrollPreference(mOriginalScrollPreference);
// XXX If view != scrolledView, then there is a scrolled frame,
// e.g., a DIV with 'overflow' of 'scroll', somewhere in the middle,
// or maybe an absolutely positioned element that has a view. We
// need to handle these cases...
sview->ScrollTo(x, y, NS_VMREFRESH_IMMEDIATE);
// Note that we did this so that we don't bother doing it again
mNotAtRef = PR_FALSE;
}
}
}
shell->FlushPendingNotifications();
// Scroll to the anchor
shell->GoToAnchor(*mRef);
}
}
}
@ -3612,19 +3583,6 @@ HTMLContentSink::ProcessATag(const nsIParserNode& aNode,
nsIHTMLContent* aContent)
{
AddBaseTagInfo(aContent);
if ((nsnull != mRef) && (nsnull == mRefContent)) {
nsHTMLValue value;
aContent->GetHTMLAttribute(nsHTMLAtoms::name, value);
if (eHTMLUnit_String == value.GetUnit()) {
nsAutoString tmp;
value.GetStringValue(tmp);
if (mRef->EqualsIgnoreCase(tmp)) {
// Winner. We just found the content that is the named anchor
mRefContent = aContent;
NS_ADDREF(aContent);
}
}
}
return NS_OK;
}

56
layout/html/document/src/nsHTMLContentSink.cpp
Просмотреть файл

@ -2396,6 +2396,7 @@ HTMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
("HTMLContentSink::DidBuildModel: layout final content"));
mCurrentContext->FlushTags(PR_TRUE);
}
ScrollToRef();
mDocument->EndLoad();
@ -3552,45 +3553,15 @@ HTMLContentSink::StartLayout()
void
HTMLContentSink::ScrollToRef()
{
if (mNotAtRef && (nsnull != mRef) && (nsnull != mRefContent)) {
// See if the ref content has been reflowed by finding its frame
if (mRef && mRef->Length() > 0)
{
PRInt32 i, ns = mDocument->GetNumberOfShells();
for (i = 0; i < ns; i++) {
nsCOMPtr<nsIPresShell> shell( dont_AddRef(mDocument->GetShellAt(i)) );
nsCOMPtr<nsIPresShell> shell(dont_AddRef(mDocument->GetShellAt(i)));
if (shell) {
nsIFrame* frame;
shell->GetPrimaryFrameFor(mRefContent, &frame);
if (nsnull != frame) {
nsCOMPtr<nsIViewManager> vm;
shell->GetViewManager(getter_AddRefs(vm));
if (vm) {
nsIScrollableView* sview = nsnull;
vm->GetRootScrollableView(&sview);
if (sview) {
// Determine the x,y scroll offsets for the given
// frame. The offsets are relative to the
// ScrollableView's upper left corner so we need frame
// coordinates that are relative to that.
nsPoint offset;
nsIView* view;
nsCOMPtr<nsIPresContext> presContext;
shell->GetPresContext(getter_AddRefs(presContext));
frame->GetOffsetFromView(presContext, offset, &view);
nscoord x = 0;
nscoord y = offset.y;
sview->SetScrollPreference(mOriginalScrollPreference);
// XXX If view != scrolledView, then there is a scrolled frame,
// e.g., a DIV with 'overflow' of 'scroll', somewhere in the middle,
// or maybe an absolutely positioned element that has a view. We
// need to handle these cases...
sview->ScrollTo(x, y, NS_VMREFRESH_IMMEDIATE);
// Note that we did this so that we don't bother doing it again
mNotAtRef = PR_FALSE;
}
}
}
shell->FlushPendingNotifications();
// Scroll to the anchor
shell->GoToAnchor(*mRef);
}
}
}
@ -3612,19 +3583,6 @@ HTMLContentSink::ProcessATag(const nsIParserNode& aNode,
nsIHTMLContent* aContent)
{
AddBaseTagInfo(aContent);
if ((nsnull != mRef) && (nsnull == mRefContent)) {
nsHTMLValue value;
aContent->GetHTMLAttribute(nsHTMLAtoms::name, value);
if (eHTMLUnit_String == value.GetUnit()) {
nsAutoString tmp;
value.GetStringValue(tmp);
if (mRef->EqualsIgnoreCase(tmp)) {
// Winner. We just found the content that is the named anchor
mRefContent = aContent;
NS_ADDREF(aContent);
}
}
}
return NS_OK;
}