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

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

Issue 306123003: Eliminate MediaPlayer & MediaPlayerClient abstractions(seek, duration, poster APIs) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed review comments Created 6 years, 6 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 updateDisplayState(); 108 updateDisplayState();
109 if (shouldDisplayPosterImage()) { 109 if (shouldDisplayPosterImage()) {
110 if (!m_imageLoader) 110 if (!m_imageLoader)
111 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); 111 m_imageLoader = adoptPtr(new HTMLImageLoader(this));
112 m_imageLoader->updateFromElementIgnoringPreviousError(); 112 m_imageLoader->updateFromElementIgnoringPreviousError();
113 } else { 113 } else {
114 if (renderer()) 114 if (renderer())
115 toRenderImage(renderer())->imageResource()->setImageResource(0); 115 toRenderImage(renderer())->imageResource()->setImageResource(0);
116 } 116 }
117 // Notify the player when the poster image URL changes. 117 // Notify the player when the poster image URL changes.
118 if (player()) 118 if (webMediaPlayer())
119 player()->setPoster(posterImageURL()); 119 webMediaPlayer()->setPoster(posterImageURL());
120 } else 120 } else
121 HTMLMediaElement::parseAttribute(name, value); 121 HTMLMediaElement::parseAttribute(name, value);
122 } 122 }
123 123
124 bool HTMLVideoElement::supportsFullscreen() const 124 bool HTMLVideoElement::supportsFullscreen() const
125 { 125 {
126 if (!document().page()) 126 if (!document().page())
127 return false; 127 return false;
128 128
129 if (!player()) 129 if (!player())
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 { 299 {
300 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c())); 300 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c()));
301 } 301 }
302 302
303 FloatSize HTMLVideoElement::sourceSize() const 303 FloatSize HTMLVideoElement::sourceSize() const
304 { 304 {
305 return FloatSize(videoWidth(), videoHeight()); 305 return FloatSize(videoWidth(), videoHeight());
306 } 306 }
307 307
308 } 308 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698