[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 5a8c7b2194d90979fd9a85d63d1344ccb55a9ea2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 30 09:06:44 2004 +0000

    	Disable XBL.  The loadBindings call was taking 0.1-0.25%.  While I know how to get rid of this overhead,
    	it's easier for now to just disable all of XBL.
    
            * WebCorePrefix.h:
            * khtml/misc/loader.h:
            * khtml/xbl/xbl_binding.cpp:
            * khtml/xbl/xbl_binding_manager.cpp:
            * khtml/xbl/xbl_docimpl.cpp:
            * khtml/xbl/xbl_protobinding.cpp:
            * khtml/xbl/xbl_protohandler.cpp:
            * khtml/xbl/xbl_protoimplementation.cpp:
            * khtml/xbl/xbl_tokenizer.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6008 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index edcbc01..41819e0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2004-01-30  David Hyatt  <hyatt at apple.com>
+
+	Disable XBL.  The loadBindings call was taking 0.1-0.25%.  While I know how to get rid of this overhead,
+	it's easier for now to just disable all of XBL.
+
+        * WebCorePrefix.h:
+        * khtml/misc/loader.h:
+        * khtml/xbl/xbl_binding.cpp:
+        * khtml/xbl/xbl_binding_manager.cpp:
+        * khtml/xbl/xbl_docimpl.cpp:
+        * khtml/xbl/xbl_protobinding.cpp:
+        * khtml/xbl/xbl_protohandler.cpp:
+        * khtml/xbl/xbl_protoimplementation.cpp:
+        * khtml/xbl/xbl_tokenizer.cpp:
+
 2004-01-29  David Hyatt  <hyatt at apple.com>
 
 	Atomize font families (KWQFontFamily) and all attribute values.  Move atomic string into separate files.
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index 6f760db..8d4208c 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -43,6 +43,8 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>
 
+#define KHTML_NO_XBL 1
+
 #ifdef __OBJC__
 
 #import <Cocoa/Cocoa.h>
diff --git a/WebCore/khtml/misc/loader.h b/WebCore/khtml/misc/loader.h
index 8821cd6..7608809 100644
--- a/WebCore/khtml/misc/loader.h
+++ b/WebCore/khtml/misc/loader.h
@@ -401,8 +401,11 @@ protected:
 	CachedImage *requestImage( const DOM::DOMString &url);
 	CachedCSSStyleSheet *requestStyleSheet( const DOM::DOMString &url, const QString& charset);
         CachedScript *requestScript( const DOM::DOMString &url, const QString& charset);
+
+#ifndef KHTML_NO_XBL
         CachedXBLDocument* requestXBLDocument(const DOM::DOMString &url);
-        
+#endif
+
 	bool autoloadImages() const { return m_bautoloadImages; }
         KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
         KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; }
diff --git a/WebCore/khtml/xbl/xbl_binding.cpp b/WebCore/khtml/xbl/xbl_binding.cpp
index 6ced43e..b9408ff 100644
--- a/WebCore/khtml/xbl/xbl_binding.cpp
+++ b/WebCore/khtml/xbl/xbl_binding.cpp
@@ -1,3 +1,5 @@
+#ifndef KHTML_NO_XBL
+
 #include <kurl.h>
 #include "xbl_protobinding.h"
 #include "xbl_binding.h"
@@ -171,3 +173,6 @@ void XBLBinding::setXBLDocument(const DOMString& url, XBLDocumentImpl* doc)
 }
 
 }
+
+#endif // KHTML_NO_XBL
+
diff --git a/WebCore/khtml/xbl/xbl_binding_manager.cpp b/WebCore/khtml/xbl/xbl_binding_manager.cpp
index b836340..bc171bb 100644
--- a/WebCore/khtml/xbl/xbl_binding_manager.cpp
+++ b/WebCore/khtml/xbl/xbl_binding_manager.cpp
@@ -1,3 +1,5 @@
+#ifndef KHTML_NO_XBL
+
 #include "qptrdict.h"
 #include "xml/dom_docimpl.h"
 #include "xml/dom_elementimpl.h"
