| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Victor Carbune (victor@rosedu.org) | 2 * Copyright (C) 2012 Victor Carbune (victor@rosedu.org) |
| 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 LayoutRectRecorder recorder(*this); | 43 LayoutRectRecorder recorder(*this); |
| 44 RenderBlockFlow::layout(); | 44 RenderBlockFlow::layout(); |
| 45 | 45 |
| 46 // If WebVTT Regions are used, the regular WebVTT layout algorithm is no | 46 // If WebVTT Regions are used, the regular WebVTT layout algorithm is no |
| 47 // longer necessary, since cues having the region parameter set do not have | 47 // longer necessary, since cues having the region parameter set do not have |
| 48 // any positioning parameters. Also, in this case, the regions themselves | 48 // any positioning parameters. Also, in this case, the regions themselves |
| 49 // have positioning information. | 49 // have positioning information. |
| 50 if (!m_cue->regionId().isEmpty()) | 50 if (!m_cue->regionId().isEmpty()) |
| 51 return; | 51 return; |
| 52 | 52 |
| 53 LayoutStateMaintainer statePusher(this, locationOffset()); | 53 LayoutStateMaintainer statePusher(*this, locationOffset()); |
| 54 | 54 |
| 55 if (m_cue->snapToLines()) | 55 if (m_cue->snapToLines()) |
| 56 repositionCueSnapToLinesSet(); | 56 repositionCueSnapToLinesSet(); |
| 57 else | 57 else |
| 58 repositionCueSnapToLinesNotSet(); | 58 repositionCueSnapToLinesNotSet(); |
| 59 | 59 |
| 60 statePusher.pop(); | 60 statePusher.pop(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 bool RenderVTTCue::findFirstLineBox(InlineFlowBox*& firstLineBox) | 63 bool RenderVTTCue::findFirstLineBox(InlineFlowBox*& firstLineBox) |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 } | 263 } |
| 264 } | 264 } |
| 265 | 265 |
| 266 void RenderVTTCue::repositionCueSnapToLinesNotSet() | 266 void RenderVTTCue::repositionCueSnapToLinesNotSet() |
| 267 { | 267 { |
| 268 // FIXME: Implement overlapping detection when snap-to-lines is not set. htt
p://wkb.ug/84296 | 268 // FIXME: Implement overlapping detection when snap-to-lines is not set. htt
p://wkb.ug/84296 |
| 269 } | 269 } |
| 270 | 270 |
| 271 } // namespace WebCore | 271 } // namespace WebCore |
| 272 | 272 |
| OLD | NEW |