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

Unified Diff: Source/core/layout/LayoutVideo.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/LayoutThemeFontProviderWin.cpp ('k') | Source/core/layout/LayoutView.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutVideo.cpp
diff --git a/Source/core/layout/LayoutVideo.cpp b/Source/core/layout/LayoutVideo.cpp
index dfcde4d4f1efc6dd0b2c5c986a38be55adf94bb6..409a9b97a842c3416d70f4722b396b55fbb92b13 100644
--- a/Source/core/layout/LayoutVideo.cpp
+++ b/Source/core/layout/LayoutVideo.cpp
@@ -126,7 +126,7 @@ void LayoutVideo::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
IntRect LayoutVideo::videoBox() const
{
- const LayoutSize* overriddenIntrinsicSize = 0;
+ const LayoutSize* overriddenIntrinsicSize = nullptr;
if (videoElement()->shouldDisplayPosterImage())
overriddenIntrinsicSize = &m_cachedImageSize;
@@ -204,11 +204,11 @@ static const LayoutBlock* layoutObjectPlaceholder(const LayoutObject* layoutObje
{
LayoutObject* parent = layoutObject->parent();
if (!parent)
- return 0;
+ return nullptr;
LayoutFullScreen* fullScreen = parent->isLayoutFullScreen() ? toLayoutFullScreen(parent) : 0;
if (!fullScreen)
- return 0;
+ return nullptr;
return fullScreen->placeholder();
}
« no previous file with comments | « Source/core/layout/LayoutThemeFontProviderWin.cpp ('k') | Source/core/layout/LayoutView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698