diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/html/HTMLTableCellElement.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/html/HTMLTableCellElement.cpp')
-rw-r--r-- | WebCore/html/HTMLTableCellElement.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/WebCore/html/HTMLTableCellElement.cpp b/WebCore/html/HTMLTableCellElement.cpp index d90b125..0bd3cf5 100644 --- a/WebCore/html/HTMLTableCellElement.cpp +++ b/WebCore/html/HTMLTableCellElement.cpp @@ -123,7 +123,7 @@ void HTMLTableCellElement::parseMappedAttribute(Attribute* attr) // used by table cells to share style decls created by the enclosing table. void HTMLTableCellElement::additionalAttributeStyleDecls(Vector<CSSMutableStyleDeclaration*>& results) { - Node* p = parentNode(); + ContainerNode* p = parentNode(); while (p && !p->hasTagName(tableTag)) p = p->parentNode(); if (!p) @@ -173,4 +173,20 @@ void HTMLTableCellElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) addSubresourceURL(urls, document()->completeURL(getAttribute(backgroundAttr))); } +HTMLTableCellElement* HTMLTableCellElement::cellAbove() const +{ + RenderObject* cellRenderer = renderer(); + if (!cellRenderer) + return 0; + if (!cellRenderer->isTableCell()) + return 0; + + RenderTableCell* tableCellRenderer = toRenderTableCell(cellRenderer); + RenderTableCell* cellAboveRenderer = tableCellRenderer->table()->cellAbove(tableCellRenderer); + if (!cellAboveRenderer) + return 0; + + return static_cast<HTMLTableCellElement*>(cellAboveRenderer->node()); } + +} // namespace WebCore |