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

b=291216, canvas should not be an empty element, default width/height, fallback content should not be rendered, r+sr=bzbarsky, a=brendan/shaver

Browse Source
This commit is contained in:
vladimir@pobox.com
2005-05-07 03:45:06 +00:00
parent 9777498606
commit 5c48e9ed2a
6 changed files with 133 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -5394,6 +5394,9 @@ nsCSSFrameConstructor::ConstructHTMLFrame(nsFrameConstructorState& aState,
rv = NS_NewIsIndexFrame(mPresShell, &newFrame);
}
else if (nsHTMLAtoms::canvas == aTag) {
if (!aHasPseudoParent && !aState.mPseudoFrames.IsEmpty()) {
ProcessPseudoFrames(aState, aFrameItems);
}
isReplaced = PR_TRUE;
rv = NS_NewHTMLCanvasFrame(mPresShell, &newFrame);
}
@@ -8484,8 +8487,9 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
// then don't do any processing now
nsIAtom* frameType = parentFrame->GetType();
if (frameType == nsLayoutAtoms::objectFrame ||
frameType == nsLayoutAtoms::tableColFrame) {
// This handles APPLET, EMBED, OBJECT and COL
frameType == nsLayoutAtoms::tableColFrame ||
frameType == nsLayoutAtoms::canvasFrame) {
// This handles APPLET, EMBED, OBJECT, COL, and CANVAS
return NS_OK;
}
// Deal with inner/outer tables, fieldsets
@@ -9071,8 +9075,9 @@ nsCSSFrameConstructor::ContentInserted(nsIContent* aContainer,
// then don't do any processing now
nsIAtom* frameType = parentFrame->GetType();
if (frameType == nsLayoutAtoms::objectFrame ||
frameType == nsLayoutAtoms::tableColFrame) {
// This handles APPLET, EMBED, OBJECT and COL
frameType == nsLayoutAtoms::tableColFrame ||
frameType == nsLayoutAtoms::canvasFrame) {
// This handles APPLET, EMBED, OBJECT, COL, and CANVAS
return NS_OK;
}
// Deal with inner/outer tables, fieldsets