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

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:30:45 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1bce5aa363f919cb3aa2e7ad092fbfd0e274d306
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 20 22:21:59 2003 +0000

    	Always do residual style fixups in all three Safari rendering
    	modes.
    
            Reviewed by darin
    
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::popBlock):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f7b9a5f..3eb028a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-03-20  David Hyatt  <hyatt at apple.com>
+
+	Always do residual style fixups in all three Safari rendering
+	modes.
+	
+        Reviewed by darin
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::popBlock):
+
 === Safari-68 ===
 
 2003-03-19  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f7b9a5f..3eb028a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-03-20  David Hyatt  <hyatt at apple.com>
+
+	Always do residual style fixups in all three Safari rendering
+	modes.
+	
+        Reviewed by darin
+
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::popBlock):
+
 === Safari-68 ===
 
 2003-03-19  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 4a89ee1..9651122 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1367,7 +1367,7 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem)
     curr = blockStack;
     HTMLStackElem* residualStyleStack = 0;
     while (curr && curr != maxElem) {
-        // In quirks mode only, we will actually schedule this tag for reopening
+        // We will actually schedule this tag for reopening
         // after we complete the close of this entire block.
         NodeImpl* currNode = current;
         if (isResidualStyleTag(curr->id)) {
@@ -1461,8 +1461,8 @@ void KHTMLParser::popBlock( int _id )
 
     if (maxLevel > Elem->level) {
         // We didn't match because the tag is in a different scope, e.g.,
-        // <b><p>Foo</b>.  In quirks mode only, try to correct the problem.
-        if (!document->document()->inQuirksMode() || !isResidualStyleTag(_id))
+        // <b><p>Foo</b>.  Try to correct the problem.
+        if (!isResidualStyleTag(_id))
             return;
         return handleResidualStyleCloseTagAcrossBlocks(Elem);
     }
@@ -1486,10 +1486,10 @@ void KHTMLParser::popBlock( int _id )
                 // bottom margin.
                 form->setMalformed(true);
 
-            // In quirks mode only, we will actually schedule this tag for reopening
+            // Schedule this tag for reopening
             // after we complete the close of this entire block.
             NodeImpl* currNode = current;
-            if (isAffectedByStyle && document->document()->inQuirksMode() && isResidualStyleTag(Elem->id)) {
+            if (isAffectedByStyle && isResidualStyleTag(Elem->id)) {
                 // We've overloaded the use of stack elements and are just reusing the
                 // struct with a slightly different meaning to the variables.  Instead of chaining
                 // from innermost to outermost, we build up a list of all the tags we need to reopen

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list