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

eric at webkit.org eric at webkit.org
Wed Dec 22 12:37:00 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 0731dcce4da066816641a88a895db4c16fe33063
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 00:23:14 2010 +0000

    2010-08-25  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.  Build fix.
    
            Make Chromiums Broken WebPageSerializerImpl compile again
            https://bugs.webkit.org/show_bug.cgi?id=44652
    
            Make it compile again.  This code is still horribly wrong.
    
            * src/WebPageSerializerImpl.cpp:
            (WebKit::WebPageSerializerImpl::endTagToString):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6783864..5cc7fd6 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-25  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.  Build fix.
+
+        Make Chromiums Broken WebPageSerializerImpl compile again
+        https://bugs.webkit.org/show_bug.cgi?id=44652
+
+        Make it compile again.  This code is still horribly wrong.
+
+        * src/WebPageSerializerImpl.cpp:
+        (WebKit::WebPageSerializerImpl::endTagToString):
+
 2010-08-20  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/src/WebPageSerializerImpl.cpp b/WebKit/chromium/src/WebPageSerializerImpl.cpp
index e65af85..885ee25 100644
--- a/WebKit/chromium/src/WebPageSerializerImpl.cpp
+++ b/WebKit/chromium/src/WebPageSerializerImpl.cpp
@@ -380,9 +380,8 @@ void WebPageSerializerImpl::endTagToString(const Element* element,
         // Check whether we have to write end tag for empty element.
         if (param->isHTMLDocument) {
             result += ">";
-            const HTMLElement* htmlElement =
-            static_cast<const HTMLElement*>(element);
-            if (htmlElement->endTagRequirement() == TagStatusRequired) {
+            // FIXME: This code is horribly wrong.  WebPageSerializerImpl must die.
+            if (!static_cast<const HTMLElement*>(element)->ieForbidsInsertHTML()) {
                 // We need to write end tag when it is required.
                 result += "</";
                 result += element->nodeName().lower();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list