[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
girish at forwardbias.in
girish at forwardbias.in
Wed Dec 22 14:26:11 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6cf46f383dea3b52bba200e0919647e9f5b19526
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 8 16:01:53 2010 +0000
2010-10-08 Girish Ramakrishnan <girish at forwardbias.in>
Reviewed by Andreas Kling.
[Qt] Use constBegin and constEnd when using const iterators
* platform/graphics/qt/GraphicsLayerQt.cpp:
(WebCore::GraphicsLayerQtImpl::~GraphicsLayerQtImpl):
(WebCore::GraphicsLayerQtImpl::updateTransform):
(WebCore::GraphicsLayerQtImpl::flushChanges):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69402 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 84a9155..c671572 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-08 Girish Ramakrishnan <girish at forwardbias.in>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Use constBegin and constEnd when using const iterators
+
+ * platform/graphics/qt/GraphicsLayerQt.cpp:
+ (WebCore::GraphicsLayerQtImpl::~GraphicsLayerQtImpl):
+ (WebCore::GraphicsLayerQtImpl::updateTransform):
+ (WebCore::GraphicsLayerQtImpl::flushChanges):
+
2010-10-07 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 079d8ba..8fc6519 100644
--- a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -320,7 +320,7 @@ GraphicsLayerQtImpl::~GraphicsLayerQtImpl()
// our items automatically.
const QList<QGraphicsItem*> children = childItems();
QList<QGraphicsItem*>::const_iterator cit;
- for (cit = children.begin(); cit != children.end(); ++cit) {
+ for (cit = children.constBegin(); cit != children.constEnd(); ++cit) {
if (QGraphicsItem* item = *cit) {
if (scene())
scene()->removeItem(item);
@@ -523,7 +523,7 @@ void GraphicsLayerQtImpl::updateTransform()
const QList<QGraphicsItem*> children = childItems();
QList<QGraphicsItem*>::const_iterator it;
- for (it = children.begin(); it != children.end(); ++it)
+ for (it = children.constBegin(); it != children.constEnd(); ++it)
if (GraphicsLayerQtImpl* layer= toGraphicsLayerQtImpl(*it))
layer->updateTransform();
}
@@ -634,13 +634,13 @@ void GraphicsLayerQtImpl::flushChanges(bool recursive, bool forceUpdateTransform
const QSet<QGraphicsItem*> childrenToRemove = currentChildren - newChildren;
QSet<QGraphicsItem*>::const_iterator it;
- for (it = childrenToAdd.begin(); it != childrenToAdd.end(); ++it) {
+ for (it = childrenToAdd.constBegin(); it != childrenToAdd.constEnd(); ++it) {
if (QGraphicsItem* w = *it)
w->setParentItem(this);
}
QSet<QGraphicsItem*>::const_iterator rit;
- for (rit = childrenToRemove.begin(); rit != childrenToRemove.end(); ++rit) {
+ for (rit = childrenToRemove.constBegin(); rit != childrenToRemove.constEnd(); ++rit) {
if (GraphicsLayerQtImpl* w = toGraphicsLayerQtImpl(*rit))
w->setParentItem(0);
}
@@ -804,7 +804,7 @@ afterLayerChanges:
children.append(m_state.maskLayer->platformLayer());
QList<QGraphicsItem*>::const_iterator it;
- for (it = children.begin(); it != children.end(); ++it) {
+ for (it = children.constBegin(); it != children.constEnd(); ++it) {
if (QGraphicsItem* item = *it) {
if (GraphicsLayerQtImpl* layer = toGraphicsLayerQtImpl(item))
layer->flushChanges(true, forceUpdateTransform);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list