[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 c1b723f95a526053f339d3db0452f946ae2786d6
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 31 18:57:45 2010 +0000

    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
    
            Have PathQt obtain the pen() through the platformContext() instead.
    
            * platform/graphics/GraphicsContext.h:
            * platform/graphics/qt/GraphicsContextQt.cpp:
            * platform/graphics/qt/PathQt.cpp:
            (WebCore::Path::strokeContains):
            (WebCore::Path::strokeBoundingRect):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e4828fe..3e9dd99 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+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
+
+        Have PathQt obtain the pen() through the platformContext() instead.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::strokeContains):
+        (WebCore::Path::strokeBoundingRect):
+
 2010-10-31  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r70959.
diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index 2465a7c..ab79ea1 100644
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -399,7 +399,6 @@ namespace WebCore {
         bool inTransparencyLayer() const;
         PlatformPath* currentPath();
         void pushTransparencyLayerInternal(const QRect &rect, qreal opacity, QPixmap& alphaMask);
-        QPen pen();
         static QPainter::CompositionMode toQtCompositionMode(CompositeOperator op);
 #endif
 
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 50971b5..2fd35e4 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -507,15 +507,6 @@ void GraphicsContext::clipConvexPolygon(size_t numPoints, const FloatPoint* poin
     m_data->p()->setClipPath(path, Qt::IntersectClip);
 }
 
-QPen GraphicsContext::pen()
-{
-    if (paintingDisabled())
-        return QPen();
-
-    QPainter* p = m_data->p();
-    return p->pen();
-}
-
 void GraphicsContext::fillPath()
 {
     if (paintingDisabled())
diff --git a/WebCore/platform/graphics/qt/PathQt.cpp b/WebCore/platform/graphics/qt/PathQt.cpp
index 508ba6a..b686fef 100644
--- a/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/WebCore/platform/graphics/qt/PathQt.cpp
@@ -134,10 +134,10 @@ bool Path::strokeContains(StrokeStyleApplier* applier, const FloatPoint& point)
     ASSERT(applier);
 
     QPainterPathStroker stroke;
-    GraphicsContext* gc = scratchContext();
-    applier->strokeStyle(gc);
+    GraphicsContext* context = scratchContext();
+    applier->strokeStyle(context);
 
-    QPen pen = gc->pen();
+    QPen pen = context->platformContext()->pen();
     stroke.setWidth(pen.widthF());
     stroke.setCapStyle(pen.capStyle());
     stroke.setJoinStyle(pen.joinStyle());
@@ -162,12 +162,12 @@ FloatRect Path::boundingRect() const
 
 FloatRect Path::strokeBoundingRect(StrokeStyleApplier* applier)
 {
-    GraphicsContext* gc = scratchContext();
+    GraphicsContext* context = scratchContext();
     QPainterPathStroker stroke;
     if (applier) {
-        applier->strokeStyle(gc);
+        applier->strokeStyle(context);
 
-        QPen pen = gc->pen();
+        QPen pen = context->platformContext()->pen();
         stroke.setWidth(pen.widthF());
         stroke.setCapStyle(pen.capStyle());
         stroke.setJoinStyle(pen.joinStyle());

-- 
WebKit Debian packaging