| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 return upScrollValueKeyword; | 192 return upScrollValueKeyword; |
| 193 | 193 |
| 194 return ""; | 194 return ""; |
| 195 } | 195 } |
| 196 | 196 |
| 197 void TextTrackRegion::setScroll(const AtomicString& value, ExceptionCode& ec) | 197 void TextTrackRegion::setScroll(const AtomicString& value, ExceptionCode& ec) |
| 198 { | 198 { |
| 199 DEFINE_STATIC_LOCAL(const AtomicString, upScrollValueKeyword, ("up", AtomicS
tring::ConstructFromLiteral)); | 199 DEFINE_STATIC_LOCAL(const AtomicString, upScrollValueKeyword, ("up", AtomicS
tring::ConstructFromLiteral)); |
| 200 | 200 |
| 201 if (value != emptyString() && value != upScrollValueKeyword) { | 201 if (value != emptyString() && value != upScrollValueKeyword) { |
| 202 ec = SYNTAX_ERR; | 202 ec = SyntaxError; |
| 203 return; | 203 return; |
| 204 } | 204 } |
| 205 | 205 |
| 206 m_scroll = value == upScrollValueKeyword; | 206 m_scroll = value == upScrollValueKeyword; |
| 207 } | 207 } |
| 208 | 208 |
| 209 void TextTrackRegion::updateParametersFromRegion(TextTrackRegion* region) | 209 void TextTrackRegion::updateParametersFromRegion(TextTrackRegion* region) |
| 210 { | 210 { |
| 211 m_heightInLines = region->height(); | 211 m_heightInLines = region->height(); |
| 212 m_width = region->width(); | 212 m_width = region->width(); |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 { | 497 { |
| 498 LOG(Media, "TextTrackRegion::scrollTimerFired"); | 498 LOG(Media, "TextTrackRegion::scrollTimerFired"); |
| 499 | 499 |
| 500 stopTimer(); | 500 stopTimer(); |
| 501 displayLastTextTrackCueBox(); | 501 displayLastTextTrackCueBox(); |
| 502 } | 502 } |
| 503 | 503 |
| 504 } // namespace WebCore | 504 } // namespace WebCore |
| 505 | 505 |
| 506 #endif | 506 #endif |
| OLD | NEW |