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

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

Issue 1028383002: Enable new multicol for testing and experimental web platform features. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Need to mark virtual/slimmingpaint/svg/text/columns-do-not-apply.html as failing too. 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" 42 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
43 #include "core/layout/LayoutPagedFlowThread.h" 43 #include "core/layout/LayoutPagedFlowThread.h"
44 #include "core/layout/LayoutText.h" 44 #include "core/layout/LayoutText.h"
45 #include "core/layout/LayoutView.h" 45 #include "core/layout/LayoutView.h"
46 #include "core/layout/TextAutosizer.h" 46 #include "core/layout/TextAutosizer.h"
47 #include "core/layout/line/LineBreaker.h" 47 #include "core/layout/line/LineBreaker.h"
48 #include "core/layout/line/LineWidth.h" 48 #include "core/layout/line/LineWidth.h"
49 #include "core/paint/BlockFlowPainter.h" 49 #include "core/paint/BlockFlowPainter.h"
50 #include "core/paint/DeprecatedPaintLayer.h" 50 #include "core/paint/DeprecatedPaintLayer.h"
51 #include "core/paint/LayoutObjectDrawingRecorder.h" 51 #include "core/paint/LayoutObjectDrawingRecorder.h"
52 #include "platform/RuntimeEnabledFeatures.h"
52 #include "platform/geometry/TransformState.h" 53 #include "platform/geometry/TransformState.h"
53 #include "platform/graphics/paint/ClipRecorderStack.h" 54 #include "platform/graphics/paint/ClipRecorderStack.h"
54 #include "platform/text/BidiTextRun.h" 55 #include "platform/text/BidiTextRun.h"
55 56
56 namespace blink { 57 namespace blink {
57 58
58 bool LayoutBlockFlow::s_canPropagateFloatIntoSibling = false; 59 bool LayoutBlockFlow::s_canPropagateFloatIntoSibling = false;
59 60
60 struct SameSizeAsMarginInfo { 61 struct SameSizeAsMarginInfo {
61 uint16_t bitfields; 62 uint16_t bitfields;
(...skipping 3001 matching lines...) Expand 10 before | Expand all | Expand 10 after
3063 // Paged overflow is currently done using the multicol implementation. 3064 // Paged overflow is currently done using the multicol implementation.
3064 return LayoutPagedFlowThread::createAnonymous(document(), styleRef()); 3065 return LayoutPagedFlowThread::createAnonymous(document(), styleRef());
3065 default: 3066 default:
3066 ASSERT_NOT_REACHED(); 3067 ASSERT_NOT_REACHED();
3067 return nullptr; 3068 return nullptr;
3068 } 3069 }
3069 } 3070 }
3070 3071
3071 void LayoutBlockFlow::createOrDestroyMultiColumnFlowThreadIfNeeded(const LayoutS tyle* oldStyle) 3072 void LayoutBlockFlow::createOrDestroyMultiColumnFlowThreadIfNeeded(const LayoutS tyle* oldStyle)
3072 { 3073 {
3073 if (!document().regionBasedColumnsEnabled()) 3074 if (!RuntimeEnabledFeatures::regionBasedColumnsEnabled())
3074 return; 3075 return;
3075 3076
3076 // Paged overflow trumps multicol in this implementation. Ideally, it should be possible to have 3077 // Paged overflow trumps multicol in this implementation. Ideally, it should be possible to have
3077 // both paged overflow and multicol on the same element, but then we need tw o flow 3078 // both paged overflow and multicol on the same element, but then we need tw o flow
3078 // threads. Anyway, this is nothing to worry about until we can actually nes t multicol properly 3079 // threads. Anyway, this is nothing to worry about until we can actually nes t multicol properly
3079 // inside other fragmentation contexts. 3080 // inside other fragmentation contexts.
3080 FlowThreadType type = flowThreadType(styleRef()); 3081 FlowThreadType type = flowThreadType(styleRef());
3081 3082
3082 if (multiColumnFlowThread()) { 3083 if (multiColumnFlowThread()) {
3083 ASSERT(oldStyle); 3084 ASSERT(oldStyle);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
3155 } 3156 }
3156 if (isAnonymous()) 3157 if (isAnonymous())
3157 return "LayoutBlockFlow (anonymous)"; 3158 return "LayoutBlockFlow (anonymous)";
3158 if (isRelPositioned()) 3159 if (isRelPositioned())
3159 return "LayoutBlockFlow (relative positioned)"; 3160 return "LayoutBlockFlow (relative positioned)";
3160 return "LayoutBlockFlow"; 3161 return "LayoutBlockFlow";
3161 } 3162 }
3162 3163
3163 3164
3164 } // namespace blink 3165 } // 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