@@ -115,4 +117,6 @@ void XBLBindingManager::checkLoadState(ElementImpl* elt)
         elt->setChanged();
 }
 
-}
\ No newline at end of file
+}
+
+#endif // KHTML_NO_XBL
diff --git a/WebCore/khtml/xbl/xbl_docimpl.cpp b/WebCore/khtml/xbl/xbl_docimpl.cpp
index bdb55ff..4b557da 100644
--- a/WebCore/khtml/xbl/xbl_docimpl.cpp
+++ b/WebCore/khtml/xbl/xbl_docimpl.cpp
@@ -1,3 +1,5 @@
+#ifndef KHTML_NO_XBL
+
 #include "xbl_docimpl.h"
 #include "xbl_tokenizer.h"
 #include "xbl_protobinding.h"
@@ -34,4 +36,6 @@ XBLPrototypeBinding* XBLDocumentImpl::prototypeBinding(const DOM::DOMString& id)
     return m_prototypeBindingTable.find(id.string());
 }
 
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/WebCore/khtml/xbl/xbl_protobinding.cpp b/WebCore/khtml/xbl/xbl_protobinding.cpp
index 66a1a94..2640fb6 100644
--- a/WebCore/khtml/xbl/xbl_protobinding.cpp
+++ b/WebCore/khtml/xbl/xbl_protobinding.cpp
@@ -1,3 +1,5 @@
+#ifndef KHTML_NO_XBL
+
 #include "xbl_protobinding.h"
 #include "xbl_docimpl.h"
 
@@ -28,4 +30,6 @@ void XBLPrototypeBinding::addResource(const DOMString& type, const DOMString& sr
     // FIXME: Implement!
 }
 
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/WebCore/khtml/xbl/xbl_protohandler.cpp b/WebCore/khtml/xbl/xbl_protohandler.cpp
index 379e74d..28046b1 100644
--- a/WebCore/khtml/xbl/xbl_protohandler.cpp
+++ b/WebCore/khtml/xbl/xbl_protohandler.cpp
@@ -1,3 +1,5 @@
+#ifndef KHTML_NO_XBL
+
 #include "qstringlist.h"
 #include "qstring.h"
 #include "xbl_protohandler.h"
@@ -87,4 +89,6 @@ void XBLPrototypeHandler::appendData(const QString& ch)
     m_handlerText += ch;
 }
 
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/WebCore/khtml/xbl/xbl_protoimplementation.cpp b/WebCore/khtml/xbl/xbl_protoimplementation.cpp
index 49a6dd6..1a5dc32 100644
--- a/WebCore/khtml/xbl/xbl_protoimplementation.cpp
+++ b/WebCore/khtml/xbl/xbl_protoimplementation.cpp
@@ -1,3 +1,5 @@
+#ifndef KHTML_NO_XBL
+
 #include "xbl_protoimplementation.h"
 #include "xbl_protobinding.h"
 
@@ -91,3 +93,5 @@ void XBLPrototypeProperty::appendSetterText(const DOM::DOMString& text)
 }
 
 }
+
+#endif // KHTML_NO_XBL
diff --git a/WebCore/khtml/xbl/xbl_tokenizer.cpp b/WebCore/khtml/xbl/xbl_tokenizer.cpp
index 64f314b..6218beb 100644
--- a/WebCore/khtml/xbl/xbl_tokenizer.cpp
+++ b/WebCore/khtml/xbl/xbl_tokenizer.cpp
@@ -1,3 +1,5 @@
+#ifndef KHTML_NO_XBL
+
 #include "dom/dom_node.h"
 #include "xml/dom_elementimpl.h"
 #include "misc/htmlattrs.h"
@@ -412,3 +414,5 @@ void XBLTokenHandler::createParameter(const QXmlAttributes& attrs)
 }
 
 }
+
+#endif

-- 
WebKit Debian packaging