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/rendering/RenderObject.cpp

Issue 712553003: [New Multicolumn] Actual support for layout of column-span:all. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase master Created 6 years, 1 month 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 return !isTable(); 319 return !isTable();
320 else if (newChild->isTableSection()) 320 else if (newChild->isTableSection())
321 return !isTable(); 321 return !isTable();
322 else if (newChild->isTableRow()) 322 else if (newChild->isTableRow())
323 return !isTableSection(); 323 return !isTableSection();
324 else if (newChild->isTableCell()) 324 else if (newChild->isTableCell())
325 return !isTableRow(); 325 return !isTableRow();
326 return false; 326 return false;
327 } 327 }
328 328
329 bool RenderObject::isValidColumnSpanAll() const
330 {
331 ASSERT(style()->columnSpan() == ColumnSpanAll);
332 RenderFlowThread* flowThread = flowThreadContainingBlock();
333 return flowThread && flowThread->isColumnSpanner(this);
334 }
335
329 void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild) 336 void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild)
330 { 337 {
331 ASSERT(isAllowedToModifyRenderTreeStructure(document())); 338 ASSERT(isAllowedToModifyRenderTreeStructure(document()));
332 339
333 RenderObjectChildList* children = virtualChildren(); 340 RenderObjectChildList* children = virtualChildren();
334 ASSERT(children); 341 ASSERT(children);
335 if (!children) 342 if (!children)
336 return; 343 return;
337 344
338 if (requiresAnonymousTableWrappers(newChild)) { 345 if (requiresAnonymousTableWrappers(newChild)) {
(...skipping 2814 matching lines...) Expand 10 before | Expand all | Expand 10 after
3153 { 3160 {
3154 if (object1) { 3161 if (object1) {
3155 const blink::RenderObject* root = object1; 3162 const blink::RenderObject* root = object1;
3156 while (root->parent()) 3163 while (root->parent())
3157 root = root->parent(); 3164 root = root->parent();
3158 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3165 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3159 } 3166 }
3160 } 3167 }
3161 3168
3162 #endif 3169 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698