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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 179993006: [New multicol] Eliminate the need for RenderMultiColumnBlock. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "core/rendering/RenderFlexibleBox.h" 56 #include "core/rendering/RenderFlexibleBox.h"
57 #include "core/rendering/RenderFlowThread.h" 57 #include "core/rendering/RenderFlowThread.h"
58 #include "core/rendering/RenderGeometryMap.h" 58 #include "core/rendering/RenderGeometryMap.h"
59 #include "core/rendering/RenderGrid.h" 59 #include "core/rendering/RenderGrid.h"
60 #include "core/rendering/RenderImage.h" 60 #include "core/rendering/RenderImage.h"
61 #include "core/rendering/RenderImageResourceStyleImage.h" 61 #include "core/rendering/RenderImageResourceStyleImage.h"
62 #include "core/rendering/RenderInline.h" 62 #include "core/rendering/RenderInline.h"
63 #include "core/rendering/RenderLayer.h" 63 #include "core/rendering/RenderLayer.h"
64 #include "core/rendering/RenderListItem.h" 64 #include "core/rendering/RenderListItem.h"
65 #include "core/rendering/RenderMarquee.h" 65 #include "core/rendering/RenderMarquee.h"
66 #include "core/rendering/RenderMultiColumnBlock.h"
67 #include "core/rendering/RenderScrollbarPart.h" 66 #include "core/rendering/RenderScrollbarPart.h"
68 #include "core/rendering/RenderTableCaption.h" 67 #include "core/rendering/RenderTableCaption.h"
69 #include "core/rendering/RenderTableCell.h" 68 #include "core/rendering/RenderTableCell.h"
70 #include "core/rendering/RenderTableCol.h" 69 #include "core/rendering/RenderTableCol.h"
71 #include "core/rendering/RenderTableRow.h" 70 #include "core/rendering/RenderTableRow.h"
72 #include "core/rendering/RenderTheme.h" 71 #include "core/rendering/RenderTheme.h"
73 #include "core/rendering/RenderView.h" 72 #include "core/rendering/RenderView.h"
74 #include "core/rendering/compositing/CompositedLayerMapping.h" 73 #include "core/rendering/compositing/CompositedLayerMapping.h"
75 #include "core/rendering/compositing/RenderLayerCompositor.h" 74 #include "core/rendering/compositing/RenderLayerCompositor.h"
76 #include "core/rendering/style/ContentData.h" 75 #include "core/rendering/style/ContentData.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 return image; 155 return image;
157 } 156 }
158 157
159 switch (style->display()) { 158 switch (style->display()) {
160 case NONE: 159 case NONE:
161 return 0; 160 return 0;
162 case INLINE: 161 case INLINE:
163 return new RenderInline(element); 162 return new RenderInline(element);
164 case BLOCK: 163 case BLOCK:
165 case INLINE_BLOCK: 164 case INLINE_BLOCK:
166 if ((!style->hasAutoColumnCount() || !style->hasAutoColumnWidth()) && el ement->document().regionBasedColumnsEnabled())
167 return new RenderMultiColumnBlock(element);
168 return new RenderBlockFlow(element); 165 return new RenderBlockFlow(element);
169 case LIST_ITEM: 166 case LIST_ITEM:
170 return new RenderListItem(element); 167 return new RenderListItem(element);
171 case TABLE: 168 case TABLE:
172 case INLINE_TABLE: 169 case INLINE_TABLE:
173 return new RenderTable(element); 170 return new RenderTable(element);
174 case TABLE_ROW_GROUP: 171 case TABLE_ROW_GROUP:
175 case TABLE_HEADER_GROUP: 172 case TABLE_HEADER_GROUP:
176 case TABLE_FOOTER_GROUP: 173 case TABLE_FOOTER_GROUP:
177 return new RenderTableSection(element); 174 return new RenderTableSection(element);
(...skipping 3155 matching lines...) Expand 10 before | Expand all | Expand 10 after
3333 { 3330 {
3334 if (object1) { 3331 if (object1) {
3335 const WebCore::RenderObject* root = object1; 3332 const WebCore::RenderObject* root = object1;
3336 while (root->parent()) 3333 while (root->parent())
3337 root = root->parent(); 3334 root = root->parent();
3338 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3335 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3339 } 3336 }
3340 } 3337 }
3341 3338
3342 #endif 3339 #endif
OLDNEW
« Source/core/rendering/RenderBlockFlow.cpp ('K') | « Source/core/rendering/RenderObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698