diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h')
-rw-r--r-- | Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h index 2a38b90..d2d646a 100644 --- a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h +++ b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h @@ -43,7 +43,7 @@ class TextureMapperPlatformLayer { public: enum Type { ContentLayer, - VideoLayer + MediaLayer }; virtual Type layerType() const = 0; @@ -66,13 +66,11 @@ public: virtual Type layerType() const { return ContentLayer; } }; -#if ENABLE(VIDEO) -class TextureMapperVideoLayer : public TextureMapperPlatformLayer { +class TextureMapperMediaLayer : public TextureMapperPlatformLayer { public: virtual void paint(GraphicsContext*) = 0; - virtual Type layerType() const { return VideoLayer; } + virtual Type layerType() const { return MediaLayer; } }; -#endif } |