Clean up the XBL and XSLT ifdefs to be consistent with the SVG

        and XPath ifdefs.  KHTML_NO_XBL is flipped and is now XBL_SUPPORT.
        KHTML_XSLT is now XSLT_SUPPORT.

        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/JSXSLTProcessor.cpp:
        * bindings/js/JSXSLTProcessor.h:
        * bindings/js/kjs_window.cpp:
        (KJS::Window::getValueProperty):
        * config.h:
        * css/CSSComputedStyleDeclaration.cpp:
        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
        * css/cssparser.cpp:
        (WebCore::CSSParser::parseValue):
        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::applyProperty):
        * dom/Document.cpp:
        (WebCore::Document::Document):
        (WebCore::Document::~Document):
        (WebCore::Document::recalcStyleSelector):
        * dom/Document.h:
        (WebCore::Document::bindingManager):
        * dom/Node.cpp:
        (WebCore::Node::createRendererIfNeeded):
        * dom/ProcessingInstruction.cpp:
        (WebCore::ProcessingInstruction::ProcessingInstruction):
        (WebCore::ProcessingInstruction::checkStyleSheet):
        (WebCore::ProcessingInstruction::setStyleSheet):
        * dom/ProcessingInstruction.h:
        * dom/XMLTokenizer.cpp:
        (WebCore::XMLTokenizer::processingInstruction):
        (WebCore::XMLTokenizer::insertErrorMessageBlock):
        * dom/XMLTokenizer.h:
        * loader/Cache.cpp:
        (WebCore::Cache::getStatistics):
        * loader/Cache.h:
        * loader/CachedResource.h:
        (WebCore::CachedResource::):
        * loader/CachedResourceClient.h:
        * loader/CachedXBLDocument.cpp:
        * loader/CachedXBLDocument.h:
        * loader/CachedXSLStyleSheet.cpp:
        * loader/CachedXSLStyleSheet.h:
        * loader/DocLoader.cpp:
        * loader/DocLoader.h:
        * rendering/RenderStyle.cpp:
        (WebCore::StyleCSS3NonInheritedData::StyleCSS3NonInheritedData):
        (WebCore::StyleCSS3NonInheritedData::~StyleCSS3NonInheritedData):
        (WebCore::StyleCSS3NonInheritedData::operator==):
        * rendering/RenderStyle.h:
        * xml/XSLImportRule.cpp:
        * xml/XSLImportRule.h:
        * xml/XSLStyleSheet.cpp:
        * xml/XSLStyleSheet.h:
        * xml/XSLTProcessor.cpp:
        * xml/XSLTProcessor.h:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2968421e98167b1c7de9a2995024380dba1b0bac..4ed111326c107ad69871f8ef38b4422bafea24a3 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,62 @@
+2006-09-13  David Hyatt  <hyatt@apple.com>
+
+        Clean up the XBL and XSLT ifdefs to be consistent with the SVG
+        and XPath ifdefs.  KHTML_NO_XBL is flipped and is now XBL_SUPPORT.
+        KHTML_XSLT is now XSLT_SUPPORT.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSXSLTProcessor.cpp:
+        * bindings/js/JSXSLTProcessor.h:
+        * bindings/js/kjs_window.cpp:
+        (KJS::Window::getValueProperty):
+        * config.h:
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/cssparser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::~Document):
+        (WebCore::Document::recalcStyleSelector):
+        * dom/Document.h:
+        (WebCore::Document::bindingManager):
+        * dom/Node.cpp:
+        (WebCore::Node::createRendererIfNeeded):
+        * dom/ProcessingInstruction.cpp:
+        (WebCore::ProcessingInstruction::ProcessingInstruction):
+        (WebCore::ProcessingInstruction::checkStyleSheet):
+        (WebCore::ProcessingInstruction::setStyleSheet):
+        * dom/ProcessingInstruction.h:
+        * dom/XMLTokenizer.cpp:
+        (WebCore::XMLTokenizer::processingInstruction):
+        (WebCore::XMLTokenizer::insertErrorMessageBlock):
+        * dom/XMLTokenizer.h:
+        * loader/Cache.cpp:
+        (WebCore::Cache::getStatistics):
+        * loader/Cache.h:
+        * loader/CachedResource.h:
+        (WebCore::CachedResource::):
+        * loader/CachedResourceClient.h:
+        * loader/CachedXBLDocument.cpp:
+        * loader/CachedXBLDocument.h:
+        * loader/CachedXSLStyleSheet.cpp:
+        * loader/CachedXSLStyleSheet.h:
+        * loader/DocLoader.cpp:
+        * loader/DocLoader.h:
+        * rendering/RenderStyle.cpp:
+        (WebCore::StyleCSS3NonInheritedData::StyleCSS3NonInheritedData):
+        (WebCore::StyleCSS3NonInheritedData::~StyleCSS3NonInheritedData):
+        (WebCore::StyleCSS3NonInheritedData::operator==):
+        * rendering/RenderStyle.h:
+        * xml/XSLImportRule.cpp:
+        * xml/XSLImportRule.h:
+        * xml/XSLStyleSheet.cpp:
+        * xml/XSLStyleSheet.h:
+        * xml/XSLTProcessor.cpp:
+        * xml/XSLTProcessor.h:
+
 2006-09-13  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by eseidel.  Landed by eseidel.

