| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "core/rendering/RenderRuby.h" | 33 #include "core/rendering/RenderRuby.h" |
| 34 | 34 |
| 35 #include "core/rendering/RenderRubyRun.h" | 35 #include "core/rendering/RenderRubyRun.h" |
| 36 #include "core/rendering/style/RenderStyle.h" | 36 #include "core/rendering/style/RenderStyle.h" |
| 37 #include "core/rendering/style/StyleInheritedData.h" | |
| 38 #include <wtf/RefPtr.h> | 37 #include <wtf/RefPtr.h> |
| 39 | 38 |
| 40 namespace WebCore { | 39 namespace WebCore { |
| 41 | 40 |
| 42 //=== generic helper functions to avoid excessive code duplication === | 41 //=== generic helper functions to avoid excessive code duplication === |
| 43 | 42 |
| 44 static inline bool isAnonymousRubyInlineBlock(const RenderObject* object) | 43 static inline bool isAnonymousRubyInlineBlock(const RenderObject* object) |
| 45 { | 44 { |
| 46 ASSERT(!object | 45 ASSERT(!object |
| 47 || !object->parent()->isRuby() | 46 || !object->parent()->isRuby() |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 return; | 312 return; |
| 314 } | 313 } |
| 315 | 314 |
| 316 // Otherwise find the containing run and remove it from there. | 315 // Otherwise find the containing run and remove it from there. |
| 317 RenderRubyRun* run = findRubyRunParent(child); | 316 RenderRubyRun* run = findRubyRunParent(child); |
| 318 ASSERT(run); | 317 ASSERT(run); |
| 319 run->removeChild(child); | 318 run->removeChild(child); |
| 320 } | 319 } |
| 321 | 320 |
| 322 } // namespace WebCore | 321 } // namespace WebCore |
| OLD | NEW |