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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d7fd009c333aa3c4db5f72ae8bb8cbe028f66408
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 6 05:34:37 2010 +0000

    2010-11-05  Simon Fraser  <simon.fraser at apple.com>
    
            Just put things back the way they were. Too many mysterious linker errors.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71464 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c9d607e..1418cda 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,9 @@
 2010-11-05  Simon Fraser  <simon.fraser at apple.com>
 
+        Just put things back the way they were. Too many mysterious linker errors.
+
+2010-11-05  Simon Fraser  <simon.fraser at apple.com>
+
         Undo most of the previous commit since the compiler seems to have trouble
         with an inlined operator++ in debug builds.
 
diff --git a/WebCore/platform/DeprecatedPtrListImpl.cpp b/WebCore/platform/DeprecatedPtrListImpl.cpp
index 3e6e989..96fd513 100644
--- a/WebCore/platform/DeprecatedPtrListImpl.cpp
+++ b/WebCore/platform/DeprecatedPtrListImpl.cpp
@@ -29,9 +29,21 @@
 #include <cstddef>
 #include <algorithm>
 #include <wtf/Assertions.h>
+#include <wtf/Noncopyable.h>
 
 namespace WebCore {
 
+class DeprecatedListNode : public Noncopyable
+{
+public:
+    DeprecatedListNode(void *d) : data(d), next(0), prev(0) { }
+
+    void *data;
+    DeprecatedListNode *next;
+    DeprecatedListNode *prev;
+};
+
+
 static DeprecatedListNode *copyList(DeprecatedListNode *l, DeprecatedListNode *&tail)
 {
     DeprecatedListNode *node = l;
@@ -463,6 +475,11 @@ void *DeprecatedPtrListImplIterator::toLast()
     return current();
 }
 
+void *DeprecatedPtrListImplIterator::current() const
+{
+    return node == 0 ? 0 : node->data;
+}
+
 void *DeprecatedPtrListImplIterator::operator--()
 {
     if (node) {
@@ -473,9 +490,9 @@ void *DeprecatedPtrListImplIterator::operator--()
 
 void *DeprecatedPtrListImplIterator::operator++()
 {
-    if (node)
+    if (node) {
         node = node->next;
-
+    }
     return current();
 }
 
diff --git a/WebCore/platform/DeprecatedPtrListImpl.h b/WebCore/platform/DeprecatedPtrListImpl.h
index 4290bfb..5e4121b 100644
--- a/WebCore/platform/DeprecatedPtrListImpl.h
+++ b/WebCore/platform/DeprecatedPtrListImpl.h
@@ -26,15 +26,15 @@
 #ifndef DeprecatedPtrListImpl_h
 #define DeprecatedPtrListImpl_h
 
-#include <wtf/Noncopyable.h>
-
 namespace WebCore {
 
 class DeprecatedListNode;
 class DeprecatedPtrListImplIterator;
 
-class DeprecatedPtrListImpl {
+class DeprecatedPtrListImpl
+{
 public:
+    
     DeprecatedPtrListImpl(void (*deleteFunc)(void *));
     DeprecatedPtrListImpl(const DeprecatedPtrListImpl &impl);
     ~DeprecatedPtrListImpl();
@@ -90,14 +90,6 @@ public:
     friend class DeprecatedPtrListImplIterator;
 };
 
-class DeprecatedListNode : public Noncopyable {
-public:
-    DeprecatedListNode(void *d) : data(d), next(0), prev(0) { }
-
-    void *data;
-    DeprecatedListNode *next;
-    DeprecatedListNode *prev;
-};
 
 class DeprecatedPtrListImplIterator {
 public:
@@ -111,7 +103,7 @@ public:
     unsigned count() const;
     void *toFirst();
     void *toLast();
-    void *current() const { return node ? node->data : 0; }
+    void *current() const;
 
     void *operator--();
     void *operator++();

-- 
WebKit Debian packaging