Remove ENABLE(XHTMLMP) and associated code
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Oct 2011 02:04:36 +0000 (02:04 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Oct 2011 02:04:36 +0000 (02:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=69729

Reviewed by David Levin.

.:

* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsWinCE.cmake:
* Source/cmakeconfig.h.cmake:
* configure.ac:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

As discussed on webkit-dev, we are removing this feature as part of our
cleanup of unmaintained code in WebKit.

* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* dom/DOMImplementation.cpp:
(WebCore::DOMImplementation::createDocument):
* dom/Document.cpp:
(WebCore::Document::Document):
* dom/Document.h:
(WebCore::Document::isMediaDocument):
* dom/Node.cpp:
* dom/make_names.pl:
(usesDefaultJSWrapper):
* features.pri:
* html/HTMLElement.cpp:
(WebCore::HTMLElement::rendererIsNeeded):
* html/HTMLElementsAllInOne.cpp:
* html/HTMLNoScriptElement.cpp: Removed.
* html/HTMLNoScriptElement.h: Removed.
* html/HTMLTagNames.in:
* html/HTMLViewSourceDocument.cpp:
(WebCore::HTMLViewSourceDocument::createParser):
* loader/FrameLoader.cpp:
* platform/wince/MIMETypeRegistryWinCE.cpp:
(WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
* xml/parser/XMLDocumentParser.h:
(WebCore::XMLDocumentParser::isXHTMLDocument):
* xml/parser/XMLDocumentParserLibxml2.cpp:
(WebCore::XMLDocumentParser::XMLDocumentParser):
(WebCore::XMLDocumentParser::startElementNs):
(WebCore::XMLDocumentParser::endElementNs):
(WebCore::XMLDocumentParser::endDocument):
(WebCore::XMLDocumentParser::internalSubset):
(WebCore::getEntityHandler):
(WebCore::externalSubsetHandler):
* xml/parser/XMLDocumentParserQt.cpp:
(WebCore::XMLDocumentParser::XMLDocumentParser):
(WebCore::XMLDocumentParser::parse):
(WebCore::XMLDocumentParser::parseStartElement):
(WebCore::XMLDocumentParser::parseEndElement):
(WebCore::XMLDocumentParser::endDocument):
(WebCore::XMLDocumentParser::parseDtd):

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:

Tools:

* Scripts/build-webkit:
* Scripts/old-run-webkit-tests:
* Scripts/webkitperl/features.pm:
* Scripts/webkitpy/layout_tests/port/webkit.py:
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:

WebKitLibraries:

* win/tools/vsprops/FeatureDefines.vsprops:
* win/tools/vsprops/FeatureDefinesCairo.vsprops:

LayoutTests:

These tests are not needed anymore (and they are currently not run).

* fast/xhtmlmp: Removed.
* fast/xhtmlmp/check-doctype-declaration.xhtml: Removed.
* fast/xhtmlmp/check-rootelement.xhtml: Removed.
* fast/xhtmlmp/noscript-basic-expected.txt: Removed.
* fast/xhtmlmp/noscript-basic.xhtml: Removed.
* fast/xhtmlmp/noscript-in-multiscripts.xhtml: Removed.
* fast/xhtmlmp/noscript-nested.xhtml: Removed.
* fast/xhtmlmp/noscript.xhtml: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@97333 268f45cc-cd09-0410-ab3c-d52691b4dbfc

56 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/xhtmlmp/check-doctype-declaration.xhtml [deleted file]
LayoutTests/fast/xhtmlmp/check-rootelement.xhtml [deleted file]
LayoutTests/fast/xhtmlmp/noscript-basic-expected.txt [deleted file]
LayoutTests/fast/xhtmlmp/noscript-basic.xhtml [deleted file]
LayoutTests/fast/xhtmlmp/noscript-in-multiscripts.xhtml [deleted file]
LayoutTests/fast/xhtmlmp/noscript-nested.xhtml [deleted file]
LayoutTests/fast/xhtmlmp/noscript.xhtml [deleted file]
LayoutTests/http/tests/xhtmlmp/xhtml-expected.txt [deleted file]
LayoutTests/http/tests/xhtmlmp/xhtml.xhtmlmp [deleted file]
LayoutTests/platform/chromium/test_expectations.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/dom/DOMImplementation.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/dom/Node.cpp
Source/WebCore/dom/make_names.pl
Source/WebCore/features.pri
Source/WebCore/html/HTMLElement.cpp
Source/WebCore/html/HTMLElementsAllInOne.cpp
Source/WebCore/html/HTMLNoScriptElement.cpp [deleted file]
Source/WebCore/html/HTMLNoScriptElement.h [deleted file]
Source/WebCore/html/HTMLTagNames.in
Source/WebCore/html/HTMLViewSourceDocument.cpp
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/platform/wince/MIMETypeRegistryWinCE.cpp
Source/WebCore/xml/parser/XMLDocumentParser.h
Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
Source/WebCore/xml/parser/XMLDocumentParserQt.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsWinCE.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/build-webkit
Tools/Scripts/old-run-webkit-tests
Tools/Scripts/webkitperl/features.pm
Tools/Scripts/webkitpy/layout_tests/port/webkit.py
Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
configure.ac

index 105929c..2c964af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsWinCE.cmake:
+        * Source/cmakeconfig.h.cmake:
+        * configure.ac:
+
 2011-10-12  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
         Fix build with GLib 2.31
index 692b56d..56d567c 100644 (file)
@@ -1,3 +1,21 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        These tests are not needed anymore (and they are currently not run).
+
+        * fast/xhtmlmp: Removed.
+        * fast/xhtmlmp/check-doctype-declaration.xhtml: Removed.
+        * fast/xhtmlmp/check-rootelement.xhtml: Removed.
+        * fast/xhtmlmp/noscript-basic-expected.txt: Removed.
+        * fast/xhtmlmp/noscript-basic.xhtml: Removed.
+        * fast/xhtmlmp/noscript-in-multiscripts.xhtml: Removed.
+        * fast/xhtmlmp/noscript-nested.xhtml: Removed.
+        * fast/xhtmlmp/noscript.xhtml: Removed.
+
 2011-10-12  Kent Tamura  <tkent@chromium.org>
 
         [Chromium] Test expectation update.
diff --git a/LayoutTests/fast/xhtmlmp/check-doctype-declaration.xhtml b/LayoutTests/fast/xhtmlmp/check-doctype-declaration.xhtml
deleted file mode 100644 (file)
index b673409..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!--
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.wapforum.org/DTD/xhtml-mobile11.dtd">
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Test document conformance of XHTMLMP</title>
-</head>
-<body>
-<p> browser should report DOCTYPE declaration lack error </p>
-<hr/>
-</body>
-</html>
diff --git a/LayoutTests/fast/xhtmlmp/check-rootelement.xhtml b/LayoutTests/fast/xhtmlmp/check-rootelement.xhtml
deleted file mode 100644 (file)
index 5a69bfe..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.wapforum.org/DTD/xhtml-mobile11.dtd">
-
-<any xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Test document conformance of XHTMLMP</title>
-</head>
-<body>
-<p> This is BODY </p>
-</body>
-</any>
diff --git a/LayoutTests/fast/xhtmlmp/noscript-basic-expected.txt b/LayoutTests/fast/xhtmlmp/noscript-basic-expected.txt
deleted file mode 100644 (file)
index df562f1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-If you see this line only when javascript enabled, it succeeds; one line follows if Javascript is disabled
-
-
diff --git a/LayoutTests/fast/xhtmlmp/noscript-basic.xhtml b/LayoutTests/fast/xhtmlmp/noscript-basic.xhtml
deleted file mode 100644 (file)
index bd33f5c..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.wapforum.org/DTD/xhtml-mobile11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<body>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-</script>
-
-<p> If you see this line only when javascript enabled, it succeeds; one line follows if Javascript is disabled</p>
-<noscript><h1 id="noscript">inside noscript</h1></noscript>
-</body>
-</html>
-
diff --git a/LayoutTests/fast/xhtmlmp/noscript-in-multiscripts.xhtml b/LayoutTests/fast/xhtmlmp/noscript-in-multiscripts.xhtml
deleted file mode 100644 (file)
index ab41580..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.wapforum.org/DTD/xhtml-mobile11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title> Test noscript in mulitple script elements </title>
-</head>
-
-<body> 
-<h1> Test noscript in mulitple script elements </h1>
-
-<a href="javascript:testFun()"> clike me, javascript code won't be executed since type of &lt;script&gt; is wrong</a>
-<p>
-<noscript>
-<h1>&lt;h1&gt;first noscript element&lt;h1&gt;</h1>
-plain text in noscript
-</noscript>
-
-<script type="text/wrongtype">
-function testFun() {
-    alert("the first script");
-}
-</script>
-
-<noscript>
-<h2> &lt;h2&gt;second noscript element&lt;h2&gt;</h2>
-</noscript>
-
-<script type="text/javascript">
-function testFun2() {
-    alert("the second script");
-}
-</script>
-</p>
-
-<a href="javascript:testFun2()"> clike me to execute javascript code</a>
-</body>
-</html>
diff --git a/LayoutTests/fast/xhtmlmp/noscript-nested.xhtml b/LayoutTests/fast/xhtmlmp/noscript-nested.xhtml
deleted file mode 100644 (file)
index f2ea8e7..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.wapforum.org/DTD/xhtml-mobile11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title> Test nested-noscript  element in XHTMLMP </title>
-<script type="text/wrongtype">
-function testFunc() {
-alert("You will see me if the scripting language identified by the type of script element is supported");
-}
-</script>
-</head>
-
-<body onload="testFunc()">
-<p> Test for nested-noscript element in XHTMLMP </p>
-<p> If the test passes, you will see the following three nested noscript text, otherwise, you will see the alert window.</p>
-<noscript>
-<h1>first noscript element</h1>
-<noscript>
-<h2>second noscript element</h2>
-<noscript>
-<h3>third noscript element</h3>
-</noscript>
-<noscript>
-<h5>fourth noscript element</h5>
-</noscript>
-</noscript>
-</noscript>
-</body>
-</html>
diff --git a/LayoutTests/fast/xhtmlmp/noscript.xhtml b/LayoutTests/fast/xhtmlmp/noscript.xhtml
deleted file mode 100644 (file)
index 9a070fe..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.wapforum.org/DTD/xhtml-mobile11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title> Test noscript element in XHTMLMP document </title>
-</head>
-
-<body onload="javascript:func()">
-<p> Test for noscript element in XHTMLMP </p>
-<p> If the test passes, you can see the noscript text above</p>
-
-<noscript>
-<h1>&lt;h1&gt;The first noscript element&lt;h1&gt;</h1>
-</noscript>
-
-<script type="text/wrongtype">
-function func() {
-alert("You will see me if the scripting language identified by the type of script element is supported");
-}
-</script>
-
-<noscript>
-<h2>&lt;h2&gt;The second noscript element&lt;h2&gt;</h2>
-</noscript>
-
-</body>
-</html>
-
diff --git a/LayoutTests/http/tests/xhtmlmp/xhtml-expected.txt b/LayoutTests/http/tests/xhtmlmp/xhtml-expected.txt
deleted file mode 100644 (file)
index af9f8cf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Simple XHTML file served with an XHTML mobile profile MIME type
diff --git a/LayoutTests/http/tests/xhtmlmp/xhtml.xhtmlmp b/LayoutTests/http/tests/xhtmlmp/xhtml.xhtmlmp
deleted file mode 100644 (file)
index 0d54abc..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-</script>
-</head>
-<body>
-    Simple XHTML file served with an XHTML mobile profile MIME type
-</body>
-</html>
index 677c1ab..9396a7b 100644 (file)
@@ -388,12 +388,6 @@ WONTFIX SKIP : http/tests/globalhistory = FAIL
 // For more details, see discussions at issue 20570.
 WONTFIX SKIP : fast/forms/get-forms-to-about-blank.html = FAIL
 
-// xhtml mp tests were added in http://trac.webkit.org/changeset/43865 and are
-// skipped on all platforms upstream.
-// We are not planning to support these.
-WONTFIX SKIP : fast/xhtmlmp = FAIL
-WONTFIX SKIP : http/tests/xhtmlmp = FAIL
-
 // This test requires LayoutTestController.setCacheModel, which we don't
 // implement because we can't emulate the caching behaviors it expects.
 WONTFIX SKIP : fast/dom/HTMLScriptElement/nested-execution.html = FAIL
index 4060d9c..9967401 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-10-12  Gavin Barraclough  <baraclough@apple.com>
 
         MacroAssemblerX86 8-bit register ops unsafe on CPU(X86)
index 0b2ea79..57e6d92 100644 (file)
@@ -113,8 +113,7 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_REGIONS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 0968bdc..5fc7209 100644 (file)
@@ -1,3 +1,59 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        As discussed on webkit-dev, we are removing this feature as part of our
+        cleanup of unmaintained code in WebKit.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/DOMImplementation.cpp:
+        (WebCore::DOMImplementation::createDocument):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * dom/Document.h:
+        (WebCore::Document::isMediaDocument):
+        * dom/Node.cpp:
+        * dom/make_names.pl:
+        (usesDefaultJSWrapper):
+        * features.pri:
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::rendererIsNeeded):
+        * html/HTMLElementsAllInOne.cpp:
+        * html/HTMLNoScriptElement.cpp: Removed.
+        * html/HTMLNoScriptElement.h: Removed.
+        * html/HTMLTagNames.in:
+        * html/HTMLViewSourceDocument.cpp:
+        (WebCore::HTMLViewSourceDocument::createParser):
+        * loader/FrameLoader.cpp:
+        * platform/wince/MIMETypeRegistryWinCE.cpp:
+        (WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
+        * xml/parser/XMLDocumentParser.h:
+        (WebCore::XMLDocumentParser::isXHTMLDocument):
+        * xml/parser/XMLDocumentParserLibxml2.cpp:
+        (WebCore::XMLDocumentParser::XMLDocumentParser):
+        (WebCore::XMLDocumentParser::startElementNs):
+        (WebCore::XMLDocumentParser::endElementNs):
+        (WebCore::XMLDocumentParser::endDocument):
+        (WebCore::XMLDocumentParser::internalSubset):
+        (WebCore::getEntityHandler):
+        (WebCore::externalSubsetHandler):
+        * xml/parser/XMLDocumentParserQt.cpp:
+        (WebCore::XMLDocumentParser::XMLDocumentParser):
+        (WebCore::XMLDocumentParser::parse):
+        (WebCore::XMLDocumentParser::parseStartElement):
+        (WebCore::XMLDocumentParser::parseEndElement):
+        (WebCore::XMLDocumentParser::endDocument):
+        (WebCore::XMLDocumentParser::parseDtd):
+
 2011-10-12  Kentaro Hara  <haraken@chromium.org>
 
         Implement a WebKitTransitionEvent constructor for V8
index e484d25..54817e7 100644 (file)
@@ -112,8 +112,7 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_SQL_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 6128855..c70793c 100644 (file)
@@ -385,14 +385,6 @@ webcore_cppflags += -DENABLE_MEDIA_STREAM=0
 endif # END ENABLE_MEDIA_STREAM
 
 # ----
-# XHTML-MP Support
-# ----
-if ENABLE_XHTMLMP
-FEATURE_DEFINES += ENABLE_XHTMLMP=1
-webcore_cppflags += -DENABLE_XHTMLMP=1
-endif # END ENABLE_XHTMLMP
-
-# ----
 # XPath Support
 # ----
 if ENABLE_XPATH
index 992778a..024d170 100644 (file)
@@ -1745,8 +1745,6 @@ webcore_sources += \
        Source/WebCore/html/HTMLModElement.h \
        Source/WebCore/html/HTMLNameCollection.cpp \
        Source/WebCore/html/HTMLNameCollection.h \
-       Source/WebCore/html/HTMLNoScriptElement.cpp \
-       Source/WebCore/html/HTMLNoScriptElement.h \
        Source/WebCore/html/HTMLObjectElement.cpp \
        Source/WebCore/html/HTMLObjectElement.h \
        Source/WebCore/html/HTMLOListElement.cpp \
index 1630670..3b8813d 100644 (file)
             'html/HTMLModElement.h',
             'html/HTMLNameCollection.cpp',
             'html/HTMLNameCollection.h',
-            'html/HTMLNoScriptElement.cpp',
-            'html/HTMLNoScriptElement.h',
             'html/HTMLOListElement.cpp',
             'html/HTMLOListElement.h',
             'html/HTMLObjectElement.cpp',
index b89b3f7..eb4327d 100644 (file)
@@ -1741,7 +1741,6 @@ HEADERS += \
     html/HTMLMeterElement.h \
     html/HTMLModElement.h \
     html/HTMLNameCollection.h \
-    html/HTMLNoScriptElement.h \
     html/HTMLObjectElement.h \
     html/HTMLOListElement.h \
     html/HTMLOptGroupElement.h \
@@ -3256,11 +3255,6 @@ contains(DEFINES, ENABLE_MATHML=1) {
         rendering/mathml/RenderMathMLUnderOver.cpp
 }
 
-contains(DEFINES, ENABLE_XHTMLMP=1) {
-    SOURCES += \
-        html/HTMLNoScriptElement.cpp
-}
-
 # QRawFont feature added in Qt 4.8.0
 # 
 # If available, this is used to implement the fast path for text rendering
index 776d0b0..56602fa 100755 (executable)
                                >
                        </File>
                        <File
-                               RelativePath="..\html\HTMLNoScriptElement.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release_Cairo_CFLite|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug_All|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Production|Win32"
-                                       ExcludedFromBuild="true"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
-                               RelativePath="..\html\HTMLNoScriptElement.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\html\HTMLObjectElement.cpp"
                                >
                                <FileConfiguration
index 0abf4f7..4090491 100644 (file)
                CE02F0C411E83ADD00C6684A /* ScriptControllerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = CE02F0C311E83ADD00C6684A /* ScriptControllerBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CE057FA51220731100A476D5 /* DocumentMarkerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */; };
                CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CE4C00E410F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE4C00E310F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp */; };
-               CE4C00E610F6F7C100CA38F5 /* HTMLNoScriptElement.h in Headers */ = {isa = PBXBuildFile; fileRef = CE4C00E510F6F7C100CA38F5 /* HTMLNoScriptElement.h */; };
                CE54FD381016D9A6008B44C8 /* ScriptSourceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = CE54FD371016D9A6008B44C8 /* ScriptSourceProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CEA3949C11D45CDA003094CF /* StaticHashSetNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEA3949A11D45CDA003094CF /* StaticHashSetNodeList.cpp */; };
                CEA3949D11D45CDA003094CF /* StaticHashSetNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = CEA3949B11D45CDA003094CF /* StaticHashSetNodeList.h */; };
                CE02F0C311E83ADD00C6684A /* ScriptControllerBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptControllerBase.h; sourceTree = "<group>"; };
                CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarkerController.cpp; sourceTree = "<group>"; };
                CE057FA41220731100A476D5 /* DocumentMarkerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarkerController.h; sourceTree = "<group>"; };
-               CE4C00E310F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLNoScriptElement.cpp; sourceTree = "<group>"; };
-               CE4C00E510F6F7C100CA38F5 /* HTMLNoScriptElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLNoScriptElement.h; sourceTree = "<group>"; };
                CE54FD371016D9A6008B44C8 /* ScriptSourceProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptSourceProvider.h; sourceTree = "<group>"; };
                CEA3949A11D45CDA003094CF /* StaticHashSetNodeList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StaticHashSetNodeList.cpp; sourceTree = "<group>"; };
                CEA3949B11D45CDA003094CF /* StaticHashSetNodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticHashSetNodeList.h; sourceTree = "<group>"; };
                                1AE2AB070A1CE5CF00B42B25 /* HTMLModElement.idl */,
                                A8DF3FCD097FA0FB0052981B /* HTMLNameCollection.cpp */,
                                A8DF3FCC097FA0FB0052981B /* HTMLNameCollection.h */,
