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

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

Issue 2325663002: Make Fullscreen::requestFullscreen and exitFullscreen static (Closed)
Patch Set: Created 4 years, 3 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
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 3276 matching lines...) Expand 10 before | Expand all | Expand 10 after
3287 3287
3288 bool HTMLMediaElement::isFullscreen() const 3288 bool HTMLMediaElement::isFullscreen() const
3289 { 3289 {
3290 return Fullscreen::isCurrentFullScreenElement(*this); 3290 return Fullscreen::isCurrentFullScreenElement(*this);
3291 } 3291 }
3292 3292
3293 void HTMLMediaElement::enterFullscreen() 3293 void HTMLMediaElement::enterFullscreen()
3294 { 3294 {
3295 BLINK_MEDIA_LOG << "enterFullscreen(" << (void*)this << ")"; 3295 BLINK_MEDIA_LOG << "enterFullscreen(" << (void*)this << ")";
3296 3296
3297 Fullscreen::from(document()).requestFullscreen(*this, Fullscreen::PrefixedRe quest); 3297 Fullscreen::requestFullscreen(*this, Fullscreen::PrefixedRequest);
3298 } 3298 }
3299 3299
3300 void HTMLMediaElement::exitFullscreen() 3300 void HTMLMediaElement::exitFullscreen()
3301 { 3301 {
3302 BLINK_MEDIA_LOG << "exitFullscreen(" << (void*)this << ")"; 3302 BLINK_MEDIA_LOG << "exitFullscreen(" << (void*)this << ")";
3303 3303
3304 Fullscreen::from(document()).exitFullscreen(); 3304 Fullscreen::exitFullscreen(document());
3305 } 3305 }
3306 3306
3307 void HTMLMediaElement::didBecomeFullscreenElement() 3307 void HTMLMediaElement::didBecomeFullscreenElement()
3308 { 3308 {
3309 if (mediaControls()) 3309 if (mediaControls())
3310 mediaControls()->enteredFullscreen(); 3310 mediaControls()->enteredFullscreen();
3311 // FIXME: There is no embedder-side handling in layout test mode. 3311 // FIXME: There is no embedder-side handling in layout test mode.
3312 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest()) 3312 if (webMediaPlayer() && !LayoutTestSupport::isRunningLayoutTest())
3313 webMediaPlayer()->enteredFullscreen(); 3313 webMediaPlayer()->enteredFullscreen();
3314 // Cache this in case the player is destroyed before leaving fullscreen. 3314 // Cache this in case the player is destroyed before leaving fullscreen.
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
4027 4027
4028 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst 4028 IntRect HTMLMediaElement::AutoplayHelperClientImpl::absoluteBoundingBoxRect() co nst
4029 { 4029 {
4030 IntRect result; 4030 IntRect result;
4031 if (LayoutObject* object = m_element->layoutObject()) 4031 if (LayoutObject* object = m_element->layoutObject())
4032 result = object->absoluteBoundingBoxRect(); 4032 result = object->absoluteBoundingBoxRect();
4033 return result; 4033 return result;
4034 } 4034 }
4035 4035
4036 } // namespace blink 4036 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698