[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit aba53360ea8c1ca97cde71aab860507c6987bc0c
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 03:08:27 2009 +0000

    2009-11-10  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Darin Adler.
    
            rename counter to makeCounterNode in RenderCounter.cpp
            https://bugs.webkit.org/show_bug.cgi?id=31289
    
            No new test because this is just a small refactoring.
    
            * rendering/RenderCounter.cpp:
            (WebCore::findPlaceForCounter):
            (WebCore::makeCounterNode):
            (WebCore::RenderCounter::originalText):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50787 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3cc0dc5..0a69960 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-10  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        rename counter to makeCounterNode in RenderCounter.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=31289
+
+        No new test because this is just a small refactoring.
+
+        * rendering/RenderCounter.cpp:
+        (WebCore::findPlaceForCounter):
+        (WebCore::makeCounterNode):
+        (WebCore::RenderCounter::originalText):
+
 2009-11-10  Daniel Bates  <dbates at webkit.org>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/rendering/RenderCounter.cpp b/WebCore/rendering/RenderCounter.cpp
index 17c6dad..59123af 100644
--- a/WebCore/rendering/RenderCounter.cpp
+++ b/WebCore/rendering/RenderCounter.cpp
@@ -38,7 +38,7 @@ using namespace HTMLNames;
 typedef HashMap<RefPtr<AtomicStringImpl>, CounterNode*> CounterMap;
 typedef HashMap<const RenderObject*, CounterMap*> CounterMaps;
 
-static CounterNode* counter(RenderObject*, const AtomicString& counterName, bool alwaysCreateCounter);
+static CounterNode* makeCounterNode(RenderObject*, const AtomicString& counterName, bool alwaysCreateCounter);
 
 static CounterMaps& counterMaps()
 {
@@ -148,7 +148,7 @@ static bool findPlaceForCounter(RenderObject* object, const AtomicString& counte
     // sibling or the reset node. This flag controls it.
     bool createChildForReset = true;
     while ((prevCounterCandidate = prevCounterCandidate->previousInPreOrder())) {
-        CounterNode* c = counter(prevCounterCandidate, counterName, false);
+        CounterNode* c = makeCounterNode(prevCounterCandidate, counterName, false);
         if (prevCounterCandidate == resetCandidate) {
             if (!candidateCounter) {
                 candidateCounter = c;
@@ -185,7 +185,7 @@ static bool findPlaceForCounter(RenderObject* object, const AtomicString& counte
     return false;
 }
 
-static CounterNode* counter(RenderObject* object, const AtomicString& counterName, bool alwaysCreateCounter)
+static CounterNode* makeCounterNode(RenderObject* object, const AtomicString& counterName, bool alwaysCreateCounter)
 {
     ASSERT(object);
 
@@ -246,7 +246,7 @@ PassRefPtr<StringImpl> RenderCounter::originalText() const
         return 0;
 
     if (!m_counterNode)
-        m_counterNode = counter(parent(), m_counter.identifier(), true);
+        m_counterNode = makeCounterNode(parent(), m_counter.identifier(), true);
 
     CounterNode* child = m_counterNode;
     int value = child->isReset() ? child->value() : child->countInParent();

-- 
WebKit Debian packaging