| Index: Source/web/WebViewImpl.cpp
|
| diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
|
| index 046aed34751bb5fdde7505a1b25d128b73f9c0f6..91a1e52a69681837180f550b88fea2cde6cfa36e 100644
|
| --- a/Source/web/WebViewImpl.cpp
|
| +++ b/Source/web/WebViewImpl.cpp
|
| @@ -211,9 +211,9 @@ 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;
|
| }
|
|
|
| @@ -756,7 +756,7 @@ bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
|
| 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
|
| @@ -1236,13 +1236,13 @@ void WebViewImpl::enableTapHighlightAtPoint(const GestureEventWithHitTestResults
|
| {
|
| 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;
|
| @@ -1589,7 +1589,7 @@ void WebViewImpl::close()
|
|
|
| // 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
|
| }
|
| @@ -1953,7 +1953,7 @@ 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.
|
| @@ -4117,14 +4117,14 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
|
| 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);
|
| @@ -4141,7 +4141,7 @@ void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
|
| } 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);
|
| }
|
|
|