wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1232852 (part 3) - Remove unused parameters from some accessibility code. r=tbsaunde.

Browse Source
This commit is contained in:
Nicholas Nethercote 2015-12-15 21:24:06 -08:00
parent 206cd31041
commit 18f37c43aa
15 changed files with 55 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accessible/base/AccEvent.cpp
View File

@ -104,8 +104,8 @@ AccReorderEvent::IsShowHideEventTarget(const Accessible* aTarget) const
////////////////////////////////////////////////////////////////////////////////
AccHideEvent::
AccHideEvent(Accessible* aTarget, nsINode* aTargetNode, bool aNeedsShutdown) :
AccMutationEvent(::nsIAccessibleEvent::EVENT_HIDE, aTarget, aTargetNode),
AccHideEvent(Accessible* aTarget, bool aNeedsShutdown) :
AccMutationEvent(::nsIAccessibleEvent::EVENT_HIDE, aTarget),
mNeedsShutdown(aNeedsShutdown)
{
mNextSibling = mAccessible->NextSibling();
@ -118,8 +118,8 @@ AccHideEvent::
////////////////////////////////////////////////////////////////////////////////
AccShowEvent::
AccShowEvent(Accessible* aTarget, nsINode* aTargetNode) :
AccMutationEvent(::nsIAccessibleEvent::EVENT_SHOW, aTarget, aTargetNode)
AccShowEvent(Accessible* aTarget) :
AccMutationEvent(::nsIAccessibleEvent::EVENT_SHOW, aTarget)
{
}

8
accessible/base/AccEvent.h
View File

@ -212,8 +212,7 @@ private:
class AccMutationEvent: public AccEvent
{
public:
AccMutationEvent(uint32_t aEventType, Accessible* aTarget,
nsINode* aTargetNode) :
AccMutationEvent(uint32_t aEventType, Accessible* aTarget) :
AccEvent(aEventType, aTarget, eAutoDetect, eCoalesceMutationTextChange)
{
// Don't coalesce these since they are coalesced by reorder event. Coalesce
@ -250,8 +249,7 @@ protected:
class AccHideEvent: public AccMutationEvent
{
public:
AccHideEvent(Accessible* aTarget, nsINode* aTargetNode,
bool aNeedsShutdown = true);
explicit AccHideEvent(Accessible* aTarget, bool aNeedsShutdown = true);
// Event
static const EventGroup kEventGroup = eHideEvent;
@ -281,7 +279,7 @@ protected:
class AccShowEvent: public AccMutationEvent
{
public:
AccShowEvent(Accessible* aTarget, nsINode* aTargetNode);
explicit AccShowEvent(Accessible* aTarget);
// Event
static const EventGroup kEventGroup = eShowEvent;

22
accessible/generic/DocAccessible.cpp
View File

@ -1511,7 +1511,7 @@ DocAccessible::DoInitialUpdate()
uint32_t childCount = ChildCount();
for (uint32_t i = 0; i < childCount; i++) {
Accessible* child = GetChildAt(i);
RefPtr<AccShowEvent> event = new AccShowEvent(child, child->GetContent());
RefPtr<AccShowEvent> event = new AccShowEvent(child);
FireDelayedEvent(event);
}
}
@ -1892,7 +1892,6 @@ DocAccessible::UpdateTreeInternal(Accessible* aChild, bool aIsInsert,
// this node already then it will be suppressed by this one.
Accessible* focusedAcc = nullptr;
nsINode* node = aChild->GetNode();
if (aIsInsert) {
// Create accessible tree for shown accessible.
CacheChildrenInSubtree(aChild, &focusedAcc);
@ -1914,9 +1913,9 @@ DocAccessible::UpdateTreeInternal(Accessible* aChild, bool aIsInsert,
// Fire show/hide event.
RefPtr<AccMutationEvent> event;
if (aIsInsert)
event = new AccShowEvent(aChild, node);
event = new AccShowEvent(aChild);
else
event = new AccHideEvent(aChild, node);
event = new AccHideEvent(aChild);
FireDelayedEvent(event);
aReorderEvent->AddSubMutationEvent(event);
@ -2089,8 +2088,7 @@ DocAccessible::SeizeChild(Accessible* aNewParent, Accessible* aChild,
int32_t oldIdxInParent = aChild->IndexInParent();
RefPtr<AccReorderEvent> reorderEvent = new AccReorderEvent(oldParent);
RefPtr<AccMutationEvent> hideEvent =
new AccHideEvent(aChild, aChild->GetContent(), false);
RefPtr<AccMutationEvent> hideEvent = new AccHideEvent(aChild, false);
reorderEvent->AddSubMutationEvent(hideEvent);
{
@ -2121,8 +2119,7 @@ DocAccessible::SeizeChild(Accessible* aNewParent, Accessible* aChild,
FireDelayedEvent(reorderEvent);
reorderEvent = new AccReorderEvent(aNewParent);
RefPtr<AccMutationEvent> showEvent =
new AccShowEvent(aChild, aChild->GetContent());
RefPtr<AccMutationEvent> showEvent = new AccShowEvent(aChild);
reorderEvent->AddSubMutationEvent(showEvent);
FireDelayedEvent(showEvent);
@ -2140,8 +2137,7 @@ DocAccessible::MoveChild(Accessible* aChild, int32_t aIdxInParent)
Accessible* parent = aChild->Parent();
RefPtr<AccReorderEvent> reorderEvent = new AccReorderEvent(parent);
RefPtr<AccMutationEvent> hideEvent =
new AccHideEvent(aChild, aChild->GetContent(), false);
RefPtr<AccMutationEvent> hideEvent = new AccHideEvent(aChild, false);
reorderEvent->AddSubMutationEvent(hideEvent);
AutoTreeMutation mut(parent);
@ -2152,8 +2148,7 @@ DocAccessible::MoveChild(Accessible* aChild, int32_t aIdxInParent)
FireDelayedEvent(hideEvent);
RefPtr<AccMutationEvent> showEvent =
new AccShowEvent(aChild, aChild->GetContent());
RefPtr<AccMutationEvent> showEvent = new AccShowEvent(aChild);
reorderEvent->AddSubMutationEvent(showEvent);
FireDelayedEvent(showEvent);
@ -2177,8 +2172,7 @@ DocAccessible::PutChildrenBack(nsTArray<RefPtr<Accessible> >* aChildren,
continue;
}
RefPtr<AccReorderEvent> reorderEvent = new AccReorderEvent(owner);
RefPtr<AccMutationEvent> hideEvent =
new AccHideEvent(child, child->GetContent(), false);
RefPtr<AccMutationEvent> hideEvent = new AccHideEvent(child, false);
reorderEvent->AddSubMutationEvent(hideEvent);
{

2
accessible/html/HTMLImageMapAccessible.cpp
View File

@ -121,7 +121,7 @@ HTMLImageMapAccessible::UpdateChildAreas(bool aDoFireEvents)
}
if (aDoFireEvents) {
RefPtr<AccShowEvent> event = new AccShowEvent(area, areaContent);
RefPtr<AccShowEvent> event = new AccShowEvent(area);
mDoc->FireDelayedEvent(event);
reorderEvent->AddSubMutationEvent(event);
}

2
accessible/html/HTMLListAccessible.cpp
View File

@ -111,7 +111,7 @@ HTMLLIAccessible::UpdateBullet(bool aHasBullet)
document->BindToDocument(mBullet, nullptr);
InsertChildAt(0, mBullet);
RefPtr<AccShowEvent> event = new AccShowEvent(mBullet, mBullet->GetContent());
RefPtr<AccShowEvent> event = new AccShowEvent(mBullet);
mDoc->FireDelayedEvent(event);
reorderEvent->AddSubMutationEvent(event);
} else {

4
layout/base/AccessibleCaretManager.cpp
View File

@ -196,7 +196,7 @@ AccessibleCaretManager::UpdateCarets(UpdateCaretsHint aHint)
UpdateCaretsForCursorMode(aHint);
break;
case CaretMode::Selection:
UpdateCaretsForSelectionMode(aHint);
UpdateCaretsForSelectionMode();
break;
}
}
@ -297,7 +297,7 @@ AccessibleCaretManager::UpdateCaretsForCursorMode(UpdateCaretsHint aHint)
}
void
AccessibleCaretManager::UpdateCaretsForSelectionMode(UpdateCaretsHint aHint)
AccessibleCaretManager::UpdateCaretsForSelectionMode()
{
AC_LOG("%s: selection: %p", __FUNCTION__, GetSelection());

2
layout/base/AccessibleCaretManager.h
View File

@ -135,7 +135,7 @@ protected:
void DoNotShowCarets();
void UpdateCaretsForCursorMode(UpdateCaretsHint aHint);
void UpdateCaretsForSelectionMode(UpdateCaretsHint aHint);
void UpdateCaretsForSelectionMode();
// Provide haptic / touch feedback, primarily for select on longpress.
void ProvideHapticFeedback();

19
layout/base/FrameLayerBuilder.cpp
View File

@ -1095,7 +1095,7 @@ public:
* @param aTextContentFlags if any child layer has CONTENT_COMPONENT_ALPHA,
* set *aTextContentFlags to CONTENT_COMPONENT_ALPHA
*/
void Finish(uint32_t *aTextContentFlags, LayerManagerData* aData,
void Finish(uint32_t *aTextContentFlags,
const nsIntRect& aContainerPixelBounds,
nsDisplayList* aChildItems, bool& aHasComponentAlphaChildren);
@ -1344,7 +1344,6 @@ protected:
* item returned true from ShouldFixToViewport.
*/
PaintedLayerData NewPaintedLayerData(nsDisplayItem* aItem,
const nsIntRect& aVisibleRect,
AnimatedGeometryRoot* aAnimatedGeometryRoot,
const DisplayItemScrollClip* aScrollClip,
const nsPoint& aTopLeft,
@ -3571,7 +3570,6 @@ PaintedLayerData::AccumulateEventRegions(ContainerState* aState, nsDisplayLayerE
PaintedLayerData
ContainerState::NewPaintedLayerData(nsDisplayItem* aItem,
const nsIntRect& aVisibleRect,
AnimatedGeometryRoot* aAnimatedGeometryRoot,
const DisplayItemScrollClip* aScrollClip,
const nsPoint& aTopLeft,
@ -4204,9 +4202,7 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
* No need to allocate geometry for items that aren't
* part of a PaintedLayer.
*/
mLayerBuilder->AddLayerDisplayItem(ownLayer, item,
layerState,
topLeft, nullptr);
mLayerBuilder->AddLayerDisplayItem(ownLayer, item, layerState, nullptr);
} else {
bool forceOwnLayer = shouldFixToViewport;
PaintedLayerData* paintedLayerData =
@ -4214,8 +4210,8 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList)
itemVisibleRect, forceOwnLayer,
item->Frame()->BackfaceIsHidden(),
[&]() {
return NewPaintedLayerData(item, itemVisibleRect, animatedGeometryRoot,
agrScrollClip, topLeft, shouldFixToViewport);
return NewPaintedLayerData(item, animatedGeometryRoot, agrScrollClip,
topLeft, shouldFixToViewport);
});
if (itemType == nsDisplayItem::TYPE_LAYER_EVENT_REGIONS) {
@ -4446,7 +4442,7 @@ FrameLayerBuilder::AddPaintedDisplayItem(PaintedLayerData* aLayerData,
}
}
AddLayerDisplayItem(layer, aItem, aLayerState, aTopLeft, tempManager);
AddLayerDisplayItem(layer, aItem, aLayerState, tempManager);
PaintedLayerItemsEntry* entry = mPaintedLayerItems.PutEntry(layer);
if (entry) {
@ -4626,7 +4622,6 @@ void
FrameLayerBuilder::AddLayerDisplayItem(Layer* aLayer,
nsDisplayItem* aItem,
LayerState aLayerState,
const nsPoint& aTopLeft,
BasicLayerManager* aManager)
{
if (aLayer->Manager() != mRetainingManager)
@ -4937,7 +4932,7 @@ ContainerState::PostprocessRetainedLayers(nsIntRegion* aOpaqueRegionForContainer
}
void
ContainerState::Finish(uint32_t* aTextContentFlags, LayerManagerData* aData,
ContainerState::Finish(uint32_t* aTextContentFlags,
const nsIntRect& aContainerPixelBounds,
nsDisplayList* aChildItems, bool& aHasComponentAlphaChildren)
{
@ -5345,7 +5340,7 @@ FrameLayerBuilder::BuildContainerLayerFor(nsDisplayListBuilder* aBuilder,
bool hasComponentAlphaChildren = false;
pixBounds = state.ScaleToOutsidePixels(bounds, false);
appUnitsPerDevPixel = state.GetAppUnitsPerDevPixel();
state.Finish(&flags, data, pixBounds, aChildren, hasComponentAlphaChildren);
state.Finish(&flags, pixBounds, aChildren, hasComponentAlphaChildren);
if (hasComponentAlphaChildren &&
!(flags & Layer::CONTENT_DISABLE_FLATTENING) &&

2
layout/base/FrameLayerBuilder.h
View File

@ -317,14 +317,12 @@ public:
* @param aLayer Layer that the display item will be rendered into
* @param aItem Display item to be drawn.
* @param aLayerState What LayerState the item is using.
* @param aTopLeft offset from active scrolled root to reference frame
* @param aManager If the layer is in the LAYER_INACTIVE state,
* then this is the temporary layer manager to draw with.
*/
void AddLayerDisplayItem(Layer* aLayer,
nsDisplayItem* aItem,
LayerState aLayerState,
const nsPoint& aTopLeft,
BasicLayerManager* aManager);
/**

10
layout/base/PositionedEventTargeting.cpp
View File

@ -265,7 +265,7 @@ GetClickableAncestor(nsIFrame* aFrame, nsIAtom* stopAt = nullptr, nsAutoString*
}
static nscoord
AppUnitsFromMM(nsIFrame* aFrame, uint32_t aMM, bool aVertical)
AppUnitsFromMM(nsIFrame* aFrame, uint32_t aMM)
{
nsPresContext* pc = aFrame->PresContext();
float result = float(aMM) *
@ -291,10 +291,10 @@ GetTargetRect(nsIFrame* aRootFrame, const nsPoint& aPointRelativeToRootFrame,
nsIFrame* aRestrictToDescendants, const EventRadiusPrefs* aPrefs,
uint32_t aFlags)
{
nsMargin m(AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[0], true),
AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[1], false),
AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[2], true),
AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[3], false));
nsMargin m(AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[0]),
AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[1]),
AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[2]),
AppUnitsFromMM(aRootFrame, aPrefs->mSideRadii[3]));
nsRect r(aPointRelativeToRootFrame, nsSize(0,0));
r.Inflate(m);
if (!(aFlags & INPUT_IGNORE_ROOT_SCROLL_FRAME)) {

12
layout/base/RestyleManager.cpp
View File

@ -2061,7 +2061,7 @@ VerifyContextParent(nsIFrame* aFrame, nsStyleContext* aContext,
}
static void
VerifyStyleTree(nsIFrame* aFrame, nsStyleContext* aParentContext)
VerifyStyleTree(nsIFrame* aFrame)
{
nsStyleContext* context = aFrame->StyleContext();
VerifyContextParent(aFrame, context, nullptr);
@ -2079,7 +2079,7 @@ VerifyStyleTree(nsIFrame* aFrame, nsStyleContext* aParentContext)
// recurse to out of flow frame, letting the parent context get resolved
do {
VerifyStyleTree(outOfFlowFrame, nullptr);
VerifyStyleTree(outOfFlowFrame);
} while ((outOfFlowFrame = outOfFlowFrame->GetNextContinuation()));
// verify placeholder using the parent frame's context as
@ -2087,7 +2087,7 @@ VerifyStyleTree(nsIFrame* aFrame, nsStyleContext* aParentContext)
VerifyContextParent(child, nullptr, nullptr);
}
else { // regular frame
VerifyStyleTree(child, nullptr);
VerifyStyleTree(child);
}
}
}
@ -2106,9 +2106,7 @@ void
RestyleManager::DebugVerifyStyleTree(nsIFrame* aFrame)
{
if (aFrame) {
nsStyleContext* context = aFrame->StyleContext();
nsStyleContext* parentContext = context->GetParent();
VerifyStyleTree(aFrame, parentContext);
VerifyStyleTree(aFrame);
}
}
@ -2526,7 +2524,7 @@ RestyleManager::ReparentStyleContext(nsIFrame* aFrame)
}
}
#ifdef DEBUG
VerifyStyleTree(aFrame, newParentContext);
VerifyStyleTree(aFrame);
#endif
}
}

14
layout/base/nsBidiPresUtils.cpp
View File

@ -842,9 +842,7 @@ nsBidiPresUtils::ResolveParagraph(nsBlockFrame* aBlockFrame,
currentLine->MarkDirty();
nsIFrame* nextBidi;
int32_t runEnd = contentOffset + runLength;
rv = EnsureBidiContinuation(frame, &nextBidi, frameIndex,
contentOffset,
runEnd);
rv = EnsureBidiContinuation(frame, &nextBidi, contentOffset, runEnd);
if (NS_FAILED(rv)) {
break;
}
@ -1275,8 +1273,7 @@ nsBidiPresUtils::ReorderFrames(nsIFrame* aFirstFrameOnLine,
}
BidiLineData bld(aFirstFrameOnLine, aNumFramesOnLine);
return RepositionInlineFrames(&bld, aFirstFrameOnLine, aLineWM,
containerSize, aStart);
return RepositionInlineFrames(&bld, aLineWM, containerSize, aStart);
}
nsIFrame*
@ -1665,7 +1662,6 @@ nsBidiPresUtils::InitContinuationStates(nsIFrame* aFrame,
/* static */ nscoord
nsBidiPresUtils::RepositionInlineFrames(BidiLineData *aBld,
nsIFrame* aFirstChild,
WritingMode aLineWM,
const nsSize& aContainerSize,
nscoord aStart)
@ -1767,7 +1763,6 @@ nsBidiPresUtils::GetFrameToLeftOf(const nsIFrame* aFrame,
inline nsresult
nsBidiPresUtils::EnsureBidiContinuation(nsIFrame* aFrame,
nsIFrame** aNewFrame,
int32_t& aFrameIndex,
int32_t aStart,
int32_t aEnd)
{
@ -1832,8 +1827,7 @@ nsresult
nsBidiPresUtils::FormatUnicodeText(nsPresContext* aPresContext,
char16_t* aText,
int32_t& aTextLength,
nsCharType aCharType,
nsBidiDirection aDir)
nsCharType aCharType)
{
nsresult rv = NS_OK;
// ahmed
@ -2090,7 +2084,7 @@ nsresult nsBidiPresUtils::ProcessText(const char16_t* aText,
if (int32_t(runVisualText.Length()) < subRunLength)
return NS_ERROR_OUT_OF_MEMORY;
FormatUnicodeText(aPresContext, runVisualText.BeginWriting(),
subRunLength, (nsCharType)charType, dir);
subRunLength, (nsCharType)charType);
aprocessor.SetText(runVisualText.get(), subRunLength, dir);
width = aprocessor.GetWidth();

6
layout/base/nsBidiPresUtils.h
View File

@ -183,8 +183,7 @@ public:
static nsresult FormatUnicodeText(nsPresContext* aPresContext,
char16_t* aText,
int32_t& aTextLength,
nsCharType aCharType,
nsBidiDirection aDir);
nsCharType aCharType);
/**
* Reorder plain text using the Unicode Bidi algorithm and send it to
@ -494,7 +493,6 @@ private:
* @lina 04/11/2000
*/
static nscoord RepositionInlineFrames(BidiLineData* aBld,
nsIFrame* aFirstChild,
mozilla::WritingMode aLineWM,
const nsSize& aContainerSize,
nscoord aStart);
@ -506,7 +504,6 @@ private:
*
* @param aFrame the original frame
* @param aNewFrame [OUT] the new frame that was created
* @param aFrameIndex [IN/OUT] index of aFrame in mLogicalFrames
* @param aStart [IN] the start of the content mapped by aFrame (and
* any fluid continuations)
* @param aEnd [IN] the offset of the end of the single-directional
@ -517,7 +514,6 @@ private:
static inline
nsresult EnsureBidiContinuation(nsIFrame* aFrame,
nsIFrame** aNewFrame,
int32_t& aFrameIndex,
int32_t aStart,
int32_t aEnd);

28
layout/base/nsCSSFrameConstructor.cpp
View File

@ -4464,7 +4464,6 @@ nsCSSFrameConstructor::BuildScrollFrame(nsFrameConstructorState& aState,
const nsCSSFrameConstructor::FrameConstructionData*
nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay* aDisplay,
Element* aElement,
nsIFrame* aParentFrame,
nsStyleContext* aStyleContext)
{
PR_STATIC_ASSERT(eParentTypeCount < (1 << (32 - FCDATA_PARENT_TYPE_OFFSET)));
@ -4953,7 +4952,6 @@ nsCSSFrameConstructor::ConstructFrameWithAnonymousChild(
nsFrameConstructorState& aState,
FrameConstructionItem& aItem,
nsContainerFrame* aParentFrame,
const nsStyleDisplay* aDisplay,
nsFrameItems& aFrameItems,
ContainerFrameCreationFunc aConstructor,
ContainerFrameCreationFunc aInnerConstructor,
@ -5024,7 +5022,7 @@ nsCSSFrameConstructor::ConstructOuterSVG(nsFrameConstructorState& aState,
nsFrameItems& aFrameItems)
{
return ConstructFrameWithAnonymousChild(
aState, aItem, aParentFrame, aDisplay, aFrameItems,
aState, aItem, aParentFrame, aFrameItems,
NS_NewSVGOuterSVGFrame, NS_NewSVGOuterSVGAnonChildFrame,
nsCSSAnonBoxes::mozSVGOuterSVGAnonChild, true);
}
@ -5037,7 +5035,7 @@ nsCSSFrameConstructor::ConstructMarker(nsFrameConstructorState& aState,
nsFrameItems& aFrameItems)
{
return ConstructFrameWithAnonymousChild(
aState, aItem, aParentFrame, aDisplay, aFrameItems,
aState, aItem, aParentFrame, aFrameItems,
NS_NewSVGMarkerFrame, NS_NewSVGMarkerAnonChildFrame,
nsCSSAnonBoxes::mozSVGMarkerAnonChild, false);
}
@ -5576,7 +5574,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
// And general display types
if (!data) {
data = FindDisplayData(display, element, aParentFrame, styleContext);
data = FindDisplayData(display, element, styleContext);
}
NS_ASSERTION(data, "Should have frame construction data now");
@ -7313,7 +7311,6 @@ bool NotifyListBoxBody(nsPresContext* aPresContext,
nsIContent* aChild,
// Only used for the removed notification
nsIContent* aOldNextSibling,
nsIDocument* aDocument,
nsIFrame* aChildFrame,
content_operation aOperation)
{
@ -7425,8 +7422,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
if (NotifyListBoxBody(mPresShell->GetPresContext(), aContainer,
// The insert case in NotifyListBoxBody
// doesn't use "old next sibling".
aStartChild, nullptr,
mDocument, nullptr, CONTENT_INSERTED)) {
aStartChild, nullptr, nullptr, CONTENT_INSERTED)) {
return NS_OK;
}
} else {
@ -8011,7 +8007,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
nsPresContext* presContext = mPresShell->GetPresContext();
#ifdef MOZ_XUL
if (NotifyListBoxBody(presContext, aContainer, aChild, aOldNextSibling,
mDocument, childFrame, CONTENT_REMOVED)) {
childFrame, CONTENT_REMOVED)) {
if (aFlags == REMOVE_DESTROY_FRAMES) {
CaptureStateForFramesOf(aChild, mTempFrameTreeState);
}
@ -10437,7 +10433,7 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
"can't be both block and box");
if (haveFirstLetterStyle) {
WrapFramesInFirstLetterFrame(aContent, aFrame, aFrameItems);
WrapFramesInFirstLetterFrame(aFrame, aFrameItems);
}
if (haveFirstLineStyle) {
WrapFramesInFirstLineFrame(aState, aContent, aFrame, nullptr,
@ -10819,7 +10815,6 @@ static bool IsFirstLetterContent(nsIContent* aContent)
void
nsCSSFrameConstructor::CreateFloatingLetterFrame(
nsFrameConstructorState& aState,
nsContainerFrame* aBlockFrame,
nsIContent* aTextContent,
nsIFrame* aTextFrame,
nsContainerFrame* aParentFrame,
@ -10938,7 +10933,7 @@ nsCSSFrameConstructor::CreateLetterFrame(nsContainerFrame* aBlockFrame,
const nsStyleDisplay* display = sc->StyleDisplay();
if (display->IsFloatingStyle() && !aParentFrame->IsSVGText()) {
// Make a floating first-letter frame
CreateFloatingLetterFrame(state, aBlockFrame, aTextContent, textFrame,
CreateFloatingLetterFrame(state, aTextContent, textFrame,
aParentFrame, sc, aResult);
}
else {
@ -10966,7 +10961,6 @@ nsCSSFrameConstructor::CreateLetterFrame(nsContainerFrame* aBlockFrame,
void
nsCSSFrameConstructor::WrapFramesInFirstLetterFrame(
nsIContent* aBlockContent,
nsContainerFrame* aBlockFrame,
nsFrameItems& aBlockFrames)
{
@ -11074,8 +11068,7 @@ FindFirstLetterFrame(nsIFrame* aFrame, nsIFrame::ChildListID aListID)
nsresult
nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
nsIPresShell* aPresShell,
nsIFrame* aBlockFrame,
bool* aStopLooking)
nsIFrame* aBlockFrame)
{
// Look for the first letter frame on the kFloatList, then kPushedFloatsList.
nsIFrame* floatFrame =
@ -11250,9 +11243,8 @@ nsCSSFrameConstructor::RemoveLetterFrames(nsIPresShell* aPresShell,
bool stopLooking = false;
nsresult rv;
do {
rv = RemoveFloatingFirstLetterFrames(aPresShell,
continuation, &stopLooking);
if (NS_SUCCEEDED(rv) && !stopLooking) {
rv = RemoveFloatingFirstLetterFrames(aPresShell, continuation);
if (NS_SUCCEEDED(rv)) {
rv = RemoveFirstLetterFrames(aPresShell,
continuation, aBlockFrame, &stopLooking);
}

13
layout/base/nsCSSFrameConstructor.h
View File

@ -1475,7 +1475,6 @@ private:
nsFrameConstructorState& aState,
FrameConstructionItem& aItem,
nsContainerFrame* aParentFrame,
const nsStyleDisplay* aDisplay,
nsFrameItems& aFrameItems,
ContainerFrameCreationFunc aConstructor,
ContainerFrameCreationFunc aInnerConstructor,
@ -1512,7 +1511,7 @@ private:
changes, make this static */
const FrameConstructionData*
FindDisplayData(const nsStyleDisplay* aDisplay, Element* aElement,
nsIFrame* aParentFrame, nsStyleContext* aStyleContext);
nsStyleContext* aStyleContext);
/**
* Construct a scrollable block frame
@ -1816,7 +1815,6 @@ private:
// Methods support :first-letter style
void CreateFloatingLetterFrame(nsFrameConstructorState& aState,
nsContainerFrame* aBlockFrame,
nsIContent* aTextContent,
nsIFrame* aTextFrame,
nsContainerFrame* aParentFrame,
@ -1829,8 +1827,7 @@ private:
nsContainerFrame* aParentFrame,
nsFrameItems& aResult);
void WrapFramesInFirstLetterFrame(nsIContent* aBlockContent,
nsContainerFrame* aBlockFrame,
void WrapFramesInFirstLetterFrame(nsContainerFrame* aBlockFrame,
nsFrameItems& aBlockFrames);
/**
@ -1851,9 +1848,6 @@ private:
* @param aTextFrame returns the textframe that had the first-letter
* @param aPrevFrame returns the previous sibling of aTextFrame
* @param aLetterFrames returns the frames that were created
* @param aStopLooking returns whether we should stop looking for a
* first-letter either because it was found or won't be
* found
*/
void WrapFramesInFirstLetterFrame(nsContainerFrame* aBlockFrame,
nsContainerFrame* aBlockContinuation,
@ -1879,8 +1873,7 @@ private:
// Special remove method for those pesky floating first-letter frames
nsresult RemoveFloatingFirstLetterFrames(nsIPresShell* aPresShell,
nsIFrame* aBlockFrame,
bool* aStopLooking);
nsIFrame* aBlockFrame);
// Capture state for the frame tree rooted at the frame associated with the
// content object, aContent