| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 // The now empty ruby base will be removed below. | 163 // The now empty ruby base will be removed below. |
| 164 ASSERT(!rubyBase()->firstChild()); | 164 ASSERT(!rubyBase()->firstChild()); |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 } | 167 } |
| 168 | 168 |
| 169 LayoutBlockFlow::removeChild(child); | 169 LayoutBlockFlow::removeChild(child); |
| 170 | 170 |
| 171 if (!beingDestroyed() && !documentBeingDestroyed()) { | 171 if (!beingDestroyed() && !documentBeingDestroyed()) { |
| 172 // Check if our base (if any) is now empty. If so, destroy it. | 172 // Check if our base (if any) is now empty. If so, destroy it. |
| 173 LayoutBlock* base = rubyBase(); | 173 LayoutBlockFlow* base = rubyBase(); |
| 174 if (base && !base->firstChild()) { | 174 if (base && !base->firstChild()) { |
| 175 LayoutBlockFlow::removeChild(base); | 175 LayoutBlockFlow::removeChild(base); |
| 176 base->deleteLineBoxTree(); | 176 base->deleteLineBoxTree(); |
| 177 base->destroy(); | 177 base->destroy(); |
| 178 } | 178 } |
| 179 | 179 |
| 180 // If any of the above leaves the run empty, destroy it as well. | 180 // If any of the above leaves the run empty, destroy it as well. |
| 181 if (!hasRubyText() && !hasRubyBase()) { | 181 if (!hasRubyText() && !hasRubyBase()) { |
| 182 deleteLineBoxTree(); | 182 deleteLineBoxTree(); |
| 183 destroy(); | 183 destroy(); |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 case U_LB_GLUE: | 324 case U_LB_GLUE: |
| 325 case U_LB_OPEN_PUNCTUATION: | 325 case U_LB_OPEN_PUNCTUATION: |
| 326 return false; | 326 return false; |
| 327 default: | 327 default: |
| 328 break; | 328 break; |
| 329 } | 329 } |
| 330 return true; | 330 return true; |
| 331 } | 331 } |
| 332 | 332 |
| 333 } // namespace blink | 333 } // namespace blink |
| OLD | NEW |