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

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

Issue 14178009: Remove CSS_REGIONS compile flag from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: New version Created 7 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
« no previous file with comments | « Source/core/rendering/RenderNamedFlowThread.cpp ('k') | 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 if (element->hasTagName(rubyTag)) { 163 if (element->hasTagName(rubyTag)) {
164 if (style->display() == INLINE) 164 if (style->display() == INLINE)
165 return new (arena) RenderRubyAsInline(element); 165 return new (arena) RenderRubyAsInline(element);
166 else if (style->display() == BLOCK) 166 else if (style->display() == BLOCK)
167 return new (arena) RenderRubyAsBlock(element); 167 return new (arena) RenderRubyAsBlock(element);
168 } 168 }
169 // treat <rt> as ruby text ONLY if it still has its default treatment of blo ck 169 // treat <rt> as ruby text ONLY if it still has its default treatment of blo ck
170 if (element->hasTagName(rtTag) && style->display() == BLOCK) 170 if (element->hasTagName(rtTag) && style->display() == BLOCK)
171 return new (arena) RenderRubyText(element); 171 return new (arena) RenderRubyText(element);
172 if (doc->cssRegionsEnabled() && style->isDisplayRegionType() && !style->regi onThread().isEmpty() && doc->renderView()) 172 if (RuntimeEnabledFeatures::cssRegionsEnabled() && style->isDisplayRegionTyp e() && !style->regionThread().isEmpty() && doc->renderView())
173 return new (arena) RenderRegion(element, 0); 173 return new (arena) RenderRegion(element, 0);
174 switch (style->display()) { 174 switch (style->display()) {
175 case NONE: 175 case NONE:
176 return 0; 176 return 0;
177 case INLINE: 177 case INLINE:
178 return new (arena) RenderInline(element); 178 return new (arena) RenderInline(element);
179 case BLOCK: 179 case BLOCK:
180 case INLINE_BLOCK: 180 case INLINE_BLOCK:
181 case RUN_IN: 181 case RUN_IN:
182 case COMPACT: 182 case COMPACT:
(...skipping 2993 matching lines...) Expand 10 before | Expand all | Expand 10 after
3176 { 3176 {
3177 if (object1) { 3177 if (object1) {
3178 const WebCore::RenderObject* root = object1; 3178 const WebCore::RenderObject* root = object1;
3179 while (root->parent()) 3179 while (root->parent())
3180 root = root->parent(); 3180 root = root->parent();
3181 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3181 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3182 } 3182 }
3183 } 3183 }
3184 3184
3185 #endif 3185 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderNamedFlowThread.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698