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

Wed Dec 22 11:27:24 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 64d64090160995af6811c43e7e54af90c284a928
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 25 21:51:04 2010 +0000

    2010-07-25  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Implement adjustMathMLAttributes
            https://bugs.webkit.org/show_bug.cgi?id=42952
    
            Yay test progression.
    
            * html5lib/runner-expected-html5.txt:
    2010-07-25  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Implement adjustMathMLAttributes
            https://bugs.webkit.org/show_bug.cgi?id=42952
    
            This is kind of mechanical overkill for adjusting one attribute name,
            but it's nice to use the same machinery as SVG.
    
            * html/HTMLTreeBuilder.cpp:
            * mathml/mathattrs.in:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64024 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5f36031..6fd77b1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-25  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Implement adjustMathMLAttributes
+        https://bugs.webkit.org/show_bug.cgi?id=42952
+
+        Yay test progression.
+
+        * html5lib/runner-expected-html5.txt:
+
 2010-07-25  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/html5lib/runner-expected-html5.txt b/LayoutTests/html5lib/runner-expected-html5.txt
index 6a401de..892a563 100644
--- a/LayoutTests/html5lib/runner-expected-html5.txt
+++ b/LayoutTests/html5lib/runner-expected-html5.txt
@@ -161,7 +161,6 @@ resources/tests17.dat: PASS
 resources/tests18.dat: PASS
 
 resources/tests19.dat:
-1
 22
 24
 63
@@ -172,25 +171,6 @@ resources/tests19.dat:
 101
 102
 
-Test 1 of 102 in resources/tests19.dat failed. Input:
-<!doctype html><math><mn DefinitionUrl="foo">
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mn>
-|         definitionurl="foo"
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mn>
-|         definitionURL="foo"
-
 Test 22 of 102 in resources/tests19.dat failed. Input:
 <!doctype html><h1><div><h3><span></h1>foo
 Got:
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0cca215..532d8d0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Eric Seidel.
 
+        Implement adjustMathMLAttributes
+        https://bugs.webkit.org/show_bug.cgi?id=42952
+
+        This is kind of mechanical overkill for adjusting one attribute name,
+        but it's nice to use the same machinery as SVG.
+
+        * html/HTMLTreeBuilder.cpp:
+        * mathml/mathattrs.in:
+
+2010-07-25  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Functions supporting the legacy tree builder are confusing
         https://bugs.webkit.org/show_bug.cgi?id=42951
 
diff --git a/WebCore/html/HTMLTreeBuilder.cpp b/WebCore/html/HTMLTreeBuilder.cpp
index f706af8..0a5c859 100644
--- a/WebCore/html/HTMLTreeBuilder.cpp
+++ b/WebCore/html/HTMLTreeBuilder.cpp
@@ -680,14 +680,15 @@ void adjustSVGTagNameCase(AtomicHTMLToken& token)
     token.setName(casedName.localName());
 }
 
-void adjustSVGAttributes(AtomicHTMLToken& token)
+template<QualifiedName** getAttrs(size_t* length)>
+void adjustAttributes(AtomicHTMLToken& token)
 {
     static PrefixedNameToQualifiedNameMap* caseMap = 0;
     if (!caseMap) {
         caseMap = new PrefixedNameToQualifiedNameMap;
         size_t length = 0;
-        QualifiedName** svgAttrs = SVGNames::getSVGAttrs(&length);
-        mapLoweredLocalNameToName(caseMap, svgAttrs, length);
+        QualifiedName** attrs = getAttrs(&length);
+        mapLoweredLocalNameToName(caseMap, attrs, length);
     }
 
     NamedNodeMap* attributes = token.attributes();
@@ -702,9 +703,14 @@ void adjustSVGAttributes(AtomicHTMLToken& token)
     }
 }
 
-void adjustMathMLAttributes(AtomicHTMLToken&)
+void adjustSVGAttributes(AtomicHTMLToken& token)
 {
-    notImplemented();
+    adjustAttributes<SVGNames::getSVGAttrs>(token);
+}
+
+void adjustMathMLAttributes(AtomicHTMLToken& token)
+{
+    adjustAttributes<MathMLNames::getMathMLAttrs>(token);
 }
 
 void addNamesWithPrefix(PrefixedNameToQualifiedNameMap* map, const AtomicString& prefix, QualifiedName** names, size_t length)
diff --git a/WebCore/mathml/mathattrs.in b/WebCore/mathml/mathattrs.in
index 55a25ed..5431453 100644
--- a/WebCore/mathml/mathattrs.in
+++ b/WebCore/mathml/mathattrs.in
@@ -4,6 +4,7 @@ guardFactoryWith="ENABLE(MATHML)"
 attrsNullNamespace
 
 close
+definitionURL
 denomalign
 linethickness
 mathbackground

-- 
WebKit Debian packaging

