Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 23224011: HTMLMediaElement::createMediaControls should use AttachLazily (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3670 matching lines...) Expand 10 before | Expand all | Expand 10 after
3681 3681
3682 RefPtr<MediaControls> mediaControls = MediaControls::create(document()); 3682 RefPtr<MediaControls> mediaControls = MediaControls::create(document());
3683 if (!mediaControls) 3683 if (!mediaControls)
3684 return false; 3684 return false;
3685 3685
3686 mediaControls->setMediaController(m_mediaController ? m_mediaController.get( ) : static_cast<MediaControllerInterface*>(this)); 3686 mediaControls->setMediaController(m_mediaController ? m_mediaController.get( ) : static_cast<MediaControllerInterface*>(this));
3687 mediaControls->reset(); 3687 mediaControls->reset();
3688 if (isFullscreen()) 3688 if (isFullscreen())
3689 mediaControls->enteredFullscreen(); 3689 mediaControls->enteredFullscreen();
3690 3690
3691 ensureUserAgentShadowRoot()->appendChild(mediaControls, ASSERT_NO_EXCEPTION) ; 3691 ensureUserAgentShadowRoot()->appendChild(mediaControls, ASSERT_NO_EXCEPTION, AttachLazily);
3692 3692
3693 if (!controls() || !inDocument()) 3693 if (!controls() || !inDocument())
3694 mediaControls->hide(); 3694 mediaControls->hide();
3695 3695
3696 return true; 3696 return true;
3697 } 3697 }
3698 3698
3699 void HTMLMediaElement::configureMediaControls() 3699 void HTMLMediaElement::configureMediaControls()
3700 { 3700 {
3701 if (!controls() || !inDocument()) { 3701 if (!controls() || !inDocument()) {
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
3973 { 3973 {
3974 m_restrictions = NoRestrictions; 3974 m_restrictions = NoRestrictions;
3975 } 3975 }
3976 3976
3977 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() 3977 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate()
3978 { 3978 {
3979 scheduleLayerUpdate(); 3979 scheduleLayerUpdate();
3980 } 3980 }
3981 3981
3982 } 3982 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698