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

Side by Side Diff: Source/core/rendering/RenderVideo.cpp

Issue 851073003: Remove unused includes of platform/graphics/media/MediaPlayer.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27
28 #include "core/rendering/RenderVideo.h" 27 #include "core/rendering/RenderVideo.h"
29 28
30 #include "core/HTMLNames.h" 29 #include "core/HTMLNames.h"
31 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
32 #include "core/frame/FrameView.h"
33 #include "core/frame/LocalFrame.h"
34 #include "core/html/HTMLVideoElement.h" 31 #include "core/html/HTMLVideoElement.h"
35 #include "core/paint/VideoPainter.h" 32 #include "core/paint/VideoPainter.h"
36 #include "core/rendering/PaintInfo.h" 33 #include "core/rendering/PaintInfo.h"
37 #include "core/rendering/RenderFullScreen.h" 34 #include "core/rendering/RenderFullScreen.h"
38 #include "platform/graphics/media/MediaPlayer.h"
39 #include "public/platform/WebLayer.h" 35 #include "public/platform/WebLayer.h"
40 36
41 namespace blink { 37 namespace blink {
42 38
43 using namespace HTMLNames; 39 using namespace HTMLNames;
44 40
45 RenderVideo::RenderVideo(HTMLVideoElement* video) 41 RenderVideo::RenderVideo(HTMLVideoElement* video)
46 : RenderMedia(video) 42 : RenderMedia(video)
47 { 43 {
48 setIntrinsicSize(calculateIntrinsicSize()); 44 setIntrinsicSize(calculateIntrinsicSize());
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 return CompositingReasonVideo; 250 return CompositingReasonVideo;
255 } 251 }
256 252
257 if (shouldDisplayVideo() && supportsAcceleratedRendering()) 253 if (shouldDisplayVideo() && supportsAcceleratedRendering())
258 return CompositingReasonVideo; 254 return CompositingReasonVideo;
259 255
260 return CompositingReasonNone; 256 return CompositingReasonNone;
261 } 257 }
262 258
263 } // namespace blink 259 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/VideoPainter.cpp ('k') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698