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

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

Issue 2316983002: Change capitalization FullScreen->Fullscreen where possible in Blink (Closed)
Patch Set: update test expectations 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 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 m_webMediaPlayer->setVolume(effectiveMediaVolume()); 1132 m_webMediaPlayer->setVolume(effectiveMediaVolume());
1133 1133
1134 m_webMediaPlayer->setPoster(posterImageURL()); 1134 m_webMediaPlayer->setPoster(posterImageURL());
1135 1135
1136 m_webMediaPlayer->setPreload(effectivePreloadType()); 1136 m_webMediaPlayer->setPreload(effectivePreloadType());
1137 1137
1138 m_webMediaPlayer->load(loadType(), source, corsMode()); 1138 m_webMediaPlayer->load(loadType(), source, corsMode());
1139 1139
1140 if (isFullscreen()) { 1140 if (isFullscreen()) {
1141 // This handles any transition to or from fullscreen overlay mode. 1141 // This handles any transition to or from fullscreen overlay mode.
1142 frame->chromeClient().enterFullScreenForElement(this); 1142 frame->chromeClient().enterFullscreenForElement(this);
1143 } 1143 }
1144 } 1144 }
1145 1145
1146 void HTMLMediaElement::setPlayerPreload() 1146 void HTMLMediaElement::setPlayerPreload()
1147 { 1147 {
1148 if (m_webMediaPlayer) 1148 if (m_webMediaPlayer)
1149 m_webMediaPlayer->setPreload(effectivePreloadType()); 1149 m_webMediaPlayer->setPreload(effectivePreloadType());
1150 1150
1151 if (loadIsDeferred() && effectivePreloadType() != WebMediaPlayer::PreloadNon e) 1151 if (loadIsDeferred() && effectivePreloadType() != WebMediaPlayer::PreloadNon e)
1152 startDeferredLoad(); 1152 startDeferredLoad();
(...skipping 2874 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