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

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

Issue 1028383002: Enable new multicol for testing and experimental web platform features. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase master 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
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 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after
1880 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO) 1880 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO)
1881 continue; 1881 continue;
1882 1882
1883 if (blockChildrenOnly && !child->isLayoutBlock()) 1883 if (blockChildrenOnly && !child->isLayoutBlock())
1884 continue; 1884 continue;
1885 1885
1886 if (child->isLayoutFullScreen() || child->isLayoutFullScreenPlaceholder( )) 1886 if (child->isLayoutFullScreen() || child->isLayoutFullScreenPlaceholder( ))
1887 continue; 1887 continue;
1888 1888
1889 RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisp lay(styleRef(), child->style()->display()); 1889 RefPtr<LayoutStyle> newStyle = LayoutStyle::createAnonymousStyleWithDisp lay(styleRef(), child->style()->display());
1890 if (!document().regionBasedColumnsEnabled()) { 1890 if (!RuntimeEnabledFeatures::regionBasedColumnsEnabled()) {
1891 if (style()->specifiesColumns()) { 1891 if (style()->specifiesColumns()) {
1892 if (child->style()->specifiesColumns()) 1892 if (child->style()->specifiesColumns())
1893 newStyle->inheritColumnPropertiesFrom(styleRef()); 1893 newStyle->inheritColumnPropertiesFrom(styleRef());
1894 if (child->style()->columnSpan()) 1894 if (child->style()->columnSpan())
1895 newStyle->setColumnSpan(ColumnSpanAll); 1895 newStyle->setColumnSpan(ColumnSpanAll);
1896 } 1896 }
1897 } 1897 }
1898 1898
1899 // Preserve the position style of anonymous block continuations as they can have relative position when 1899 // Preserve the position style of anonymous block continuations as they can have relative position when
1900 // they contain block descendants of relative positioned inlines. 1900 // they contain block descendants of relative positioned inlines.
(...skipping 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after
3226 { 3226 {
3227 if (object1) { 3227 if (object1) {
3228 const blink::LayoutObject* root = object1; 3228 const blink::LayoutObject* root = object1;
3229 while (root->parent()) 3229 while (root->parent())
3230 root = root->parent(); 3230 root = root->parent();
3231 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3231 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3232 } 3232 }
3233 } 3233 }
3234 3234
3235 #endif 3235 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698