Use C++11 range-based loop in core/frame

Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1228 matching lines @@
     // If viewport is not enabled, frameRect change will cause layout size change and then layout.
     // Otherwise, viewport constrained objects need their layout flags set separately to ensure
     // they are positioned correctly. In the virtual-viewport pinch mode frame rect changes wont
     // necessarily cause a layout size change so only take this early-out if we're in old-style
     // pinch.
     if (m_frame->settings()
         && !m_frame->settings()->viewportEnabled()
         && !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()))
                 renderer->setNeedsPositionedMovementLayout();
             else
                 renderer->setNeedsLayoutAndFullPaintInvalidation();
         }
         if (heightChanged) {
             if (style->height().isFixed() && (style->top().isAuto() || style->bottom().isAuto()))
                 renderer->setNeedsPositionedMovementLayout();
@@ skipping 48 matching lines @@
 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta)
 {
     if (!contentsInCompositedLayer() || hasSlowRepaintObjects())
         return false;
 
     if (!m_viewportConstrainedObjects || m_viewportConstrainedObjects->isEmpty()) {
         InspectorInstrumentation::didScroll(page());
         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();
 
         if (layer->isPaintInvalidationContainer())
             continue;
 
         if (layer->subtreeIsInvisible())
             continue;
 
@@ skipping 571 matching lines @@
     // m_updateWidgetsTimer should only be scheduled if we have widgets to update.
     // Thus I believe we can stop checking isEmpty here, and just ASSERT isEmpty:
     ASSERT(!m_partUpdateSet.isEmpty());
     if (m_nestedLayoutCount > 1 || m_partUpdateSet.isEmpty())
         return true;
 
     // Need to swap because script will run inside the below loop and invalidate the iterator.
     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),
         // but FrameView holds a manual ref, so it won't have been deleted.
         if (!element)
             continue;
 
         // No need to update if it's already crashed or known to be missing.
         if (object.showsUnavailablePluginIndicator())
             continue;
@@ skipping 361 matching lines @@
 {
     Page* page = m_frame->page();
     if (!page)
         return;
 
     contentAreaWillPaint();
 
     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 references below to drop the
pointer deref.

[riju_, 2014/10/16 11:30:45]

Done.

+        ScrollableArea* scrollableArea = it;
 
         if (!scrollableArea->scrollbarsCanBeActive())
             continue;
 
         scrollableArea->contentAreaWillPaint();
     }
 }
 
 bool FrameView::scrollAnimatorEnabled() const
 {
@@ skipping 104 matching lines @@
         result = result.blend(htmlElement->renderer()->style()->visitedDependentColor(CSSPropertyBackgroundColor));
     if (bodyElement && bodyElement->renderer())
         result = result.blend(bodyElement->renderer()->style()->visitedDependentColor(CSSPropertyBackgroundColor));
 
     return result;
 }
 
 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;
         } else if (widget->isScrollbar()) {
             Scrollbar* scrollbar = static_cast<Scrollbar*>(widget);
             if (scrollbar->isCustomScrollbar())
                 return true;
         }
     }
 
@@ skipping 213 matching lines @@
     // FIXME: Calling layout() shouldn't trigger scripe execution or have any
     // observable effects on the frame tree but we're not quite there yet.
     WillBeHeapVector<RefPtrWillBeMember<FrameView> > frameViews;
     for (Frame* child = m_frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (!child->isLocalFrame())
             continue;
         if (FrameView* view = toLocalFrame(child)->view())
             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
     // style recalc. The extra style recalc needs to happen after our child <iframes> were updated.
     // FIXME: We shouldn't be triggering an extra style recalc in the first place.
     if (m_frame->document()->hasSVGFilterElementsRequiringLayerUpdate()) {
         m_frame->document()->updateRenderTreeIfNeeded();
 
         if (needsLayout())
             layout();
@@ skipping 1136 matching lines @@
 
     Widget::setFrameRect(newRect);
 
     updateScrollbars(scrollOffsetDouble());
 
     frameRectsChanged();
 }
 
 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)
 {
     if (!graphicsLayer || !scrollbar)
         return;
 
     IntRect scrollbarRect = scrollbar->frameRect();
     graphicsLayer->setPosition(scrollbarRect.location());
 
@@ skipping 320 matching lines @@
 void FrameView::setParentVisible(bool visible)
 {
     if (isParentVisible() == visible)
         return;
 
     Widget::setParentVisible(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()
 {
     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);
         }
     }
 
     Widget::show();
 }
 
 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);
     }
 
     Widget::hide();
 }
 
 void FrameView::addPanScrollIcon(const IntPoint& iconPosition)
 {
     HostWindow* window = hostWindow();
@@ skipping 19 matching lines @@
         return;
 
     ScrollableArea::setScrollOrigin(origin);
 
     // Update if the scroll origin changes, since our position will be different if the content size did not change.
     if (updatePositionAtAll && updatePositionSynchronously)
         updateScrollbars(scrollOffsetDouble());
 }
 
 } // namespace blink