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

Unified Diff: Source/core/frame/Frame.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.cpp
diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
index fa53b8449e3e86a65925ce96c7ec59d1611fb050..22267308c6c09522447cd9ff93eb11b24eb150f9 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -136,9 +136,9 @@ PassRefPtr<Frame> Frame::create(PassRefPtr<FrameInit> frameInit)
Frame::~Frame()
{
- setView(0);
+ setView(nullptr);
loader().clear();
- setDOMWindow(0);
+ setDOMWindow(nullptr);
// FIXME: We should not be doing all this work inside the destructor
@@ -355,7 +355,7 @@ void Frame::willDetachFrameHost()
// FIXME: It's unclear as to why this is called more than once, but it is,
// so page() could be NULL.
if (page() && page()->focusController().focusedFrame() == this)
- page()->focusController().setFocusedFrame(0);
+ page()->focusController().setFocusedFrame(nullptr);
if (page() && page()->scrollingCoordinator() && m_view)
page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get());
@@ -438,7 +438,7 @@ PassRefPtr<Range> Frame::rangeForPoint(const IntPoint& framePoint)
{
VisiblePosition position = visiblePositionForPoint(framePoint);
if (position.isNull())
- return 0;
+ return nullptr;
VisiblePosition previous = position.previous();
if (previous.isNotNull()) {
@@ -455,7 +455,7 @@ PassRefPtr<Range> Frame::rangeForPoint(const IntPoint& framePoint)
return nextCharacterRange.release();
}
- return 0;
+ return nullptr;
}
void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor, bool transparent,
@@ -470,7 +470,7 @@ void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor
if (isMainFrame && view())
view()->setParentVisible(false);
- setView(0);
+ setView(nullptr);
RefPtr<FrameView> frameView;
if (isMainFrame) {
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698