-                               CE4C00E310F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp */,
-                               CE4C00E510F6F7C100CA38F5 /* HTMLNoScriptElement.h */,
                                A871D4510A127CBC00B12A68 /* HTMLObjectElement.cpp */,
                                A871D4500A127CBC00B12A68 /* HTMLObjectElement.h */,
                                855542980AA4938800BA89F2 /* HTMLObjectElement.idl */,
                                A454424B119B3661009BE912 /* HTMLMeterElement.h in Headers */,
                                A8CFF7A70A156978000A4234 /* HTMLModElement.h in Headers */,
                                A8DF3FD4097FA0FC0052981B /* HTMLNameCollection.h in Headers */,
-                               CE4C00E610F6F7C100CA38F5 /* HTMLNoScriptElement.h in Headers */,
                                A871D45A0A127CBC00B12A68 /* HTMLObjectElement.h in Headers */,
                                A8EA79F10A1916DF00A8EF5F /* HTMLOListElement.h in Headers */,
                                A81369DE097374F600D74463 /* HTMLOptGroupElement.h in Headers */,
                                A8CFF7A90A156978000A4234 /* HTMLModElement.cpp in Sources */,
                                A8DF3FD5097FA0FC0052981B /* HTMLNameCollection.cpp in Sources */,
                                A8D06B3A0A265DCD005E7203 /* HTMLNames.cpp in Sources */,
