Modified: trunk/Source/WebCore/dom/Document.cpp (182781 => 182782)
--- trunk/Source/WebCore/dom/Document.cpp 2015-04-14 05:10:09 UTC (rev 182781)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-04-14 05:48:23 UTC (rev 182782)
@@ -1573,8 +1573,8 @@
void Document::visibilityStateChanged()
{
dispatchEvent(Event::create(eventNames().visibilitychangeEvent, false, false));
- for (auto it = m_visibilityStateCallbackElements.begin(); it != m_visibilityStateCallbackElements.end(); ++it)
- (*it)->visibilityStateChanged();
+ for (auto* element : m_visibilityStateCallbackElements)
+ element->visibilityStateChanged();
}
PageVisibilityState Document::pageVisibilityState() const
@@ -2814,16 +2814,22 @@
const AtomicString* href = ""
const AtomicString* target = nullptr;
auto baseDescendants = descendantsOfType<HTMLBaseElement>(*this);
- for (auto base = baseDescendants.begin(), end = baseDescendants.end(); base != end && (!href || !target); ++base) {
+ for (auto& base : baseDescendants) {
if (!href) {
- const AtomicString& value = base->fastGetAttribute(hrefAttr);
- if (!value.isNull())
+ const AtomicString& value = base.fastGetAttribute(hrefAttr);
+ if (!value.isNull()) {
href = ""
+ if (target)
+ break;
+ }
}
if (!target) {
- const AtomicString& value = base->fastGetAttribute(targetAttr);
- if (!value.isNull())
+ const AtomicString& value = base.fastGetAttribute(targetAttr);
+ if (!value.isNull()) {
target = &value;
+ if (href)
+ break;
+ }
}
}
@@ -3768,34 +3774,30 @@
void Document::moveNodeIteratorsToNewDocument(Node* node, Document* newDocument)
{
- HashSet<NodeIterator*> nodeIteratorsList = m_nodeIterators;
- HashSet<NodeIterator*>::const_iterator nodeIteratorsEnd = nodeIteratorsList.end();
- for (HashSet<NodeIterator*>::const_iterator it = nodeIteratorsList.begin(); it != nodeIteratorsEnd; ++it) {
- if ((*it)->root() == node) {
- detachNodeIterator(*it);
- newDocument->attachNodeIterator(*it);
+ Vector<NodeIterator*> nodeIterators;
+ copyToVector(m_nodeIterators, nodeIterators);
+ for (auto* it : nodeIterators) {
+ if (it->root() == node) {
+ detachNodeIterator(it);
+ newDocument->attachNodeIterator(it);
}
}
}
void Document::updateRangesAfterChildrenChanged(ContainerNode& container)
{
- if (!m_ranges.isEmpty()) {
- for (auto it = m_ranges.begin(), end = m_ranges.end(); it != end; ++it)
- (*it)->nodeChildrenChanged(container);
- }
+ for (auto* range : m_ranges)
+ range->nodeChildrenChanged(container);
}
void Document::nodeChildrenWillBeRemoved(ContainerNode& container)
{
- if (!m_ranges.isEmpty()) {
- for (auto it = m_ranges.begin(), end = m_ranges.end(); it != end; ++it)
- (*it)->nodeChildrenWillBeRemoved(container);
- }
+ for (auto* range : m_ranges)
+ range->nodeChildrenWillBeRemoved(container);
- for (auto it = m_nodeIterators.begin(), end = m_nodeIterators.end(); it != end; ++it) {
+ for (auto* it : m_nodeIterators) {
for (Node* n = container.firstChild(); n; n = n->nextSibling())
- (*it)->nodeWillBeRemoved(*n);
+ it->nodeWillBeRemoved(*n);
}
if (Frame* frame = this->frame()) {
@@ -3814,15 +3816,11 @@
void Document::nodeWillBeRemoved(Node& n)
{
- HashSet<NodeIterator*>::const_iterator nodeIteratorsEnd = m_nodeIterators.end();
- for (HashSet<NodeIterator*>::const_iterator it = m_nodeIterators.begin(); it != nodeIteratorsEnd; ++it)
- (*it)->nodeWillBeRemoved(n);
+ for (auto* it : m_nodeIterators)
+ it->nodeWillBeRemoved(n);
- if (!m_ranges.isEmpty()) {
- HashSet<Range*>::const_iterator rangesEnd = m_ranges.end();
- for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != rangesEnd; ++it)
- (*it)->nodeWillBeRemoved(n);
- }
+ for (auto* range : m_ranges)
+ range->nodeWillBeRemoved(n);
if (Frame* frame = this->frame()) {
frame->eventHandler().nodeWillBeRemoved(n);
@@ -3837,7 +3835,7 @@
void Document::textInserted(Node* text, unsigned offset, unsigned length)
{
if (!m_ranges.isEmpty()) {
- for (auto& range : m_ranges)
+ for (auto* range : m_ranges)
range->textInserted(text, offset, length);
}
@@ -3848,7 +3846,7 @@
void Document::textRemoved(Node* text, unsigned offset, unsigned length)
{
if (!m_ranges.isEmpty()) {
- for (auto& range : m_ranges)
+ for (auto* range : m_ranges)
range->textRemoved(text, offset, length);
}
@@ -3861,7 +3859,7 @@
{
if (!m_ranges.isEmpty()) {
NodeWithIndex oldNodeWithIndex(oldNode);
- for (auto& range : m_ranges)
+ for (auto* range : m_ranges)
range->textNodesMerged(oldNodeWithIndex, offset);
}
@@ -3870,11 +3868,8 @@
void Document::textNodeSplit(Text* oldNode)
{
- if (!m_ranges.isEmpty()) {
- HashSet<Range*>::const_iterator end = m_ranges.end();
- for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
- (*it)->textNodeSplit(oldNode);
- }
+ for (auto* range : m_ranges)
+ range->textNodeSplit(oldNode);
// FIXME: This should update markers for spelling and grammar checking.
}
@@ -4376,9 +4371,8 @@
{
documentWillBecomeInactive();
- HashSet<Element*>::iterator end = m_documentSuspensionCallbackElements.end();
- for (HashSet<Element*>::iterator i = m_documentSuspensionCallbackElements.begin(); i != end; ++i)
- (*i)->documentWillSuspendForPageCache();
+ for (auto* element : m_documentSuspensionCallbackElements)
+ element->documentWillSuspendForPageCache();
#ifndef NDEBUG
// Clear the update flag to be able to check if the viewport arguments update
@@ -4396,9 +4390,8 @@
{
Vector<Element*> elements;
copyToVector(m_documentSuspensionCallbackElements, elements);
- Vector<Element*>::iterator end = elements.end();
- for (Vector<Element*>::iterator i = elements.begin(); i != end; ++i)
- (*i)->documentDidResumeFromPageCache();
+ for (auto* element : elements)
+ element->documentDidResumeFromPageCache();
if (renderView())
renderView()->setIsInWindow(true);
@@ -4422,9 +4415,8 @@
void Document::mediaVolumeDidChange()
{
- HashSet<Element*>::iterator end = m_mediaVolumeCallbackElements.end();
- for (HashSet<Element*>::iterator i = m_mediaVolumeCallbackElements.begin(); i != end; ++i)
- (*i)->mediaVolumeDidChange();
+ for (auto* element : m_mediaVolumeCallbackElements)
+ element->mediaVolumeDidChange();
}
void Document::registerForMediaVolumeCallbacks(Element* e)
@@ -4445,9 +4437,8 @@
void Document::privateBrowsingStateDidChange()
{
- HashSet<Element*>::iterator end = m_privateBrowsingStateChangedElements.end();
- for (HashSet<Element*>::iterator it = m_privateBrowsingStateChangedElements.begin(); it != end; ++it)
- (*it)->privateBrowsingStateDidChange();
+ for (auto* element : m_privateBrowsingStateChangedElements)
+ element->privateBrowsingStateDidChange();
}
void Document::registerForPrivateBrowsingStateChangedCallbacks(Element* e)
@@ -4476,9 +4467,8 @@
void Document::captionPreferencesChanged()
{
- HashSet<Element*>::iterator end = m_captionPreferencesChangedElements.end();
- for (HashSet<Element*>::iterator it = m_captionPreferencesChangedElements.begin(); it != end; ++it)
- (*it)->captionPreferencesChanged();
+ for (auto* element : m_captionPreferencesChangedElements)
+ element->captionPreferencesChanged();
}
#endif
@@ -5024,8 +5014,8 @@
void Document::validateAutoSizingNodes()
{
Vector<TextAutoSizingKey> nodesForRemoval;
- for (auto it = m_textAutoSizedNodes.begin(), end = m_textAutoSizedNodes.end(); it != end; ++it) {
- RefPtr<TextAutoSizingValue> value = it->value;
+ for (auto& keyValuePair : m_textAutoSizedNodes) {
+ TextAutoSizingValue* value = keyValuePair.value.get();
// Update all the nodes in the collection to reflect the new
// candidate size.
if (!value)
@@ -5033,17 +5023,15 @@
value->adjustNodeSizes();
if (!value->numNodes())
- nodesForRemoval.append(it->key);
+ nodesForRemoval.append(keyValuePair.key);
}
- unsigned count = nodesForRemoval.size();
- for (unsigned i = 0; i < count; i++)
- m_textAutoSizedNodes.remove(nodesForRemoval[i]);
+ for (auto& key : nodesForRemoval)
+ m_textAutoSizedNodes.remove(key);
}
void Document::resetAutoSizingNodes()
{
- for (auto it = m_textAutoSizedNodes.begin(), end = m_textAutoSizedNodes.end(); it != end; ++it) {
- RefPtr<TextAutoSizingValue> value = it->value;
+ for (auto& value : m_textAutoSizedNodes.values()) {
if (value)
value->reset();
}
@@ -5457,9 +5445,9 @@
// 4. For each descendant in descendants, empty descendant's fullscreen element stack, and queue a
// task to fire an event named fullscreenchange with its bubbles attribute set to true on descendant.
- for (Deque<RefPtr<Document>>::iterator i = descendants.begin(); i != descendants.end(); ++i) {
- (*i)->clearFullscreenElementStack();
- addDocumentToFullScreenChangeEventQueue(i->get());
+ for (auto& document : descendants) {
+ document->clearFullscreenElementStack();
+ addDocumentToFullScreenChangeEventQueue(document.get());
}
// 5. While doc is not null, run these substeps:
@@ -6109,17 +6097,17 @@
Region targetRegion;
bool insideFixedPosition = false;
- for (auto it : *targets) {
+ for (auto& keyValuePair : *targets) {
LayoutRect rootRelativeBounds;
- if (is<Document>(it.key)) {
- Document* document = downcast<Document>(it.key);
+ if (is<Document>(keyValuePair.key)) {
+ Document* document = downcast<Document>(keyValuePair.key);
if (document == this)
rootRelativeBounds = absoluteEventHandlerBounds(insideFixedPosition);
else if (Element* element = document->ownerElement())
rootRelativeBounds = element->absoluteEventHandlerBounds(insideFixedPosition);
- } else if (is<Element>(it.key)) {
- Element* element = downcast<Element>(it.key);
+ } else if (is<Element>(keyValuePair.key)) {
+ Element* element = downcast<Element>(keyValuePair.key);
rootRelativeBounds = element->absoluteEventHandlerBounds(insideFixedPosition);
}
