[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:42:15 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit b949a7558f9d60c3c58dc8cd94acb0646697a8e0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 26 00:38:09 2010 +0000
2010-12-25 Andreas Kling <kling at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
GraphicsContext: Don't pass StrokeStyle (enum) as const reference
https://bugs.webkit.org/show_bug.cgi?id=51608
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::setStrokeStyle):
(WebCore::GraphicsContext::setPlatformStrokeStyle):
(WebCore::GraphicsContext::adjustLineToPixelBoundaries):
* platform/graphics/GraphicsContext.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::setPlatformStrokeStyle):
* platform/graphics/haiku/GraphicsContextHaiku.cpp:
(WebCore::GraphicsContext::setPlatformStrokeStyle):
* platform/graphics/openvg/GraphicsContextOpenVG.cpp:
(WebCore::GraphicsContext::setPlatformStrokeStyle):
* platform/graphics/openvg/PainterOpenVG.cpp:
(WebCore::PainterOpenVG::setStrokeStyle):
* platform/graphics/openvg/PainterOpenVG.h:
* platform/graphics/qt/GraphicsContextQt.cpp:
(WebCore::GraphicsContext::setPlatformStrokeStyle):
* platform/graphics/skia/GraphicsContextSkia.cpp:
(WebCore::GraphicsContext::setPlatformStrokeStyle):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74662 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b17777a..3504468 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2010-12-25 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ GraphicsContext: Don't pass StrokeStyle (enum) as const reference
+ https://bugs.webkit.org/show_bug.cgi?id=51608
+
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::setStrokeStyle):
+ (WebCore::GraphicsContext::setPlatformStrokeStyle):
+ (WebCore::GraphicsContext::adjustLineToPixelBoundaries):
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::setPlatformStrokeStyle):
+ * platform/graphics/haiku/GraphicsContextHaiku.cpp:
+ (WebCore::GraphicsContext::setPlatformStrokeStyle):
+ * platform/graphics/openvg/GraphicsContextOpenVG.cpp:
+ (WebCore::GraphicsContext::setPlatformStrokeStyle):
+ * platform/graphics/openvg/PainterOpenVG.cpp:
+ (WebCore::PainterOpenVG::setStrokeStyle):
+ * platform/graphics/openvg/PainterOpenVG.h:
+ * platform/graphics/qt/GraphicsContextQt.cpp:
+ (WebCore::GraphicsContext::setPlatformStrokeStyle):
+ * platform/graphics/skia/GraphicsContextSkia.cpp:
+ (WebCore::GraphicsContext::setPlatformStrokeStyle):
+
2010-12-24 Dan Bernstein <mitz at apple.com>
Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/platform/graphics/GraphicsContext.cpp b/WebCore/platform/graphics/GraphicsContext.cpp
index 907cdd2..96a92fb 100644
--- a/WebCore/platform/graphics/GraphicsContext.cpp
+++ b/WebCore/platform/graphics/GraphicsContext.cpp
@@ -115,7 +115,7 @@ void GraphicsContext::setStrokeThickness(float thickness)
setPlatformStrokeThickness(thickness);
}
-void GraphicsContext::setStrokeStyle(const StrokeStyle& style)
+void GraphicsContext::setStrokeStyle(StrokeStyle style)
{
m_state.strokeStyle = style;
setPlatformStrokeStyle(style);
@@ -616,7 +616,7 @@ void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags mode)
#endif
#if !PLATFORM(QT) && !PLATFORM(CAIRO) && !PLATFORM(SKIA) && !PLATFORM(HAIKU) && !PLATFORM(OPENVG)
-void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle&)
+void GraphicsContext::setPlatformStrokeStyle(StrokeStyle)
{
}
#endif
@@ -642,7 +642,7 @@ void GraphicsContext::markDirtyRect(const IntRect&)
#endif
-void GraphicsContext::adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, const StrokeStyle& penStyle)
+void GraphicsContext::adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, StrokeStyle penStyle)
{
// For odd widths, we add in 0.5 to the appropriate x/y so that the float arithmetic
// works out. For example, with a border width of 3, WebKit will pass us (y1+y2)/2, e.g.,
diff --git a/WebCore/platform/graphics/GraphicsContext.h b/WebCore/platform/graphics/GraphicsContext.h
index bcf6b10..a4a2695 100644
--- a/WebCore/platform/graphics/GraphicsContext.h
+++ b/WebCore/platform/graphics/GraphicsContext.h
@@ -218,7 +218,7 @@ namespace WebCore {
float strokeThickness() const;
void setStrokeThickness(float);
StrokeStyle strokeStyle() const;
- void setStrokeStyle(const StrokeStyle& style);
+ void setStrokeStyle(StrokeStyle);
Color strokeColor() const;
ColorSpace strokeColorSpace() const;
void setStrokeColor(const Color&, ColorSpace);
@@ -497,7 +497,7 @@ namespace WebCore {
void setPlatformFont(const Font& font);
void setPlatformStrokeColor(const Color&, ColorSpace);
- void setPlatformStrokeStyle(const StrokeStyle&);
+ void setPlatformStrokeStyle(StrokeStyle);
void setPlatformStrokeThickness(float);
void setPlatformStrokeGradient(Gradient*);
void setPlatformStrokePattern(Pattern*);
@@ -514,7 +514,7 @@ namespace WebCore {
void setPlatformCompositeOperation(CompositeOperator);
- static void adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, const StrokeStyle&);
+ static void adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, StrokeStyle);
GraphicsContextPlatformPrivate* m_data;
diff --git a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index a6edaf7..5885ea9 100644
--- a/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -797,7 +797,7 @@ void GraphicsContext::setPlatformStrokeThickness(float strokeThickness)
cairo_set_line_width(m_data->cr, strokeThickness);
}
-void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle& strokeStyle)
+void GraphicsContext::setPlatformStrokeStyle(StrokeStyle strokeStyle)
{
static double dashPattern[] = {5.0, 5.0};
static double dotPattern[] = {1.0, 1.0};
diff --git a/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp b/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp
index 38c1fb7..acd431d 100644
--- a/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp
+++ b/WebCore/platform/graphics/haiku/GraphicsContextHaiku.cpp
@@ -500,7 +500,7 @@ pattern GraphicsContext::getHaikuStrokeStyle()
}
}
-void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle& strokeStyle)
+void GraphicsContext::setPlatformStrokeStyle(StrokeStyle strokeStyle)
{
// FIXME: see getHaikuStrokeStyle.
notImplemented();
diff --git a/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp b/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp
index 633ca75..6466a9c 100644
--- a/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp
+++ b/WebCore/platform/graphics/openvg/GraphicsContextOpenVG.cpp
@@ -475,7 +475,7 @@ void GraphicsContext::setPlatformStrokeColor(const Color& color, ColorSpace colo
UNUSED_PARAM(colorSpace); // FIXME
}
-void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle& strokeStyle)
+void GraphicsContext::setPlatformStrokeStyle(StrokeStyle strokeStyle)
{
if (paintingDisabled())
return;
diff --git a/WebCore/platform/graphics/openvg/PainterOpenVG.cpp b/WebCore/platform/graphics/openvg/PainterOpenVG.cpp
index 54937a4..3e2b92c 100644
--- a/WebCore/platform/graphics/openvg/PainterOpenVG.cpp
+++ b/WebCore/platform/graphics/openvg/PainterOpenVG.cpp
@@ -574,7 +574,7 @@ StrokeStyle PainterOpenVG::strokeStyle() const
return m_state->strokeStyle;
}
-void PainterOpenVG::setStrokeStyle(const StrokeStyle& style)
+void PainterOpenVG::setStrokeStyle(StrokeStyle style)
{
ASSERT(m_state);
m_surface->makeCurrent();
diff --git a/WebCore/platform/graphics/openvg/PainterOpenVG.h b/WebCore/platform/graphics/openvg/PainterOpenVG.h
index 24fd8a0..32f1fe5 100644
--- a/WebCore/platform/graphics/openvg/PainterOpenVG.h
+++ b/WebCore/platform/graphics/openvg/PainterOpenVG.h
@@ -77,7 +77,7 @@ public:
float strokeThickness() const;
void setStrokeThickness(float);
StrokeStyle strokeStyle() const;
- void setStrokeStyle(const StrokeStyle&);
+ void setStrokeStyle(StrokeStyle);
void setLineDash(const DashArray&, float dashOffset);
void setLineCap(LineCap);
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 9dd38aa..701be00 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -1227,7 +1227,7 @@ void GraphicsContext::setPlatformStrokeColor(const Color& color, ColorSpace colo
p->setPen(newPen);
}
-void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle& strokeStyle)
+void GraphicsContext::setPlatformStrokeStyle(StrokeStyle strokeStyle)
{
if (paintingDisabled())
return;
diff --git a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
index 1b217ee..51e2477 100644
--- a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
+++ b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -1103,7 +1103,7 @@ void GraphicsContext::setPlatformStrokeColor(const Color& strokecolor, ColorSpac
platformContext()->setStrokeColor(strokecolor.rgb());
}
-void GraphicsContext::setPlatformStrokeStyle(const StrokeStyle& stroke)
+void GraphicsContext::setPlatformStrokeStyle(StrokeStyle stroke)
{
if (paintingDisabled())
return;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list