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

Unified Diff: Source/core/layout/LayoutFullScreen.cpp

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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/layout/LayoutFlowThread.cpp ('k') | Source/core/layout/LayoutGeometryMap.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutFullScreen.cpp
diff --git a/Source/core/layout/LayoutFullScreen.cpp b/Source/core/layout/LayoutFullScreen.cpp
index 1c0a873ce8cc5cd72259589efa81b4697bb56ffd..d23f7ee932b69abcea90078df0d6df98edab4bf3 100644
--- a/Source/core/layout/LayoutFullScreen.cpp
+++ b/Source/core/layout/LayoutFullScreen.cpp
@@ -38,7 +38,7 @@ using namespace blink;
class LayoutFullScreenPlaceholder final : public LayoutBlockFlow {
public:
LayoutFullScreenPlaceholder(LayoutFullScreen* owner)
- : LayoutBlockFlow(0)
+ : LayoutBlockFlow(nullptr)
, m_owner(owner)
{
setDocumentForAnonymous(&owner->document());
@@ -51,12 +51,12 @@ private:
void LayoutFullScreenPlaceholder::willBeDestroyed()
{
- m_owner->setPlaceholder(0);
+ m_owner->setPlaceholder(nullptr);
LayoutBlockFlow::willBeDestroyed();
}
LayoutFullScreen::LayoutFullScreen()
- : LayoutFlexibleBox(0)
+ : LayoutFlexibleBox(nullptr)
, m_placeholder(nullptr)
{
setReplaced(false);
@@ -124,7 +124,7 @@ LayoutObject* LayoutFullScreen::wrapLayoutObject(LayoutObject* object, LayoutObj
fullscreenLayoutObject->updateStyle();
if (parent && !parent->isChildAllowed(fullscreenLayoutObject, fullscreenLayoutObject->styleRef())) {
fullscreenLayoutObject->destroy();
- return 0;
+ return nullptr;
}
if (object) {
// |object->parent()| can be null if the object is not yet attached
« no previous file with comments | « Source/core/layout/LayoutFlowThread.cpp ('k') | Source/core/layout/LayoutGeometryMap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698