summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderTableRow.cpp
diff options
context:
space:
mode:
authorFeng Qian <fqian@google.com>2009-06-17 12:12:20 -0700
committerFeng Qian <fqian@google.com>2009-06-17 12:12:20 -0700
commit5f1ab04193ad0130ca8204aadaceae083aca9881 (patch)
tree5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/rendering/RenderTableRow.cpp
parent194315e5a908cc8ed67d597010544803eef1ac59 (diff)
downloadexternal_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip
external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz
external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2
Get WebKit r44544.
Diffstat (limited to 'WebCore/rendering/RenderTableRow.cpp')
-rw-r--r--WebCore/rendering/RenderTableRow.cpp18
1 files changed, 1 insertions, 17 deletions
diff --git a/WebCore/rendering/RenderTableRow.cpp b/WebCore/rendering/RenderTableRow.cpp
index c0603a2..33b2c39 100644
--- a/WebCore/rendering/RenderTableRow.cpp
+++ b/WebCore/rendering/RenderTableRow.cpp
@@ -33,10 +33,6 @@
#include "RenderTableCell.h"
#include "RenderView.h"
-#if ENABLE(WML)
-#include "WMLNames.h"
-#endif
-
namespace WebCore {
using namespace HTMLNames;
@@ -74,19 +70,7 @@ void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
if (!beforeChild && isAfterContent(lastChild()))
beforeChild = lastChild();
- bool isTableRow = node() && node()->hasTagName(trTag);
-
-#if ENABLE(WML)
- if (!isTableRow && node() && node()->isWMLElement())
- isTableRow = node()->hasTagName(WMLNames::trTag);
-#endif
-
if (!child->isTableCell()) {
- if (isTableRow && child->node() && child->node()->hasTagName(formTag) && document()->isHTMLDocument()) {
- RenderBox::addChild(child, beforeChild);
- return;
- }
-
RenderObject* last = beforeChild;
if (!last)
last = lastChild();
@@ -121,7 +105,7 @@ void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
if (parent())
section()->addCell(cell, this);
- ASSERT(!beforeChild || beforeChild->isTableCell() || isTableRow && beforeChild->node() && beforeChild->node()->hasTagName(formTag) && document()->isHTMLDocument());
+ ASSERT(!beforeChild || beforeChild->isTableCell());
RenderBox::addChild(cell, beforeChild);
if (beforeChild || nextSibling())