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

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

Issue 1050243002: Revert Enable new multicol for testing and experimental web platform features. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutObject.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" 43 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
44 #include "core/layout/LayoutPagedFlowThread.h" 44 #include "core/layout/LayoutPagedFlowThread.h"
45 #include "core/layout/LayoutText.h" 45 #include "core/layout/LayoutText.h"
46 #include "core/layout/LayoutView.h" 46 #include "core/layout/LayoutView.h"
47 #include "core/layout/TextAutosizer.h" 47 #include "core/layout/TextAutosizer.h"
48 #include "core/layout/line/LineBreaker.h" 48 #include "core/layout/line/LineBreaker.h"
49 #include "core/layout/line/LineWidth.h" 49 #include "core/layout/line/LineWidth.h"
50 #include "core/paint/BlockFlowPainter.h" 50 #include "core/paint/BlockFlowPainter.h"
51 #include "core/paint/DeprecatedPaintLayer.h" 51 #include "core/paint/DeprecatedPaintLayer.h"
52 #include "core/paint/LayoutObjectDrawingRecorder.h" 52 #include "core/paint/LayoutObjectDrawingRecorder.h"
53 #include "platform/RuntimeEnabledFeatures.h"
54 #include "platform/geometry/TransformState.h" 53 #include "platform/geometry/TransformState.h"
55 #include "platform/graphics/paint/ClipRecorderStack.h" 54 #include "platform/graphics/paint/ClipRecorderStack.h"
56 #include "platform/text/BidiTextRun.h" 55 #include "platform/text/BidiTextRun.h"
57 56
58 namespace blink { 57 namespace blink {
59 58
60 bool LayoutBlockFlow::s_canPropagateFloatIntoSibling = false; 59 bool LayoutBlockFlow::s_canPropagateFloatIntoSibling = false;
61 60
62 struct SameSizeAsMarginInfo { 61 struct SameSizeAsMarginInfo {
63 uint16_t bitfields; 62 uint16_t bitfields;
(...skipping 3006 matching lines...) Expand 10 before | Expand all | Expand 10 after
3070 // Paged overflow is currently done using the multicol implementation. 3069 // Paged overflow is currently done using the multicol implementation.
3071 return LayoutPagedFlowThread::createAnonymous(document(), styleRef()); 3070 return LayoutPagedFlowThread::createAnonymous(document(), styleRef());
3072 default: 3071 default:
3073 ASSERT_NOT_REACHED(); 3072 ASSERT_NOT_REACHED();
3074 return nullptr; 3073 return nullptr;
3075 } 3074 }
3076 } 3075 }
3077 3076
3078 void LayoutBlockFlow::createOrDestroyMultiColumnFlowThreadIfNeeded(const Compute dStyle* oldStyle) 3077 void LayoutBlockFlow::createOrDestroyMultiColumnFlowThreadIfNeeded(const Compute dStyle* oldStyle)
3079 { 3078 {
3080 if (!RuntimeEnabledFeatures::regionBasedColumnsEnabled()) 3079 if (!document().regionBasedColumnsEnabled())
3081 return; 3080 return;
3082 3081
3083 // Paged overflow trumps multicol in this implementation. Ideally, it should be possible to have 3082 // Paged overflow trumps multicol in this implementation. Ideally, it should be possible to have
3084 // both paged overflow and multicol on the same element, but then we need tw o flow 3083 // both paged overflow and multicol on the same element, but then we need tw o flow
3085 // threads. Anyway, this is nothing to worry about until we can actually nes t multicol properly 3084 // threads. Anyway, this is nothing to worry about until we can actually nes t multicol properly
3086 // inside other fragmentation contexts. 3085 // inside other fragmentation contexts.
3087 FlowThreadType type = flowThreadType(styleRef()); 3086 FlowThreadType type = flowThreadType(styleRef());
3088 3087
3089 if (multiColumnFlowThread()) { 3088 if (multiColumnFlowThread()) {
3090 ASSERT(oldStyle); 3089 ASSERT(oldStyle);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
3162 } 3161 }
3163 if (isAnonymous()) 3162 if (isAnonymous())
3164 return "LayoutBlockFlow (anonymous)"; 3163 return "LayoutBlockFlow (anonymous)";
3165 if (isRelPositioned()) 3164 if (isRelPositioned())
3166 return "LayoutBlockFlow (relative positioned)"; 3165 return "LayoutBlockFlow (relative positioned)";
3167 return "LayoutBlockFlow"; 3166 return "LayoutBlockFlow";
3168 } 3167 }
3169 3168
3170 3169
3171 } // namespace blink 3170 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698