The following commit has been merged in the debian/experimental branch:
commit d70539c3f2a8f3fad5db88bd876823c19867e281
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jul 17 03:19:59 2010 +0000
2010-07-16 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Oliver Hunt.
[Qt] Remove redundant logic in Path::addArcTo()
https://bugs.webkit.org/show_bug.cgi?id=42494
Bounds checking for arcTo() is now done in cross-platform code
thanks to <http://trac.webkit.org/changeset/63599>
* platform/graphics/qt/PathQt.cpp:
(WebCore::Path::addArcTo):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63605 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a8ea3aa..1dfa273 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16 Andreas Kling <andreas.kling at nokia.com>
+
+ Reviewed by Oliver Hunt.
+
+ [Qt] Remove redundant logic in Path::addArcTo()
+ https://bugs.webkit.org/show_bug.cgi?id=42494
+
+ Bounds checking for arcTo() is now done in cross-platform code
+ thanks to <http://trac.webkit.org/changeset/63599>
+
+ * platform/graphics/qt/PathQt.cpp:
+ (WebCore::Path::addArcTo):
+
2010-07-16 Zhe Su <suzhe at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/qt/PathQt.cpp b/WebCore/platform/graphics/qt/PathQt.cpp
index d2e7c00..cbcf6ca 100644
--- a/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/WebCore/platform/graphics/qt/PathQt.cpp
@@ -209,11 +209,6 @@ void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius)
FloatPoint p0(m_path.currentPosition());
- if ((p1.x() == p0.x() && p1.y() == p0.y()) || (p1.x() == p2.x() && p1.y() == p2.y()) || radius == 0.f) {
- m_path.lineTo(p1);
- return;
- }
-
FloatPoint p1p0((p0.x() - p1.x()), (p0.y() - p1.y()));
FloatPoint p1p2((p2.x() - p1.x()), (p2.y() - p1.y()));
float p1p0_length = sqrtf(p1p0.x() * p1p0.x() + p1p0.y() * p1p0.y());
--
WebKit Debian packaging