Changeset 70992 in webkit

Timestamp:

Oct 31, 2010 11:57:45 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-10-31 Andreas Kling <​kling@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (1 diff)
• platform/graphics/qt/PathQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-31  Andreas Kling  <kling@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@gmail.com>
 

trunk/WebCore/platform/graphics/GraphicsContext.h

@@ -400 +400 @@
         PlatformPath* currentPath();
         void pushTransparencyLayerInternal(const QRect &rect, qreal opacity, QPixmap& alphaMask);
-        QPen pen();
         static QPainter::CompositionMode toQtCompositionMode(CompositeOperator op);
 #endif

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -506 +506 @@
     path.setFillRule(Qt::WindingFill);
     m_data->p()->setClipPath(path, Qt::IntersectClip);
-}
-
-QPen GraphicsContext::pen()
-{
-    if (paintingDisabled())
-        return QPen();
-
-    QPainter* p = m_data->p();
-    return p->pen();
 }
 

trunk/WebCore/platform/graphics/qt/PathQt.cpp

@@ -135 +135 @@
 
     QPainterPathStroker stroke;
-    GraphicsContext* gc = scratchContext();
-    applier->strokeStyle(gc);
-
-    QPen pen = gc->pen();
+    GraphicsContext* context = scratchContext();
+    applier->strokeStyle(context);
+
+    QPen pen = context->platformContext()->pen();
     stroke.setWidth(pen.widthF());
     stroke.setCapStyle(pen.capStyle());
@@ -163 +163 @@
 FloatRect Path::strokeBoundingRect(StrokeStyleApplier* applier)
 {
-    GraphicsContext* gc = scratchContext();
+    GraphicsContext* context = scratchContext();
     QPainterPathStroker stroke;
     if (applier) {
-        applier->strokeStyle(gc);
-
-        QPen pen = gc->pen();
+        applier->strokeStyle(context);
+
+        QPen pen = context->platformContext()->pen();
         stroke.setWidth(pen.widthF());
         stroke.setCapStyle(pen.capStyle());