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

[ariya at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0f7e67d996e1d8d108ab8644edf76be5799395fa
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 05:27:39 2010 +0000

    2010-08-15  Ariya Hidayat  <ariya at sencha.com>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Border should not cast shadows
            https://bugs.webkit.org/show_bug.cgi?id=44015
    
            Update pixel test reference.
    
            * platform/qt/fast/box-shadow/basic-shadows-expected.checksum:
            * platform/qt/fast/box-shadow/basic-shadows-expected.png:
    2010-08-15  Ariya Hidayat  <ariya at sencha.com>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Border should not cast shadows
            https://bugs.webkit.org/show_bug.cgi?id=44015
    
            Shadows should be not casted except for brush fill (which is not what
            drawLine and drawRect are supposed to do).
    
            * platform/graphics/qt/GraphicsContextQt.cpp:
            (WebCore::GraphicsContext::drawRect): Remove shadow painting,
            (WebCore::GraphicsContext::drawLine): ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65392 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 25c480b..4df4e0a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-15  Ariya Hidayat  <ariya at sencha.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Border should not cast shadows
+        https://bugs.webkit.org/show_bug.cgi?id=44015
+
+        Update pixel test reference.
+
+        * platform/qt/fast/box-shadow/basic-shadows-expected.checksum:
+        * platform/qt/fast/box-shadow/basic-shadows-expected.png:
+
 2010-08-15  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.checksum b/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.checksum
index ba9831a..181ee20 100644
--- a/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.checksum
+++ b/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.checksum
@@ -1 +1 @@
-2b67d6d647e12fd1583a14e9d2e0bb11
\ No newline at end of file
+b4d3c35c842ed05b52fc30be51863f1f
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.png b/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.png
index 3482f33..e20642a 100644
Binary files a/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.png and b/LayoutTests/platform/qt/fast/box-shadow/basic-shadows-expected.png differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5499b1d..3ba64d7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-15  Ariya Hidayat  <ariya at sencha.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Border should not cast shadows
+        https://bugs.webkit.org/show_bug.cgi?id=44015
+
+        Shadows should be not casted except for brush fill (which is not what
+        drawLine and drawRect are supposed to do).
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::GraphicsContext::drawRect): Remove shadow painting,
+        (WebCore::GraphicsContext::drawLine): ditto.
+
 2010-08-15  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 94e6f67..d22131f 100644
--- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -301,6 +301,8 @@ void GraphicsContext::restorePlatformState()
 }
 
 // Draws a filled rectangle with a stroked border.
+// This is only used to draw borders (real fill is done via fillRect), and
+// thus it must not cast any shadow.
 void GraphicsContext::drawRect(const IntRect& rect)
 {
     if (paintingDisabled())
@@ -310,19 +312,13 @@ void GraphicsContext::drawRect(const IntRect& rect)
     const bool antiAlias = p->testRenderHint(QPainter::Antialiasing);
     p->setRenderHint(QPainter::Antialiasing, m_data->antiAliasingForRectsAndLines);
 
-    if (m_data->hasShadow()) {
-        IntRect shadowRect = rect;
-        shadowRect.move(m_data->shadowOffset.x(), m_data->shadowOffset.y());
-        shadowRect.inflate(static_cast<int>(p->pen().widthF()));
-        p->fillRect(shadowRect, m_data->shadowColor);
-    }
-
     p->drawRect(rect);
 
     p->setRenderHint(QPainter::Antialiasing, antiAlias);
 }
 
 // This is only used to draw borders.
+// Must not cast any shadow.
 void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2)
 {
     if (paintingDisabled())
@@ -344,16 +340,6 @@ void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2)
     p->setRenderHint(QPainter::Antialiasing, m_data->antiAliasingForRectsAndLines);
     adjustLineToPixelBoundaries(p1, p2, width, style);
 
-    if (m_data->hasShadow()) {
-        if (textDrawingMode() == cTextFill) {
-            p->save();
-            p->translate(m_data->shadowOffset);
-            p->setPen(m_data->shadowColor);
-            p->drawLine(p1, p2);
-            p->restore();
-        }
-    }
-
     int patWidth = 0;
     switch (style) {
     case NoStroke:

-- 
WebKit Debian packaging