Changeset 19856 for S60/trunk/WebCore

Timestamp:

02/26/07 12:49:18 (23 months ago)

Author:

brmorris

Message:

vbradley, reviewed by Zalan

DESC: [S60] MLIO-6YCACU: Browser freeze and panic in symbianoggplay.sourceforge.com
http://bugs.webkit.org/show_bug.cgi?id=12831

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• kwq/KWQPainter.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ -1 @@
-hongzhao, reviewed by Zalan, merged by mbradley++
- DESC: merge of r19802 to s60 trunk. Cache memory collector is not initialized in 3.2 HZHO-6YMQCK 
- Fix: Initialize the initial size of cache memory collector after create it.
- http://bugs.webkit.org/show_bug.cgi?id=12844
+vbradley, reviewed by Zalan
+ DESC: [S60] MLIO-6YCACU: Browser freeze and panic in symbianoggplay.sourceforge.com
+ http://bugs.webkit.org/show_bug.cgi?id=12831
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * kwq/KWQPainter.cpp:
+        (RectPolygon::findCrossingEdge):
+
 
         WARNING: NO TEST CASES ADDED OR CHANGED

S60/trunk/WebCore/kwq/KWQPainter.cpp

@@ -1085 +1085 @@
     QPoint c1 = current.end();
     QValueListIterator<PolyRect> it;
+    PolyRect* res = 0;
+    QPoint saveCrossingPoint(1000000, 1000000);
     for ( it = rects.begin(); it != rects.end() ; it++) {
         if ((*it).rect == current.rect)
@@ -1092 +1094 @@
         QPoint e1 = searchEdge.end();
         QPoint crossingPoint;
-        if ( lineCrosses(c0,c1,e0,e1,crossingPoint) && crossingPoint!=e1 ){
-            crossingEdge = searchEdge;
-            lastCrossing = crossingPoint;
-            (*it).used = true;
-            return true;
+        if ( lineCrosses(c0,c1,e0,e1,crossingPoint) && crossingPoint!=e1 ) {
+            if ( saveCrossingPoint.x() == 1000000 || 
+                 current.direction == 0 && crossingPoint.x() < saveCrossingPoint.x() ||
+                 current.direction == 1 && crossingPoint.y() < saveCrossingPoint.y() ||
+                 current.direction == 2 && crossingPoint.x() > saveCrossingPoint.x() ||
+                 current.direction == 3 && crossingPoint.y() > saveCrossingPoint.y() ) {
+                res = &(*it);
+                saveCrossingPoint = crossingPoint;
+                crossingEdge = searchEdge;
+                lastCrossing = crossingPoint;
+            }
         }
     }
+    if (res) {
+        res->used = true;
+        return true;
+        }
     return false;
 }