[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 15:32:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e576f45461fd3ae05df2674fc387ecd20e2308e8
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 6 05:23:23 2010 +0000
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.
* platform/DeprecatedPtrListImpl.cpp:
(WebCore::DeprecatedPtrListImplIterator::operator++):
* platform/DeprecatedPtrListImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71463 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 79b22b4..c9d607e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
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.
+
+ * platform/DeprecatedPtrListImpl.cpp:
+ (WebCore::DeprecatedPtrListImplIterator::operator++):
+ * platform/DeprecatedPtrListImpl.h:
+
+2010-11-05 Simon Fraser <simon.fraser at apple.com>
+
Reviewed by Dave Hyatt.
Inline some DeprecatedPtrListImplIterator methods for performance
diff --git a/WebCore/platform/DeprecatedPtrListImpl.cpp b/WebCore/platform/DeprecatedPtrListImpl.cpp
index e6b536d..3e6e989 100644
--- a/WebCore/platform/DeprecatedPtrListImpl.cpp
+++ b/WebCore/platform/DeprecatedPtrListImpl.cpp
@@ -471,6 +471,14 @@ void *DeprecatedPtrListImplIterator::operator--()
return current();
}
+void *DeprecatedPtrListImplIterator::operator++()
+{
+ if (node)
+ node = node->next;
+
+ return current();
+}
+
DeprecatedPtrListImplIterator &DeprecatedPtrListImplIterator::operator=(const DeprecatedPtrListImplIterator &impl)
{
if (list) {
diff --git a/WebCore/platform/DeprecatedPtrListImpl.h b/WebCore/platform/DeprecatedPtrListImpl.h
index 416da67..4290bfb 100644
--- a/WebCore/platform/DeprecatedPtrListImpl.h
+++ b/WebCore/platform/DeprecatedPtrListImpl.h
@@ -114,13 +114,7 @@ public:
void *current() const { return node ? node->data : 0; }
void *operator--();
- void *operator++()
- {
- if (node)
- node = node->next;
-
- return current();
- }
+ void *operator++();
private:
const DeprecatedPtrListImpl *list;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list