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

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

Issue 493283003: Property propagation to anonymous children only needed by old multicol. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | 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) 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 2235 matching lines...) Expand 10 before | Expand all | Expand 10 after
2246 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO) 2246 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO)
2247 continue; 2247 continue;
2248 2248
2249 if (blockChildrenOnly && !child->isRenderBlock()) 2249 if (blockChildrenOnly && !child->isRenderBlock())
2250 continue; 2250 continue;
2251 2251
2252 if (child->isRenderFullScreen() || child->isRenderFullScreenPlaceholder( )) 2252 if (child->isRenderFullScreen() || child->isRenderFullScreenPlaceholder( ))
2253 continue; 2253 continue;
2254 2254
2255 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisp lay(style(), child->style()->display()); 2255 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisp lay(style(), child->style()->display());
2256 if (style()->specifiesColumns()) { 2256 if (!document().regionBasedColumnsEnabled()) {
2257 if (child->style()->specifiesColumns()) 2257 if (style()->specifiesColumns()) {
2258 newStyle->inheritColumnPropertiesFrom(style()); 2258 if (child->style()->specifiesColumns())
2259 if (child->style()->columnSpan()) 2259 newStyle->inheritColumnPropertiesFrom(style());
2260 newStyle->setColumnSpan(ColumnSpanAll); 2260 if (child->style()->columnSpan())
2261 newStyle->setColumnSpan(ColumnSpanAll);
2262 }
2261 } 2263 }
2262 2264
2263 // Preserve the position style of anonymous block continuations as they can have relative position when 2265 // Preserve the position style of anonymous block continuations as they can have relative position when
2264 // they contain block descendants of relative positioned inlines. 2266 // they contain block descendants of relative positioned inlines.
2265 if (child->isRelPositioned() && toRenderBlock(child)->isAnonymousBlockCo ntinuation()) 2267 if (child->isRelPositioned() && toRenderBlock(child)->isAnonymousBlockCo ntinuation())
2266 newStyle->setPosition(child->style()->position()); 2268 newStyle->setPosition(child->style()->position());
2267 2269
2268 child->setStyle(newStyle.release()); 2270 child->setStyle(newStyle.release());
2269 } 2271 }
2270 } 2272 }
(...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after
3481 { 3483 {
3482 if (object1) { 3484 if (object1) {
3483 const blink::RenderObject* root = object1; 3485 const blink::RenderObject* root = object1;
3484 while (root->parent()) 3486 while (root->parent())
3485 root = root->parent(); 3487 root = root->parent();
3486 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3488 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3487 } 3489 }
3488 } 3490 }
3489 3491
3490 #endif 3492 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698