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

Side by Side Diff: Source/core/layout/LayoutFlowThread.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 unified diff | Download patch
« no previous file with comments | « Source/core/layout/LayoutFlowThread.h ('k') | Source/core/layout/LayoutFullScreen.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 19 matching lines...) Expand all
30 #include "config.h" 30 #include "config.h"
31 31
32 #include "core/layout/LayoutFlowThread.h" 32 #include "core/layout/LayoutFlowThread.h"
33 33
34 #include "core/layout/LayoutMultiColumnSet.h" 34 #include "core/layout/LayoutMultiColumnSet.h"
35 #include "core/layout/LayoutView.h" 35 #include "core/layout/LayoutView.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 LayoutFlowThread::LayoutFlowThread() 39 LayoutFlowThread::LayoutFlowThread()
40 : LayoutBlockFlow(0) 40 : LayoutBlockFlow(nullptr)
41 , m_columnSetsInvalidated(false) 41 , m_columnSetsInvalidated(false)
42 , m_columnSetsHaveUniformLogicalHeight(true) 42 , m_columnSetsHaveUniformLogicalHeight(true)
43 , m_pageLogicalSizeChanged(false) 43 , m_pageLogicalSizeChanged(false)
44 { 44 {
45 } 45 }
46 46
47 void LayoutFlowThread::removeColumnSetFromThread(LayoutMultiColumnSet* columnSet ) 47 void LayoutFlowThread::removeColumnSetFromThread(LayoutMultiColumnSet* columnSet )
48 { 48 {
49 ASSERT(columnSet); 49 ASSERT(columnSet);
50 m_multiColumnSetList.remove(columnSet); 50 m_multiColumnSetList.remove(columnSet);
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval) 196 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval)
197 { 197 {
198 if (m_result) 198 if (m_result)
199 return; 199 return;
200 if (interval.low() <= m_offset && interval.high() > m_offset) 200 if (interval.low() <= m_offset && interval.high() > m_offset)
201 m_result = interval.data(); 201 m_result = interval.data();
202 } 202 }
203 203
204 } // namespace blink 204 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFlowThread.h ('k') | Source/core/layout/LayoutFullScreen.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698