diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 15bb73ed01c..1295b941ef6 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -1249,7 +1249,22 @@ nsBlockFrame::IncrementalReflow(nsIPresContext* aPresContext, } else { NS_NOTYETIMPLEMENTED("unexpected reflow command"); } - } else { + } else { +#if 0 + // The command is passing through us. Get the next frame in the reflow chain + nsIFrame* nextFrame = aReflowCommand.GetNext(); + + // Restore our state as if nextFrame is the next frame to reflow + RecoverState(aPresContext, state, nextFrame); + + // Get the current bounds. We'll need this to adjust the frames that follow + nsRect oldBounds; + nextFrame->GetRect(oldBounds); + + // Pass along the reflow command + nsRect desiredRect; + aStatus = aReflowCommand.Next(aSpaceManager, desiredRect, aMaxSize, nextFrame); +#endif NS_NOTYETIMPLEMENTED("unexpected reflow command"); } diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 15bb73ed01c..1295b941ef6 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -1249,7 +1249,22 @@ nsBlockFrame::IncrementalReflow(nsIPresContext* aPresContext, } else { NS_NOTYETIMPLEMENTED("unexpected reflow command"); } - } else { + } else { +#if 0 + // The command is passing through us. Get the next frame in the reflow chain + nsIFrame* nextFrame = aReflowCommand.GetNext(); + + // Restore our state as if nextFrame is the next frame to reflow + RecoverState(aPresContext, state, nextFrame); + + // Get the current bounds. We'll need this to adjust the frames that follow + nsRect oldBounds; + nextFrame->GetRect(oldBounds); + + // Pass along the reflow command + nsRect desiredRect; + aStatus = aReflowCommand.Next(aSpaceManager, desiredRect, aMaxSize, nextFrame); +#endif NS_NOTYETIMPLEMENTED("unexpected reflow command"); } diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 15bb73ed01c..1295b941ef6 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -1249,7 +1249,22 @@ nsBlockFrame::IncrementalReflow(nsIPresContext* aPresContext, } else { NS_NOTYETIMPLEMENTED("unexpected reflow command"); } - } else { + } else { +#if 0 + // The command is passing through us. Get the next frame in the reflow chain + nsIFrame* nextFrame = aReflowCommand.GetNext(); + + // Restore our state as if nextFrame is the next frame to reflow + RecoverState(aPresContext, state, nextFrame); + + // Get the current bounds. We'll need this to adjust the frames that follow + nsRect oldBounds; + nextFrame->GetRect(oldBounds); + + // Pass along the reflow command + nsRect desiredRect; + aStatus = aReflowCommand.Next(aSpaceManager, desiredRect, aMaxSize, nextFrame); +#endif NS_NOTYETIMPLEMENTED("unexpected reflow command"); } diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 15bb73ed01c..1295b941ef6 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -1249,7 +1249,22 @@ nsBlockFrame::IncrementalReflow(nsIPresContext* aPresContext, } else { NS_NOTYETIMPLEMENTED("unexpected reflow command"); } - } else { + } else { +#if 0 + // The command is passing through us. Get the next frame in the reflow chain + nsIFrame* nextFrame = aReflowCommand.GetNext(); + + // Restore our state as if nextFrame is the next frame to reflow + RecoverState(aPresContext, state, nextFrame); + + // Get the current bounds. We'll need this to adjust the frames that follow + nsRect oldBounds; + nextFrame->GetRect(oldBounds); + + // Pass along the reflow command + nsRect desiredRect; + aStatus = aReflowCommand.Next(aSpaceManager, desiredRect, aMaxSize, nextFrame); +#endif NS_NOTYETIMPLEMENTED("unexpected reflow command"); } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 15bb73ed01c..1295b941ef6 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -1249,7 +1249,22 @@ nsBlockFrame::IncrementalReflow(nsIPresContext* aPresContext, } else { NS_NOTYETIMPLEMENTED("unexpected reflow command"); } - } else { + } else { +#if 0 + // The command is passing through us. Get the next frame in the reflow chain + nsIFrame* nextFrame = aReflowCommand.GetNext(); + + // Restore our state as if nextFrame is the next frame to reflow + RecoverState(aPresContext, state, nextFrame); + + // Get the current bounds. We'll need this to adjust the frames that follow + nsRect oldBounds; + nextFrame->GetRect(oldBounds); + + // Pass along the reflow command + nsRect desiredRect; + aStatus = aReflowCommand.Next(aSpaceManager, desiredRect, aMaxSize, nextFrame); +#endif NS_NOTYETIMPLEMENTED("unexpected reflow command"); } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 15bb73ed01c..1295b941ef6 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -1249,7 +1249,22 @@ nsBlockFrame::IncrementalReflow(nsIPresContext* aPresContext, } else { NS_NOTYETIMPLEMENTED("unexpected reflow command"); } - } else { + } else { +#if 0 + // The command is passing through us. Get the next frame in the reflow chain + nsIFrame* nextFrame = aReflowCommand.GetNext(); + + // Restore our state as if nextFrame is the next frame to reflow + RecoverState(aPresContext, state, nextFrame); + + // Get the current bounds. We'll need this to adjust the frames that follow + nsRect oldBounds; + nextFrame->GetRect(oldBounds); + + // Pass along the reflow command + nsRect desiredRect; + aStatus = aReflowCommand.Next(aSpaceManager, desiredRect, aMaxSize, nextFrame); +#endif NS_NOTYETIMPLEMENTED("unexpected reflow command"); }