[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 8596beebad8c42952108ec46b67e16f98bfff9a8
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 03:47:24 2010 +0000

    2010-01-10  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Darin Adler.
    
            Allows plugins to participate in accelerated compositing
            https://bugs.webkit.org/show_bug.cgi?id=33455
    
            Part 1: rename setContentsToVideo() on GraphicsLayer to setContentsToMedia()
            to make it more general. Rename associated enums and methods similarly.
    
            * platform/graphics/GraphicsLayer.h:
            (WebCore::GraphicsLayer::setContentsToMedia):
            * platform/graphics/mac/GraphicsLayerCA.h:
            (WebCore::GraphicsLayerCA::):
            * platform/graphics/mac/GraphicsLayerCA.mm:
            (WebCore::GraphicsLayerCA::setContentsToMedia):
            (WebCore::GraphicsLayerCA::commitLayerChanges):
            (WebCore::GraphicsLayerCA::updateContentsMediaLayer):
            * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
            (WebCore::MediaPlayerPrivate::createQTMovieLayer):
            (WebCore::MediaPlayerPrivate::acceleratedRenderingStateChanged):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c6dcc5a..8762eb5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-01-10  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Allows plugins to participate in accelerated compositing
+        https://bugs.webkit.org/show_bug.cgi?id=33455
+
+        Part 1: rename setContentsToVideo() on GraphicsLayer to setContentsToMedia()
+        to make it more general. Rename associated enums and methods similarly.
+
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::setContentsToMedia):
+        * platform/graphics/mac/GraphicsLayerCA.h:
+        (WebCore::GraphicsLayerCA::):
+        * platform/graphics/mac/GraphicsLayerCA.mm:
+        (WebCore::GraphicsLayerCA::setContentsToMedia):
+        (WebCore::GraphicsLayerCA::commitLayerChanges):
+        (WebCore::GraphicsLayerCA::updateContentsMediaLayer):
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivate::createQTMovieLayer):
+        (WebCore::MediaPlayerPrivate::acceleratedRenderingStateChanged):
+
 2010-01-10  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Nikolas Zimmerman.
diff --git a/WebCore/platform/graphics/GraphicsLayer.h b/WebCore/platform/graphics/GraphicsLayer.h
index 1ad7a1e..c0b0245 100644
--- a/WebCore/platform/graphics/GraphicsLayer.h
+++ b/WebCore/platform/graphics/GraphicsLayer.h
@@ -270,7 +270,7 @@ public:
     
     // Layer contents
     virtual void setContentsToImage(Image*) { }
-    virtual void setContentsToVideo(PlatformLayer*) { }
+    virtual void setContentsToMedia(PlatformLayer*) { } // video or plug-in
     virtual void setContentsBackgroundColor(const Color&) { }
     
 #if ENABLE(3D_CANVAS)
diff --git a/WebCore/platform/graphics/mac/GraphicsLayerCA.h b/WebCore/platform/graphics/mac/GraphicsLayerCA.h
index 38506f6..42e27bc 100644
--- a/WebCore/platform/graphics/mac/GraphicsLayerCA.h
+++ b/WebCore/platform/graphics/mac/GraphicsLayerCA.h
@@ -104,7 +104,7 @@ public:
     virtual void pauseAnimation(const String& keyframesName, double timeOffset);
     
     virtual void setContentsToImage(Image*);
-    virtual void setContentsToVideo(PlatformLayer*);
+    virtual void setContentsToMedia(PlatformLayer*);
 #if ENABLE(3D_CANVAS)
     virtual void setContentsToGraphicsContext3D(const GraphicsContext3D*);
 #endif
@@ -178,7 +178,7 @@ private:
     void updateLayerBackgroundColor();
 
     void updateContentsImage();
-    void updateContentsVideo();
+    void updateContentsMediaLayer();
 #if ENABLE(3D_CANVAS)
     void updateContentsGraphicsContext3D();
 #endif
@@ -219,7 +219,7 @@ private:
         AnimationChanged = 1 << 15,
         DirtyRectsChanged = 1 << 16,
         ContentsImageChanged = 1 << 17,
-        ContentsVideoChanged = 1 << 18,
+        ContentsMediaLayerChanged = 1 << 18,
 #if ENABLE(3D_CANVAS)
         ContentsGraphicsContext3DChanged = 1 << 19,
 #endif
