[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[kevino at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 598220a283c4fd540b2bb8c68731b174f3a285af
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 00:24:48 2010 +0000

    [wx] Build fixes. Move drawPattern implementation to the Image class like other platforms have it, and add a stub for a new LayoutTestController method.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54631 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eb74b48..6b60c46 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+
+2010-02-10  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix. Switch drawPattern to Image class like other platforms.
+
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/wx/ImageWx.cpp:
+        (WebCore::Image::drawPattern):
+
 2010-02-10  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/BitmapImage.h b/WebCore/platform/graphics/BitmapImage.h
index a743672..71606d1 100644
--- a/WebCore/platform/graphics/BitmapImage.h
+++ b/WebCore/platform/graphics/BitmapImage.h
@@ -169,7 +169,7 @@ protected:
 #endif
     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator);
 
-#if PLATFORM(WX) || (OS(WINCE) && !PLATFORM(QT))
+#if (OS(WINCE) && !PLATFORM(QT))
     virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform,
                              const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect);
 #endif
diff --git a/WebCore/platform/graphics/wx/ImageWx.cpp b/WebCore/platform/graphics/wx/ImageWx.cpp
index 6ca0f4b..c246ec1 100644
--- a/WebCore/platform/graphics/wx/ImageWx.cpp
+++ b/WebCore/platform/graphics/wx/ImageWx.cpp
@@ -176,17 +176,16 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst, const FloatR
         observer->didDraw(this);
 }
 
-void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace, CompositeOperator, const FloatRect& dstRect)
+void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace, CompositeOperator, const FloatRect& dstRect)
 {
-    if (!m_source.initialized())
-        return;
+    
 
 #if USE(WXGC)
     wxGCDC* context = (wxGCDC*)ctxt->platformContext();
-    wxGraphicsBitmap* bitmap = frameAtIndex(m_currentFrame);
+    wxGraphicsBitmap* bitmap = nativeImageForCurrentFrame();
 #else
     wxWindowDC* context = ctxt->platformContext();
-    wxBitmap* bitmap = frameAtIndex(m_currentFrame);
+    wxBitmap* bitmap = nativeImageForCurrentFrame();
 #endif
 
     if (!bitmap) // If it's too early we won't have an image yet.
@@ -261,9 +260,4 @@ void BitmapImage::invalidatePlatformData()
 
 }
 
-void Image::drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform, const FloatPoint& phase, ColorSpace, CompositeOperator, const FloatRect& destRect)
-{
-    notImplemented();
-}
-
 }
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 49d2ccf..c774759 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix. Add stub for new LayoutTestController method.
+
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        (LayoutTestController::numberOfPages):
+
 2010-02-10  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed. Roll out r54626, because it broke GTK and Win build.
diff --git a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
index 6d3b624..875b7ab 100644
--- a/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+++ b/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
@@ -365,3 +365,9 @@ int LayoutTestController::pageNumberForElementById(JSStringRef, float, float)
     // FIXME: implement
     return -1;
 }
+
+int LayoutTestController::numberOfPages(float, float)
+{
+    // FIXME: implement
+    return -1;
+}
\ No newline at end of file

-- 
WebKit Debian packaging