Changeset 82199 in webkit

Timestamp:

Mar 28, 2011 11:32:36 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-28 Kwang Yul Seo <​skyul@company100.net>

Reviewed by Benjamin Poulain.

[Qt] Change TextureMapperVideoLayer to TextureMapperMediaLayer
​https://bugs.webkit.org/show_bug.cgi?id=57142

TextureMapperMediaLayer is a better name here because both video and plugins use this layer.
Remove ENABLE(VIDEO) guard.

• platform/graphics/qt/MediaPlayerPrivateQt.cpp:
• platform/graphics/qt/MediaPlayerPrivateQt.h:
• platform/graphics/texmap/GraphicsLayerTextureMapper.cpp: (WebCore::GraphicsLayerTextureMapper::setContentsToMedia):
• platform/graphics/texmap/TextureMapperNode.h:
• platform/graphics/texmap/TextureMapperPlatformLayer.h: (WebCore::TextureMapperMediaLayer::layerType):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (1 diff)
• platform/graphics/qt/MediaPlayerPrivateQt.h (modified) (2 diffs)
• platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (modified) (1 diff)
• platform/graphics/texmap/TextureMapperNode.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapperPlatformLayer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-28  Kwang Yul Seo  <skyul@company100.net>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Change TextureMapperVideoLayer to TextureMapperMediaLayer
+        https://bugs.webkit.org/show_bug.cgi?id=57142
+
+        TextureMapperMediaLayer is a better name here because both video and plugins use this layer.
+        Remove ENABLE(VIDEO) guard.
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        * platform/graphics/qt/MediaPlayerPrivateQt.h:
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::setContentsToMedia):
+        * platform/graphics/texmap/TextureMapperNode.h:
+        * platform/graphics/texmap/TextureMapperPlatformLayer.h:
+        (WebCore::TextureMapperMediaLayer::layerType):
+
 2011-03-28  Thomas Klausner  <tk@giga.or.at>
 

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -598 +598 @@
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
 
-class TextureMapperVideoLayerQt : public virtual TextureMapperVideoLayer {
+class TextureMapperVideoLayerQt : public virtual TextureMapperMediaLayer {
 public:
     TextureMapperVideoLayerQt(QGraphicsVideoItem* videoItem)

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h

@@ -34 +34 @@
 namespace WebCore {
 
-class TextureMapperVideoLayer;
+class TextureMapperMediaLayer;
 
 class MediaPlayerPrivateQt : public QObject, public MediaPlayerPrivateInterface {
@@ -140 +140 @@
     QGraphicsScene* m_videoScene;
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
-    OwnPtr<TextureMapperVideoLayer> m_platformLayer;
+    OwnPtr<TextureMapperMediaLayer> m_platformLayer;
 #endif
 

trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp

@@ -337 +337 @@
     m_pendingContent.contentType = media ? TextureMapperNode::MediaContentType : TextureMapperNode::HTMLContentType;
     if (media)
-        m_pendingContent.media = static_cast<TextureMapperVideoLayer*>(media);
+        m_pendingContent.media = static_cast<TextureMapperMediaLayer*>(media);
     else
         m_pendingContent.media = 0;

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperNode.h

@@ -95 +95 @@
         ContentType contentType;
         RefPtr<Image> image;
-        TextureMapperVideoLayer* media;
+        TextureMapperMediaLayer* media;
 
         ContentData()

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h

@@ -44 +44 @@
     enum Type {
         ContentLayer,
-        VideoLayer
+        MediaLayer
     };
 
@@ -67 +67 @@
 };
 
-#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
 
 }