-                               CE4C00E410F6F7BA00CA38F5 /* HTMLNoScriptElement.cpp in Sources */,
                                A871D45B0A127CBC00B12A68 /* HTMLObjectElement.cpp in Sources */,
                                A8EA79FB0A1916DF00A8EF5F /* HTMLOListElement.cpp in Sources */,
                                A81369DF097374F600D74463 /* HTMLOptGroupElement.cpp in Sources */,
index 03ff03f..fdee5ba 100644 (file)
@@ -317,11 +317,7 @@ PassRefPtr<Document> DOMImplementation::createDocument(const String& type, Frame
     // Plugins cannot take HTML and XHTML from us, and we don't even need to initialize the plugin database for those.
     if (type == "text/html")
         return HTMLDocument::create(frame, url);
-    if (type == "application/xhtml+xml"
-#if ENABLE(XHTMLMP)
-        || type == "application/vnd.wap.xhtml+xml"
-#endif
-        )
+    if (type == "application/xhtml+xml")
         return Document::createXHTML(frame, url);
 
 #if ENABLE(FTPDIR)
index 7e4de1f..a419b73 100644 (file)
 #include "MathMLNames.h"
 #endif
 
-#if ENABLE(XHTMLMP)
-#include "HTMLNoScriptElement.h"
-#endif
-
 #if ENABLE(FULLSCREEN_API)
 #include "RenderFullScreen.h"
 #endif
@@ -517,9 +513,6 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
 
     static int docID = 0;
     m_docID = docID++;
-#if ENABLE(XHTMLMP)
-    m_shouldProcessNoScriptElement = !(m_frame && m_frame->script()->canExecuteScripts(NotAboutToExecuteScript));
-#endif
 }
 
 Document::~Document()
