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

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

Issue 59463007: Have Element::ensureUserAgentShadowRoot() return a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add extra assertion Created 7 years, 1 month 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
« no previous file with comments | « Source/core/html/HTMLKeygenElement.cpp ('k') | Source/core/html/HTMLMeterElement.h » ('j') | 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 3576 matching lines...) Expand 10 before | Expand all | Expand 10 after
3587 3587
3588 RefPtr<MediaControls> mediaControls = MediaControls::create(document()); 3588 RefPtr<MediaControls> mediaControls = MediaControls::create(document());
3589 if (!mediaControls) 3589 if (!mediaControls)
3590 return false; 3590 return false;
3591 3591
3592 mediaControls->setMediaController(m_mediaController ? m_mediaController.get( ) : static_cast<MediaControllerInterface*>(this)); 3592 mediaControls->setMediaController(m_mediaController ? m_mediaController.get( ) : static_cast<MediaControllerInterface*>(this));
3593 mediaControls->reset(); 3593 mediaControls->reset();
3594 if (isFullscreen()) 3594 if (isFullscreen())
3595 mediaControls->enteredFullscreen(); 3595 mediaControls->enteredFullscreen();
3596 3596
3597 ensureUserAgentShadowRoot()->appendChild(mediaControls); 3597 ensureUserAgentShadowRoot().appendChild(mediaControls);
3598 3598
3599 if (!controls() || !inDocument()) 3599 if (!controls() || !inDocument())
3600 mediaControls->hide(); 3600 mediaControls->hide();
3601 3601
3602 return true; 3602 return true;
3603 } 3603 }
3604 3604
3605 void HTMLMediaElement::configureMediaControls() 3605 void HTMLMediaElement::configureMediaControls()
3606 { 3606 {
3607 if (!controls() || !inDocument()) { 3607 if (!controls() || !inDocument()) {
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
3871 { 3871 {
3872 scheduleLayerUpdate(); 3872 scheduleLayerUpdate();
3873 } 3873 }
3874 3874
3875 bool HTMLMediaElement::isInteractiveContent() const 3875 bool HTMLMediaElement::isInteractiveContent() const
3876 { 3876 {
3877 return fastHasAttribute(controlsAttr); 3877 return fastHasAttribute(controlsAttr);
3878 } 3878 }
3879 3879
3880 } 3880 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLKeygenElement.cpp ('k') | Source/core/html/HTMLMeterElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698