Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1486)

Unified Diff: Source/web/WebRemoteFrameImpl.cpp

Issue 843683005: Fix a bit of C++11 in web/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/WebRemoteFrameImpl.cpp
diff --git a/Source/web/WebRemoteFrameImpl.cpp b/Source/web/WebRemoteFrameImpl.cpp
index ef6e86587d926935d797069fbcc49b70c9d7a5c6..243653e6db2035b4655ef44a8a35df25d5004d20 100644
--- a/Source/web/WebRemoteFrameImpl.cpp
+++ b/Source/web/WebRemoteFrameImpl.cpp
@@ -137,7 +137,7 @@ bool WebRemoteFrameImpl::isWebLocalFrame() const
WebLocalFrame* WebRemoteFrameImpl::toWebLocalFrame()
{
ASSERT_NOT_REACHED();
- return 0;
+ return nullptr;
}
bool WebRemoteFrameImpl::isWebRemoteFrame() const
@@ -261,7 +261,7 @@ bool WebRemoteFrameImpl::hasVerticalScrollbar() const
WebView* WebRemoteFrameImpl::view() const
{
if (!frame())
- return 0;
+ return nullptr;
return WebViewImpl::fromPage(frame()->page());
}
@@ -296,7 +296,7 @@ void WebRemoteFrameImpl::dispatchUnloadEvent()
NPObject* WebRemoteFrameImpl::windowObject() const
{
ASSERT_NOT_REACHED();
- return 0;
+ return nullptr;
}
void WebRemoteFrameImpl::bindToWindowObject(const WebString& name, NPObject*)
@@ -356,7 +356,7 @@ v8::Handle<v8::Value> WebRemoteFrameImpl::executeScriptAndReturnValue(
void WebRemoteFrameImpl::executeScriptInIsolatedWorld(
int worldID, const WebScriptSource* sourcesIn, unsigned numSources,
- int extensionGroup, WebVector<v8::Local<v8::Value> >* results)
+ int extensionGroup, WebVector<v8::Local<v8::Value>>* results)
{
ASSERT_NOT_REACHED();
}
@@ -419,13 +419,13 @@ void WebRemoteFrameImpl::stopLoading()
WebDataSource* WebRemoteFrameImpl::provisionalDataSource() const
{
ASSERT_NOT_REACHED();
- return 0;
+ return nullptr;
}
WebDataSource* WebRemoteFrameImpl::dataSource() const
{
ASSERT_NOT_REACHED();
- return 0;
+ return nullptr;
}
void WebRemoteFrameImpl::enableViewSourceMode(bool enable)
@@ -452,7 +452,7 @@ void WebRemoteFrameImpl::dispatchWillSendRequest(WebURLRequest&)
WebURLLoader* WebRemoteFrameImpl::createAssociatedURLLoader(const WebURLLoaderOptions&)
{
ASSERT_NOT_REACHED();
- return 0;
+ return nullptr;
}
unsigned WebRemoteFrameImpl::unloadListenerCount() const
@@ -797,7 +797,7 @@ WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const
WebLocalFrame* WebRemoteFrameImpl::createLocalChild(const WebString& name, WebFrameClient* client)
{
WebLocalFrameImpl* child = toWebLocalFrameImpl(WebLocalFrame::create(client));
- WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner> >::AddResult result =
+ WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner>>::AddResult result =
m_ownersForChildren.add(child, RemoteBridgeFrameOwner::create(child));
appendChild(child);
// FIXME: currently this calls LocalFrame::init() on the created LocalFrame, which may
@@ -820,7 +820,7 @@ void WebRemoteFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner,
WebRemoteFrame* WebRemoteFrameImpl::createRemoteChild(const WebString& name, WebRemoteFrameClient* client)
{
WebRemoteFrameImpl* child = toWebRemoteFrameImpl(WebRemoteFrame::create(client));
- WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner> >::AddResult result =
+ WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner>>::AddResult result =
m_ownersForChildren.add(child, adoptPtrWillBeNoop(new PlaceholderFrameOwner));
appendChild(child);
child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(), name);
@@ -835,7 +835,7 @@ void WebRemoteFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame> frame)
WebRemoteFrameImpl* WebRemoteFrameImpl::fromFrame(RemoteFrame& frame)
{
if (!frame.client())
- return 0;
+ return nullptr;
return static_cast<RemoteFrameClientImpl*>(frame.client())->webFrame();
}

Powered by Google App Engine
This is Rietveld 408576698