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

Side by Side Diff: Source/WebCore/rendering/RenderRubyText.cpp

Issue 8044031: Merge 94991 - <rdar://problem/10054615> Floats in ruby text intrude into the base (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 2 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/WebCore/rendering/RenderRubyText.h ('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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 { 85 {
86 // RenderRubyText manages its own :before and :after content 86 // RenderRubyText manages its own :before and :after content
87 // and is not handled by its anonymous wrappers RenderRubyRun 87 // and is not handled by its anonymous wrappers RenderRubyRun
88 // and RenderRuby. This contrasts with other ruby children, which 88 // and RenderRuby. This contrasts with other ruby children, which
89 // are enclosed in RenderRubyBase and hence they are able to 89 // are enclosed in RenderRubyBase and hence they are able to
90 // update their :before, :after content (since RenderRubyBase 90 // update their :before, :after content (since RenderRubyBase
91 // is not a anonymous wrapper). 91 // is not a anonymous wrapper).
92 return children()->updateBeforeAfterContent(this, pseudoId); 92 return children()->updateBeforeAfterContent(this, pseudoId);
93 } 93 }
94 94
95 bool RenderRubyText::avoidsFloats() const
96 {
97 return true;
98 }
99
95 } // namespace WebCore 100 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderRubyText.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698