2010-06-28 Daniel Bates <dbates@rim.com>
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Jun 2010 03:33:30 +0000 (03:33 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Jun 2010 03:33:30 +0000 (03:33 +0000)
        Unreviewed, build fix.

        Change return type of method HTMLTreeBuilder::reconstructTheActiveFormattingElements()
        from int to unsigned.

        Attempt to fix the build after changeset 62077 <https://trac.webkit.org/changeset/62077>
        (https://bugs.webkit.org/show_bug.cgi?id=41319).

        * html/HTMLTreeBuilder.cpp:
        (WebCore::HTMLTreeBuilder::indexOfLastOpenFormattingElementOrMarker):
        (WebCore::HTMLTreeBuilder::reconstructTheActiveFormattingElements):
        * html/HTMLTreeBuilder.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@62080 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/html/HTMLTreeBuilder.cpp
WebCore/html/HTMLTreeBuilder.h

index a2b00b7..3d9a544 100644 (file)
@@ -1,3 +1,18 @@
+2010-06-28  Daniel Bates  <dbates@rim.com>
+
+        Unreviewed, build fix.
+
+        Change return type of method HTMLTreeBuilder::reconstructTheActiveFormattingElements()
+        from int to unsigned.
+
+        Attempt to fix the build after changeset 62077 <https://trac.webkit.org/changeset/62077>
+        (https://bugs.webkit.org/show_bug.cgi?id=41319).
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::indexOfLastOpenFormattingElementOrMarker):
+        (WebCore::HTMLTreeBuilder::reconstructTheActiveFormattingElements):
+        * html/HTMLTreeBuilder.h:
+
 2010-06-28  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Barth.
index a75fd9f..0dca642 100644 (file)
@@ -914,7 +914,7 @@ PassRefPtr<Element> HTMLTreeBuilder::createElement(AtomicHTMLToken& token)
     return element.release();
 }
 
-unsigned HTMLTreeBuilder::indexOfLastOpenFormattingElementOrMarker() const
+int HTMLTreeBuilder::indexOfLastOpenFormattingElementOrMarker() const
 {
     ASSERT(!m_activeFormattingElements.isEmpty());
     for (int index = m_activeFormattingElements.size() - 1; index >= 0; --index) {
@@ -944,7 +944,7 @@ void HTMLTreeBuilder::reconstructTheActiveFormattingElements()
     if (m_activeFormattingElements.isEmpty())
         return;
 
-    unsigned lastOpenElementIndex = indexOfLastOpenFormattingElementOrMarker();
+    int lastOpenElementIndex = indexOfLastOpenFormattingElementOrMarker();
     if (lastOpenElementIndex < m_activeFormattingElements.size() - 1)
         reopenFormattingElementsAfterIndex(lastOpenElementIndex);
 }
index 109678a..9709f86 100644 (file)
@@ -215,7 +215,7 @@ private:
     void insertHTMLStartTagInBody(AtomicHTMLToken&);
 
     PassRefPtr<Element> createElement(AtomicHTMLToken&);
-    unsigned indexOfLastOpenFormattingElementOrMarker() const;
+    int indexOfLastOpenFormattingElementOrMarker() const;
     void reopenFormattingElementsAfterIndex(unsigned lastOpenElementIndex);
     void reconstructTheActiveFormattingElements();