[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 42167583408c293d2d470d9653eddb8d9a71d0ae
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 23 19:01:51 2004 +0000

    	Fix hiermenu opacity bug.  Make sure to save/restore the graphics state before pushing and popping
    	transparency layers, so that alterations to alpha don't accidentally persist.
    
            Reviewed by kocienda
    
            * kwq/KWQPainter.mm:
            (QPainter::beginTransparencyLayer):
            (QPainter::endTransparencyLayer):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d40de51..2db8967 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,23 @@
+2004-04-20  David Hyatt  <hyatt at apple.com>
+
+	Fix hiermenu opacity bug.  Make sure to save/restore the graphics state before pushing and popping
+	transparency layers, so that alterations to alpha don't accidentally persist.
+	
+        Reviewed by kocienda
+
+        * kwq/KWQPainter.mm:
+        (QPainter::beginTransparencyLayer):
+        (QPainter::endTransparencyLayer):
+
+2004-04-20  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3622818, bad rendering on sabernomics.com.  Just eliminate the priority difference between
+	4 and 5, and make all of the priority 4 tags the same.  This seems to match other browsers.
+	
+        Reviewed by kocienda
+
+        * khtml/html/dtd.cpp:
+
 2004-04-23  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index b08c6ab..6a22e1b 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -71,8 +71,8 @@ const unsigned short DOM::tagPriority[] = {
     1, // ID_DEL
     1, // ID_DFN
     5, // ID_DIR
-    4, // ID_DIV
-    4, // ID_DL
+    5, // ID_DIV
+    5, // ID_DL
     3, // ID_DT
     1, // ID_EM
     0, // ID_EMBED
@@ -107,7 +107,7 @@ const unsigned short DOM::tagPriority[] = {
     3, // ID_MARQUEE
     5, // ID_MENU
     0, // ID_META
-    4, // ID_NOBR
+    5, // ID_NOBR
    10,// ID_NOEMBED
    10,// ID_NOFRAMES
     3, // ID_NOSCRIPT
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index fcd01af..66bf68d 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -635,6 +635,7 @@ bool QPainter::paintingDisabled() const
 
 void QPainter::beginTransparencyLayer(float opacity)
 {
+    [NSGraphicsContext saveGraphicsState];
     CGContextRef context = (CGContextRef)([[NSGraphicsContext currentContext] graphicsPort]);
     CGContextSetAlpha(context, opacity);
     CGContextBeginTransparencyLayer(context, 0);
@@ -644,6 +645,7 @@ void QPainter::endTransparencyLayer()
 {
     CGContextRef context = (CGContextRef)([[NSGraphicsContext currentContext] graphicsPort]);
     CGContextEndTransparencyLayer(context);
+    [NSGraphicsContext restoreGraphicsState];
 }
 
 void QPainter::setShadow(int x, int y, int blur, const QColor& color)

-- 
WebKit Debian packaging