[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f6b0b2a04868fc3e1cff9b3a44540627e532a032
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 21:33:08 2010 +0000

    * editing/TextIterator.cpp:
    (WebCore::TextIterator::handleTextBox):
    Added a cast so we can mix int and unsigned in a single ?: expression.
    This warns with clang, but strangely not with gcc.
    
    Reviewed by Anders Carlsson.
    
    * html/parser/HTMLTreeBuilder.cpp: Removed unused functions.
    The clang compiler notices and complains about these. If we need them
    later we should use Subversion to bring them back.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66536 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f2a11b5..6074bf0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-31  Darin Adler  <darin at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        * editing/TextIterator.cpp:
+        (WebCore::TextIterator::handleTextBox):
+        Added a cast so we can mix int and unsigned in a single ?: expression.
+        This warns with clang, but strangely not with gcc.
+
+        * html/parser/HTMLTreeBuilder.cpp: Removed unused functions.
+        The clang compiler notices and complains about these. If we need them
+        later we should use Subversion to bring them back.
+
 2010-08-31  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/editing/TextIterator.cpp b/WebCore/editing/TextIterator.cpp
index 57f9a3c..daba80e 100644
--- a/WebCore/editing/TextIterator.cpp
+++ b/WebCore/editing/TextIterator.cpp
@@ -522,7 +522,7 @@ void TextIterator::handleTextBox()
     }
     String str = renderer->text();
     unsigned start = m_offset;
-    unsigned end = (m_node == m_endContainer) ? m_endOffset : UINT_MAX;
+    unsigned end = (m_node == m_endContainer) ? static_cast<unsigned>(m_endOffset) : UINT_MAX;
     while (m_textBox) {
         unsigned textBoxStart = m_textBox->start();
         unsigned runStart = max(textBoxStart, start);
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index 07db2f3..fe912de 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -200,20 +200,6 @@ bool isSpecialNode(Node* node)
         || tagName == xmpTag;
 }
 
-// http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#scoping
-// and isScopeMarker in HTMLElementStack.cpp
-bool isScopingTag(const AtomicString& tagName)
-{
-    return tagName == appletTag
-        || tagName == captionTag
-        || tagName == SVGNames::foreignObjectTag
-        || tagName == htmlTag
-        || tagName == marqueeTag
-        || tagName == objectTag
-        || tagName == tableTag
-        || isTableCellContextTag(tagName);
-}
-
 bool isNonAnchorNonNobrFormattingTag(const AtomicString& tagName)
 {
     return tagName == bTag
@@ -669,11 +655,6 @@ void mapLoweredLocalNameToName(PrefixedNameToQualifiedNameMap* map, QualifiedNam
     }
 }
 
-void addName(PrefixedNameToQualifiedNameMap* map, const QualifiedName& name)
-{
-    map->add(name.localName().lower(), name);
-}
-
 void adjustSVGTagNameCase(AtomicHTMLToken& token)
 {
     static PrefixedNameToQualifiedNameMap* caseMap = 0;

-- 
WebKit Debian packaging