Title: [160764] trunk/Source/WebCore
- Revision
- 160764
- Author
- [email protected]
- Date
- 2013-12-18 07:04:42 -0800 (Wed, 18 Dec 2013)
Log Message
Use range for syntax in Frame and FrameView.
<https://webkit.org/b/125922>
Convert code in Frame and FrameView to use C++11's range for syntax.
Reviewed by Antti Koivisto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160763 => 160764)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 15:02:45 UTC (rev 160763)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 15:04:42 UTC (rev 160764)
@@ -1,5 +1,14 @@
2013-12-18 Andreas Kling <[email protected]>
+ Use range for syntax in Frame and FrameView.
+ <https://webkit.org/b/125922>
+
+ Convert code in Frame and FrameView to use C++11's range for syntax.
+
+ Reviewed by Antti Koivisto.
+
+2013-12-18 Andreas Kling <[email protected]>
+
RenderElement-ize adjustForAbsoluteZoom() and friends.
<https://webkit.org/b/125921>
Modified: trunk/Source/WebCore/page/Frame.cpp (160763 => 160764)
--- trunk/Source/WebCore/page/Frame.cpp 2013-12-18 15:02:45 UTC (rev 160763)
+++ trunk/Source/WebCore/page/Frame.cpp 2013-12-18 15:04:42 UTC (rev 160764)
@@ -223,9 +223,8 @@
disconnectOwnerElement();
- HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.end();
- for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObservers.begin(); it != stop; ++it)
- (*it)->frameDestroyed();
+ for (auto& observer : m_destructionObservers)
+ observer->frameDestroyed();
if (!isMainFrame())
m_mainFrame.selfOnlyDeref();
@@ -614,9 +613,8 @@
if (Frame* parent = tree().parent())
parent->loader().checkLoadComplete();
- HashSet<FrameDestructionObserver*>::iterator stop = m_destructionObservers.end();
- for (HashSet<FrameDestructionObserver*>::iterator it = m_destructionObservers.begin(); it != stop; ++it)
- (*it)->willDetachPage();
+ for (auto& observer : m_destructionObservers)
+ observer->willDetachPage();
// FIXME: It's unclear as to why this is called more than once, but it is,
// so page() could be NULL.
Modified: trunk/Source/WebCore/page/FrameView.cpp (160763 => 160764)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-12-18 15:02:45 UTC (rev 160763)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-12-18 15:04:42 UTC (rev 160764)
@@ -1645,8 +1645,7 @@
// Get the rects of the fixed objects visible in the rectToScroll
Region regionToUpdate;
- for (auto it = m_viewportConstrainedObjects->begin(), end = m_viewportConstrainedObjects->end(); it != end; ++it) {
- RenderElement* renderer = *it;
+ for (auto& renderer : *m_viewportConstrainedObjects) {
if (!renderer->style().hasViewportConstrainedPosition())
continue;
#if USE(ACCELERATED_COMPOSITING)
@@ -1745,8 +1744,8 @@
// Renderers with fixed backgrounds may be in compositing layers, so we need to explicitly
// repaint them after scrolling.
- for (auto it = m_slowRepaintObjects->begin(), end = m_slowRepaintObjects->end(); it != end; ++it)
- (*it)->repaint();
+ for (auto& renderer : *m_slowRepaintObjects)
+ renderer->repaint();
}
// Note that this gets called at painting time.
@@ -1945,8 +1944,8 @@
if (!hasViewportConstrainedObjects())
return;
- for (auto it = m_viewportConstrainedObjects->begin(), end = m_viewportConstrainedObjects->end(); it != end; ++it)
- (*it)->setNeedsLayout();
+ for (auto& renderer : *m_viewportConstrainedObjects)
+ renderer->setNeedsLayout();
}
void FrameView::scrollPositionChangedViaPlatformWidget()
@@ -2591,8 +2590,7 @@
return;
Vector<ScheduledEvent> eventsToDispatch = std::move(m_scheduledEvents);
- for (auto it = eventsToDispatch.begin(), end = eventsToDispatch.end(); it != end; ++it) {
- ScheduledEvent& scheduledEvent = *it;
+ for (auto& scheduledEvent : eventsToDispatch) {
if (!scheduledEvent.target->inDocument())
continue;
scheduledEvent.target->dispatchEvent(scheduledEvent.event.release(), IGNORE_EXCEPTION);
@@ -3168,10 +3166,8 @@
if (!m_scrollableAreas)
return;
- for (HashSet<ScrollableArea*>::const_iterator it = m_scrollableAreas->begin(), end = m_scrollableAreas->end(); it != end; ++it) {
- ScrollableArea* scrollableArea = *it;
+ for (auto& scrollableArea : *m_scrollableAreas)
scrollableArea->contentAreaWillPaint();
- }
}
bool FrameView::scrollAnimatorEnabled() const
@@ -3318,14 +3314,12 @@
bool FrameView::hasCustomScrollbars() const
{
- for (auto it = children().begin(), end = children().end(); it != end; ++it) {
- Widget* widget = it->get();
+ for (auto& widget : children()) {
if (widget->isFrameView()) {
- if (toFrameView(widget)->hasCustomScrollbars())
+ if (toFrameView(*widget).hasCustomScrollbars())
return true;
} else if (widget->isScrollbar()) {
- Scrollbar* scrollbar = static_cast<Scrollbar*>(widget);
- if (scrollbar->isCustomScrollbar())
+ if (toScrollbar(*widget).isCustomScrollbar())
return true;
}
}
@@ -3631,9 +3625,9 @@
// and thus mutates the children() set.
Vector<Ref<FrameView>, 16> childViews;
childViews.reserveInitialCapacity(children().size());
- for (auto it = children().begin(), end = children().end(); it != end; ++it) {
- if (it->get()->isFrameView())
- childViews.uncheckedAppend(*toFrameView(it->get()));
+ for (auto& widget : children()) {
+ if (widget->isFrameView())
+ childViews.uncheckedAppend(toFrameView(*widget));
}
for (unsigned i = 0; i < childViews.size(); ++i)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
