Index: Source/core/frame/FrameView.cpp |
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp |
index 1f408250578509ebdc55c433317e2c896e92dccf..2da207c128a5a88519edee8a2932b7e64742259e 100644 |
--- a/Source/core/frame/FrameView.cpp |
+++ b/Source/core/frame/FrameView.cpp |
@@ -1246,9 +1246,8 @@ void FrameView::viewportConstrainedVisibleContentSizeChanged(bool widthChanged, |
&& !m_frame->settings()->pinchVirtualViewportEnabled()) |
return; |
- ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObjects->end(); |
- for (ViewportConstrainedObjectSet::const_iterator it = m_viewportConstrainedObjects->begin(); it != end; ++it) { |
- RenderObject* renderer = *it; |
+ for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) { |
+ RenderObject* renderer = viewportConstrainedObject; |
RenderStyle* style = renderer->style(); |
if (widthChanged) { |
if (style->width().isFixed() && (style->left().isAuto() || style->right().isAuto())) |
@@ -1317,9 +1316,8 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta) |
return true; |
} |
- ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObjects->end(); |
- for (ViewportConstrainedObjectSet::const_iterator it = m_viewportConstrainedObjects->begin(); it != end; ++it) { |
- RenderObject* renderer = *it; |
+ for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) { |
+ RenderObject* renderer = viewportConstrainedObject; |
ASSERT(renderer->style()->hasViewportConstrainedPosition()); |
ASSERT(renderer->hasLayer()); |
RenderLayer* layer = toRenderBoxModelObject(renderer)->layer(); |
@@ -1911,8 +1909,8 @@ bool FrameView::updateWidgets() |
EmbeddedObjectSet objects; |
objects.swap(m_partUpdateSet); |
- for (EmbeddedObjectSet::iterator it = objects.begin(); it != objects.end(); ++it) { |
- RenderEmbeddedObject& object = **it; |
+ for (const auto& embeddedObject : objects) { |
+ RenderEmbeddedObject& object = *embeddedObject; |
HTMLPlugInElement* element = toHTMLPlugInElement(object.node()); |
// The object may have already been destroyed (thus node cleared), |
@@ -2294,8 +2292,8 @@ void FrameView::notifyPageThatContentAreaWillPaint() const |
if (!m_scrollableAreas) |
return; |
- for (HashSet<ScrollableArea*>::const_iterator it = m_scrollableAreas->begin(), end = m_scrollableAreas->end(); it != end; ++it) { |
- ScrollableArea* scrollableArea = *it; |
+ for (const auto& it : *m_scrollableAreas) { |
Mike West
2014/10/16 09:09:40
s/it/scrollableArea/, and then just change the ref
riju_
2014/10/16 11:30:45
Done.
|
+ ScrollableArea* scrollableArea = it; |
if (!scrollableArea->scrollbarsCanBeActive()) |
continue; |
@@ -2420,9 +2418,8 @@ Color FrameView::documentBackgroundColor() const |
bool FrameView::hasCustomScrollbars() const |
{ |
const ChildrenWidgetSet* viewChildren = children(); |
- ChildrenWidgetSet::const_iterator end = viewChildren->end(); |
- for (ChildrenWidgetSet::const_iterator current = viewChildren->begin(); current != end; ++current) { |
- Widget* widget = current->get(); |
+ for (const auto& current : *viewChildren) { |
Mike West
2014/10/16 09:09:39
s/current/child/
riju_
2014/10/16 11:30:45
Done.
|
+ Widget* widget = current.get(); |
if (widget->isFrameView()) { |
if (toFrameView(widget)->hasCustomScrollbars()) |
return true; |
@@ -2656,9 +2653,8 @@ void FrameView::updateLayoutAndStyleIfNeededRecursive() |
frameViews.append(view); |
} |
- const WillBeHeapVector<RefPtrWillBeMember<FrameView> >::iterator end = frameViews.end(); |
- for (WillBeHeapVector<RefPtrWillBeMember<FrameView> >::iterator it = frameViews.begin(); it != end; ++it) |
- (*it)->updateLayoutAndStyleIfNeededRecursive(); |
+ for (const auto& frameView : frameViews) |
+ frameView->updateLayoutAndStyleIfNeededRecursive(); |
// When an <iframe> gets composited, it triggers an extra style recalc in its containing FrameView. |
// To avoid pushing an invalid tree for display, we have to check for this case and do another |
@@ -3815,9 +3811,8 @@ void FrameView::setFrameRectInternal(const IntRect& newRect) |
void FrameView::frameRectsChangedInternal() |
{ |
- ChildrenWidgetSet::const_iterator end = m_children.end(); |
- for (ChildrenWidgetSet::const_iterator current = m_children.begin(); current != end; ++current) |
- (*current)->frameRectsChanged(); |
+ for (const auto& current : m_children) |
Mike West
2014/10/16 09:09:39
s/current/child/
riju_
2014/10/16 11:30:45
Done.
|
+ current->frameRectsChanged(); |
} |
static void positionScrollbarLayer(GraphicsLayer* graphicsLayer, Scrollbar* scrollbar) |
@@ -4158,9 +4153,8 @@ void FrameView::setParentVisible(bool visible) |
if (!isSelfVisible()) |
return; |
- ChildrenWidgetSet::const_iterator end = m_children.end(); |
- for (ChildrenWidgetSet::const_iterator it = m_children.begin(); it != end; ++it) |
- (*it)->setParentVisible(visible); |
+ for (const auto& child : m_children) |
+ child->setParentVisible(visible); |
} |
void FrameView::show() |
@@ -4168,9 +4162,8 @@ void FrameView::show() |
if (!isSelfVisible()) { |
setSelfVisible(true); |
if (isParentVisible()) { |
- ChildrenWidgetSet::const_iterator end = m_children.end(); |
- for (ChildrenWidgetSet::const_iterator it = m_children.begin(); it != end; ++it) |
- (*it)->setParentVisible(true); |
+ for (const auto& it : m_children) |
Mike West
2014/10/16 09:09:40
s/it/child/
riju_
2014/10/16 11:30:45
Done.
|
+ it->setParentVisible(true); |
} |
} |
@@ -4181,9 +4174,8 @@ void FrameView::hide() |
{ |
if (isSelfVisible()) { |
if (isParentVisible()) { |
- ChildrenWidgetSet::const_iterator end = m_children.end(); |
- for (ChildrenWidgetSet::const_iterator it = m_children.begin(); it != end; ++it) |
- (*it)->setParentVisible(false); |
+ for (const auto& child : m_children) |
+ child->setParentVisible(false); |
} |
setSelfVisible(false); |
} |