Fix a bit of C++11 in web/

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 193 matching lines @@
 // Change the text zoom level by kTextSizeMultiplierRatio each time the user
 // zooms text in or out (ie., change by 20%).  The min and max values limit
 // text zoom to half and 3x the original text size.  These three values match
 // those in Apple's port in WebKit/WebKit/WebView/WebView.mm
 const double WebView::textSizeMultiplierRatio = 1.2;
 const double WebView::minTextSizeMultiplier = 0.5;
 const double WebView::maxTextSizeMultiplier = 3.0;
 
 // Used to defer all page activity in cases where the embedder wishes to run
 // a nested event loop. Using a stack enables nesting of message loop invocations.
-static WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer> >& pageLoadDeferrerStack()
+static WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer>>& pageLoadDeferrerStack()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer> > >, deferrerStack, (adoptPtrWillBeNoop(new WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer> > ())));
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer>>>, deferrerStack, (adoptPtrWillBeNoop(new WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer>>())));
     return *deferrerStack;
 }
 
 // Ensure that the WebDragOperation enum values stay in sync with the original
 // DragOperation constants.
 #define STATIC_ASSERT_MATCHING_ENUM(coreName) \
     static_assert(int(coreName) == int(Web##coreName), "DragOperation and WebDragOperation enum mismatch: " #coreName)
 STATIC_ASSERT_MATCHING_ENUM(DragOperationNone);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationCopy);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationLink);
@@ skipping 522 matching lines @@
                 scaledEvent.data.tap.width,
                 scaledEvent.data.tap.height);
 
             WebSize pinchViewportOffset = pinchVirtualViewportEnabled() ?
                 flooredIntSize(page()->frameHost().pinchViewport().location()) : IntSize();
 
             // Keep bounding box relative to the main frame.
             boundingBox.move(pinchViewportOffset);
 
             Vector<IntRect> goodTargets;
-            WillBeHeapVector<RawPtrWillBeMember<Node> > highlightNodes;
+            WillBeHeapVector<RawPtrWillBeMember<Node>> highlightNodes;
             findGoodTouchTargets(boundingBox, mainFrameImpl()->frame(), goodTargets, highlightNodes);
             // FIXME: replace touch adjustment code when numberOfGoodTargets == 1?
             // Single candidate case is currently handled by: https://bugs.webkit.org/show_bug.cgi?id=85101
             if (goodTargets.size() >= 2 && m_client
                 && m_client->didTapMultipleTargets(pinchViewportOffset, boundingBox, goodTargets)) {
 
                 enableTapHighlights(highlightNodes);
                 for (size_t i = 0; i < m_linkHighlights.size(); ++i)
                     m_linkHighlights[i]->startHighlightAnimationIfNeeded();
                 eventSwallowed = true;
@@ skipping 459 matching lines @@
             m_page->deprecatedLocalMainFrame());
     } while (cursorDefiningAncestor && showsHandCursor(cursorDefiningAncestor, m_page->deprecatedLocalMainFrame()));
 
     return bestTouchNode;
 }
 
 void WebViewImpl::enableTapHighlightAtPoint(const GestureEventWithHitTestResults& targetedTapEvent)
 {
     Node* touchNode = bestTapNode(targetedTapEvent);
 
-    WillBeHeapVector<RawPtrWillBeMember<Node> > highlightNodes;
+    WillBeHeapVector<RawPtrWillBeMember<Node>> highlightNodes;
     highlightNodes.append(touchNode);
 
     enableTapHighlights(highlightNodes);
 }
 
-void WebViewImpl::enableTapHighlights(WillBeHeapVector<RawPtrWillBeMember<Node> >& highlightNodes)
+void WebViewImpl::enableTapHighlights(WillBeHeapVector<RawPtrWillBeMember<Node>>& highlightNodes)
 {
     if (highlightNodes.isEmpty())
         return;
 
     // Always clear any existing highlight when this is invoked, even if we
     // don't get a new target to highlight.
     m_linkHighlights.clear();
 
     // LinkHighlight reads out layout and compositing state, so we need to make sure that's all up to date.
     layout();
@@ skipping 326 matching lines @@
         m_page->willBeDestroyed();
         m_page.clear();
     }
 
     // Should happen after m_page.clear().
     if (m_devToolsAgent)
         m_devToolsAgent.clear();
 
     // Reset the delegate to prevent notifications being sent as we're being
     // deleted.