@@ -4833,19 +4826,6 @@ MediaCanStartListener* Document::takeAnyMediaCanStartListener()
     return listener;
 }
 
-#if ENABLE(XHTMLMP)
-bool Document::isXHTMLMPDocument() const
-{
-    if (!frame() || !frame()->loader())
-        return false;
-    // As per section 7.2 of OMA-WAP-XHTMLMP-V1_1-20061020-A.pdf, a conforming user agent
-    // MUST accept XHTMLMP document identified as "application/vnd.wap.xhtml+xml"
-    // and SHOULD accept it identified as "application/xhtml+xml" , "application/xhtml+xml" is a 
-    // general MIME type for all XHTML documents, not only for XHTMLMP
-    return loader()->writer()->mimeType() == "application/vnd.wap.xhtml+xml";
-}
-#endif
-
 #if ENABLE(FULLSCREEN_API)
 bool Document::fullScreenIsAllowedForElement(Element* element) const
 {
index f799012..a02dbea 100644 (file)
@@ -440,11 +440,6 @@ public:
 #endif
     virtual bool isPluginDocument() const { return false; }
     virtual bool isMediaDocument() const { return false; }
-#if ENABLE(XHTMLMP)
-    bool isXHTMLMPDocument() const; 
-    bool shouldProcessNoscriptElement() const { return m_shouldProcessNoScriptElement; }
-    void setShouldProcessNoscriptElement(bool shouldDo) { m_shouldProcessNoScriptElement = shouldDo; }
-#endif
     virtual bool isFrameSet() const { return false; }
     
     PassRefPtr<CSSPrimitiveValueCache> cssPrimitiveValueCache() const;
@@ -1317,10 +1312,6 @@ private:
 
     String m_contentLanguage;
 
-#if ENABLE(XHTMLMP)
-    bool m_shouldProcessNoScriptElement;
-#endif
-
     RenderObject* m_savedRenderer;
     
     RefPtr<TextResourceDecoder> m_decoder;
index b79d530..86b3956 100644 (file)
 #include "SVGUseElement.h"
 #endif
 
-#if ENABLE(XHTMLMP)
-#include "HTMLNoScriptElement.h"
-#endif
-
 #if USE(JSC)
 #include <runtime/JSGlobalData.h>
 #endif
index d7dbf67..9acffd1 100755 (executable)
@@ -948,7 +948,7 @@ sub usesDefaultJSWrapper
     my $name = shift;
 
     # A tag reuses the default wrapper if its JSInterfaceName matches the default namespace Element.
-    return $enabledTags{$name}{JSInterfaceName} eq $parameters{namespace} . "Element" || $enabledTags{$name}{JSInterfaceName} eq "HTMLNoScriptElement";
+    return $enabledTags{$name}{JSInterfaceName} eq $parameters{namespace} . "Element";
 }
 
 sub printWrapperFunctions