@@ -239,7 +239,7 @@ private:
     enum ContentsLayerPurpose {
         NoContentsLayer = 0,
         ContentsLayerForImage,
-        ContentsLayerForVideo
+        ContentsLayerForMedia
 #if ENABLE(3D_CANVAS)
         ,ContentsLayerForGraphicsLayer3D
 #endif
diff --git a/WebCore/platform/graphics/mac/GraphicsLayerCA.mm b/WebCore/platform/graphics/mac/GraphicsLayerCA.mm
index e32f3e7..a707a62 100644
--- a/WebCore/platform/graphics/mac/GraphicsLayerCA.mm
+++ b/WebCore/platform/graphics/mac/GraphicsLayerCA.mm
@@ -728,15 +728,15 @@ void GraphicsLayerCA::setContentsToImage(Image* image)
     noteLayerPropertyChanged(ContentsImageChanged);
 }
 
-void GraphicsLayerCA::setContentsToVideo(PlatformLayer* videoLayer)
+void GraphicsLayerCA::setContentsToMedia(PlatformLayer* mediaLayer)
 {
-    if (videoLayer != m_contentsLayer.get())
+    if (mediaLayer != m_contentsLayer.get())
         noteLayerPropertyChanged(ChildrenChanged);
 
-    m_contentsLayer = videoLayer;
-    noteLayerPropertyChanged(ContentsVideoChanged);
+    m_contentsLayer = mediaLayer;
+    noteLayerPropertyChanged(ContentsMediaLayerChanged);
 
-    m_contentsLayerPurpose = videoLayer ? ContentsLayerForVideo : NoContentsLayer;
+    m_contentsLayerPurpose = mediaLayer ? ContentsLayerForMedia : NoContentsLayer;
 }
 
 void GraphicsLayerCA::setGeometryOrientation(CompositingCoordinatesOrientation orientation)
@@ -798,8 +798,8 @@ void GraphicsLayerCA::commitLayerChanges()
     if (m_uncommittedChanges & ContentsImageChanged) // Needs to happen before ChildrenChanged
         updateContentsImage();
         
-    if (m_uncommittedChanges & ContentsVideoChanged) // Needs to happen before ChildrenChanged
-        updateContentsVideo();
+    if (m_uncommittedChanges & ContentsMediaLayerChanged) // Needs to happen before ChildrenChanged
+        updateContentsMediaLayer();
     
 #if ENABLE(3D_CANVAS)
     if (m_uncommittedChanges & ContentsGraphicsContext3DChanged) // Needs to happen before ChildrenChanged
@@ -1147,7 +1147,7 @@ void GraphicsLayerCA::updateContentsImage()
     }
 }
 
-void GraphicsLayerCA::updateContentsVideo()
+void GraphicsLayerCA::updateContentsMediaLayer()
 {
     // Video layer was set as m_contentsLayer, and will get parented in updateSublayerList().
     if (m_contentsLayer) {
diff --git a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
index dfb5958..ff5a9df 100644
--- a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+++ b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
@@ -449,7 +449,7 @@ void MediaPlayerPrivate::createQTMovieLayer()
         // later via acceleratedRenderingStateChanged().
         GraphicsLayer* videoGraphicsLayer = m_player->mediaPlayerClient()->mediaPlayerGraphicsLayer(m_player);
         if (videoGraphicsLayer)
-            videoGraphicsLayer->setContentsToVideo((PlatformLayer *)m_qtVideoLayer.get());
+            videoGraphicsLayer->setContentsToMedia(m_qtVideoLayer.get());
     }
 #endif
 }
@@ -1404,7 +1404,7 @@ void MediaPlayerPrivate::acceleratedRenderingStateChanged()
     if (currentRenderingMode() == MediaRenderingMovieLayer) {
         GraphicsLayer* videoGraphicsLayer = m_player->mediaPlayerClient()->mediaPlayerGraphicsLayer(m_player);
         if (videoGraphicsLayer)
-            videoGraphicsLayer->setContentsToVideo((PlatformLayer *)m_qtVideoLayer.get());
+            videoGraphicsLayer->setContentsToMedia(m_qtVideoLayer.get());
     }
 }
 #endif

-- 
WebKit Debian packaging