From 05a135ab750df3df05f2531b8ce2d91f78b6ff6a Mon Sep 17 00:00:00 2001 From: "bernd.mielke%snafu.de" Date: Wed, 9 Jan 2002 19:28:12 +0000 Subject: [PATCH] completing the backout of my checkin for bug 110596 git-svn-id: svn://10.0.0.236/trunk@111720 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrame.cpp | 12 ------------ mozilla/layout/html/base/src/nsFrame.cpp | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index eeffdb657d0..cc6e2066477 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -4571,25 +4571,14 @@ void DR_State::InitFrameTypeTable() { AddFrameTypeInfo(nsLayoutAtoms::areaFrame, "area", "area"); AddFrameTypeInfo(nsLayoutAtoms::blockFrame, "block", "block"); - AddFrameTypeInfo(nsLayoutAtoms::boxFrame, "box", "box"); AddFrameTypeInfo(nsLayoutAtoms::brFrame, "br", "br"); AddFrameTypeInfo(nsLayoutAtoms::bulletFrame, "bullet", "bullet"); - AddFrameTypeInfo(nsLayoutAtoms::comboBoxFrame, "combo", "comboBox"); - AddFrameTypeInfo(nsLayoutAtoms::fieldSetFrame, "field", "fieldset"); - AddFrameTypeInfo(nsLayoutAtoms::fileControlFrame, "file", "fileControl"); - AddFrameTypeInfo(nsLayoutAtoms::formControlFrame, "form", "form"); AddFrameTypeInfo(nsLayoutAtoms::gfxButtonControlFrame, "button", "gfxButtonControl"); - AddFrameTypeInfo(nsLayoutAtoms::gfxCheckBoxFrame, "check", "gfxCheckBox"); - AddFrameTypeInfo(nsLayoutAtoms::gfxRadioControlFrame, "radio", "gfxRadioControl"); AddFrameTypeInfo(nsLayoutAtoms::hrFrame, "hr", "hr"); AddFrameTypeInfo(nsLayoutAtoms::htmlFrameInnerFrame, "frameI", "htmlFrameInner"); AddFrameTypeInfo(nsLayoutAtoms::htmlFrameOuterFrame, "frameO", "htmlFrameOuter"); AddFrameTypeInfo(nsLayoutAtoms::imageFrame, "img", "image"); - AddFrameTypeInfo(nsLayoutAtoms::imageControlFrame, "imgC", "imageControl"); AddFrameTypeInfo(nsLayoutAtoms::inlineFrame, "inline", "inline"); - AddFrameTypeInfo(nsLayoutAtoms::isIndexFrame, "index", "isIndex"); - AddFrameTypeInfo(nsLayoutAtoms::labelFrame, "label", "label"); - AddFrameTypeInfo(nsLayoutAtoms::legendFrame, "legend", "legend"); AddFrameTypeInfo(nsLayoutAtoms::letterFrame, "letter", "letter"); AddFrameTypeInfo(nsLayoutAtoms::lineFrame, "line", "line"); AddFrameTypeInfo(nsLayoutAtoms::listControlFrame, "select", "select"); @@ -4610,7 +4599,6 @@ void DR_State::InitFrameTypeTable() AddFrameTypeInfo(nsLayoutAtoms::tableRowFrame, "row", "tableRow"); AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textCtl", "textInput"); AddFrameTypeInfo(nsLayoutAtoms::textFrame, "text", "text"); - AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textInp", "textInput"); AddFrameTypeInfo(nsLayoutAtoms::viewportFrame, "VP", "viewport"); AddFrameTypeInfo(nsnull, "unknown", "unknown"); } diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index eeffdb657d0..cc6e2066477 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -4571,25 +4571,14 @@ void DR_State::InitFrameTypeTable() { AddFrameTypeInfo(nsLayoutAtoms::areaFrame, "area", "area"); AddFrameTypeInfo(nsLayoutAtoms::blockFrame, "block", "block"); - AddFrameTypeInfo(nsLayoutAtoms::boxFrame, "box", "box"); AddFrameTypeInfo(nsLayoutAtoms::brFrame, "br", "br"); AddFrameTypeInfo(nsLayoutAtoms::bulletFrame, "bullet", "bullet"); - AddFrameTypeInfo(nsLayoutAtoms::comboBoxFrame, "combo", "comboBox"); - AddFrameTypeInfo(nsLayoutAtoms::fieldSetFrame, "field", "fieldset"); - AddFrameTypeInfo(nsLayoutAtoms::fileControlFrame, "file", "fileControl"); - AddFrameTypeInfo(nsLayoutAtoms::formControlFrame, "form", "form"); AddFrameTypeInfo(nsLayoutAtoms::gfxButtonControlFrame, "button", "gfxButtonControl"); - AddFrameTypeInfo(nsLayoutAtoms::gfxCheckBoxFrame, "check", "gfxCheckBox"); - AddFrameTypeInfo(nsLayoutAtoms::gfxRadioControlFrame, "radio", "gfxRadioControl"); AddFrameTypeInfo(nsLayoutAtoms::hrFrame, "hr", "hr"); AddFrameTypeInfo(nsLayoutAtoms::htmlFrameInnerFrame, "frameI", "htmlFrameInner"); AddFrameTypeInfo(nsLayoutAtoms::htmlFrameOuterFrame, "frameO", "htmlFrameOuter"); AddFrameTypeInfo(nsLayoutAtoms::imageFrame, "img", "image"); - AddFrameTypeInfo(nsLayoutAtoms::imageControlFrame, "imgC", "imageControl"); AddFrameTypeInfo(nsLayoutAtoms::inlineFrame, "inline", "inline"); - AddFrameTypeInfo(nsLayoutAtoms::isIndexFrame, "index", "isIndex"); - AddFrameTypeInfo(nsLayoutAtoms::labelFrame, "label", "label"); - AddFrameTypeInfo(nsLayoutAtoms::legendFrame, "legend", "legend"); AddFrameTypeInfo(nsLayoutAtoms::letterFrame, "letter", "letter"); AddFrameTypeInfo(nsLayoutAtoms::lineFrame, "line", "line"); AddFrameTypeInfo(nsLayoutAtoms::listControlFrame, "select", "select"); @@ -4610,7 +4599,6 @@ void DR_State::InitFrameTypeTable() AddFrameTypeInfo(nsLayoutAtoms::tableRowFrame, "row", "tableRow"); AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textCtl", "textInput"); AddFrameTypeInfo(nsLayoutAtoms::textFrame, "text", "text"); - AddFrameTypeInfo(nsLayoutAtoms::textInputFrame, "textInp", "textInput"); AddFrameTypeInfo(nsLayoutAtoms::viewportFrame, "VP", "viewport"); AddFrameTypeInfo(nsnull, "unknown", "unknown"); }