diff --git a/WebCore/bindings/js/JSXSLTProcessor.cpp b/WebCore/bindings/js/JSXSLTProcessor.cpp
index e4e4452b32c415c7071e5079bfbb10d065274ab9..291308b4dc3ee37972a0a08f979fe750c3a2a147 100644 (file)
--- a/WebCore/bindings/js/JSXSLTProcessor.cpp
+++ b/WebCore/bindings/js/JSXSLTProcessor.cpp
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #include "JSXSLTProcessor.h"
 #include "XSLTProcessor.h"
@@ -158,4 +158,4 @@ XSLTProcessorConstructorImp::XSLTProcessorConstructorImp(ExecState *exec)
 
 }
 
-#endif // KHTML_XSLT
+#endif // XSLT_SUPPORT

diff --git a/WebCore/bindings/js/JSXSLTProcessor.h b/WebCore/bindings/js/JSXSLTProcessor.h
index d3483107721bc85bc428632abe87c9619d47305e..01b17194408c289f8a9119911e3f948d28751250 100644 (file)
--- a/WebCore/bindings/js/JSXSLTProcessor.h
+++ b/WebCore/bindings/js/JSXSLTProcessor.h
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #ifndef XSLTProcessor_H
 #define XSLTProcessor_H
@@ -67,4 +67,4 @@ public:
 
 #endif // XSLTProcessor_H
 
-#endif // KHTML_XSLT
+#endif // XSLT_SUPPORT

diff --git a/WebCore/bindings/js/kjs_window.cpp b/WebCore/bindings/js/kjs_window.cpp
index f345d1cdc45a15e76a63914b5788e46d2af1a50f..f6566da1e8ca6bf36379697aa49ffb1188215ca9 100644 (file)
--- a/WebCore/bindings/js/kjs_window.cpp
+++ b/WebCore/bindings/js/kjs_window.cpp
@@ -56,7 +56,7 @@
 #include "kjs_traversal.h"
 #include <wtf/MathExtras.h>
 
-#if KHTML_XSLT
+#if XSLT_SUPPORT
 #include "JSXSLTProcessor.h"
 #endif
 
@@ -788,7 +788,7 @@ JSValue *Window::getValueProperty(ExecState *exec, int token) const
       return new JSHTMLOptionElementConstructor(exec, m_frame->document());
     case XMLHttpRequest:
       return new JSXMLHttpRequestConstructorImp(exec, m_frame->document());
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
     case XSLTProcessor_:
       return new XSLTProcessorConstructorImp(exec);
 #else

diff --git a/WebCore/config.h b/WebCore/config.h
index 919ea8931109efe667a3edf7a3fbf3ee73575112..b4e965709df67fe239207167b4ab374bf1cd6d5e 100644 (file)
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -20,9 +20,7 @@
 
 #include <wtf/Platform.h>
 
-#define KHTML_NO_XBL 1
-#define KHTML_XSLT 1
-
+#define XSLT_SUPPORT 1
 
 #if __APPLE__
 #define HAVE_FUNC_USLEEP 1

diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index a58b5e31748f6ad2abdd8e85937d3aeec47f5942..dab7985d32570cd0cd4b62f298774d41e0b88118 100644 (file)
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -456,7 +456,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         return valueForLength(style->backgroundXPosition());
     case CSS_PROP_BACKGROUND_POSITION_Y:
         return valueForLength(style->backgroundYPosition());
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     case CSS_PROP__WEBKIT_BINDING:
         // FIXME: unimplemented
         break;

