diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-10 15:31:59 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:35:59 -0800 |
| commit | 28040489d744e0c5d475a88663056c9040ed5320 (patch) | |
| tree | c463676791e4a63e452a95f0a12b2a8519730693 /WebCore/platform/graphics/qt/PathQt.cpp | |
| parent | eff9be92c41913c92fb1d3b7983c071f3e718678 (diff) | |
| download | external_webkit-28040489d744e0c5d475a88663056c9040ed5320.zip external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.gz external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.bz2 | |
Merge WebKit at r71558: Initial merge by git.
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
Diffstat (limited to 'WebCore/platform/graphics/qt/PathQt.cpp')
| -rw-r--r-- | WebCore/platform/graphics/qt/PathQt.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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()); |