Use C++11 features in core/html

Source/core/html/canvas/WebGLFramebuffer.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 314 matching lines @@
 {
     ASSERT(isBound());
     WebGLAttachment* attachmentObject = getAttachment(attachment);
     if (attachmentObject)
         attachmentObject->attach(context()->webContext(), attachmentPoint);
 }
 
 WebGLSharedObject* WebGLFramebuffer::getAttachmentObject(GLenum attachment) const
 {
     if (!object())
-        return 0;
+        return nullptr;
     WebGLAttachment* attachmentObject = getAttachment(attachment);
-    return attachmentObject ? attachmentObject->object() : 0;
+    return attachmentObject ? attachmentObject->object() : nullptr;
 }
 
 bool WebGLFramebuffer::isAttachmentComplete(WebGLAttachment* attachedObject, GLenum attachment, const char** reason) const
 {
     ASSERT(attachedObject && attachedObject->valid());
     ASSERT(reason);
 
     GLenum internalformat = attachedObject->format();
     WebGLSharedObject* object = attachedObject->object();
     ASSERT(object && (object->isTexture() || object->isRenderbuffer()));
@@ skipping 112 matching lines @@
 {
     ASSERT(isBound());
     if (!object())
         return;
     if (!attachment)
         return;
 
     bool checkMore = true;
     while (checkMore) {
         checkMore = false;
-        for (AttachmentMap::iterator it = m_attachments.begin(); it != m_attachments.end(); ++it) {
-            WebGLAttachment* attachmentObject = it->value.get();
+        for (const auto& it : m_attachments) {
+            WebGLAttachment* attachmentObject = it.value.get();
             if (attachmentObject->isSharedObject(attachment)) {
-                GLenum attachmentType = it->key;
+                GLenum attachmentType = it.key;
                 attachmentObject->unattach(context()->webContext(), attachmentType);
                 removeAttachmentFromBoundFramebuffer(attachmentType);
                 checkMore = true;
                 break;
             }
         }
     }
 }
 
 GLenum WebGLFramebuffer::colorBufferFormat() const
 {
     if (!object())
         return 0;
     WebGLAttachment* attachment = getAttachment(GL_COLOR_ATTACHMENT0);
     if (!attachment)
         return 0;
     return attachment->format();
 }
 
 GLenum WebGLFramebuffer::checkStatus(const char** reason) const
 {
     unsigned count = 0;
     GLsizei width = 0, height = 0;
     bool haveDepth = false;
     bool haveStencil = false;
     bool haveDepthStencil = false;
-    for (AttachmentMap::const_iterator it = m_attachments.begin(); it != m_attachments.end(); ++it) {
-        WebGLAttachment* attachment = it->value.get();
-        if (!isAttachmentComplete(attachment, it->key, reason))
+    for (const auto& it : m_attachments) {
+        WebGLAttachment* attachment = it.value.get();
+        if (!isAttachmentComplete(attachment, it.key, reason))
             return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
         if (!attachment->valid()) {
             *reason = "attachment is not valid";
             return GL_FRAMEBUFFER_UNSUPPORTED;
         }
         if (!attachment->format()) {
             *reason = "attachment is an unsupported format";
             return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
         }
-        switch (it->key) {
+        switch (it.key) {
         case GL_DEPTH_ATTACHMENT:
             haveDepth = true;
             break;
         case GL_STENCIL_ATTACHMENT:
             haveStencil = true;
             break;
         case GC3D_DEPTH_STENCIL_ATTACHMENT_WEBGL:
             haveDepthStencil = true;
             break;
         }
@@ skipping 42 matching lines @@
 void WebGLFramebuffer::deleteObjectImpl(blink::WebGraphicsContext3D* context3d, Platform3DObject object)
 {
 #if !ENABLE(OILPAN)
     // With Oilpan, both the AttachmentMap and its WebGLAttachment objects are
     // GCed objects and cannot be accessed, as they may have been finalized
     // already during the same GC sweep.
     //
     // The WebGLAttachment-derived classes instead handle detachment
     // on their own when finalizing, so the explicit notification is
     // not needed.
-    for (AttachmentMap::iterator it = m_attachments.begin(); it != m_attachments.end(); ++it)
-        it->value->onDetached(context3d);
+    for (const auto& attachment : m_attachments)
+        attachment.value->onDetached(context3d);
 #endif
 
     context3d->deleteFramebuffer(object);
 }
 
 bool WebGLFramebuffer::isBound() const
 {
     return (context()->m_framebufferBinding.get() == this);
 }
 
@@ skipping 44 matching lines @@
 
 void WebGLFramebuffer::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_attachments);
 #endif
     WebGLContextObject::trace(visitor);
 }
 
 }