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

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

Issue 23628004: Tables with display:inline rendered in wrong position. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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 | « LayoutTests/platform/linux/fast/table/table-display-inline-expected.txt ('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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 if (element->hasTagName(rubyTag)) { 160 if (element->hasTagName(rubyTag)) {
161 if (style->display() == INLINE) 161 if (style->display() == INLINE)
162 return new RenderRubyAsInline(element); 162 return new RenderRubyAsInline(element);
163 else if (style->display() == BLOCK) 163 else if (style->display() == BLOCK)
164 return new RenderRubyAsBlock(element); 164 return new RenderRubyAsBlock(element);
165 } 165 }
166 // treat <rt> as ruby text ONLY if it still has its default treatment of blo ck 166 // treat <rt> as ruby text ONLY if it still has its default treatment of blo ck
167 if (element->hasTagName(rtTag) && style->display() == BLOCK) 167 if (element->hasTagName(rtTag) && style->display() == BLOCK)
168 return new RenderRubyText(element); 168 return new RenderRubyText(element);
169 if (element->hasTagName(tableTag) && style->display() == INLINE)
170 return new RenderTable(element);
esprehn 2013/08/28 18:17:54 This does not appear correct, if you make a table
suchit.agrawal 2013/08/29 04:31:09 I have tried this example and check the behavior.
suchit.agrawal 2013/08/29 05:49:05 Our previous behavior of this example was wrong. '
169 if (RuntimeEnabledFeatures::cssRegionsEnabled() && style->isDisplayRegionTyp e() && !style->regionThread().isEmpty() && doc->renderView()) 171 if (RuntimeEnabledFeatures::cssRegionsEnabled() && style->isDisplayRegionTyp e() && !style->regionThread().isEmpty() && doc->renderView())
170 return new RenderRegion(element, 0); 172 return new RenderRegion(element, 0);
171 173
172 if (style->display() == RUN_IN) 174 if (style->display() == RUN_IN)
173 UseCounter::count(doc, UseCounter::CSSDisplayRunIn); 175 UseCounter::count(doc, UseCounter::CSSDisplayRunIn);
174 else if (style->display() == COMPACT) 176 else if (style->display() == COMPACT)
175 UseCounter::count(doc, UseCounter::CSSDisplayCompact); 177 UseCounter::count(doc, UseCounter::CSSDisplayCompact);
176 178
177 switch (style->display()) { 179 switch (style->display()) {
178 case NONE: 180 case NONE:
(...skipping 3153 matching lines...) Expand 10 before | Expand all | Expand 10 after
3332 { 3334 {
3333 if (object1) { 3335 if (object1) {
3334 const WebCore::RenderObject* root = object1; 3336 const WebCore::RenderObject* root = object1;
3335 while (root->parent()) 3337 while (root->parent())
3336 root = root->parent(); 3338 root = root->parent();
3337 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3339 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3338 } 3340 }
3339 } 3341 }
3340 3342
3341 #endif 3343 #endif
OLDNEW
« no previous file with comments | « LayoutTests/platform/linux/fast/table/table-display-inline-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698