diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebCore/html/HTMLTableCellElement.cpp | |
parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebCore/html/HTMLTableCellElement.cpp')
-rw-r--r-- | Source/WebCore/html/HTMLTableCellElement.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/html/HTMLTableCellElement.cpp b/Source/WebCore/html/HTMLTableCellElement.cpp index 294607d77..02c1a2fee 100644 --- a/Source/WebCore/html/HTMLTableCellElement.cpp +++ b/Source/WebCore/html/HTMLTableCellElement.cpp @@ -67,6 +67,9 @@ int HTMLTableCellElement::rowSpan() const int HTMLTableCellElement::cellIndex() const { int index = 0; + if (!parentElement() || !parentElement()->hasTagName(trTag)) + return -1; + for (const Node * node = previousSibling(); node; node = node->previousSibling()) { if (node->hasTagName(tdTag) || node->hasTagName(thTag)) index++; |