[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[reni at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2b3b451ae6df8f039b7d4907989449074ad9dbe1
Author: reni at webkit.org <reni at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 15:21:31 2010 +0000

    [Qt] GraphicsContext: Clean up Qt/WebCore type conversion functions
    https://bugs.webkit.org/show_bug.cgi?id=49919
    
    Reviewed by Andreas Kling.
    
    Add ASSERT_NOT_REACHED() if the given WebCore type doesn't have an equivalent type in Qt.
    Also change the return value of toQtLineJoin() from Qt::MiterJoin to the default Qt::SvgMiterJoin,
    because the previous one doesn't work currently.
    
    No new test is needed.
    
    * platform/graphics/qt/GraphicsContextQt.cpp:
    (WebCore::GraphicsContext::toQtCompositionMode):
    (WebCore::toQtLineCap):
    (WebCore::toQtLineJoin):
    (WebCore::toQPenStyle):
    (WebCore::toQtFillRule):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72668 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dd05e14..a9f2f97 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-24  Renata Hodovan  <reni at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] GraphicsContext: Clean up Qt/WebCore type conversion functions
+        https://bugs.webkit.org/show_bug.cgi?id=49919
+
+        Add ASSERT_NOT_REACHED() if the given WebCore type doesn't have an equivalent type in Qt.
+        Also change the return value of toQtLineJoin() from Qt::MiterJoin to the default Qt::SvgMiterJoin,
+        because the previous one doesn't work currently.
+
+        No new test is needed.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::toQtCompositionMode):
+        (WebCore::toQtLineCap):
+        (WebCore::toQtLineJoin):
+        (WebCore::toQPenStyle):
+        (WebCore::toQtFillRule):
+
 2010-11-24  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 10a7f89..ada538c 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -104,6 +104,8 @@ QPainter::CompositionMode GraphicsContext::toQtCompositionMode(CompositeOperator
         return QPainter::CompositionMode_SourceOver;
     case CompositePlusLighter:
         return QPainter::CompositionMode_Plus;
+    default:
+        ASSERT_NOT_REACHED();
     }
 
     return QPainter::CompositionMode_SourceOver;
@@ -118,6 +120,8 @@ static inline Qt::PenCapStyle toQtLineCap(LineCap lc)
         return Qt::RoundCap;
     case SquareCap:
         return Qt::SquareCap;
+    default:
+        ASSERT_NOT_REACHED();
     }
 
     return Qt::FlatCap;
@@ -132,9 +136,11 @@ static inline Qt::PenJoinStyle toQtLineJoin(LineJoin lj)
         return Qt::RoundJoin;
     case BevelJoin:
         return Qt::BevelJoin;
+    default:
+        ASSERT_NOT_REACHED();
     }
 
-    return Qt::MiterJoin;
+    return Qt::SvgMiterJoin;
 }
 
 static Qt::PenStyle toQPenStyle(StrokeStyle style)
@@ -152,8 +158,9 @@ static Qt::PenStyle toQPenStyle(StrokeStyle style)
     case DashedStroke:
         return Qt::DashLine;
         break;
+    default:
+        ASSERT_NOT_REACHED();
     }
-    qWarning("couldn't recognize the pen style");
     return Qt::NoPen;
 }
 
@@ -164,8 +171,9 @@ static inline Qt::FillRule toQtFillRule(WindRule rule)
         return Qt::OddEvenFill;
     case RULE_NONZERO:
         return Qt::WindingFill;
+    default:
+        ASSERT_NOT_REACHED();
     }
-    qDebug("Qt: unrecognized wind rule!");
     return Qt::OddEvenFill;
 }
 

-- 
WebKit Debian packaging