| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 | 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 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 } | 519 } |
| 520 | 520 |
| 521 void HTMLMediaElement::didRecalcStyle(StyleRecalcChange) | 521 void HTMLMediaElement::didRecalcStyle(StyleRecalcChange) |
| 522 { | 522 { |
| 523 if (renderer()) | 523 if (renderer()) |
| 524 renderer()->updateFromElement(); | 524 renderer()->updateFromElement(); |
| 525 } | 525 } |
| 526 | 526 |
| 527 void HTMLMediaElement::scheduleDelayedAction(DelayedActionType actionType) | 527 void HTMLMediaElement::scheduleDelayedAction(DelayedActionType actionType) |
| 528 { | 528 { |
| 529 LOG(Media, "HTMLMediaElement::scheduleLoad"); | 529 LOG(Media, "HTMLMediaElement::scheduleDelayedAction"); |
| 530 | 530 |
| 531 if ((actionType & LoadMediaResource) && !(m_pendingActionFlags & LoadMediaRe
source)) { | 531 if ((actionType & LoadMediaResource) && !(m_pendingActionFlags & LoadMediaRe
source)) { |
| 532 prepareForLoad(); | 532 prepareForLoad(); |
| 533 m_pendingActionFlags |= LoadMediaResource; | 533 m_pendingActionFlags |= LoadMediaResource; |
| 534 } | 534 } |
| 535 | 535 |
| 536 if (RuntimeEnabledFeatures::videoTrackEnabled() && (actionType & LoadTextTra
ckResource)) | 536 if (RuntimeEnabledFeatures::videoTrackEnabled() && (actionType & LoadTextTra
ckResource)) |
| 537 m_pendingActionFlags |= LoadTextTrackResource; | 537 m_pendingActionFlags |= LoadTextTrackResource; |
| 538 | 538 |
| 539 if (!m_loadTimer.isActive()) | 539 if (!m_loadTimer.isActive()) |
| (...skipping 3335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3875 { | 3875 { |
| 3876 scheduleLayerUpdate(); | 3876 scheduleLayerUpdate(); |
| 3877 } | 3877 } |
| 3878 | 3878 |
| 3879 bool HTMLMediaElement::isInteractiveContent() const | 3879 bool HTMLMediaElement::isInteractiveContent() const |
| 3880 { | 3880 { |
| 3881 return fastHasAttribute(controlsAttr); | 3881 return fastHasAttribute(controlsAttr); |
| 3882 } | 3882 } |
| 3883 | 3883 |
| 3884 } | 3884 } |
| OLD | NEW |