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

Remove hacks no longer needed since text inputs became reflow roots (instead of using the IncrementalDamageConstrained hack. b=241833 r+sr=rbs

Browse Source
This commit is contained in:
dbaron@dbaron.org
2004-05-04 23:56:25 +00:00
parent bd0ddc5757
commit fe56d877b9
6 changed files with 4 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
layout/generic/nsLineLayout.cpp
View File

@@ -40,7 +40,6 @@
* ***** END LICENSE BLOCK ***** */
#include "nsCOMPtr.h"
#include "nsLineLayout.h"
#include "nsBlockFrame.h"
#include "nsInlineFrame.h"
#include "nsStyleConsts.h"
#include "nsHTMLContainerFrame.h"
@@ -997,40 +996,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
return rv;
}
// SEC: added this next block for bug 45152
// text frames don't know how to invalidate themselves on initial reflow. Do it for them here.
// This only shows up in textareas, so do a quick check to see if we're inside one
if (eReflowReason_Initial == reflowState.reason)
{
if (nsLayoutAtoms::textFrame == frameType)
{ // aFrame is a text frame, see if it's inside a text control
// although this is a bit slow, the frame tree shouldn't be too deep, it's only called
// for the text frame's initial reflow (once in the text frame's lifetime)
// and we don't make any expensive calls.
// Doing it this way shields us from knowing anything about the frame structure inside a text control.
PRBool inTextControl = PR_FALSE;
for (nsIFrame *parentFrame = aFrame->GetParent(); parentFrame;
parentFrame = parentFrame->GetParent())
{
if (nsLayoutAtoms::textInputFrame == parentFrame->GetType())
{
inTextControl = PR_TRUE; // found it
break;
}
}
if (inTextControl)
{
nsLineBox *currentLine=nsnull;
// use localResult because a failure here should not be propagated to my caller
nsresult localResult = nsBlockFrame::GetCurrentLine(mBlockRS, &currentLine);
if (NS_SUCCEEDED(localResult) && currentLine) {
currentLine->SetForceInvalidate(PR_TRUE);
}
}
}
}
// end fix for bug 45152
pfd->mJustificationNumSpaces = mTextJustificationNumSpaces;
pfd->mJustificationNumLetters = mTextJustificationNumLetters;
@@ -2860,18 +2825,6 @@ nsLineLayout::HorizontalAlignFrames(nsRect& aLineBounds,
case NS_STYLE_TEXT_ALIGN_RIGHT:
case NS_STYLE_TEXT_ALIGN_MOZ_RIGHT:
{
// fix for bug 50758
// right-aligned text in a text control doesn't know how to paint itself
// so we force the invalidate here. Getting the current line is quick,
// and at worst we're invalidating more of the line (and just that line) than we need to.
nsLineBox *currentLine=nsnull;
// use localResult because a failure here should not be propagated to my caller
nsresult localResult = nsBlockFrame::GetCurrentLine(mBlockRS, &currentLine);
if (NS_SUCCEEDED(localResult) && currentLine) {
currentLine->SetForceInvalidate(PR_TRUE);
}
}
dx = remainingWidth;
break;