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

Bug 655877 - Part 14: Ignore float in SVG text frames. r=roc

Browse Source
This commit is contained in:
Cameron McCormack
2012-08-02 21:38:49 +10:00
parent 7994d426a3
commit 30ac972c28
16 changed files with 72 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsHTMLReflowState.cpp
View File

@@ -644,8 +644,8 @@ nsHTMLReflowState::InitFrameType(nsIAtom* aFrameType)
NS_ASSERTION(frame->GetStyleDisplay()->IsAbsolutelyPositioned() ==
disp->IsAbsolutelyPositioned(),
"Unexpected position style");
NS_ASSERTION(frame->GetStyleDisplay()->IsFloating() ==
disp->IsFloating(), "Unexpected float style");
NS_ASSERTION(frame->GetStyleDisplay()->IsFloatingStyle() ==
disp->IsFloatingStyle(), "Unexpected float style");
if (frame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
if (disp->IsAbsolutelyPositioned()) {
frameType = NS_CSS_FRAME_TYPE_ABSOLUTE;
@@ -654,7 +654,7 @@ nsHTMLReflowState::InitFrameType(nsIAtom* aFrameType)
if (frame->GetPrevInFlow())
frameType = NS_CSS_FRAME_TYPE_BLOCK;
}
else if (disp->IsFloating()) {
else if (disp->IsFloating(frame)) {
frameType = NS_CSS_FRAME_TYPE_FLOATING;
} else {
NS_ASSERTION(disp->mDisplay == NS_STYLE_DISPLAY_POPUP,