diff --git a/WebCore/css/cssparser.cpp b/WebCore/css/cssparser.cpp
index 615dcd14d72895f5946f2c5d8f84279209884216..ed26e233556caaf553d338f98bf8f3cde177fcf0 100644 (file)
--- a/WebCore/css/cssparser.cpp
+++ b/WebCore/css/cssparser.cpp
@@ -919,7 +919,7 @@ bool CSSParser::parseValue(int propId, bool important)
         break;
 
     case CSS_PROP__WEBKIT_BINDING:
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
         if (id == CSS_VAL_NONE)
             valid_primitive = true;
         else {

diff --git a/WebCore/css/cssstyleselector.cpp b/WebCore/css/cssstyleselector.cpp
index 27045fe00d940af57dc9c0d3c49e6d8f5bfac724..8105cd8ed3083c53da1eb2397114985bbd4a268a 100644 (file)
--- a/WebCore/css/cssstyleselector.cpp
+++ b/WebCore/css/cssstyleselector.cpp
@@ -3492,7 +3492,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
         style->setAppearance(appearance);
     }
     case CSS_PROP__WEBKIT_BINDING: {
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
         if (isInitial || (primitiveValue && primitiveValue->getIdent() == CSS_VAL_NONE)) {
             style->deleteBindingURIs();
             return;

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 16f5c18161c497c65e82cb5a58d40b29fcfa5835..779d5a8e0b627571ce73a781e3160aebaa973ac6 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -91,13 +91,12 @@
 #include "XPathResult.h"
 #endif
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 #include "XSLTProcessor.h"
 #endif
 
-#ifndef KHTML_NO_XBL
-#include "xbl_binding_manager.h"
-using XBL::XBLBindingManager;
+#ifdef XBL_SUPPORT
+#include "XBLBindingManager.h"
 #endif
 
 #ifdef SVG_SUPPORT
@@ -212,10 +211,10 @@ Document::Document(DOMImplementation* impl, FrameView *v)
     , m_title("")
     , m_titleSetExplicitly(false)
     , m_imageLoadEventTimer(this, &Document::imageLoadEventTimerFired)
-#if !KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     , m_bindingManager(new XBLBindingManager(this))
 #endif
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
     , m_transformSource(0)
 #endif
     , m_savedRenderer(0)
@@ -338,11 +337,11 @@ Document::~Document()
         m_renderArena = 0;
     }
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
     xmlFreeDoc((xmlDocPtr)m_transformSource);
 #endif
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     delete m_bindingManager;
 #endif
 
@@ -1831,7 +1830,7 @@ void Document::recalcStyleSelector()
             // Processing instruction (XML documents only)
             ProcessingInstruction* pi = static_cast<ProcessingInstruction*>(n);
             sheet = pi->sheet();
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
             // Don't apply XSL transforms to already transformed documents -- <rdar://problem/4132806>
             if (pi->isXSL() && !transformSourceDocument()) {
                 // Don't apply XSL transforms until loading is finished.
@@ -3084,7 +3083,7 @@ void Document::shiftMarkers(Node *node, unsigned startOffset, int delta, Documen
         node->renderer()->repaint();
 }
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 void Document::applyXSLTransform(ProcessingInstruction* pi)
 {

diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index f74a2f451ee048c0d3b49f16ea29acbabd883cfc..adeac3191d994cf86bed430a61620fc09e4f8056 100644 (file)
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -36,12 +36,6 @@
 #include "Timer.h"
 #include <wtf/HashCountedSet.h>
 
-#ifndef KHTML_NO_XBL
-namespace XBL {
-    class XBLBindingManager;
-}
-#endif
-
 namespace WebCore {
 
     class AXObjectCache;
@@ -89,6 +83,9 @@ namespace WebCore {
     class Text;
     class Tokenizer;
     class TreeWalker;
+#ifdef XBL_SUPPORT
+    class XBLBindingManager;
+#endif
 #ifdef XPATH_SUPPORT
     class XPathEvaluator;
     class XPathExpression;
@@ -563,7 +560,7 @@ public:
 
     int docID() const { return m_docID; }
 
-#if KHTML_XSLT
+#if XSLT_SUPPORT
     void applyXSLTransform(ProcessingInstruction* pi);
     void setTransformSource(void* doc) { m_transformSource = doc; }
     const void* transformSource() { return m_transformSource; }
@@ -571,9 +568,9 @@ public:
     void setTransformSourceDocument(Document *doc) { m_transformSourceDocument = doc; }
 #endif
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     // XBL methods
-    XBL::XBLBindingManager* bindingManager() const { return m_bindingManager; }
+    XBLBindingManager* bindingManager() const { return m_bindingManager; }
 #endif
 
     void incDOMTreeVersion() { ++m_domtree_version; }
@@ -702,13 +699,13 @@ protected:
     double m_startTime;
     bool m_overMinimumLayoutThreshold;
     
-#if KHTML_XSLT
+#if XSLT_SUPPORT
     void* m_transformSource;
     RefPtr<Document> m_transformSourceDocument;
 #endif
 
-#ifndef KHTML_NO_XBL
-    XBL::XBLBindingManager* m_bindingManager; // The access point through which documents and elements communicate with XBL.
+#ifdef XBL_SUPPORT
+    XBLBindingManager* m_bindingManager; // The access point through which documents and elements communicate with XBL.
 #endif
     
     typedef HashMap<AtomicStringImpl*, HTMLMapElement*> ImageMapsByName;

diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index 25d047bd274b76ba724f1237c79158f2508ba726..8dfc6ac3754740c5f3df22690630964beea905fa 100644 (file)
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -896,27 +896,13 @@ void Node::createRendererIfNeeded()
 #endif
         ) {
         RenderStyle* style = styleForRenderer(parentRenderer);
-#ifndef KHTML_NO_XBL
-        bool resolveStyle = false;
-        if (document()->bindingManager()->loadBindings(this, style->bindingURIs(), true, &resolveStyle) && 
-            rendererIsNeeded(style)) {
-            if (resolveStyle) {
-                style->deref(document()->renderArena());
-                style = styleForRenderer(parentRenderer);
-            }
-#else
         if (rendererIsNeeded(style)) {
-#endif
             setRenderer(createRenderer(document()->renderArena(), style));
             if (renderer()) {
                 renderer()->setStyle(style);
                 parentRenderer->addChild(renderer(), nextRenderer());
             }
-#ifndef KHTML_NO_XBL
-        } // avoid confusing the change log code parser by having two close braces to match the two open braces above
-#else
         }
-#endif
         style->deref(document()->renderArena());
     }
 }

diff --git a/WebCore/dom/ProcessingInstruction.cpp b/WebCore/dom/ProcessingInstruction.cpp
index a2ae6fba2481e624b98939228a26615bda7e748f..d3086a0b6cead591903f68908c8fcba23b3577b2 100644 (file)
--- a/WebCore/dom/ProcessingInstruction.cpp
+++ b/WebCore/dom/ProcessingInstruction.cpp
@@ -37,7 +37,7 @@ ProcessingInstruction::ProcessingInstruction(Document* doc)
     : ContainerNode(doc)
     , m_cachedSheet(0)
     , m_loading(false)
-#if KHTML_XSLT
+#if XSLT_SUPPORT
     , m_isXSL(false)
 #endif
 {
@@ -49,7 +49,7 @@ ProcessingInstruction::ProcessingInstruction(Document* doc, const String& target
     , m_data(data.impl())
     , m_cachedSheet(0)
     , m_loading(false)
-#if KHTML_XSLT
+#if XSLT_SUPPORT
     , m_isXSL(false)
 #endif
 {
@@ -120,7 +120,7 @@ bool ProcessingInstruction::checkStyleSheet()
             type = i->second;
         
         bool isCSS = type.isEmpty() || type == "text/css";
-#if KHTML_XSLT
+#if XSLT_SUPPORT
         m_isXSL = (type == "text/xml" || type == "text/xsl" || type == "application/xml" ||
                    type == "application/xhtml+xml" || type == "application/rss+xml" || type == "application/atom=xml");
         if (!isCSS && !m_isXSL)
@@ -134,7 +134,7 @@ bool ProcessingInstruction::checkStyleSheet()
         if (href.length() > 1) {
             if (href[0] == '#') {
                 m_localHref = href.substring(1).impl();
-#if KHTML_XSLT
+#if XSLT_SUPPORT
                 // We need to make a synthetic XSLStyleSheet that is embedded.  It needs to be able
                 // to kick off import/include loads that can hang off some parent sheet.
                 if (m_isXSL) {
@@ -153,7 +153,7 @@ bool ProcessingInstruction::checkStyleSheet()
                     document()->addPendingSheet();
                     if (m_cachedSheet)
                         m_cachedSheet->deref(this);
-#if KHTML_XSLT
+#if XSLT_SUPPORT
                     if (m_isXSL)
                         m_cachedSheet = document()->docLoader()->requestXSLStyleSheet(document()->completeURL(href));
                     else
@@ -161,7 +161,7 @@ bool ProcessingInstruction::checkStyleSheet()
                     m_cachedSheet = document()->docLoader()->requestStyleSheet(document()->completeURL(href), String());
                     if (m_cachedSheet)
                         m_cachedSheet->ref( this );
-#if KHTML_XSLT
+#if XSLT_SUPPORT
                     return !m_isXSL;
 #endif
                 }
@@ -190,7 +190,7 @@ void ProcessingInstruction::sheetLoaded()
 
 void ProcessingInstruction::setStyleSheet(const String &url, const String &sheet)
 {
-#if KHTML_XSLT
+#if XSLT_SUPPORT
     if (m_isXSL)
         m_sheet = new XSLStyleSheet(this, url);
     else

diff --git a/WebCore/dom/ProcessingInstruction.h b/WebCore/dom/ProcessingInstruction.h
index 98244b69e1573a561a377a4fff26e71020833c27..ae1b9c3ccd5b000cf1bea28a2c8960efa080b76f 100644 (file)
--- a/WebCore/dom/ProcessingInstruction.h
+++ b/WebCore/dom/ProcessingInstruction.h
@@ -61,7 +61,7 @@ public:
     void sheetLoaded();
     virtual String toString() const;
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
     bool isXSL() const { return m_isXSL; }
 #endif
 
@@ -72,7 +72,7 @@ private:
     CachedResource* m_cachedSheet;
     RefPtr<StyleSheet> m_sheet;
     bool m_loading;
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
     bool m_isXSL;
 #endif
 };

diff --git a/WebCore/dom/XMLTokenizer.cpp b/WebCore/dom/XMLTokenizer.cpp
index 72c86a8ab364b8fb076370c47781315de4f1e8f8..06f5ffd6c104d80d7b3bd705579862e2b3ea2055 100644 (file)
--- a/WebCore/dom/XMLTokenizer.cpp
+++ b/WebCore/dom/XMLTokenizer.cpp
@@ -47,7 +47,7 @@
 #include <wtf/Platform.h>
 #include <wtf/Vector.h>
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 #include <libxslt/xslt.h>
 #endif
 
@@ -959,7 +959,7 @@ void XMLTokenizer::processingInstruction(const xmlChar *target, const xmlChar *d
     // don't load stylesheets for standalone documents
     if (m_doc->frame()) {
         m_sawXSLTransform = !m_sawFirstElement && !pi->checkStyleSheet();
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
         // Pretend we didn't see this PI if we're the result of a transform.
         if (m_sawXSLTransform && !m_doc->transformSourceDocument())
 #else
@@ -1298,7 +1298,7 @@ void XMLTokenizer::insertErrorMessageBlock()
 
     RefPtr<Element> reportElement = createXHTMLParserErrorHeader(doc, m_errorMessages);
     documentElement->insertBefore(reportElement, documentElement->firstChild(), ec);
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
     if (doc->transformSourceDocument()) {
         RefPtr<Element> par = doc->createElementNS(xhtmlNamespaceURI, "p", ec);
         reportElement->appendChild(par, ec);
@@ -1341,7 +1341,7 @@ bool XMLTokenizer::isWaitingForScripts() const
     return m_pendingScript != 0;
 }
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 void* xmlDocPtrForString(DocLoader* docLoader, const String& source, const DeprecatedString &url)
 {
     if (source.isEmpty())

diff --git a/WebCore/dom/XMLTokenizer.h b/WebCore/dom/XMLTokenizer.h
index 7a4a4d87bd4c20da680fa220d788a3bf0c4ed167..0d77b06d07cc5784f85c8c0b3e49dea562a7f0c3 100644 (file)
--- a/WebCore/dom/XMLTokenizer.h
+++ b/WebCore/dom/XMLTokenizer.h
@@ -73,7 +73,7 @@ protected:
 };
 
 Tokenizer* newXMLTokenizer(Document*, FrameView* = 0);
-#if KHTML_XSLT
+#if XSLT_SUPPORT
 void* xmlDocPtrForString(DocLoader*, const String& source, const DeprecatedString& URL);
 void setLoaderForLibXMLCallbacks(DocLoader*);
 #endif

diff --git a/WebCore/loader/Cache.cpp b/WebCore/loader/Cache.cpp
index 0b5c89a44e8162acad9db684ca0bde111ee92072..fd881e70a7844d66299ea72177ba5f4fbd114b3f 100644 (file)
--- a/WebCore/loader/Cache.cpp
+++ b/WebCore/loader/Cache.cpp
@@ -279,7 +279,7 @@ CachedScript* Cache::requestScript(DocLoader* dl, const String& url, bool reload
     return static_cast<CachedScript *>(o);
 }
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 CachedXSLStyleSheet* Cache::requestXSLStyleSheet(DocLoader* dl, const String& url, bool reload, time_t expireDate)
 {
     // this brings the _url to a standard form...
@@ -331,7 +331,7 @@ CachedXSLStyleSheet* Cache::requestXSLStyleSheet(DocLoader* dl, const String& ur
 }
 #endif
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
 CachedXBLDocument* Cache::requestXBLDocument(DocLoader* dl, const String& url, bool reload, 
                                              time_t expireDate)
 {
@@ -573,13 +573,13 @@ Cache::Statistics Cache::getStatistics()
                 stats.scripts.count++;
                 stats.scripts.size += o->size();
                 break;
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
             case CachedResource::XSLStyleSheet:
                 stats.xslStyleSheets.count++;
                 stats.xslStyleSheets.size += o->size();
                 break;
 #endif
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
             case CachedResource::XBL:
                 stats.xblDocs.count++;
                 stats.xblDocs.size += o->size();

diff --git a/WebCore/loader/Cache.h b/WebCore/loader/Cache.h
index 2be58cfcc094a223bd44d2420f192f60abc26e53..c9ebb619e87ac20d6de56c0b7d6da50e4d368b89 100644 (file)
--- a/WebCore/loader/Cache.h
+++ b/WebCore/loader/Cache.h
@@ -65,11 +65,11 @@ namespace WebCore  {
         static CachedCSSStyleSheet* requestStyleSheet(DocLoader*, const String& URL, bool reload, time_t expireDate, const String& charset);
         static CachedScript* requestScript(DocLoader*, const String& URL, bool reload, time_t expireDate, const String& charset);
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
         static CachedXSLStyleSheet* requestXSLStyleSheet(DocLoader*, const String& URL, bool reload, time_t expireDate);
 #endif
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
         static CachedXBLDocument* requestXBLDocument(DocLoader*, const String& URL, bool reload, time_t expireDate);
 #endif
 
@@ -120,10 +120,10 @@ namespace WebCore  {
             TypeStatistic movies;
             TypeStatistic styleSheets;
             TypeStatistic scripts;
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
             TypeStatistic xslStyleSheets;
 #endif
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
             TypeStatistic xblDocs;
 #endif
             TypeStatistic other;

diff --git a/WebCore/loader/CachedResource.h b/WebCore/loader/CachedResource.h
index 0eb62b8715598c7c5b664d82640ee76583f66426..a9b70ad2a1d5e8b09a1a33d77f99643edf0c45f8 100644 (file)
--- a/WebCore/loader/CachedResource.h
+++ b/WebCore/loader/CachedResource.h
@@ -59,10 +59,10 @@ namespace WebCore {
             ImageResource,
             CSSStyleSheet,
             Script
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
             , XSLStyleSheet
 #endif
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
             , XBL
 #endif
         };

diff --git a/WebCore/loader/CachedResourceClient.h b/WebCore/loader/CachedResourceClient.h
index 752d1b141b6aa49bb7c3f2e28192066aa136ea78..be2bf809c7941bf8c402bc0ad6744771d2080620 100644 (file)
--- a/WebCore/loader/CachedResourceClient.h
+++ b/WebCore/loader/CachedResourceClient.h
@@ -27,7 +27,7 @@
 #ifndef CachedResourceClient_h
 #define CachedResourceClient_h
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
 namespace XBL {
     class XBLDocument;
 }
@@ -65,7 +65,7 @@ namespace WebCore {
 
         virtual void setStyleSheet(const String& /*URL*/, const String& /*sheet*/) { }
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
         virtual void setXBLDocument(const String& /*URL*/, XBL::XBLDocument*) { }
 #endif
 

diff --git a/WebCore/loader/CachedXBLDocument.cpp b/WebCore/loader/CachedXBLDocument.cpp
index a64d45b388c26b772b2a2cab129aa900da3b63b8..33a74567b4b3e29fa3d4d8011729fc57308be4f5 100644 (file)
--- a/WebCore/loader/CachedXBLDocument.cpp
+++ b/WebCore/loader/CachedXBLDocument.cpp
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
 
 #include "CachedXBLDocument.h"
 

diff --git a/WebCore/loader/CachedXBLDocument.h b/WebCore/loader/CachedXBLDocument.h
index 850130f61dad6494530ba5e75add210b234d159e..146c080b8e50645c52dcd74661225f435864950d 100644 (file)
--- a/WebCore/loader/CachedXBLDocument.h
+++ b/WebCore/loader/CachedXBLDocument.h
@@ -38,7 +38,7 @@ namespace WebCore {
     class Decoder;
     class CachedResourceClient;
     
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     class CachedXBLDocument : public CachedResource {
     public:
         CachedXBLDocument(DocLoader*, const String& url, CachePolicy, time_t expireDate);

diff --git a/WebCore/loader/CachedXSLStyleSheet.cpp b/WebCore/loader/CachedXSLStyleSheet.cpp
index 0e30d61aae09e781bd33b46eb93d085b719d1c35..4abbe74fed222f2ca28dec24da91c0475479bca3 100644 (file)
--- a/WebCore/loader/CachedXSLStyleSheet.cpp
+++ b/WebCore/loader/CachedXSLStyleSheet.cpp
@@ -38,7 +38,7 @@
 
 namespace WebCore {
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 CachedXSLStyleSheet::CachedXSLStyleSheet(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
     : CachedResource(url, XSLStyleSheet, cachePolicy, _expireDate)

diff --git a/WebCore/loader/CachedXSLStyleSheet.h b/WebCore/loader/CachedXSLStyleSheet.h
index 0a8c487cfab464e66cb45aec39a5dd6142e46faf..19d5c3a4844fe8909034ca3ca5f40ab5b6c6bb5c 100644 (file)
--- a/WebCore/loader/CachedXSLStyleSheet.h
+++ b/WebCore/loader/CachedXSLStyleSheet.h
@@ -36,7 +36,7 @@ namespace WebCore {
     class DocLoader;
     class Decoder;
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
     class CachedXSLStyleSheet : public CachedResource {
     public:
         CachedXSLStyleSheet(DocLoader*, const String& url, CachePolicy, time_t expireDate);

diff --git a/WebCore/loader/DocLoader.cpp b/WebCore/loader/DocLoader.cpp
index 880c120df4597d8768426f605bfa6ae335de0c33..58259b8a68ad046f0548bf9ac034614b0c85c3bc 100644 (file)
--- a/WebCore/loader/DocLoader.cpp
+++ b/WebCore/loader/DocLoader.cpp
@@ -129,7 +129,7 @@ CachedScript* DocLoader::requestScript(const String& url, const String& charset)
     return cachedObject;
 }
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 CachedXSLStyleSheet* DocLoader::requestXSLStyleSheet(const String& url)
 {
     KURL fullURL = m_doc->completeURL(url.deprecatedString());
@@ -145,7 +145,7 @@ CachedXSLStyleSheet* DocLoader::requestXSLStyleSheet(const String& url)
 }
 #endif
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
 CachedXBLDocument* DocLoader::requestXBLDocument(const String& url)
 {
     KURL fullURL = m_doc->completeURL(url.deprecatedString());

diff --git a/WebCore/loader/DocLoader.h b/WebCore/loader/DocLoader.h
index e0291753873f8b85f3e0802d7ee4b85c52df36d4..4696a40dc53e26e73c5391bf7b093a2d4b30266b 100644 (file)
--- a/WebCore/loader/DocLoader.h
+++ b/WebCore/loader/DocLoader.h
@@ -57,10 +57,10 @@ namespace WebCore {
         CachedCSSStyleSheet* requestStyleSheet(const String& url, const String& charset);
         CachedScript* requestScript(const String& url, const String& charset);
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
         CachedXSLStyleSheet* requestXSLStyleSheet(const String& url);
 #endif
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
         CachedXBLDocument* requestXBLDocument(const String &url);
 #endif
 

diff --git a/WebCore/rendering/RenderStyle.cpp b/WebCore/rendering/RenderStyle.cpp
index 50854593e4797040da9df519074e05d05b48d130..364be09db4a25e9fafa9269695b8fe6fad51bb7c 100644 (file)
--- a/WebCore/rendering/RenderStyle.cpp
+++ b/WebCore/rendering/RenderStyle.cpp
@@ -399,7 +399,7 @@ StyleCSS3NonInheritedData::StyleCSS3NonInheritedData()
     , marginTopCollapse(MCOLLAPSE)
     , marginBottomCollapse(MCOLLAPSE)
     , m_appearance(RenderStyle::initialAppearance())
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     , bindingURI(0)
 #endif
 {
@@ -417,7 +417,7 @@ StyleCSS3NonInheritedData::StyleCSS3NonInheritedData(const StyleCSS3NonInherited
     , marginTopCollapse(o.marginTopCollapse)
     , marginBottomCollapse(o.marginBottomCollapse)
     , m_appearance(o.m_appearance)
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     , bindingURI(o.bindingURI ? o.bindingURI->copy() : 0)
 #endif
 {
@@ -425,12 +425,12 @@ StyleCSS3NonInheritedData::StyleCSS3NonInheritedData(const StyleCSS3NonInherited
 
 StyleCSS3NonInheritedData::~StyleCSS3NonInheritedData()
 {
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     delete bindingURI;
 #endif
 }
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
 bool StyleCSS3NonInheritedData::bindingsEquivalent(const StyleCSS3NonInheritedData& o) const
 {
     if (this == &o) return true;
@@ -448,7 +448,7 @@ bool StyleCSS3NonInheritedData::operator==(const StyleCSS3NonInheritedData& o) c
            userDrag == o.userDrag && userSelect == o.userSelect && textOverflow == o.textOverflow &&
            marginTopCollapse == o.marginTopCollapse && marginBottomCollapse == o.marginBottomCollapse &&
            m_appearance == o.m_appearance
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
            && bindingsEquivalent(o)
 #endif
            && lineClamp == o.lineClamp && m_dashboardRegions == o.m_dashboardRegions
@@ -1103,7 +1103,7 @@ void ContentData::clearContent()
     }
 }
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
 BindingURI::BindingURI(StringImpl* uri) 
 :m_next(0)
 { 

diff --git a/WebCore/rendering/RenderStyle.h b/WebCore/rendering/RenderStyle.h
index fcbbcd81393b934a367a488ba5497fc84c916912..14d327fd792680b39ba9b2af8dcd1289dff674de 100644 (file)
--- a/WebCore/rendering/RenderStyle.h
+++ b/WebCore/rendering/RenderStyle.h
@@ -632,7 +632,7 @@ struct ShadowData {
     ShadowData* next;
 };
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
 struct BindingURI {
     BindingURI(StringImpl*);
     ~BindingURI();
@@ -724,7 +724,7 @@ public:
     ~StyleCSS3NonInheritedData();
     StyleCSS3NonInheritedData(const StyleCSS3NonInheritedData& o);
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     bool bindingsEquivalent(const StyleCSS3NonInheritedData& o) const;
 #endif
 
@@ -747,7 +747,7 @@ public:
 
     unsigned m_appearance : 6; // EAppearance
 
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     BindingURI* bindingURI; // The XBL binding URI list.
 #endif
 };
@@ -1323,7 +1323,7 @@ public:
     EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninherited_flags._page_break_after); }
     
     // CSS3 Getter Methods
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     BindingURI* bindingURIs() const { return css3NonInheritedData->bindingURI; }
 #endif
     int outlineOffset() const { 
@@ -1541,7 +1541,7 @@ public:
     void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; }
     
     // CSS3 Setters
-#ifndef KHTML_NO_XBL
+#ifdef XBL_SUPPORT
     void deleteBindingURIs() { 
         delete css3NonInheritedData->bindingURI; 
         SET_VAR(css3NonInheritedData, bindingURI, (BindingURI*) 0);

diff --git a/WebCore/xml/XSLImportRule.cpp b/WebCore/xml/XSLImportRule.cpp
index 9a410f4648af8c11f99bc39a257f0ac315b665eb..54d456df5ec7a22b5fb5ff462f9d91dad9beae03 100644 (file)
--- a/WebCore/xml/XSLImportRule.cpp
+++ b/WebCore/xml/XSLImportRule.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "XSLImportRule.h"
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #include "CachedXSLStyleSheet.h"
 #include "DocLoader.h"
@@ -113,4 +113,4 @@ void XSLImportRule::loadSheet()
 
 } // namespace WebCore
 
-#endif // KHTML_XSLT
+#endif // XSLT_SUPPORT

diff --git a/WebCore/xml/XSLImportRule.h b/WebCore/xml/XSLImportRule.h
index 2e77233f695c4ea5523ea43b20d2b63ed2c098ff..3dd7a4666553c102d3905ccc60cc7d3da091832b 100644 (file)
--- a/WebCore/xml/XSLImportRule.h
+++ b/WebCore/xml/XSLImportRule.h
@@ -23,7 +23,7 @@
 #ifndef XSLImportRule_H
 #define XSLImportRule_H
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #include "CachedResourceClient.h"
 #include "StyleBase.h"
@@ -59,6 +59,6 @@ protected:
 
 } // namespace WebCore
 
-#endif // KHTML_XSLT
+#endif // XSLT_SUPPORT
 
 #endif // XSLImportRule_H

diff --git a/WebCore/xml/XSLStyleSheet.cpp b/WebCore/xml/XSLStyleSheet.cpp
index 669cbbb2b2505ded07b0d5a0c5e15a3f2aa34248..e62bccc8b94527b5c84fbb470cb65a60897c77b0 100644 (file)
--- a/WebCore/xml/XSLStyleSheet.cpp
+++ b/WebCore/xml/XSLStyleSheet.cpp
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "XSLStyleSheet.h"
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #include "DocLoader.h"
 #include "Document.h"
@@ -260,4 +260,4 @@ void XSLStyleSheet::markAsProcessed()
 
 } // namespace WebCore
 
-#endif // KHTML_XSLT
+#endif // XSLT_SUPPORT

diff --git a/WebCore/xml/XSLStyleSheet.h b/WebCore/xml/XSLStyleSheet.h
index d2e9fe4cddae9dcd5a56770f4f67e5b1b87eb804..c4345292fdd0de38481c85d837245b721e48e83a 100644 (file)
--- a/WebCore/xml/XSLStyleSheet.h
+++ b/WebCore/xml/XSLStyleSheet.h
@@ -23,7 +23,7 @@
 #ifndef XSLStyleSheet_H
 #define XSLStyleSheet_H
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #include "StyleSheet.h"
 #include <libxml/parser.h>
@@ -79,6 +79,6 @@ protected:
 
 } // namespace WebCore
 
-#endif // KHTML_XSLT
+#endif // XSLT_SUPPORT
 
 #endif // XSLStyleSheet_H

diff --git a/WebCore/xml/XSLTProcessor.cpp b/WebCore/xml/XSLTProcessor.cpp
index 7350ca6698e3ea91e32e363da4812bcd1e5b04fb..e69dfc4e6312c93e07df589ad8c6ff3ec123050a 100644 (file)
--- a/WebCore/xml/XSLTProcessor.cpp
+++ b/WebCore/xml/XSLTProcessor.cpp
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #include "XSLTProcessor.h"
 
@@ -385,4 +385,4 @@ void XSLTProcessor::removeParameter(StringImpl *namespaceURI, StringImpl *localN
 
 } // namespace WebCore
 
-#endif // KHTML_XSLT
+#endif // XSLT_SUPPORT

diff --git a/WebCore/xml/XSLTProcessor.h b/WebCore/xml/XSLTProcessor.h
index 08e8e41d680beed63f75cc6372da2e00b9d6ec61..bf1af19ed6eea4945dbc5bbcf5764bf612adecdf 100644 (file)
--- a/WebCore/xml/XSLTProcessor.h
+++ b/WebCore/xml/XSLTProcessor.h
@@ -23,7 +23,7 @@
 #ifndef xslt_processorimpl_h_
 #define xslt_processorimpl_h_
 
-#ifdef KHTML_XSLT
+#ifdef XSLT_SUPPORT
 
 #include "StringHash.h"
 #include "XSLStyleSheet.h"