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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ebf75d9f8183a4c09a1c3f3184efc4b3a341c3f6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 18:04:40 2010 +0000

    2010-08-16  Alex Milowski  <alex at milowski.com>
    
            Reviewed by David Levin.
    
            Added the configuration of the MathML related files.
    
            * WebCore.gyp/WebCore.gyp:
            * WebCore.gypi:
    2010-08-16  Alex Milowski  <alex at milowski.com>
    
            Reviewed by David Levin.
    
            Added the ENABLE_MATHML=1 to the feature_defines.
    
            * features.gypi:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65441 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 517d76d..5b37ae3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-16  Alex Milowski  <alex at milowski.com>
+
+        Reviewed by David Levin.
+
+        Added the configuration of the MathML related files.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+
 2010-08-16  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed: fix Leopard Release inspector tests.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 2b0700e..ff1ec27 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -127,6 +127,7 @@
       '../loader/appcache',
       '../loader/archive',
       '../loader/icon',
+      '../mathml',
       '../notifications',
       '../page',
       '../page/animation',
@@ -399,6 +400,8 @@
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLNames.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLNames.h',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLElementFactory.cpp',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLElementFactory.h',
           ],
           'action': [
             'python',
@@ -407,6 +410,7 @@
             '--',
             '<@(_inputs)',
             '--',
+            '--factory',
             '--extraDefines', '<(feature_defines)'
           ],
         },
@@ -421,6 +425,7 @@
             '../css/themeWin.css',
             '../css/themeWinQuirks.css',
             '../css/svg.css',
+            '../css/mathml.css',
             '../css/mediaControls.css',
             '../css/mediaControlsChromium.css',
           ],
@@ -733,6 +738,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLNSNames.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLNames.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGNames.cpp',
+        '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLElementFactory.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/MathMLNames.cpp',
 
         # Generated from HTMLEntityNames.json
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 08c95f0..b7d0b31 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1927,6 +1927,34 @@
             'loader/WorkerThreadableLoader.h',
             'loader/loader.cpp',
             'loader/loader.h',
+            'mathml/MathMLElement.cpp',
+            'mathml/MathMLElement.h',
+            'mathml/MathMLInlineContainerElement.cpp',
+            'mathml/MathMLInlineContainerElement.h',
+            'mathml/MathMLMathElement.cpp',
+            'mathml/MathMLMathElement.h',
+            'mathml/MathMLTextElement.cpp',
+            'mathml/MathMLTextElement.h',
+            'mathml/RenderMathMLBlock.cpp',
+            'mathml/RenderMathMLBlock.h',
+            'mathml/RenderMathMLFenced.cpp',
+            'mathml/RenderMathMLFenced.h',
+            'mathml/RenderMathMLFraction.cpp',
+            'mathml/RenderMathMLFraction.h',
+            'mathml/RenderMathMLMath.cpp',
+            'mathml/RenderMathMLMath.h',
+            'mathml/RenderMathMLOperator.cpp',
+            'mathml/RenderMathMLOperator.h',
+            'mathml/RenderMathMLRoot.cpp',
+            'mathml/RenderMathMLRoot.h',
+            'mathml/RenderMathMLRow.cpp',
+            'mathml/RenderMathMLRow.h',
+            'mathml/RenderMathMLSquareRoot.cpp',
+            'mathml/RenderMathMLSquareRoot.h',
+            'mathml/RenderMathMLSubSup.cpp',
+            'mathml/RenderMathMLSubSup.h',
+            'mathml/RenderMathMLUnderOver.cpp',
+            'mathml/RenderMathMLUnderOver.h',
             'notifications/Notification.cpp',
             'notifications/Notification.h',
             'notifications/NotificationCenter.cpp',
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9e358d2..865eda1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-16  Alex Milowski  <alex at milowski.com>
+
+        Reviewed by David Levin.
+
+        Added the ENABLE_MATHML=1 to the feature_defines.
+
+        * features.gypi:
+
 2010-08-16  Marcus Bulach  <bulach at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index b99d86f..e3092b3 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -59,6 +59,7 @@
         'ENABLE_JAVASCRIPT_DEBUGGER=1',
         'ENABLE_JSC_MULTIPLE_THREADS=0',
         'ENABLE_LINK_PREFETCH=1',
+        'ENABLE_MATHML=0',
         'ENABLE_METER_TAG=1',
         'ENABLE_NOTIFICATIONS=1',
         'ENABLE_OFFLINE_WEB_APPLICATIONS=1',

-- 
WebKit Debian packaging