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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMedia.cpp

Issue 2795783004: Move core MediaControls implementation to modules/media_controls/. (Closed)
Patch Set: rebase Created 3 years, 8 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 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 10 matching lines...) Expand all
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 "core/layout/LayoutMedia.h" 26 #include "core/layout/LayoutMedia.h"
27 27
28 #include "core/frame/FrameView.h" 28 #include "core/frame/FrameView.h"
29 #include "core/frame/VisualViewport.h" 29 #include "core/frame/VisualViewport.h"
30 #include "core/html/HTMLMediaElement.h" 30 #include "core/html/HTMLMediaElement.h"
31 #include "core/html/shadow/MediaControls.h" 31 #include "core/html/media/MediaControls.h"
32 #include "core/layout/LayoutView.h" 32 #include "core/layout/LayoutView.h"
33 #include "core/page/Page.h" 33 #include "core/page/Page.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 LayoutMedia::LayoutMedia(HTMLMediaElement* video) : LayoutImage(video) { 37 LayoutMedia::LayoutMedia(HTMLMediaElement* video) : LayoutImage(video) {
38 setImageResource(LayoutImageResource::create()); 38 setImageResource(LayoutImageResource::create());
39 } 39 }
40 40
41 LayoutMedia::~LayoutMedia() {} 41 LayoutMedia::~LayoutMedia() {}
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 .x()); 153 .x());
154 const LayoutUnit newWidth = visibleWidth - absoluteXOffset; 154 const LayoutUnit newWidth = visibleWidth - absoluteXOffset;
155 155
156 if (newWidth < 0) 156 if (newWidth < 0)
157 return mediaRect.width(); 157 return mediaRect.width();
158 158
159 return std::min(mediaRect.width(), visibleWidth - absoluteXOffset); 159 return std::min(mediaRect.width(), visibleWidth - absoluteXOffset);
160 } 160 }
161 161
162 } // namespace blink 162 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698