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

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

Issue 1119293002: Enable new multicol for testing and experimental web platform features. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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/LayoutBlockFlow.cpp ('k') | Source/core/layout/LayoutTestHelper.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) 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 1965 matching lines...) Expand 10 before | Expand all | Expand 10 after
1976 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO) 1976 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO)
1977 continue; 1977 continue;
1978 1978
1979 if (blockChildrenOnly && !child->isLayoutBlock()) 1979 if (blockChildrenOnly && !child->isLayoutBlock())
1980 continue; 1980 continue;
1981 1981
1982 if (child->isLayoutFullScreen() || child->isLayoutFullScreenPlaceholder( )) 1982 if (child->isLayoutFullScreen() || child->isLayoutFullScreenPlaceholder( ))
1983 continue; 1983 continue;
1984 1984
1985 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWith Display(styleRef(), child->style()->display()); 1985 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWith Display(styleRef(), child->style()->display());
1986 if (!document().regionBasedColumnsEnabled()) { 1986 if (!RuntimeEnabledFeatures::regionBasedColumnsEnabled()) {
1987 if (style()->specifiesColumns()) { 1987 if (style()->specifiesColumns()) {
1988 if (child->style()->specifiesColumns()) 1988 if (child->style()->specifiesColumns())
1989 newStyle->inheritColumnPropertiesFrom(styleRef()); 1989 newStyle->inheritColumnPropertiesFrom(styleRef());
1990 if (child->style()->columnSpan()) 1990 if (child->style()->columnSpan())
1991 newStyle->setColumnSpan(ColumnSpanAll); 1991 newStyle->setColumnSpan(ColumnSpanAll);
1992 } 1992 }
1993 } 1993 }
1994 1994
1995 // Preserve the position style of anonymous block continuations as they can have relative position when 1995 // Preserve the position style of anonymous block continuations as they can have relative position when
1996 // they contain block descendants of relative positioned inlines. 1996 // they contain block descendants of relative positioned inlines.
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
3339 { 3339 {
3340 if (object1) { 3340 if (object1) {
3341 const blink::LayoutObject* root = object1; 3341 const blink::LayoutObject* root = object1;
3342 while (root->parent()) 3342 while (root->parent())
3343 root = root->parent(); 3343 root = root->parent();
3344 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3344 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3345 } 3345 }
3346 } 3346 }
3347 3347
3348 #endif 3348 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.cpp ('k') | Source/core/layout/LayoutTestHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698