From 2f86fd16d35cbe4b6f5b302887a9d0d813796eb4 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Thu, 9 Sep 1999 21:02:02 +0000 Subject: [PATCH] Fixed bug 10820 git-svn-id: svn://10.0.0.236/trunk@46623 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBulletFrame.cpp | 15 +++++++++++++++ mozilla/layout/html/base/src/nsBulletFrame.cpp | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index cef44c84fbb..a9be5137db2 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -849,6 +849,21 @@ nsBulletFrame::Reflow(nsIPresContext& aPresContext, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) { + if (eReflowReason_Incremental == aReflowState.reason) { + nsIReflowCommand::ReflowType type; + aReflowState.reflowCommand->GetType(type); + if (nsIReflowCommand::StyleChanged == type) { + // Reload the image, maybe... + nsAutoString oldImageURL; + mImageLoader.GetURLSpec(oldImageURL); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); + if (myList->mListStyleImage != oldImageURL) { + mImageLoader.UpdateURLSpec(&aPresContext, myList->mListStyleImage); + } + } + } + // Get the base size GetDesiredSize(&aPresContext, aReflowState, aMetrics); diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index cef44c84fbb..a9be5137db2 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp @@ -849,6 +849,21 @@ nsBulletFrame::Reflow(nsIPresContext& aPresContext, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) { + if (eReflowReason_Incremental == aReflowState.reason) { + nsIReflowCommand::ReflowType type; + aReflowState.reflowCommand->GetType(type); + if (nsIReflowCommand::StyleChanged == type) { + // Reload the image, maybe... + nsAutoString oldImageURL; + mImageLoader.GetURLSpec(oldImageURL); + const nsStyleList* myList = (const nsStyleList*) + mStyleContext->GetStyleData(eStyleStruct_List); + if (myList->mListStyleImage != oldImageURL) { + mImageLoader.UpdateURLSpec(&aPresContext, myList->mListStyleImage); + } + } + } + // Get the base size GetDesiredSize(&aPresContext, aReflowState, aMetrics);