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

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

Issue 48273013: Move MediaPlayer, IntSizeHash to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: move MediaPlayer and friends to platform/graphics/media 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
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
(...skipping 15 matching lines...) Expand all
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "core/rendering/RenderVideo.h" 28 #include "core/rendering/RenderVideo.h"
29 29
30 #include "HTMLNames.h" 30 #include "HTMLNames.h"
31 #include "core/dom/Document.h" 31 #include "core/dom/Document.h"
32 #include "core/html/HTMLVideoElement.h" 32 #include "core/html/HTMLVideoElement.h"
33 #include "core/frame/Frame.h" 33 #include "core/frame/Frame.h"
34 #include "core/frame/FrameView.h" 34 #include "core/frame/FrameView.h"
35 #include "core/page/Page.h" 35 #include "core/page/Page.h"
36 #include "core/platform/graphics/MediaPlayer.h"
37 #include "core/rendering/PaintInfo.h" 36 #include "core/rendering/PaintInfo.h"
38 #include "core/rendering/RenderFullScreen.h" 37 #include "core/rendering/RenderFullScreen.h"
38 #include "platform/graphics/media/MediaPlayer.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 using namespace HTMLNames; 42 using namespace HTMLNames;
43 43
44 RenderVideo::RenderVideo(HTMLVideoElement* video) 44 RenderVideo::RenderVideo(HTMLVideoElement* video)
45 : RenderMedia(video) 45 : RenderMedia(video)
46 { 46 {
47 setIntrinsicSize(calculateIntrinsicSize()); 47 setIntrinsicSize(calculateIntrinsicSize());
48 } 48 }
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 } 269 }
270 270
271 LayoutUnit RenderVideo::offsetHeight() const 271 LayoutUnit RenderVideo::offsetHeight() const
272 { 272 {
273 if (const RenderBlock* block = rendererPlaceholder(this)) 273 if (const RenderBlock* block = rendererPlaceholder(this))
274 return block->offsetHeight(); 274 return block->offsetHeight();
275 return RenderMedia::offsetHeight(); 275 return RenderMedia::offsetHeight();
276 } 276 }
277 277
278 } // namespace WebCore 278 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698