summaryrefslogtreecommitdiffstats
path: root/webkit/media
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 19:32:04 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-11 19:32:04 +0000
commitc91f49440d1251103210637f91567849e0ade62a (patch)
tree2ccbd87b3519bdf2d08c874c448fdeb50c4a7745 /webkit/media
parent871da305e61696753db715bf68fedec2b071fde4 (diff)
downloadchromium_src-c91f49440d1251103210637f91567849e0ade62a.zip
chromium_src-c91f49440d1251103210637f91567849e0ade62a.tar.gz
chromium_src-c91f49440d1251103210637f91567849e0ade62a.tar.bz2
remove WEBKIT_USING_SKIA
WEBKIT_USING_SKIA is always set, so having the #ifdef isn't helpful. This just removes the guards. BUG=none TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10391041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r--webkit/media/webmediaplayer_impl.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 56fe552..272b103 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -130,16 +130,12 @@ class WebMediaPlayerImpl
// Methods for painting.
virtual void setSize(const WebKit::WebSize& size);
-#if WEBKIT_USING_SKIA
// This variant (without alpha) is just present during staging of this API
// change. Later we will again only have one virtual paint().
virtual void paint(WebKit::WebCanvas* canvas, const WebKit::WebRect& rect);
virtual void paint(WebKit::WebCanvas* canvas,
const WebKit::WebRect& rect,
uint8_t alpha);
-#else
- virtual void paint(WebKit::WebCanvas* canvas, const WebKit::WebRect& rect);
-#endif
// True if the loaded media has a playable video/audio track.
virtual bool hasVideo() const;