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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.cpp

Issue 2231383002: Need to roll back the multicol machinery state when re-laying out a block child. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h ('k') | no next file » | 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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 return false; 1040 return false;
1041 } 1041 }
1042 if (canContainSpannerInParentFragmentationContext(*object)) 1042 if (canContainSpannerInParentFragmentationContext(*object))
1043 next = object->nextInPreOrder(&root); 1043 next = object->nextInPreOrder(&root);
1044 else 1044 else
1045 next = object->nextInPreOrderAfterChildren(&root); 1045 next = object->nextInPreOrderAfterChildren(&root);
1046 } 1046 }
1047 return true; 1047 return true;
1048 } 1048 }
1049 1049
1050 MultiColumnLayoutState LayoutMultiColumnFlowThread::multiColumnLayoutState() con st
1051 {
1052 return MultiColumnLayoutState(m_lastSetWorkedOn);
1053 }
1054
1055 void LayoutMultiColumnFlowThread::restoreMultiColumnLayoutState(const MultiColum nLayoutState& state)
1056 {
1057 m_lastSetWorkedOn = state.columnSet();
1058 }
1059
1050 } // namespace blink 1060 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThread.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698