Changeset 58207 in webkit

Timestamp:

Apr 23, 2010 8:27:37 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-23 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] LayoutTests/fast/canvas/pointInPath.html passed, actually it failed
​https://bugs.webkit.org/show_bug.cgi?id=37276

pointInPath.html passed because the expected.txt expect it fail, it is wrong.

• platform/qt/fast/canvas/pointInPath-expected.txt: Removed.

2010-04-23 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] LayoutTests/fast/canvas/pointInPath.html passed, actually it failed
​https://bugs.webkit.org/show_bug.cgi?id=37276

QPainterPath::contains doesn't count the point on the bound.

• platform/graphics/qt/PathQt.cpp: (WebCore::isPointOnPathBorder): (WebCore::Path::contains):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/fast/canvas/pointInPath-expected.txt (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/PathQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-23  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] LayoutTests/fast/canvas/pointInPath.html passed, actually it failed
+        https://bugs.webkit.org/show_bug.cgi?id=37276
+
+        pointInPath.html passed because the expected.txt expect it fail, it is wrong.
+
+        * platform/qt/fast/canvas/pointInPath-expected.txt: Removed.
+
 2010-04-23  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-23  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] LayoutTests/fast/canvas/pointInPath.html passed, actually it failed
+        https://bugs.webkit.org/show_bug.cgi?id=37276
+
+        QPainterPath::contains doesn't count the point on the bound.
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::isPointOnPathBorder):
+        (WebCore::Path::contains):
+
 2010-04-23  Sam Weinig  <sam@webkit.org>
 

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

@@ -70 +70 @@
 }
 
+// Check whether a point is on the border
+bool isPointOnPathBorder(const QPolygonF& border, const QPointF& p)
+{
+    QPointF p1 = border.at(0);
+    QPointF p2;
+
+    for (int i = 1; i < border.size(); ++i) {
+        p2 = border.at(i);
+        //  (x1<=x<=x2||x1=>x>=x2) && (y1<=y<=y2||y1=>y>=y2)  && (y2-y1)(x-x1) == (y-y1)(x2-x1)
+        //  In which, (y2-y1)(x-x1) == (y-y1)(x2-x1) is from (y2-y1)/(x2-x1) == (y-y1)/(x-x1)
+        //  it want to check the slope between p1 and p2 is same with slope between p and p1,
+        //  if so then the three points lie on the same line.
+        //  In which, (x1<=x<=x2||x1=>x>=x2) && (y1<=y<=y2||y1=>y>=y2) want to make sure p is
+        //  between p1 and p2, not outside.
+        if (((p.x() <= p1.x() && p.x() >= p2.x()) || (p.x() >= p1.x() && p.x() <= p2.x()))
+            && ((p.y() <= p1.y() && p.y() >= p2.y()) || (p.y() >= p1.y() && p.y() <= p2.y()))
+            && (p2.y() - p1.y()) * (p.x() - p1.x()) == (p.y() - p1.y()) * (p2.x() - p1.x())) {
+            return true;
+        }
+        p1 = p2;
+    }
+    return false;
+}
+
 bool Path::contains(const FloatPoint& point, WindRule rule) const
 {
@@ -76 +100 @@
 
     bool contains = m_path.contains(point);
+    
+    if (!contains) {
+        // check whether the point is on the border
+        contains = isPointOnPathBorder(m_path.toFillPolygon(), point);
+    }
 
     const_cast<QPainterPath*>(&m_path)->setFillRule(savedRule);