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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 32655523cea688e39b601689a0e2f474716a285f
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 31 18:59:42 2010 +0000

    2010-10-31  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Dirk Schulze.
    
            Remove the unused GraphicsContext::origin()
            https://bugs.webkit.org/show_bug.cgi?id=48732
    
            This method was not called from anywhere.
    
            * platform/graphics/GraphicsContext.h:
            * platform/graphics/cairo/GraphicsContextCairo.cpp:
            * platform/graphics/haiku/GraphicsContextHaiku.cpp:
            * platform/graphics/openvg/GraphicsContextOpenVG.cpp:
            * platform/graphics/qt/GraphicsContextQt.cpp:
            * platform/graphics/wince/GraphicsContextWinCE.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3e9dd99..14d7216 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Dirk Schulze.
 
+        Remove the unused GraphicsContext::origin()
+        https://bugs.webkit.org/show_bug.cgi?id=48732
+
+        This method was not called from anywhere.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        * platform/graphics/haiku/GraphicsContextHaiku.cpp:
+        * platform/graphics/openvg/GraphicsContextOpenVG.cpp:
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        * platform/graphics/wince/GraphicsContextWinCE.cpp:
+
+2010-10-31  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Dirk Schulze.
+
         [Qt] Remove GraphicsContext::pen()
         https://bugs.webkit.org/show_bug.cgi?id=48733
 
diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index ab79ea1..d7b94f0 100644
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -320,7 +320,6 @@ namespace WebCore {
         void rotate(float angleInRadians);
         void translate(const FloatSize& size) { translate(size.width(), size.height()); }
         void translate(float x, float y);
-        IntPoint origin();
 
         void setURLForRect(const KURL&, const IntRect&);
 
diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index 0847da1..4551e16 100644
--- a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -766,14 +766,6 @@ void GraphicsContext::translate(float x, float y)
     m_data->translate(x, y);
 }
 
-IntPoint GraphicsContext::origin()
-{
-    cairo_matrix_t matrix;
-    cairo_t* cr = m_data->cr;
-    cairo_get_matrix(cr, &matrix);
-    return IntPoint(static_cast<int>(matrix.x0), static_cast<int>(matrix.y0));
-}
-
 void GraphicsContext::setPlatformFillColor(const Color& col, ColorSpace colorSpace)
 {
     // Cairo contexts can't hold separate fill and stroke colors
diff --git a/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp b/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp
index 252abd7..3c15980 100644
--- a/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp
+++ b/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp
@@ -416,12 +416,6 @@ void GraphicsContext::translate(float x, float y)
     notImplemented();
 }
 
-IntPoint GraphicsContext::origin()
-{
-    notImplemented();
-    return IntPoint(0, 0);
-}
-
 void GraphicsContext::rotate(float radians)
 {
     if (paintingDisabled())
diff --git a/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp b/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp
index 37fd8ad..5c47cb9 100644
--- a/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp
+++ b/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp
@@ -452,15 +452,6 @@ void GraphicsContext::translate(float dx, float dy)
     m_data->translate(dx, dy);
 }
 
-IntPoint GraphicsContext::origin()
-{
-    if (paintingDisabled())
-        return IntPoint();
-
-    AffineTransform transformation = m_data->transformation();
-    return IntPoint(roundf(transformation.e()), roundf(transformation.f()));
-}
-
 void GraphicsContext::clipOut(const IntRect& rect)
 {
     if (paintingDisabled())
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 2fd35e4..de18d61 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1119,14 +1119,6 @@ void GraphicsContext::translate(float x, float y)
     }
 }
 
-IntPoint GraphicsContext::origin()
-{
-    if (paintingDisabled())
-        return IntPoint();
-    const QTransform &transform = m_data->p()->transform();
-    return IntPoint(qRound(transform.dx()), qRound(transform.dy()));
-}
-
 void GraphicsContext::rotate(float radians)
 {
     if (paintingDisabled())
diff --git a/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp b/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
index a11b8d8..975814e 100644
--- a/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
+++ b/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp
@@ -194,11 +194,6 @@ public:
             restore();
     }
 
-    IntPoint origin() const
-    {
-        return IntPoint(stableRound(-m_transform.e()), stableRound(-m_transform.f()));
-    }
-
     void translate(float x, float y)
     {
         m_transform.translate(x, y);
@@ -1159,11 +1154,6 @@ void GraphicsContext::rotate(float radians)
     m_data->rotate(radians);
 }
 
-IntPoint GraphicsContext::origin()
-{
-    return m_data->origin();
-}
-
 void GraphicsContext::scale(const FloatSize& size)
 {
     m_data->scale(size);

-- 
WebKit Debian packaging