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

Side by Side Diff: Source/core/html/HTMLVideoElement.cpp

Issue 388803005: Eliminate MediaPlayer abstraction(seek, duration, poster APIs) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: updated as per review Created 6 years, 5 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
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/platform/graphics/media/MediaPlayer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 updateDisplayState(); 116 updateDisplayState();
117 if (shouldDisplayPosterImage()) { 117 if (shouldDisplayPosterImage()) {
118 if (!m_imageLoader) 118 if (!m_imageLoader)
119 m_imageLoader = HTMLImageLoader::create(this); 119 m_imageLoader = HTMLImageLoader::create(this);
120 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr ror); 120 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr ror);
121 } else { 121 } else {
122 if (renderer()) 122 if (renderer())
123 toRenderImage(renderer())->imageResource()->setImageResource(0); 123 toRenderImage(renderer())->imageResource()->setImageResource(0);
124 } 124 }
125 // Notify the player when the poster image URL changes. 125 // Notify the player when the poster image URL changes.
126 if (player()) 126 if (webMediaPlayer())
127 player()->setPoster(posterImageURL()); 127 webMediaPlayer()->setPoster(posterImageURL());
128 } else 128 } else
129 HTMLMediaElement::parseAttribute(name, value); 129 HTMLMediaElement::parseAttribute(name, value);
130 } 130 }
131 131
132 bool HTMLVideoElement::supportsFullscreen() const 132 bool HTMLVideoElement::supportsFullscreen() const
133 { 133 {
134 if (!document().page()) 134 if (!document().page())
135 return false; 135 return false;
136 136
137 if (!player()) 137 if (!player())
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 { 307 {
308 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c())); 308 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c()));
309 } 309 }
310 310
311 FloatSize HTMLVideoElement::sourceSize() const 311 FloatSize HTMLVideoElement::sourceSize() const
312 { 312 {
313 return FloatSize(videoWidth(), videoHeight()); 313 return FloatSize(videoWidth(), videoHeight());
314 } 314 }
315 315
316 } 316 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/platform/graphics/media/MediaPlayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698