From 6925dad5f1f25b2ef9cff5826afd5e103ea19be4 Mon Sep 17 00:00:00 2001
From: "mats.palmgren%bredband.net" <mats.palmgren%bredband.net>
Date: Fri, 26 Nov 2004 20:39:30 +0000
Subject: [PATCH] Look for ::first-letter frames in relative positioned inlines
 too. b=264799 r=bzbarsky sr=dbaron

---
 layout/base/nsCSSFrameConstructor.cpp           | 6 ++++--
 layout/html/style/src/nsCSSFrameConstructor.cpp | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index e754626789b..ce0544b143d 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -12380,7 +12380,8 @@ nsCSSFrameConstructor::WrapFramesInFirstLetterFrame(
       }
     }
     else if ((nsLayoutAtoms::inlineFrame == frameType) ||
-             (nsLayoutAtoms::lineFrame == frameType)) {
+             (nsLayoutAtoms::lineFrame == frameType) ||
+             (nsLayoutAtoms::positionedInlineFrame == frameType)) {
       nsIFrame* kids = frame->GetFirstChild(nsnull);
       WrapFramesInFirstLetterFrame(aPresShell, aPresContext, aState, frame, kids,
                                    aModifiedParent, aTextFrame,
@@ -12570,7 +12571,8 @@ nsCSSFrameConstructor::RemoveFirstLetterFrames(nsPresContext* aPresContext,
       break;
     }
     else if ((nsLayoutAtoms::inlineFrame == frameType) ||
-             (nsLayoutAtoms::lineFrame == frameType)) {
+             (nsLayoutAtoms::lineFrame == frameType) ||
+             (nsLayoutAtoms::positionedInlineFrame == frameType)) {
       // Look inside child inline frame for the letter frame
       RemoveFirstLetterFrames(aPresContext, aPresShell, aFrameManager, kid,
                               aStopLooking);
diff --git a/layout/html/style/src/nsCSSFrameConstructor.cpp b/layout/html/style/src/nsCSSFrameConstructor.cpp
index e754626789b..ce0544b143d 100644
--- a/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -12380,7 +12380,8 @@ nsCSSFrameConstructor::WrapFramesInFirstLetterFrame(
       }
     }
     else if ((nsLayoutAtoms::inlineFrame == frameType) ||
-             (nsLayoutAtoms::lineFrame == frameType)) {
+             (nsLayoutAtoms::lineFrame == frameType) ||
+             (nsLayoutAtoms::positionedInlineFrame == frameType)) {
       nsIFrame* kids = frame->GetFirstChild(nsnull);
       WrapFramesInFirstLetterFrame(aPresShell, aPresContext, aState, frame, kids,
                                    aModifiedParent, aTextFrame,
@@ -12570,7 +12571,8 @@ nsCSSFrameConstructor::RemoveFirstLetterFrames(nsPresContext* aPresContext,
       break;
     }
     else if ((nsLayoutAtoms::inlineFrame == frameType) ||
-             (nsLayoutAtoms::lineFrame == frameType)) {
+             (nsLayoutAtoms::lineFrame == frameType) ||
+             (nsLayoutAtoms::positionedInlineFrame == frameType)) {
       // Look inside child inline frame for the letter frame
       RemoveFirstLetterFrames(aPresContext, aPresShell, aFrameManager, kid,
                               aStopLooking);