Changeset 86264 in webkit

Timestamp:

May 11, 2011 2:02:58 PM (13 years ago)

Author:

noam.rosenthal@nokia.com

Message:

2011-05-11 Noam Rosenthal <​noam.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
​https://bugs.webkit.org/show_bug.cgi?id=60439

Patch 1/12: Change the TextureMapperPlatformLayer API to allow a 3D-context or a
media player to decide how to paint into the TextureMapper, rather than mandate specific
types of platform layers.

No new tests. Tests in LayoutTests/compositing test this.

• platform/graphics/GraphicsLayer.h:
• platform/graphics/texmap/TextureMapperPlatformLayer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsLayer.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapperPlatformLayer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-11  Noam Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Texmap][Qt] Upstream texture-mapper changes from Qt's WebKit2 branch
+        https://bugs.webkit.org/show_bug.cgi?id=60439
+
+        Patch 1/12: Change the TextureMapperPlatformLayer API to allow a 3D-context or a
+        media player to decide how to paint into the TextureMapper, rather than mandate specific
+        types of platform layers.
+
+        No new tests. Tests in LayoutTests/compositing test this.
+
+        * platform/graphics/GraphicsLayer.h:
+        * platform/graphics/texmap/TextureMapperPlatformLayer.h:
+
 2011-05-11  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

@@ -41 +41 @@
 #include <wtf/PassOwnPtr.h>
 
-#if USE(TEXTURE_MAPPER)
-#include "texmap/TextureMapperPlatformLayer.h"
-#endif
-
 #if PLATFORM(MAC)
 #ifdef __OBJC__

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

@@ -21 +21 @@
 #define TextureMapperPlatformLayer_h
 
+#include "FloatRect.h"
+#include "TransformationMatrix.h"
+
 namespace WebCore {
 
-class GraphicsContext;
-class IntRect;
-class IntSize;
 class TextureMapper;
-class TransformationMatrix;
-
-
-// Glue layer to connect the texmap layer to the platform specific container.
-class TextureMapperLayerClient {
-public:
-    virtual ~TextureMapperLayerClient() {}
-    virtual void setNeedsDisplay() = 0;
-    virtual void setNeedsDisplayInRect(const IntRect& rect) = 0;
-    virtual void setSizeChanged(const IntSize&) = 0;
-    virtual TextureMapper* textureMapper() = 0;
-};
+class BitmapTexture;
 
 class TextureMapperPlatformLayer {
 public:
-    enum Type {
-        ContentLayer,
-        MediaLayer
-    };
-
-    virtual Type layerType() const = 0;
-    virtual ~TextureMapperPlatformLayer() {}
+    virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TransformationMatrix& modelViewMatrix = TransformationMatrix(), float opacity = 1.0, BitmapTexture* mask = 0) const = 0;
 };
 
-class TextureMapperContentLayer : public TextureMapperPlatformLayer {
-public:
-    struct PaintOptions {
-        IntRect visibleRect;
-        IntRect targetRect;
-        IntSize viewportSize;
-        TransformationMatrix transform;
-        float opacity;
-    };
-
-    virtual void setPlatformLayerClient(TextureMapperLayerClient*) = 0;
-    virtual void paint(TextureMapper*, const PaintOptions&) {}
-    virtual IntSize size() const = 0;
-    virtual Type layerType() const { return ContentLayer; }
 };
 
-class TextureMapperMediaLayer : public TextureMapperPlatformLayer {
-public:
-    virtual void paint(GraphicsContext*) = 0;
-    virtual Type layerType() const { return MediaLayer; }
-};
-
-}
-
 #endif // TextureMapperPlatformLayer_h