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

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

Issue 1050243002: Revert Enable new multicol for testing and experimental web platform features. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« 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 1897 matching lines...) Expand 10 before | Expand all | Expand 10 after
1908 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO) 1908 if (!child->isAnonymous() || child->style()->styleType() != NOPSEUDO)
1909 continue; 1909 continue;
1910 1910
1911 if (blockChildrenOnly && !child->isLayoutBlock()) 1911 if (blockChildrenOnly && !child->isLayoutBlock())
1912 continue; 1912 continue;
1913 1913
1914 if (child->isLayoutFullScreen() || child->isLayoutFullScreenPlaceholder( )) 1914 if (child->isLayoutFullScreen() || child->isLayoutFullScreenPlaceholder( ))
1915 continue; 1915 continue;
1916 1916
1917 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWith Display(styleRef(), child->style()->display()); 1917 RefPtr<ComputedStyle> newStyle = ComputedStyle::createAnonymousStyleWith Display(styleRef(), child->style()->display());
1918 if (!RuntimeEnabledFeatures::regionBasedColumnsEnabled()) { 1918 if (!document().regionBasedColumnsEnabled()) {
1919 if (style()->specifiesColumns()) { 1919 if (style()->specifiesColumns()) {
1920 if (child->style()->specifiesColumns()) 1920 if (child->style()->specifiesColumns())
1921 newStyle->inheritColumnPropertiesFrom(styleRef()); 1921 newStyle->inheritColumnPropertiesFrom(styleRef());
1922 if (child->style()->columnSpan()) 1922 if (child->style()->columnSpan())
1923 newStyle->setColumnSpan(ColumnSpanAll); 1923 newStyle->setColumnSpan(ColumnSpanAll);
1924 } 1924 }
1925 } 1925 }
1926 1926
1927 // Preserve the position style of anonymous block continuations as they can have relative position when 1927 // Preserve the position style of anonymous block continuations as they can have relative position when
1928 // they contain block descendants of relative positioned inlines. 1928 // they contain block descendants of relative positioned inlines.
(...skipping 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after
3254 { 3254 {
3255 if (object1) { 3255 if (object1) {
3256 const blink::LayoutObject* root = object1; 3256 const blink::LayoutObject* root = object1;
3257 while (root->parent()) 3257 while (root->parent())
3258 root = root->parent(); 3258 root = root->parent();
3259 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3259 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3260 } 3260 }
3261 } 3261 }
3262 3262
3263 #endif 3263 #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