index 933069b..02d7eb5 100644 (file)
@@ -54,7 +54,6 @@ isEmpty(HAVE_QRAWFONT) {
 !contains(DEFINES, ENABLE_XPATH=.): DEFINES += ENABLE_XPATH=1
 !contains(DEFINES, ENABLE_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=1
 !contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1
-!contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0
 !contains(DEFINES, ENABLE_DETAILS=.): DEFINES += ENABLE_DETAILS=1
 !contains(DEFINES, ENABLE_METER_TAG=.): DEFINES += ENABLE_METER_TAG=1
 !contains(DEFINES, ENABLE_MHTML=.): DEFINES += ENABLE_MHTML=0
@@ -196,7 +195,6 @@ contains(DEFINES, ENABLE_VIDEO=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
 contains(DEFINES, ENABLE_XPATH=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XPATH=1
 contains(DEFINES, ENABLE_XSLT=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XSLT=1
 contains(DEFINES, ENABLE_FILTERS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_FILTERS=1
-contains(DEFINES, ENABLE_XHTMLMP=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_XHTMLMP=1
 contains(DEFINES, ENABLE_SVG=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG=1
 contains(DEFINES, ENABLE_SVG_FONTS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_SVG_FONTS=1
 contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_JAVASCRIPT_DEBUGGER=1
index b767ebc..f1be0fa 100644 (file)
@@ -790,13 +790,8 @@ bool HTMLElement::rendererIsNeeded(const NodeRenderingContext& context)
 {
     if (hasLocalName(noscriptTag)) {
         Frame* frame = document()->frame();
-#if ENABLE(XHTMLMP)
-        if (!document()->shouldProcessNoscriptElement())
-            return false;
-#else
         if (frame && frame->script()->canExecuteScripts(NotAboutToExecuteScript))
             return false;
-#endif        
     } else if (hasLocalName(noembedTag)) {
         Frame* frame = document()->frame();
         if (frame && frame->loader()->subframeLoader()->allowPlugins(NotAboutToInstantiatePlugin))
index 45f1ef4..5d9942f 100644 (file)
@@ -76,7 +76,6 @@
 #include "HTMLMetaElement.cpp"
 #include "HTMLMeterElement.cpp"
 #include "HTMLModElement.cpp"
-#include "HTMLNoScriptElement.cpp"
 #include "HTMLOListElement.cpp"
 #include "HTMLObjectElement.cpp"
 #include "HTMLOptGroupElement.cpp"
diff --git a/Source/WebCore/html/HTMLNoScriptElement.cpp b/Source/WebCore/html/HTMLNoScriptElement.cpp
deleted file mode 100644 (file)
index 2b7580d..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#if ENABLE(XHTMLMP)
-#include "HTMLNoScriptElement.h"
-
-#include "CSSStyleSelector.h"
-#include "HTMLNames.h"
-#include "RenderObject.h"
-
-namespace WebCore {
-
-using namespace HTMLNames;
-
-inline HTMLNoScriptElement::HTMLNoScriptElement(const QualifiedName& tagName, Document* document)
-    : HTMLElement(tagName, document)
-{
-    ASSERT(hasTagName(noscriptTag));
-
-    setHasCustomWillOrDidRecalcStyle();
-#if ENABLE(XHTMLMP)
-    setHasCustomStyleForRenderer();
-#endif
-}
-
-PassRefPtr<HTMLNoScriptElement> HTMLNoScriptElement::create(const QualifiedName& tagName, Document* document)
-{
-    return adoptRef(new HTMLNoScriptElement(tagName, document));
-}
-
-void HTMLNoScriptElement::attach()
-{
-    HTMLElement::attach();
-
-    // If no need to process <noscript>, we hide it by setting display:none temporarily
-    if (!document()->shouldProcessNoscriptElement()) {
-        if (renderer() && renderer()->style())
-            renderer()->style()->setDisplay(NONE);
-        setNeedsStyleRecalc();
-    }
-}
-
-bool HTMLNoScriptElement::willRecalcStyle(StyleChange)
-{
-    if (!document()->shouldProcessNoscriptElement() || !renderer() || !renderer()->style())
-        return false;
-
-    // If <noscript> needs processing, we make it visiable here, including its visible children
-    RefPtr<RenderStyle> style = renderer()->style();
-    if (style->display() == NONE) {
-        style->setDisplay(INLINE);
-
-        // Create renderers for its children
-        if (hasChildNodes()) {
-            for (Node* n = firstChild(); n; n = n->traverseNextNode(this))
-                if (!n->renderer())
-                    n->createRendererIfNeeded();
-        }
-    }
-    return false;
-}
-    
-#if ENABLE(XHTMLMP)
-PassRefPtr<RenderStyle> HTMLNoScriptElement::customStyleForRenderer()
-{
-    // noscript needs the display property protected - it's a special case
-    // FIXME: Why?
-    return document()->styleSelector()->styleForElement(static_cast<Element*>(this), 0, false/*allowSharing*/);
-}
-#endif
-
-bool HTMLNoScriptElement::childShouldCreateRenderer(Node*) const
-{
-    return document()->shouldProcessNoscriptElement();
-}
-
-}
-
-#endif
diff --git a/Source/WebCore/html/HTMLNoScriptElement.h b/Source/WebCore/html/HTMLNoScriptElement.h
deleted file mode 100644 (file)
index d3fae6c..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef HTMLNoScriptElement_h
-#define HTMLNoScriptElement_h
-
-#if ENABLE(XHTMLMP)
-#include "HTMLElement.h"
-
-namespace WebCore {
-
-class HTMLNoScriptElement : public HTMLElement {
-public:
-    static PassRefPtr<HTMLNoScriptElement> create(const QualifiedName&, Document*);
-
-private:
-    HTMLNoScriptElement(const QualifiedName&, Document*);
-
-    virtual void attach();
-    virtual bool willRecalcStyle(StyleChange);
-    virtual bool childShouldCreateRenderer(Node*) const;
-    virtual bool rendererIsNeeded(const NodeRenderingContext&) {  return true; }
-#if ENABLE(XHTMLMP)
-    virtual PassRefPtr<RenderStyle> customStyleForRenderer();
-#endif
-};
-
-} //namespace
-
-#endif
-#endif
index 49dd2d4..8298c25 100644 (file)
@@ -131,10 +131,4 @@ var interfaceName=HTMLElement
 video wrapperOnlyIfMediaIsAvailable, conditional=VIDEO
 wbr interfaceName=HTMLElement
 xmp interfaceName=HTMLPreElement
-
-#if ENABLE_XHTMLMP
-noscript interfaceName=HTMLNoScriptElement
-#else
 noscript interfaceName=HTMLElement
-#endif
-
index 402fab8..8aebb54 100644 (file)
@@ -61,11 +61,7 @@ HTMLViewSourceDocument::HTMLViewSourceDocument(Frame* frame, const KURL& url, co
 
 PassRefPtr<DocumentParser> HTMLViewSourceDocument::createParser()
 {
-    if (m_type == "text/html" || m_type == "application/xhtml+xml" || m_type == "image/svg+xml" || DOMImplementation::isXMLMIMEType(m_type)
-#if ENABLE(XHTMLMP)
-        || m_type == "application/vnd.wap.xhtml+xml"
-#endif
-        )
+    if (m_type == "text/html" || m_type == "application/xhtml+xml" || m_type == "image/svg+xml" || DOMImplementation::isXMLMIMEType(m_type))
         return HTMLViewSourceParser::create(this);
 
     return TextViewSourceParser::create(this);
index 0fe54b4..c5c2048 100644 (file)
@@ -133,12 +133,7 @@ using namespace HTMLNames;
 using namespace SVGNames;
 #endif
 
-#if ENABLE(XHTMLMP)
-static const char defaultAcceptHeader[] = "application/vnd.wap.xhtml+xml,application/xhtml+xml;profile='http://www.wapforum.org/xhtml',text/html,application/xml;q=0.9,*/*;q=0.8";
-#else
 static const char defaultAcceptHeader[] = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
-#endif
-
 static double storedTimeOfLastCompletedLoad;
 
 bool isBackForwardLoadType(FrameLoadType type)
index b21a7eb..5717187 100644 (file)
@@ -108,11 +108,6 @@ String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& type)
             return i->first;
     }
 
-#if ENABLE(XHTMLMP)
-    if (equalIgnoringCase("application/vnd.wap.xhtml+xml", type))
-        return String("xml");
-#endif
-
     return String();
 }
 
index d514596..1ec0a80 100644 (file)
@@ -91,10 +91,6 @@ class Text;
 
         void setIsXHTMLDocument(bool isXHTML) { m_isXHTMLDocument = isXHTML; }
         bool isXHTMLDocument() const { return m_isXHTMLDocument; }
-#if ENABLE(XHTMLMP)
-        void setIsXHTMLMPDocument(bool isXHTML) { m_isXHTMLMPDocument = isXHTML; }
-        bool isXHTMLMPDocument() const { return m_isXHTMLMPDocument; }
-#endif
 
         static bool parseDocumentFragment(const String&, DocumentFragment*, Element* parent = 0, FragmentScriptingPermission = FragmentScriptingAllowed);
 
@@ -196,11 +192,6 @@ public:
         bool m_sawXSLTransform;
         bool m_sawFirstElement;
         bool m_isXHTMLDocument;
-#if ENABLE(XHTMLMP)
-        bool m_isXHTMLMPDocument;
-        bool m_hasDocTypeDeclaration;
-#endif
-
         bool m_parserPaused;
         bool m_requestingScript;
         bool m_finishCalled;
index 0d2892b..0fdd227 100644 (file)
 #include <libxslt/xslt.h>
 #endif
 
-#if ENABLE(XHTMLMP)
-#include "HTMLScriptElement.h"
-#endif
-
-
 using namespace std;
 
 namespace WebCore {
@@ -555,10 +550,6 @@ XMLDocumentParser::XMLDocumentParser(Document* document, FrameView* frameView)
     , m_sawXSLTransform(false)
     , m_sawFirstElement(false)
     , m_isXHTMLDocument(false)
-#if ENABLE(XHTMLMP)
-    , m_isXHTMLMPDocument(false)
-    , m_hasDocTypeDeclaration(false)
-#endif
     , m_parserPaused(false)
     , m_requestingScript(false)
     , m_finishCalled(false)
@@ -581,10 +572,6 @@ XMLDocumentParser::XMLDocumentParser(DocumentFragment* fragment, Element* parent
     , m_sawXSLTransform(false)
     , m_sawFirstElement(false)
     , m_isXHTMLDocument(false)
-#if ENABLE(XHTMLMP)
-    , m_isXHTMLMPDocument(false)
-    , m_hasDocTypeDeclaration(false)
-#endif
     , m_parserPaused(false)
     , m_requestingScript(false)
     , m_finishCalled(false)
@@ -756,14 +743,6 @@ void XMLDocumentParser::startElementNs(const xmlChar* xmlLocalName, const xmlCha
         return;
     }
 
-#if ENABLE(XHTMLMP)
-    // check if the DOCTYPE Declaration of XHTMLMP document exists
-    if (!m_hasDocTypeDeclaration && document()->isXHTMLMPDocument()) {
-        handleError(fatal, "DOCTYPE declaration lost.", lineNumber(), columnNumber());
-        return;
-    }
-#endif
-
     exitText();
 
     AtomicString localName = toAtomicString(xmlLocalName);
@@ -777,24 +756,6 @@ void XMLDocumentParser::startElementNs(const xmlChar* xmlLocalName, const xmlCha
             uri = m_defaultNamespaceURI;
     }
 
-#if ENABLE(XHTMLMP)
-    if (!m_sawFirstElement && isXHTMLMPDocument()) {
-        // As per the section 7.1 of OMA-WAP-XHTMLMP-V1_1-20061020-A.pdf,
-        // we should make sure that the root element MUST be 'html' and
-        // ensure the name of the default namespace on the root elment 'html'
-        // MUST be 'http://www.w3.org/1999/xhtml'
-        if (localName != HTMLNames::htmlTag.localName()) {
-            handleError(fatal, "XHTMLMP document expects 'html' as root element.", lineNumber(), columnNumber());
-            return;
-        }
-
-        if (uri.isNull()) {
-            m_defaultNamespaceURI = HTMLNames::xhtmlNamespaceURI;
-            uri = m_defaultNamespaceURI;
-        }
-    }
-#endif
-
     bool isFirstElement = !m_sawFirstElement;
     m_sawFirstElement = true;
 
@@ -887,13 +848,7 @@ void XMLDocumentParser::endElementNs()
     ASSERT(!m_pendingScript);
     m_requestingScript = true;
 
-    bool successfullyPrepared = scriptElement->prepareScript(m_scriptStartPosition, ScriptElement::AllowLegacyTypeInTypeAttribute);
-    if (!successfullyPrepared) {
-#if ENABLE(XHTMLMP)
-        if (!scriptElement->isScriptTypeSupported(ScriptElement::AllowLegacyTypeInTypeAttribute))
-            document()->setShouldProcessNoscriptElement(true);
-#endif
-    } else {
+    if (scriptElement->prepareScript(m_scriptStartPosition, ScriptElement::AllowLegacyTypeInTypeAttribute)) {
         // FIXME: Script execution should be shared between
         // the libxml2 and Qt XMLDocumentParser implementations.
 
@@ -1043,9 +998,6 @@ void XMLDocumentParser::startDocument(const xmlChar* version, const xmlChar* enc
 void XMLDocumentParser::endDocument()
 {
     exitText();
-#if ENABLE(XHTMLMP)
-    m_hasDocTypeDeclaration = false;
-#endif
 }
 
 void XMLDocumentParser::internalSubset(const xmlChar* name, const xmlChar* externalID, const xmlChar* systemID)
@@ -1058,28 +1010,8 @@ void XMLDocumentParser::internalSubset(const xmlChar* name, const xmlChar* exter
         return;
     }
 
-    if (document()) {
-#if ENABLE(XHTMLMP)
-        String extId = toString(externalID);
-        String dtdName = toString(name);
-        if (extId == "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-            || extId == "-//WAPFORUM//DTD XHTML Mobile 1.1//EN") {
-            if (dtdName != HTMLNames::htmlTag.localName()) {
-                handleError(fatal, "Invalid DOCTYPE declaration, expected 'html' as root element.", lineNumber(), columnNumber());
-                return;
-            }
-
-            if (document()->isXHTMLMPDocument())
-                setIsXHTMLMPDocument(true);
-            else
-                setIsXHTMLDocument(true);
-
-            m_hasDocTypeDeclaration = true;
-        }
-#endif
-
+    if (document())
         document()->parserAddChild(DocumentType::create(document(), toString(name), toString(externalID), toString(systemID)));
-    }
 }
 
 static inline XMLDocumentParser* getParser(void* closure)
@@ -1220,11 +1152,7 @@ static xmlEntityPtr getEntityHandler(void* closure, const xmlChar* name)
     }
 
     ent = xmlGetDocEntity(ctxt->myDoc, name);
-    if (!ent && (getParser(closure)->isXHTMLDocument()
-#if ENABLE(XHTMLMP)
-                 || getParser(closure)->isXHTMLMPDocument()
-#endif
-       )) {
+    if (!ent && getParser(closure)->isXHTMLDocument()) {
         ent = getXHTMLEntity(name);
         if (ent)
             ent->etype = XML_INTERNAL_GENERAL_ENTITY;
@@ -1263,8 +1191,7 @@ static void externalSubsetHandler(void* closure, const xmlChar*, const xmlChar*
         || (extId == "-//W3C//DTD XHTML Basic 1.0//EN")
         || (extId == "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN")
         || (extId == "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN")
-        || (extId == "-//WAPFORUM//DTD XHTML Mobile 1.0//EN")
-       )
+        || (extId == "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"))
         getParser(closure)->setIsXHTMLDocument(true); // controls if we replace entities or not.
 }
 
index f5d17d8..0ebfaa9 100644 (file)
 #include <wtf/Vector.h>
 #include <wtf/text/CString.h>
 
-#if ENABLE(XHTMLMP)
-#include "HTMLNames.h"
-#include "HTMLScriptElement.h"
-#endif
-
 using namespace std;
 
 namespace WebCore {
@@ -94,10 +89,6 @@ XMLDocumentParser::XMLDocumentParser(Document* document, FrameView* frameView)
     , m_sawXSLTransform(false)
     , m_sawFirstElement(false)
     , m_isXHTMLDocument(false)
-#if ENABLE(XHTMLMP)
-    , m_isXHTMLMPDocument(false)
-    , m_hasDocTypeDeclaration(false)
-#endif
     , m_parserPaused(false)
     , m_requestingScript(false)
     , m_finishCalled(false)
@@ -120,10 +111,6 @@ XMLDocumentParser::XMLDocumentParser(DocumentFragment* fragment, Element* parent
     , m_sawXSLTransform(false)
     , m_sawFirstElement(false)
     , m_isXHTMLDocument(false)
-#if ENABLE(XHTMLMP)
-    , m_isXHTMLMPDocument(false)
-    , m_hasDocTypeDeclaration(false)
-#endif
     , m_parserPaused(false)
     , m_requestingScript(false)
     , m_finishCalled(false)
@@ -362,27 +349,17 @@ void XMLDocumentParser::parse()
     while (!isStopped() && !m_parserPaused && !m_stream.atEnd()) {
         m_stream.readNext();
         switch (m_stream.tokenType()) {
-        case QXmlStreamReader::StartDocument: {
+        case QXmlStreamReader::StartDocument:
             startDocument();
-        }
             break;
-        case QXmlStreamReader::EndDocument: {
+        case QXmlStreamReader::EndDocument:
             endDocument();
-        }
             break;
-        case QXmlStreamReader::StartElement: {
-#if ENABLE(XHTMLMP)
-            if (document()->isXHTMLMPDocument() && !m_hasDocTypeDeclaration) {
-                handleError(XMLErrors::fatal, "DOCTYPE declaration lost.", lineNumber(), columnNumber());
-                break;
-            }
-#endif
+        case QXmlStreamReader::StartElement:
             parseStartElement();
-        }
             break;
-        case QXmlStreamReader::EndElement: {
+        case QXmlStreamReader::EndElement:
             parseEndElement();
-        }
             break;
         case QXmlStreamReader::Characters: {
             if (m_stream.isCDATA()) {
@@ -392,28 +369,19 @@ void XMLDocumentParser::parse()
                 //characters
                 parseCharacters();
             }
-        }
             break;
-        case QXmlStreamReader::Comment: {
-            parseComment();
         }
+        case QXmlStreamReader::Comment:
+            parseComment();
             break;
-        case QXmlStreamReader::DTD: {
+        case QXmlStreamReader::DTD:
             //qDebug()<<"------------- DTD";
             parseDtd();
-#if ENABLE(XHTMLMP)
-            m_hasDocTypeDeclaration = true;
-#endif
-        }
             break;
         case QXmlStreamReader::EntityReference: {
             //qDebug()<<"---------- ENTITY = "<<m_stream.name().toString()
             //        <<", t = "<<m_stream.text().toString();
-            if (isXHTMLDocument()
-#if ENABLE(XHTMLMP)
-                || isXHTMLMPDocument()
-#endif
-               ) {
+            if (isXHTMLDocument()) {
                 QString entity = m_stream.name().toString();
                 UChar c = decodeNamedEntity(entity.toUtf8().constData());
                 if (!m_leafTextNode)
@@ -423,11 +391,10 @@ void XMLDocumentParser::parse()
                 // qDebug()<<" ------- adding entity "<<str;
                 m_leafTextNode->appendData(str, ec);
             }
-        }
             break;
-        case QXmlStreamReader::ProcessingInstruction: {
-            parseProcessingInstruction();
         }
+        case QXmlStreamReader::ProcessingInstruction:
+            parseProcessingInstruction();
             break;
         default: {
             if (m_stream.error() != QXmlStreamReader::PrematureEndOfDocumentError) {
@@ -435,9 +402,9 @@ void XMLDocumentParser::parse()
                                  XMLErrors::fatal : XMLErrors::warning;
                 handleError(type, qPrintable(m_stream.errorString()), textPosition());
             }
-        }
             break;
         }
+        }
     }
 }
 
@@ -484,25 +451,6 @@ void XMLDocumentParser::parseStartElement()
         return;
     }
 
-#if ENABLE(XHTMLMP)
-    if (!m_sawFirstElement && isXHTMLMPDocument()) {
-        // As per 7.1 section of OMA-WAP-XHTMLMP-V1_1-20061020-A.pdf,
-        // we should make sure that the root element MUST be 'html' and
-        // ensure the name of the default namespace on the root elment 'html'
-        // MUST be 'http://www.w3.org/1999/xhtml'
-        if (localName != HTMLNames::htmlTag.localName()) {
-            handleError(XMLErrors::fatal, "XHTMLMP document expects 'html' as root element.", lineNumber(), columnNumber());
-            return;
-        }
-
-        if (uri.isNull()) {
-            m_defaultNamespaceURI = HTMLNames::xhtmlNamespaceURI;
-            uri = m_defaultNamespaceURI;
-            m_stream.addExtraNamespaceDeclaration(QXmlStreamNamespaceDeclaration(prefix, HTMLNames::xhtmlNamespaceURI));
-        }
-    }
-#endif
-
     bool isFirstElement = !m_sawFirstElement;
     m_sawFirstElement = true;
 
@@ -575,13 +523,7 @@ void XMLDocumentParser::parseEndElement()
     ASSERT(!m_pendingScript);
     m_requestingScript = true;
 
-    bool successfullyPrepared = scriptElement->prepareScript(m_scriptStartPosition, ScriptElement::AllowLegacyTypeInTypeAttribute);
-    if (!successfullyPrepared) {
-#if ENABLE(XHTMLMP)
-        if (!scriptElement->isScriptTypeSupported(ScriptElement::AllowLegacyTypeInTypeAttribute))
-            document()->setShouldProcessNoscriptElement(true);
-#endif
-    } else {
+    if (scriptElement->prepareScript(m_scriptStartPosition, ScriptElement::AllowLegacyTypeInTypeAttribute)) {
         if (scriptElement->readyToBeParserExecuted())
             scriptElement->executeScript(ScriptSourceCode(scriptElement->scriptContent(), document()->url(), m_scriptStartPosition));
         else if (scriptElement->willBeParserExecuted()) {
@@ -660,9 +602,6 @@ void XMLDocumentParser::parseComment()
 
 void XMLDocumentParser::endDocument()
 {
-#if ENABLE(XHTMLMP)
-    m_hasDocTypeDeclaration = false;
-#endif
 }
 
 bool XMLDocumentParser::hasError() const
@@ -684,25 +623,9 @@ void XMLDocumentParser::parseDtd()
         || (publicId == QLatin1String("-//W3C//DTD XHTML Basic 1.0//EN"))
         || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"))
         || (publicId == QLatin1String("-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"))
-#if !ENABLE(XHTMLMP)
         || (publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.0//EN"))
-#endif
        )
         setIsXHTMLDocument(true); // controls if we replace entities or not.
-#if ENABLE(XHTMLMP)
-    else if ((publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.1//EN"))
-             || (publicId == QLatin1String("-//WAPFORUM//DTD XHTML Mobile 1.0//EN"))) {
-        if (AtomicString(name) != HTMLNames::htmlTag.localName()) {
-            handleError(XMLErrors::fatal, "Invalid DOCTYPE declaration, expected 'html' as root element.", lineNumber(), columnNumber());
-            return;
-        }
-
-        if (document()->isXHTMLMPDocument()) // check if the MIME type is correct with this method
-            setIsXHTMLMPDocument(true);
-        else
-            setIsXHTMLDocument(true);
-    }
-#endif
     if (!m_parsingFragment)
         document()->parserAddChild(DocumentType::create(document(), name, publicId, systemId));
 
index 4881ab7..bd8d5aa 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-10-10  Nate Chapin  <japhet@chromium.org>
 
         Use a CachedImageClient instead of CachedResourceClient
index 9301a61..fcf6052 100644 (file)
@@ -112,8 +112,7 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 2f2cc1f..6a21ab4 100644 (file)
@@ -1,3 +1,12 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2011-10-12  Dan Bernstein  <mitz@apple.com>
 
         Hang beneath PluginProcessProxy::createPropertyListFile() when using a thin build
index 9301a61..fcf6052 100644 (file)
@@ -112,8 +112,7 @@ ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
 ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
 ENABLE_WEB_TIMING = ;
 ENABLE_WORKERS = ENABLE_WORKERS;
-ENABLE_XHTMLMP = ;
 ENABLE_XPATH = ENABLE_XPATH;
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHTMLMP) $(ENABLE_XPATH) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CLIENT_BASED_GEOLOCATION) $(ENABLE_CSS3_FLEXBOX) $(ENABLE_CSS_FILTERS) $(ENABLE_DATABASE) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM_STORAGE) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SHARED_WORKERS) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XPATH) $(ENABLE_XSLT);
index 36f97d0..d045a41 100644 (file)
@@ -92,7 +92,6 @@ WEBKIT_FEATURE(ENABLE_TOUCH_ICON_LOADING "Enable Touch Icon Loading" DEFAULT OFF
 WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT ON HTML)
 WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT ON)
-WEBKIT_FEATURE(ENABLE_XHTMLMP "Enable XHTMLMP" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_XPATH "Enable XPath" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_DFG_JIT "Enable DFG JIT" DEFAULT OFF)
index 7cde329..1c8c6aa 100644 (file)
@@ -47,6 +47,5 @@ WEBKIT_FEATURE(ENABLE_TOUCH_EVENTS "Enable Touch Events" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_VIDEO "Enable video" DEFAULT OFF HTML)
 WEBKIT_FEATURE(ENABLE_WEB_SOCKETS "Enable web sockets" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_WORKERS "Enable workers" DEFAULT OFF)
-WEBKIT_FEATURE(ENABLE_XHTMLMP "Enable XHTMLMP" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_XPATH "Enable XPath" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_XSLT "Enable XSLT" DEFAULT OFF)
index f57dd19..e8deaae 100644 (file)
@@ -40,7 +40,6 @@
 #cmakedefine01 ENABLE_WEBGL
 #cmakedefine01 ENABLE_WEB_SOCKETS
 #cmakedefine01 ENABLE_WORKERS
-#cmakedefine01 ENABLE_XHTMLMP
 #cmakedefine01 ENABLE_XPATH
 #cmakedefine01 ENABLE_XSLT
 #cmakedefine01 ENABLE_DFG_JIT
index 17511f9..9e7b786 100644 (file)
@@ -1,3 +1,16 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        * Scripts/build-webkit:
+        * Scripts/old-run-webkit-tests:
+        * Scripts/webkitperl/features.pm:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+
 2011-10-12  Ryosuke Niwa  <rniwa@webkit.org>
 
         Kill old run-webkit-tests processes in kill-process on Mac
index f952095..70ca3c5 100755 (executable)
@@ -128,7 +128,6 @@ my (
     $webSocketsSupport,
     $webTimingSupport,
     $workersSupport,
-    $xhtmlmpSupport,
     $xpathSupport,
     $xsltSupport,
 );
@@ -323,9 +322,6 @@ my @features = (
     { option => "workers", desc => "Toggle Web Workers support",
       define => "ENABLE_WORKERS", default => (isAppleWebKit() || isGtk()), value => \$workersSupport },
 
-    { option => "xhtmlmp", desc => "Toggle XHTML-MP support",
-      define => "ENABLE_XHTMLMP", default => 0, value => \$xhtmlmpSupport },
-
     { option => "xpath", desc => "Toggle XPath support",
       define => "ENABLE_XPATH", default => 1, value => \$xpathSupport },
 
index 7754450..6309959 100755 (executable)
@@ -620,10 +620,6 @@ if (!checkWebCoreFeatureSupport("3D Canvas", 0)) {
     $ignoredDirectories{'http/tests/canvas/webgl'} = 1;
 }
 
-if (!checkWebCoreFeatureSupport("XHTMLMP", 0)) {
-    $ignoredDirectories{'fast/xhtmlmp'} = 1;
-}
-
 if (isAppleMacWebKit() && $platform ne "mac-wk2" && osXVersion()->{minor} >= 6 && architecture() =~ /x86_64/) {
     # This test relies on executing JavaScript during NPP_Destroy, which isn't supported with
     # out-of-process plugins in WebKit1. See <http://webkit.org/b/58077>.
index 468dc78..1df5640 100644 (file)
@@ -71,7 +71,6 @@ sub hasFeature($$)
         "Accelerated Compositing" => "GraphicsLayer",
         "3D Rendering" => "WebCoreHas3DRendering",
         "3D Canvas" => "WebGLShader",
-        "XHTMLMP" => "isXHTMLMPDocument",
         "MHTML" => "MHTMLArchive"
     );
     my $symbolName = $symbolForFeature{$featureName};
index 44e85ae..349807f 100644 (file)
@@ -270,7 +270,6 @@ class WebKitPort(Port):
             "GraphicsLayer": ["compositing"],
             "WebCoreHas3DRendering": ["animations/3d", "transforms/3d"],
             "WebGLShader": ["fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl"],
-            "isXHTMLMPDocument": ["fast/xhtmlmp"],
             "MHTMLArchive": ["mhtml"],
         }
         return directories_for_symbol
index 9d0ef52..bb94a50 100755 (executable)
@@ -96,7 +96,7 @@ class WebKitPortTest(port_testcase.PortTestCase):
         pass
 
     def test_skipped_directories_for_symbols(self):
-        supported_symbols = ["GraphicsLayer", "WebCoreHas3DRendering", "isXHTMLMPDocument", "fooSymbol"]
+        supported_symbols = ["GraphicsLayer", "WebCoreHas3DRendering", "fooSymbol"]
         expected_directories = set(["mathml", "fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl", "mhtml"])
         result_directories = set(TestWebKitPort(supported_symbols, None)._skipped_tests_for_unsupported_features())
         self.assertEqual(result_directories, expected_directories)
index 9a39ba0..efb04b8 100644 (file)
@@ -1,3 +1,13 @@
+2011-10-12  Adam Barth  <abarth@webkit.org>
+
+        Remove ENABLE(XHTMLMP) and associated code
+        https://bugs.webkit.org/show_bug.cgi?id=69729
+
+        Reviewed by David Levin.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2011-10-11  Kent Tamura  <tkent@chromium.org>
 
         C4481 warning should be disabled for OVERRIDE and FINAL.
index 8be4777..aea6e74 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_REQUEST_ANIMATION_FRAME"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_XHTMLMP"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_XPATH"
                Value="ENABLE_XPATH"
                PerformEnvironmentSet="true"
index ab72705..8b41ec0 100644 (file)
@@ -9,7 +9,7 @@
        >
   <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+               PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM_STORAGE);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_CSS3_FLEXBOX);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XPATH);$(ENABLE_XSLT)"
        />
   <UserMacro
                Name="ENABLE_3D_CANVAS"
                PerformEnvironmentSet="true"
        />
   <UserMacro
-               Name="ENABLE_XHTMLMP"
-               Value=""
-               PerformEnvironmentSet="true"
-       />
-  <UserMacro
                Name="ENABLE_XPATH"
                Value="ENABLE_XPATH"
                PerformEnvironmentSet="true"
index 7675946..563059f 100644 (file)
@@ -598,14 +598,6 @@ AC_ARG_ENABLE(media_stream,
               [],[enable_media_stream="no"])
 AC_MSG_RESULT([$enable_media_stream])
 
-# check whether to enable XHTML-MP support
-AC_MSG_CHECKING([whether to enable XHTML-MP support])
-AC_ARG_ENABLE(xhtmlmp,
-              AC_HELP_STRING([--enable-xhtmlmp],
-                             [enable support for XHTML-MP [default=no]]),
-              [],[enable_xhtmlmp="no"])
-AC_MSG_RESULT([$enable_xhtmlmp])
-
 # check whether to enable XPath support
 AC_MSG_CHECKING([whether to enable XPath support])
 AC_ARG_ENABLE(xpath,
@@ -1165,7 +1157,6 @@ AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
 AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
 AM_CONDITIONAL([ENABLE_INPUT_COLOR],[test "$enable_input_color" = "yes"])
 AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"])
-AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
 AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
 AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
 AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
@@ -1297,7 +1288,6 @@ Features:
  Web Sockets support                                      : $enable_web_sockets
  Web Timing support                                       : $enable_web_timing
  Web Workers support                                      : $enable_workers
- XHTML-MP support                                         : $enable_xhtmlmp
  XPATH support                                            : $enable_xpath
  XSLT support                                             : $enable_xslt
  Spellcheck support                                       : $enable_spellcheck