[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jer.noble at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3b55f84dea8da1f613853a6873e27df93f46e519
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 06:52:42 2010 +0000

    No review; build fix only.
    
    <CoreGraphics/CGAffineTransform.h> isn't on the build bots either.  Wrap
    all references to m_movieTransform in #if USE(ACCELERATED_COMPOSITING) guards.
    
    * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
    (WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):
    (WebCore::MediaPlayerPrivateQuickTimeVisualContext::naturalSize):
    (WebCore::MediaPlayerPrivateQuickTimeVisualContext::retrieveAndResetMovieTransform):
    * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7b7b9da..55dd5a0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         No review; build fix only.
 
+        <CoreGraphics/CGAffineTransform.h> isn't on the build bots either.  Wrap
+        all references to m_movieTransform in #if USE(ACCELERATED_COMPOSITING) guards.
+        
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::naturalSize):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::retrieveAndResetMovieTransform):
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
+
+2010-09-10  Jer Noble  <jer.noble at apple.com>
+
+        No review; build fix only.
+
         <CoreGraphics/CGFloat.h> does not exist on the build bots.  Replace
         instances of CGFAbs() with abs().
 
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
index 1205fca..e864753 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
@@ -171,9 +171,9 @@ MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualConte
 #if USE(ACCELERATED_COMPOSITING)
     , m_layerClient(new MediaPlayerPrivateQuickTimeVisualContext::LayerClient(this))
     , m_layoutClient(new MediaPlayerPrivateQuickTimeVisualContext::LayoutClient(this))
+    , m_movieTransform(CGAffineTransformIdentity)
 #endif
     , m_visualContextClient(new MediaPlayerPrivateQuickTimeVisualContext::VisualContextClient(this))
-    , m_movieTransform(CGAffineTransformIdentity)
 {
 }
 
@@ -439,9 +439,13 @@ IntSize MediaPlayerPrivateQuickTimeVisualContext::naturalSize() const
     int width;
     int height;
     m_movie->getNaturalSize(width, height);
+#if USE(ACCELERATED_COMPOSITING)
     CGSize originalSize = {width, height};
     CGSize transformedSize = CGSizeApplyAffineTransform(originalSize, m_movieTransform);
     return IntSize(abs(transformedSize.width), abs(transformedSize.height));
+#else
+    return IntSize(width, height);
+#endif
 }
 
 bool MediaPlayerPrivateQuickTimeVisualContext::hasVideo() const
@@ -1056,6 +1060,7 @@ bool MediaPlayerPrivateQuickTimeVisualContext::hasSetUpVideoRendering() const
 
 void MediaPlayerPrivateQuickTimeVisualContext::retrieveAndResetMovieTransform()
 {
+#if USE(ACCELERATED_COMPOSITING)
     // First things first, reset the total movie transform so that
     // we can bail out early:
     m_movieTransform = CGAffineTransformIdentity;
@@ -1084,6 +1089,7 @@ void MediaPlayerPrivateQuickTimeVisualContext::retrieveAndResetMovieTransform()
     // Multiply the two transforms together, taking care to 
     // do so in the correct order, track * movie = final:
     m_movieTransform = CGAffineTransformConcat(trackTransform, movieTransform);
+#endif
 }
 
 void MediaPlayerPrivateQuickTimeVisualContext::createLayerForMovie()
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
index cc28e7b..272b90f 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
@@ -173,6 +173,7 @@ private:
     RefPtr<WKCACFLayer> m_qtVideoLayer;
     OwnPtr<GraphicsLayer> m_transformLayer;
     OwnPtr<WKCAImageQueue> m_imageQueue;
+    CGAffineTransform m_movieTransform; 
 #endif
     RefPtr<QTMovieVisualContext> m_visualContext;
     float m_seekTo;
@@ -193,7 +194,6 @@ private:
     double m_timeStartedPlaying;
     double m_timeStoppedPlaying;
 #endif
-    CGAffineTransform m_movieTransform; 
 
 };
 

-- 
WebKit Debian packaging