| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 } | 635 } |
| 636 } | 636 } |
| 637 | 637 |
| 638 void HTMLMediaElement::attachLayoutTree(const AttachContext& context) { | 638 void HTMLMediaElement::attachLayoutTree(const AttachContext& context) { |
| 639 HTMLElement::attachLayoutTree(context); | 639 HTMLElement::attachLayoutTree(context); |
| 640 | 640 |
| 641 if (layoutObject()) | 641 if (layoutObject()) |
| 642 layoutObject()->updateFromElement(); | 642 layoutObject()->updateFromElement(); |
| 643 } | 643 } |
| 644 | 644 |
| 645 void HTMLMediaElement::didRecalcStyle() { | 645 void HTMLMediaElement::didRebuildLayoutTree() { |
| 646 if (layoutObject()) | 646 if (layoutObject()) |
| 647 layoutObject()->updateFromElement(); | 647 layoutObject()->updateFromElement(); |
| 648 } | 648 } |
| 649 | 649 |
| 650 void HTMLMediaElement::scheduleTextTrackResourceLoad() { | 650 void HTMLMediaElement::scheduleTextTrackResourceLoad() { |
| 651 BLINK_MEDIA_LOG << "scheduleTextTrackResourceLoad(" << (void*)this << ")"; | 651 BLINK_MEDIA_LOG << "scheduleTextTrackResourceLoad(" << (void*)this << ")"; |
| 652 | 652 |
| 653 m_pendingActionFlags |= LoadTextTrackResource; | 653 m_pendingActionFlags |= LoadTextTrackResource; |
| 654 | 654 |
| 655 if (!m_loadTimer.isActive()) | 655 if (!m_loadTimer.isActive()) |
| (...skipping 3472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4128 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); | 4128 kMostlyFillViewportBecomeStableSeconds, BLINK_FROM_HERE); |
| 4129 } | 4129 } |
| 4130 | 4130 |
| 4131 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) { | 4131 void HTMLMediaElement::viewportFillDebouncerTimerFired(TimerBase*) { |
| 4132 m_mostlyFillingViewport = true; | 4132 m_mostlyFillingViewport = true; |
| 4133 if (m_webMediaPlayer) | 4133 if (m_webMediaPlayer) |
| 4134 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport); | 4134 m_webMediaPlayer->becameDominantVisibleContent(m_mostlyFillingViewport); |
| 4135 } | 4135 } |
| 4136 | 4136 |
| 4137 } // namespace blink | 4137 } // namespace blink |
| OLD | NEW |