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

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

Issue 568763002: Replace HTMLMediaElement::player() calls with webMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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.h ('k') | Source/core/rendering/RenderVideo.cpp » ('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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 webMediaPlayer()->setPoster(posterImageURL()); 130 webMediaPlayer()->setPoster(posterImageURL());
131 } else 131 } else
132 HTMLMediaElement::parseAttribute(name, value); 132 HTMLMediaElement::parseAttribute(name, value);
133 } 133 }
134 134
135 bool HTMLVideoElement::supportsFullscreen() const 135 bool HTMLVideoElement::supportsFullscreen() const
136 { 136 {
137 if (!document().page()) 137 if (!document().page())
138 return false; 138 return false;
139 139
140 if (!player()) 140 if (!webMediaPlayer())
141 return false; 141 return false;
142 142
143 return true; 143 return true;
144 } 144 }
145 145
146 unsigned HTMLVideoElement::videoWidth() const 146 unsigned HTMLVideoElement::videoWidth() const
147 { 147 {
148 if (!webMediaPlayer()) 148 if (!webMediaPlayer())
149 return 0; 149 return 0;
150 return webMediaPlayer()->naturalSize().width; 150 return webMediaPlayer()->naturalSize().width;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 { 316 {
317 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c())); 317 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c()));
318 } 318 }
319 319
320 FloatSize HTMLVideoElement::sourceSize() const 320 FloatSize HTMLVideoElement::sourceSize() const
321 { 321 {
322 return FloatSize(videoWidth(), videoHeight()); 322 return FloatSize(videoWidth(), videoHeight());
323 } 323 }
324 324
325 } 325 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/rendering/RenderVideo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698