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

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 732d2f3c1b28a3b8ed5d8083cd5842d1600cb1b8
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 00:06:15 2010 +0000

    2010-08-09  Kenneth Russell  <kbr at google.com>
    
            Reviewed by David Levin.
    
            Fix compilation of VideoLayerChromium on Mac OS X with compositor
            https://bugs.webkit.org/show_bug.cgi?id=43757
    
            No new tests; build fix only (associated functionality not implemented yet).
    
            * platform/graphics/chromium/VideoLayerChromium.cpp:
            (WebCore::VideoLayerChromium::VideoLayerChromium):
            (WebCore::VideoLayerChromium::updateTextureContents):
            (WebCore::VideoLayerChromium::createTextureRect):
            (WebCore::VideoLayerChromium::updateTextureRect):
            * platform/graphics/chromium/VideoLayerChromium.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65018 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1a67ff6..9cbbba3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-09  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by David Levin.
+
+        Fix compilation of VideoLayerChromium on Mac OS X with compositor
+        https://bugs.webkit.org/show_bug.cgi?id=43757
+
+        No new tests; build fix only (associated functionality not implemented yet).
+
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+        (WebCore::VideoLayerChromium::VideoLayerChromium):
+        (WebCore::VideoLayerChromium::updateTextureContents):
+        (WebCore::VideoLayerChromium::createTextureRect):
+        (WebCore::VideoLayerChromium::updateTextureRect):
+        * platform/graphics/chromium/VideoLayerChromium.h:
+
 2010-08-09  Ariya Hidayat  <ariya at sencha.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index 440b502..89b6ec1 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -56,8 +56,10 @@ PassRefPtr<VideoLayerChromium> VideoLayerChromium::create(GraphicsLayerChromium*
 VideoLayerChromium::VideoLayerChromium(GraphicsLayerChromium* owner)
     : LayerChromium(owner)
     , m_allocatedTextureId(0)
+#if PLATFORM(SKIA)
     , m_canvas(0)
     , m_skiaContext(0)
+#endif
     , m_graphicsContext(0)
 {
 }
@@ -114,7 +116,8 @@ void VideoLayerChromium::updateTextureContents(unsigned textureId)
     else
         updateTextureRect(dirtyRect, textureId);
 #else
-#error "Need to implement for your platform."
+    // FIXME: Implement non-skia path
+    notImplemented();
 #endif
 }
 
@@ -122,12 +125,13 @@ void VideoLayerChromium::createTextureRect(const IntSize& requiredTextureSize, c
 {
     // Paint into graphics context and get bitmap.
     m_owner->paintGraphicsLayerContents(*m_graphicsContext, updateRect);
+    void* pixels = 0;
+    IntSize bitmapSize = IntSize();
+#if PLATFORM(SKIA)
     const SkBitmap& bitmap = m_canvas->getDevice()->accessBitmap(false);
     const SkBitmap* skiaBitmap = &bitmap;
     ASSERT(skiaBitmap);
 
-    void* pixels = 0;
-    IntSize bitmapSize;
     SkAutoLockPixels lock(*skiaBitmap);
     SkBitmap::Config skiaConfig = skiaBitmap->config();
     // FIXME: Do we need to support more image configurations?
@@ -135,7 +139,10 @@ void VideoLayerChromium::createTextureRect(const IntSize& requiredTextureSize, c
         pixels = skiaBitmap->getPixels();
         bitmapSize = IntSize(skiaBitmap->width(), skiaBitmap->height());
     }
-
+#else
+    // FIXME: Implement non-skia path
+    notImplemented();
+#endif
     if (!pixels)
         return;
 
@@ -151,6 +158,7 @@ void VideoLayerChromium::createTextureRect(const IntSize& requiredTextureSize, c
 
 void VideoLayerChromium::updateTextureRect(const IntRect& updateRect, unsigned textureId)
 {
+#if PLATFORM(SKIA)
     const SkBitmap& bitmap = m_canvas->getDevice()->accessBitmap(true);
     SkBitmap* skiaBitmap = const_cast<SkBitmap*>(&bitmap);
     ASSERT(skiaBitmap);
@@ -167,6 +175,10 @@ void VideoLayerChromium::updateTextureRect(const IntRect& updateRect, unsigned t
     }
 
     updateCompleted();
+#else
+    // FIXME: Implement non-skia path
+    notImplemented();
+#endif
 }
 
 void VideoLayerChromium::updateCompleted()
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.h b/WebCore/platform/graphics/chromium/VideoLayerChromium.h
index 80248eb..746299f 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.h
@@ -53,8 +53,10 @@ private:
 
     unsigned m_allocatedTextureId;
     IntSize m_allocatedTextureSize;
+#if PLATFORM(SKIA)
     OwnPtr<skia::PlatformCanvas> m_canvas;
     OwnPtr<PlatformContextSkia> m_skiaContext;
+#endif
     OwnPtr<GraphicsContext> m_graphicsContext;
 };
 

-- 
WebKit Debian packaging