| 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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 configureMediaControls(); | 542 configureMediaControls(); |
| 543 if (m_networkState > NETWORK_EMPTY) | 543 if (m_networkState > NETWORK_EMPTY) |
| 544 pause(); | 544 pause(); |
| 545 } | 545 } |
| 546 | 546 |
| 547 HTMLElement::removedFrom(insertionPoint); | 547 HTMLElement::removedFrom(insertionPoint); |
| 548 } | 548 } |
| 549 | 549 |
| 550 void HTMLMediaElement::attach(const AttachContext& context) | 550 void HTMLMediaElement::attach(const AttachContext& context) |
| 551 { | 551 { |
| 552 ASSERT(!attached()); | 552 ASSERT(!confusingAndOftenMisusedAttached()); |
| 553 | 553 |
| 554 HTMLElement::attach(context); | 554 HTMLElement::attach(context); |
| 555 | 555 |
| 556 if (renderer()) | 556 if (renderer()) |
| 557 renderer()->updateFromElement(); | 557 renderer()->updateFromElement(); |
| 558 } | 558 } |
| 559 | 559 |
| 560 void HTMLMediaElement::didRecalcStyle(StyleRecalcChange) | 560 void HTMLMediaElement::didRecalcStyle(StyleRecalcChange) |
| 561 { | 561 { |
| 562 if (renderer()) | 562 if (renderer()) |
| (...skipping 3440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4003 { | 4003 { |
| 4004 m_restrictions = NoRestrictions; | 4004 m_restrictions = NoRestrictions; |
| 4005 } | 4005 } |
| 4006 | 4006 |
| 4007 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() | 4007 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() |
| 4008 { | 4008 { |
| 4009 scheduleLayerUpdate(); | 4009 scheduleLayerUpdate(); |
| 4010 } | 4010 } |
| 4011 | 4011 |
| 4012 } | 4012 } |
| OLD | NEW |