diff options
| -rw-r--r-- | WebCore/html/HTMLCollection.cpp | 8 | ||||
| -rw-r--r-- | WebCore/rendering/RenderBlock.cpp | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/WebCore/html/HTMLCollection.cpp b/WebCore/html/HTMLCollection.cpp index 5e42d30..8a942c3 100644 --- a/WebCore/html/HTMLCollection.cpp +++ b/WebCore/html/HTMLCollection.cpp @@ -251,14 +251,6 @@ Node* HTMLCollection::firstItem() const Node* HTMLCollection::nextItem() const { resetCollectionInfo(); - -#ifdef ANDROID_FIX - // resetCollectionInfo() can set info->current to be 0. If this is the - // case, we need to go back to the firstItem. Otherwise traverseNextItem - // will crash. - if (!m_info->current) - return firstItem(); -#endif // Look for the 'second' item. The first one is currentItem, already given back. Element* retval = itemAfter(m_info->current); diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp index bffade7..eabb054 100644 --- a/WebCore/rendering/RenderBlock.cpp +++ b/WebCore/rendering/RenderBlock.cpp @@ -4225,11 +4225,7 @@ void RenderBlock::calcInlinePrefWidths() // check. bool hasBreakableChar, hasBreak; int beginMin, endMin; -#ifdef ANDROID_FIX // bug found by valgrind - bool beginWS = false, endWS = false; -#else bool beginWS, endWS; -#endif int beginMax, endMax; t->trimmedPrefWidths(inlineMax, beginMin, beginWS, endMin, endWS, hasBreakableChar, hasBreak, beginMax, endMax, |