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

Side by Side Diff: Source/core/layout/LayoutFlowThread.cpp

Issue 1124993002: Cleanup: Only need one bit (not two) to express flow thread state. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
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 24 matching lines...) Expand all
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(0)
41 , m_regionsInvalidated(false) 41 , m_regionsInvalidated(false)
42 , m_regionsHaveUniformLogicalHeight(true) 42 , m_regionsHaveUniformLogicalHeight(true)
43 , m_pageLogicalSizeChanged(false) 43 , m_pageLogicalSizeChanged(false)
44 { 44 {
45 setFlowThreadState(InsideOutOfFlowThread);
46 } 45 }
47 46
48 void LayoutFlowThread::removeRegionFromThread(LayoutMultiColumnSet* columnSet) 47 void LayoutFlowThread::removeRegionFromThread(LayoutMultiColumnSet* columnSet)
49 { 48 {
50 ASSERT(columnSet); 49 ASSERT(columnSet);
51 m_multiColumnSetList.remove(columnSet); 50 m_multiColumnSetList.remove(columnSet);
52 } 51 }
53 52
54 void LayoutFlowThread::invalidateRegions() 53 void LayoutFlowThread::invalidateRegions()
55 { 54 {
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 209
211 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval) 210 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval)
212 { 211 {
213 if (m_result) 212 if (m_result)
214 return; 213 return;
215 if (interval.low() <= m_offset && interval.high() > m_offset) 214 if (interval.low() <= m_offset && interval.high() > m_offset)
216 m_result = interval.data(); 215 m_result = interval.data();
217 } 216 }
218 217
219 } // namespace blink 218 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698