-    m_client = 0;
+    m_client = nullptr;
 
     deref();  // Balances ref() acquired in WebView::create
 }
 
 void WebViewImpl::willStartLiveResize()
 {
     if (mainFrameImpl() && mainFrameImpl()->frameView())
         mainFrameImpl()->frameView()->willStartLiveResize();
 
     LocalFrame* frame = mainFrameImpl()->frame();
@@ skipping 343 matching lines @@
 bool WebViewImpl::hasHorizontalScrollbar()
 {
     return mainFrameImpl()->frameView()->horizontalScrollbar();
 }
 
 bool WebViewImpl::hasVerticalScrollbar()
 {
     return mainFrameImpl()->frameView()->verticalScrollbar();
 }
 
-const WebInputEvent* WebViewImpl::m_currentInputEvent = 0;
+const WebInputEvent* WebViewImpl::m_currentInputEvent = nullptr;
 
 // FIXME: autogenerate this kind of code, and use it throughout Blink rather than
 // the one-offs for subsets of these values.
 static String inputTypeToName(WebInputEvent::Type type)
 {
     switch (type) {
     case WebInputEvent::MouseDown:
         return EventTypeNames::mousedown;
     case WebInputEvent::MouseUp:
         return EventTypeNames::mouseup;
@@ skipping 2143 matching lines @@
     suppressInvalidations(true);
 
     if (pinchVirtualViewportEnabled()) {
         PinchViewport& pinchViewport = page()->frameHost().pinchViewport();
         pinchViewport.attachToLayerTree(layer, graphicsLayerFactory());
         if (layer) {
             m_rootGraphicsLayer = pinchViewport.rootGraphicsLayer();
             m_rootLayer = pinchViewport.rootGraphicsLayer()->platformLayer();
             m_rootTransformLayer = pinchViewport.rootGraphicsLayer();
         } else {
-            m_rootGraphicsLayer = 0;
-            m_rootLayer = 0;
-            m_rootTransformLayer = 0;
+            m_rootGraphicsLayer = nullptr;
+            m_rootLayer = nullptr;
+            m_rootTransformLayer = nullptr;
         }
     } else {
         m_rootGraphicsLayer = layer;
         m_rootLayer = layer ? layer->platformLayer() : 0;
-        m_rootTransformLayer = 0;
+        m_rootTransformLayer = nullptr;
     }
 
     setIsAcceleratedCompositingActive(layer != 0);
 
     updateRootLayerTransform();
 
     if (m_layerTreeView) {
         if (m_rootLayer) {
             m_layerTreeView->setRootLayer(*m_rootLayer);
             // We register viewport layers here since there may not be a layer
             // tree view prior to this point.
             if (pinchVirtualViewportEnabled()) {
                 page()->frameHost().pinchViewport().registerLayersWithTreeView(m_layerTreeView);
             } else {
                 GraphicsLayer* rootScrollLayer = compositor()->scrollLayer();
                 ASSERT(rootScrollLayer);
-                WebLayer* pageScaleLayer = rootScrollLayer->parent() ? rootScrollLayer->parent()->platformLayer() : 0;
+                WebLayer* pageScaleLayer = rootScrollLayer->parent() ? rootScrollLayer->parent()->platformLayer() : nullptr;
                 // Note that it is invalid to have 0 as a scroll elasticity layer when using pinch virtual viewport.
                 m_layerTreeView->registerViewportLayers(0, pageScaleLayer, rootScrollLayer->platformLayer(), 0);
             }
         } else {
             m_layerTreeView->clearRootLayer();
             if (pinchVirtualViewportEnabled())
                 page()->frameHost().pinchViewport().clearLayersForTreeView(m_layerTreeView);
             else
                 m_layerTreeView->clearViewportLayers();
         }
@@ skipping 375 matching lines @@
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 } // namespace blink