Rubber stamped by Anders.
- renamed kxmlcore to wtf
kxmlcore --> wtf
KXMLCore --> WTF
WKC --> WTF
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/c/c_instance.cpp:
* bindings/objc/WebScriptObject.mm:
* kjs/JSImmediate.h:
* kjs/Parser.cpp:
* kjs/Parser.h:
* kjs/array_object.cpp:
* kjs/collector.cpp:
(KJS::Collector::registerThread):
* kjs/collector.h:
* kjs/config.h:
* kjs/function.cpp:
(KJS::isStrWhiteSpace):
* kjs/function.h:
* kjs/identifier.cpp:
* kjs/internal.cpp:
* kjs/internal.h:
* kjs/lexer.cpp:
(Lexer::shift):
(Lexer::isWhiteSpace):
(Lexer::isIdentStart):
(Lexer::isIdentPart):
* kjs/lookup.cpp:
* kjs/nodes.cpp:
* kjs/nodes.h:
* kjs/number_object.cpp:
* kjs/object.h:
* kjs/property_map.cpp:
* kjs/property_map.h:
* kjs/string_object.cpp:
(StringProtoFunc::callAsFunction):
* kjs/testkjs.cpp:
(testIsInteger):
* kjs/ustring.cpp:
* kjs/ustring.h:
* kxmlcore: Removed.
* kxmlcore/AlwaysInline.h: Removed.
* kxmlcore/Assertions.cpp: Removed.
* kxmlcore/Assertions.h: Removed.
* kxmlcore/FastMalloc.cpp: Removed.
* kxmlcore/FastMalloc.h: Removed.
* kxmlcore/FastMallocInternal.h: Removed.
* kxmlcore/Forward.h: Removed.
* kxmlcore/HashCountedSet.h: Removed.
* kxmlcore/HashFunctions.h: Removed.
* kxmlcore/HashMap.h: Removed.
* kxmlcore/HashSet.h: Removed.
* kxmlcore/HashTable.cpp: Removed.
* kxmlcore/HashTable.h: Removed.
* kxmlcore/HashTraits.h: Removed.
* kxmlcore/ListRefPtr.h: Removed.
* kxmlcore/Noncopyable.h: Removed.
* kxmlcore/OwnArrayPtr.h: Removed.
* kxmlcore/OwnPtr.h: Removed.
* kxmlcore/PassRefPtr.h: Removed.
* kxmlcore/Platform.h: Removed.
* kxmlcore/RefPtr.h: Removed.
* kxmlcore/TCPageMap.h: Removed.
* kxmlcore/TCSpinLock.h: Removed.
* kxmlcore/TCSystemAlloc.cpp: Removed.
* kxmlcore/TCSystemAlloc.h: Removed.
* kxmlcore/UnusedParam.h: Removed.
* kxmlcore/Vector.h: Removed.
* kxmlcore/VectorTraits.h: Removed.
* kxmlcore/unicode: Removed.
* kxmlcore/unicode/Unicode.h: Removed.
* kxmlcore/unicode/UnicodeCategory.h: Removed.
* kxmlcore/unicode/icu: Removed.
* kxmlcore/unicode/icu/UnicodeIcu.h: Removed.
* kxmlcore/unicode/posix: Removed.
* kxmlcore/unicode/qt3: Removed.
* kxmlcore/unicode/qt4: Removed.
* kxmlcore/unicode/qt4/UnicodeQt4.h: Removed.
* pcre/pcre_get.c:
* wtf: Added.
* wtf/Assertions.cpp:
* wtf/Assertions.h:
* wtf/FastMalloc.cpp:
(WTF::TCMalloc_ThreadCache::Scavenge):
(WTF::do_malloc):
(WTF::do_free):
(WTF::TCMallocGuard::TCMallocGuard):
(WTF::malloc):
(WTF::free):
(WTF::calloc):
(WTF::cfree):
(WTF::realloc):
* wtf/FastMalloc.h:
* wtf/FastMallocInternal.h:
* wtf/Forward.h:
* wtf/HashCountedSet.h:
* wtf/HashFunctions.h:
* wtf/HashMap.h:
* wtf/HashSet.h:
* wtf/HashTable.cpp:
* wtf/HashTable.h:
* wtf/HashTraits.h:
* wtf/ListRefPtr.h:
* wtf/Noncopyable.h:
* wtf/OwnArrayPtr.h:
* wtf/OwnPtr.h:
* wtf/PassRefPtr.h:
* wtf/RefPtr.h:
* wtf/TCSystemAlloc.cpp:
(TCMalloc_SystemAlloc):
* wtf/Vector.h:
* wtf/VectorTraits.h:
* wtf/unicode/UnicodeCategory.h:
* wtf/unicode/icu/UnicodeIcu.h:
JavaScriptGlue:
Rubber stamped by Anders.
- renamed kxmlcore to wtf
kxmlcore --> wtf
KXMLCore --> WTF
WKC --> WTF
* config.h:
* kxmlcore: Removed.
* kxmlcore/AlwaysInline.h: Removed.
* kxmlcore/Assertions.h: Removed.
* kxmlcore/FastMalloc.h: Removed.
* kxmlcore/Forward.h: Removed.
* kxmlcore/HashCountedSet.h: Removed.
* kxmlcore/HashSet.h: Removed.
* kxmlcore/Noncopyable.h: Removed.
* kxmlcore/OwnArrayPtr.h: Removed.
* kxmlcore/OwnPtr.h: Removed.
* kxmlcore/PassRefPtr.h: Removed.
* kxmlcore/Platform.h: Removed.
* kxmlcore/RefPtr.h: Removed.
* kxmlcore/Vector.h: Removed.
* wtf: Added.
WebCore:
Rubber stamped by Anders.
- renamed kxmlcore to wtf
kxmlcore --> wtf
KXMLCore --> WTF
WKC --> WTF
* ForwardingHeaders/kxmlcore: Removed.
* ForwardingHeaders/kxmlcore/AlwaysInline.h: Removed.
* ForwardingHeaders/kxmlcore/Assertions.h: Removed.
* ForwardingHeaders/kxmlcore/FastMalloc.h: Removed.
* ForwardingHeaders/kxmlcore/Forward.h: Removed.
* ForwardingHeaders/kxmlcore/HashCountedSet.h: Removed.
* ForwardingHeaders/kxmlcore/HashMap.h: Removed.
* ForwardingHeaders/kxmlcore/HashSet.h: Removed.
* ForwardingHeaders/kxmlcore/HashTraits.h: Removed.
* ForwardingHeaders/kxmlcore/Noncopyable.h: Removed.
* ForwardingHeaders/kxmlcore/OwnArrayPtr.h: Removed.
* ForwardingHeaders/kxmlcore/OwnPtr.h: Removed.
* ForwardingHeaders/kxmlcore/PassRefPtr.h: Removed.
* ForwardingHeaders/kxmlcore/Platform.h: Removed.
* ForwardingHeaders/kxmlcore/RefPtr.h: Removed.
* ForwardingHeaders/kxmlcore/Vector.h: Removed.
* ForwardingHeaders/wtf: Added.
* bindings/js/JSHTMLElementWrapperFactory.h:
* bindings/js/kjs_binding.cpp:
* bindings/js/kjs_window.h:
* bindings/objc/DOMImplementationFront.h:
* bridge/JavaAppletWidget.h:
* bridge/mac/WebCoreFrameNamespaces.mm:
* bridge/mac/WebCorePageBridge.mm:
(initializeLogChannel):
* bridge/mac/WebCoreStringTruncator.mm:
* bridge/mac/WebCoreViewFactory.m:
* config.h:
* css/css_base.h:
* css/css_valueimpl.h:
* css/csshelper.cpp:
* css/cssparser.h:
* dom/DOMImplementation.h:
* dom/Document.h:
* dom/NamedNodeMap.h:
* dom/Node.h:
* dom/NodeList.h:
* dom/QualifiedName.cpp:
* dom/Range.h:
* dom/StyledElement.cpp:
* dom/dom2_traversalimpl.h:
* dom/xml_tokenizer.h:
* editing/RebalanceWhitespaceCommand.cpp:
* editing/RemoveCSSPropertyCommand.cpp:
* editing/RemoveNodeAttributeCommand.cpp:
* editing/RemoveNodeCommand.cpp:
* editing/RemoveNodePreservingChildrenCommand.cpp:
* editing/ReplaceSelectionCommand.h:
* editing/Selection.cpp:
* editing/SetNodeAttributeCommand.cpp:
* editing/SplitElementCommand.cpp:
* editing/SplitTextNodeCommand.cpp:
* editing/SplitTextNodeContainingElementCommand.cpp:
* editing/TextIterator.h:
* editing/htmlediting.h:
* editing/markup.h:
* html/CanvasGradient.h:
* html/CanvasRenderingContext2D.h:
* html/CanvasStyle.cpp:
* html/HTMLCollection.h:
* html/HTMLElementFactory.h:
* kcanvas/KCanvasFilters.cpp:
* kcanvas/KCanvasPath.h:
* kcanvas/RenderPath.cpp:
* kcanvas/RenderSVGImage.cpp:
* kcanvas/RenderSVGText.cpp:
* kcanvas/device/quartz/KCanvasItemQuartz.mm:
* kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
* kcanvas/device/quartz/QuartzSupport.mm:
* ksvg2/misc/KSVGTimeScheduler.h:
* ksvg2/misc/SVGDocumentExtensions.h:
* ksvg2/scripts/make_names.pl:
* ksvg2/svg/SVGDOMImplementation.cpp:
* ksvg2/svg/SVGExternalResourcesRequired.h:
* ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp:
* ksvg2/svg/SVGForeignObjectElement.cpp:
* ksvg2/svg/SVGImageElement.cpp:
* ksvg2/svg/SVGMaskElement.cpp:
* ksvg2/svg/SVGStyledElement.cpp:
* ksvg2/svg/SVGTests.h:
* ksvg2/svg/SVGTransform.h:
* ksvg2/svg/SVGTransformable.cpp:
* kwq/AccessibilityObjectCache.h:
* kwq/KWQCString.cpp:
* kwq/KWQFormData.mm:
* kwq/KWQListBox.mm:
* kwq/KWQResourceLoader.mm:
* kwq/KWQTextEdit.mm:
* loader/Cache.h:
* loader/CachedObject.h:
* loader/CachedObjectClientWalker.h:
* loader/Decoder.h:
* loader/DocLoader.h:
* loader/loader.cpp:
* loader/loader.h:
* page/DOMWindow.h:
* page/Frame.h:
* page/FramePrivate.h:
* page/FrameTree.cpp:
* page/Page.cpp:
* page/Page.h:
* page/Plugin.h:
* platform/Arena.cpp:
* platform/ArrayImpl.h:
* platform/AtomicString.cpp:
* platform/CharsetNames.cpp:
* platform/Color.cpp:
* platform/DeprecatedPtrListImpl.cpp:
* platform/DeprecatedValueListImpl.h:
* platform/FontFallbackList.h:
* platform/GraphicsContext.h:
* platform/GraphicsTypes.cpp:
* platform/Image.h:
* platform/KURL.cpp:
* platform/Logging.cpp:
* platform/Logging.h:
* platform/PlatformString.h:
* platform/PlugInInfoStore.h:
* platform/StreamingTextDecoder.cpp:
* platform/StreamingTextDecoder.h:
* platform/String.cpp:
* platform/StringHash.h:
* platform/StringImpl.cpp:
* platform/StringImpl.h:
* platform/TextEncoding.cpp:
* platform/Timer.cpp:
* platform/Timer.h:
* platform/TransferJob.h:
* platform/TransferJobInternal.h:
* platform/mac/BlockExceptions.mm:
* platform/mac/ColorMac.mm:
* platform/mac/FontData.mm:
* platform/mac/KURLMac.mm:
* platform/mac/QStringMac.mm:
* platform/mac/SharedTimerMac.cpp:
* platform/mac/TextEncodingMac.cpp:
* platform/mac/WebCoreImageRendererFactory.m:
* platform/mac/WebCoreKeyGenerator.m:
* platform/mac/WebCoreTextArea.mm:
* platform/mac/WebCoreTextField.mm:
* platform/mac/WebTextRendererFactory.h:
* platform/mac/WebTextRendererFactory.mm:
* platform/win/TemporaryLinkStubs.cpp:
(JavaAppletWidget::JavaAppletWidget):
* rendering/InlineTextBox.cpp:
* rendering/RenderText.cpp:
* rendering/RenderTreeAsText.cpp:
* rendering/bidi.cpp:
* xml/XSLTProcessor.h:
* xpath/impl/XPathExpressionNode.h:
* xpath/impl/XPathParser.h:
* xpath/impl/XPathPath.h:
* xpath/impl/XPathUtil.h:
WebKit:
Rubber stamped by Anders.
- renamed kxmlcore to wtf
kxmlcore --> wtf
KXMLCore --> WTF
WKC --> WTF
* Misc/WebKitLogging.h:
* Misc/WebKitLogging.m:
(initializeLogChannel):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14256
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2006-05-09 Maciej Stachowiak <mjs@apple.com>
+
+ Rubber stamped by Anders.
+
+ - renamed kxmlcore to wtf
+
+ kxmlcore --> wtf
+ KXMLCore --> WTF
+ WKC --> WTF
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * bindings/c/c_instance.cpp:
+ * bindings/objc/WebScriptObject.mm:
+ * kjs/JSImmediate.h:
+ * kjs/Parser.cpp:
+ * kjs/Parser.h:
+ * kjs/array_object.cpp:
+ * kjs/collector.cpp:
+ (KJS::Collector::registerThread):
+ * kjs/collector.h:
+ * kjs/config.h:
+ * kjs/function.cpp:
+ (KJS::isStrWhiteSpace):
+ * kjs/function.h:
+ * kjs/identifier.cpp:
+ * kjs/internal.cpp:
+ * kjs/internal.h:
+ * kjs/lexer.cpp:
+ (Lexer::shift):
+ (Lexer::isWhiteSpace):
+ (Lexer::isIdentStart):
+ (Lexer::isIdentPart):
+ * kjs/lookup.cpp:
+ * kjs/nodes.cpp:
+ * kjs/nodes.h:
+ * kjs/number_object.cpp:
+ * kjs/object.h:
+ * kjs/property_map.cpp:
+ * kjs/property_map.h:
+ * kjs/string_object.cpp:
+ (StringProtoFunc::callAsFunction):
+ * kjs/testkjs.cpp:
+ (testIsInteger):
+ * kjs/ustring.cpp:
+ * kjs/ustring.h:
+ * kxmlcore: Removed.
+ * kxmlcore/AlwaysInline.h: Removed.
+ * kxmlcore/Assertions.cpp: Removed.
+ * kxmlcore/Assertions.h: Removed.
+ * kxmlcore/FastMalloc.cpp: Removed.
+ * kxmlcore/FastMalloc.h: Removed.
+ * kxmlcore/FastMallocInternal.h: Removed.
+ * kxmlcore/Forward.h: Removed.
+ * kxmlcore/HashCountedSet.h: Removed.
+ * kxmlcore/HashFunctions.h: Removed.
+ * kxmlcore/HashMap.h: Removed.
+ * kxmlcore/HashSet.h: Removed.
+ * kxmlcore/HashTable.cpp: Removed.
+ * kxmlcore/HashTable.h: Removed.
+ * kxmlcore/HashTraits.h: Removed.
+ * kxmlcore/ListRefPtr.h: Removed.
+ * kxmlcore/Noncopyable.h: Removed.
+ * kxmlcore/OwnArrayPtr.h: Removed.
+ * kxmlcore/OwnPtr.h: Removed.
+ * kxmlcore/PassRefPtr.h: Removed.
+ * kxmlcore/Platform.h: Removed.
+ * kxmlcore/RefPtr.h: Removed.
+ * kxmlcore/TCPageMap.h: Removed.
+ * kxmlcore/TCSpinLock.h: Removed.
+ * kxmlcore/TCSystemAlloc.cpp: Removed.
+ * kxmlcore/TCSystemAlloc.h: Removed.
+ * kxmlcore/UnusedParam.h: Removed.
+ * kxmlcore/Vector.h: Removed.
+ * kxmlcore/VectorTraits.h: Removed.
+ * kxmlcore/unicode: Removed.
+ * kxmlcore/unicode/Unicode.h: Removed.
+ * kxmlcore/unicode/UnicodeCategory.h: Removed.
+ * kxmlcore/unicode/icu: Removed.
+ * kxmlcore/unicode/icu/UnicodeIcu.h: Removed.
+ * kxmlcore/unicode/posix: Removed.
+ * kxmlcore/unicode/qt3: Removed.
+ * kxmlcore/unicode/qt4: Removed.
+ * kxmlcore/unicode/qt4/UnicodeQt4.h: Removed.
+ * pcre/pcre_get.c:
+ * wtf: Added.
+ * wtf/Assertions.cpp:
+ * wtf/Assertions.h:
+ * wtf/FastMalloc.cpp:
+ (WTF::TCMalloc_ThreadCache::Scavenge):
+ (WTF::do_malloc):
+ (WTF::do_free):
+ (WTF::TCMallocGuard::TCMallocGuard):
+ (WTF::malloc):
+ (WTF::free):
+ (WTF::calloc):
+ (WTF::cfree):
+ (WTF::realloc):
+ * wtf/FastMalloc.h:
+ * wtf/FastMallocInternal.h:
+ * wtf/Forward.h:
+ * wtf/HashCountedSet.h:
+ * wtf/HashFunctions.h:
+ * wtf/HashMap.h:
+ * wtf/HashSet.h:
+ * wtf/HashTable.cpp:
+ * wtf/HashTable.h:
+ * wtf/HashTraits.h:
+ * wtf/ListRefPtr.h:
+ * wtf/Noncopyable.h:
+ * wtf/OwnArrayPtr.h:
+ * wtf/OwnPtr.h:
+ * wtf/PassRefPtr.h:
+ * wtf/RefPtr.h:
+ * wtf/TCSystemAlloc.cpp:
+ (TCMalloc_SystemAlloc):
+ * wtf/Vector.h:
+ * wtf/VectorTraits.h:
+ * wtf/unicode/UnicodeCategory.h:
+ * wtf/unicode/icu/UnicodeIcu.h:
+
2006-05-08 Timothy Hatcher <timothy@apple.com>
Reviewed by Tim O.
children = (
937B63CC09E766D200A671DD /* DerivedSources.make */,
65417200039E01BA0058BFEB /* kjs */,
- 65162EF108E6A21C007556CD /* kxmlcore */,
+ 65162EF108E6A21C007556CD /* wtf */,
51856D950562EE9C008B9D83 /* bindings */,
65417203039E01F90058BFEB /* pcre */,
650FDF8D09D0FCA700769E54 /* Derived Sources */,
path = DerivedSources/JavaScriptCore;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 65162EF108E6A21C007556CD /* kxmlcore */ = {
+ 65162EF108E6A21C007556CD /* wtf */ = {
isa = PBXGroup;
children = (
E195678D09E7CF1200B89D13 /* unicode */,
6592C316098B7DE10003D4F6 /* Vector.h */,
6592C317098B7DE10003D4F6 /* VectorTraits.h */,
);
- path = kxmlcore;
+ path = wtf;
sourceTree = "<group>";
};
65417200039E01BA0058BFEB /* kjs */ = {
#include "c_utility.h"
#include "list.h"
#include "npruntime_impl.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
namespace KJS {
namespace Bindings {
#import "objc_instance.h"
#import "runtime_object.h"
-#import <kxmlcore/UnusedParam.h>
+#import <wtf/UnusedParam.h>
using namespace KJS;
using namespace KJS::Bindings;
#define KJS_JS_IMMEDIATE_H
#include "JSType.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#include <stdint.h>
#include <stdlib.h>
#include "lexer.h"
#include "nodes.h"
-#include <kxmlcore/HashSet.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/HashSet.h>
+#include <wtf/Vector.h>
extern int kjsyyparse();
#ifndef Parser_h
#define Parser_h
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
namespace KJS {
#include "lookup.h"
#include "operations.h"
#include "reference_list.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
#include <stdio.h>
#include "array_object.lut.h"
#include "config.h"
#include "collector.h"
-#include <kxmlcore/FastMalloc.h>
-#include <kxmlcore/FastMallocInternal.h>
-#include <kxmlcore/HashCountedSet.h>
+#include <wtf/FastMalloc.h>
+#include <wtf/FastMallocInternal.h>
+#include <wtf/HashCountedSet.h>
#include "internal.h"
#include "list.h"
#include "value.h"
if (!pthread_getspecific(registeredThreadKey)) {
pthread_t pthread = pthread_self();
- KXMLCore::fastMallocRegisterThread(pthread);
+ WTF::fastMallocRegisterThread(pthread);
Collector::Thread *thread = new Collector::Thread(pthread, pthread_mach_thread_np(pthread));
thread->next = registeredThreads;
registeredThreads = thread;
#define KJSCOLLECTOR_H_
#include "value.h"
-#include <kxmlcore/HashCountedSet.h>
+#include <wtf/HashCountedSet.h>
#define KJS_MEM_LIMIT 500000
-#include <kxmlcore/Platform.h>
+#include <wtf/Platform.h>
#if PLATFORM(DARWIN)
#define HAVE_STDINT_H 1
#define HAVE_STRING_H 1
-#define KXC_CHANGES 1
+#define WTF_CHANGES 1
#ifdef __cplusplus
#undef new
#undef delete
-#include <kxmlcore/FastMalloc.h>
+#include <wtf/FastMalloc.h>
#endif
#include <string.h>
#include <ctype.h>
-#include <kxmlcore/unicode/Unicode.h>
+#include <wtf/unicode/Unicode.h>
namespace KJS {
case 0x2029:
return true;
default:
- return KXMLCore::Unicode::isSeparatorSpace(c);
+ return WTF::Unicode::isSeparatorSpace(c);
}
}
#define KJS_FUNCTION_H
#include "internal.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
namespace KJS {
#include "identifier.h"
-#include <kxmlcore/FastMalloc.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/FastMalloc.h>
+#include <wtf/HashSet.h>
#include <string.h> // for strlen
#include <new> // for placement new
-namespace KXMLCore {
+namespace WTF {
template<typename T> class DefaultHash;
template<typename T> class StrHash;
#include "regexp_object.h"
#include "string_object.h"
#include <assert.h>
-#include <kxmlcore/HashMap.h>
-#include <kxmlcore/HashSet.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
+#include <wtf/Vector.h>
#include <math.h>
#include <stdio.h>
#include "types.h"
#include "ustring.h"
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
#define I18N_NOOP(s) s
#include "interpreter.h"
#include "nodes.h"
#include "lookup.h"
-#include <kxmlcore/unicode/Unicode.h>
+#include <wtf/unicode/Unicode.h>
static bool isDecimalDigit(unsigned short c);
break;
}
next3 = code[pos++].uc;
- } while (KXMLCore::Unicode::isFormatChar(next3));
+ } while (WTF::Unicode::isFormatChar(next3));
}
}
bool Lexer::isWhiteSpace() const
{
- return current == '\t' || current == 0x0b || current == 0x0c || KXMLCore::Unicode::isSeparatorSpace(current);
+ return current == '\t' || current == 0x0b || current == 0x0c || WTF::Unicode::isSeparatorSpace(current);
}
bool Lexer::isLineTerminator()
bool Lexer::isIdentStart(unsigned short c)
{
- return (KXMLCore::Unicode::category(c) & (KXMLCore::Unicode::Letter_Uppercase
- | KXMLCore::Unicode::Letter_Lowercase
- | KXMLCore::Unicode::Letter_Titlecase
- | KXMLCore::Unicode::Letter_Modifier
- | KXMLCore::Unicode::Letter_Other))
+ return (WTF::Unicode::category(c) & (WTF::Unicode::Letter_Uppercase
+ | WTF::Unicode::Letter_Lowercase
+ | WTF::Unicode::Letter_Titlecase
+ | WTF::Unicode::Letter_Modifier
+ | WTF::Unicode::Letter_Other))
|| c == '$' || c == '_';
}
bool Lexer::isIdentPart(unsigned short c)
{
- return (KXMLCore::Unicode::category(c) & (KXMLCore::Unicode::Letter_Uppercase
- | KXMLCore::Unicode::Letter_Lowercase
- | KXMLCore::Unicode::Letter_Titlecase
- | KXMLCore::Unicode::Letter_Modifier
- | KXMLCore::Unicode::Letter_Other
- | KXMLCore::Unicode::Mark_NonSpacing
- | KXMLCore::Unicode::Mark_SpacingCombining
- | KXMLCore::Unicode::Number_DecimalDigit
- | KXMLCore::Unicode::Punctuation_Connector))
+ return (WTF::Unicode::category(c) & (WTF::Unicode::Letter_Uppercase
+ | WTF::Unicode::Letter_Lowercase
+ | WTF::Unicode::Letter_Titlecase
+ | WTF::Unicode::Letter_Modifier
+ | WTF::Unicode::Letter_Other
+ | WTF::Unicode::Mark_NonSpacing
+ | WTF::Unicode::Mark_SpacingCombining
+ | WTF::Unicode::Number_DecimalDigit
+ | WTF::Unicode::Punctuation_Connector))
|| c == '$' || c == '_';
}
#include <string.h>
#include "lookup.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
using namespace KJS;
#include "lexer.h"
#include "operations.h"
#include "reference_list.h"
-#include <kxmlcore/HashSet.h>
-#include <kxmlcore/HashCountedSet.h>
+#include <wtf/HashSet.h>
+#include <wtf/HashCountedSet.h>
using namespace KJS;
#include "Parser.h"
#include "internal.h"
-#include <kxmlcore/ListRefPtr.h>
+#include <wtf/ListRefPtr.h>
namespace KJS {
#include "error_object.h"
#include "lookup.h"
#include "operations.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#include <math.h>
#include "number_object.lut.h"
#include "property_map.h"
#include "property_slot.h"
#include "scope_chain.h"
-#include <kxmlcore/AlwaysInline.h>
+#include <wtf/AlwaysInline.h>
namespace KJS {
#include "protect.h"
#include "reference_list.h"
#include <algorithm>
-#include <kxmlcore/FastMalloc.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/FastMalloc.h>
+#include <wtf/Vector.h>
using std::max;
#define KJS_PROPERTY_MAP_H_
#include "identifier.h"
-#include <kxmlcore/OwnArrayPtr.h>
+#include <wtf/OwnArrayPtr.h>
namespace KJS {
#include "operations.h"
#include "reference_list.h"
#include "regexp_object.h"
-#include <kxmlcore/unicode/Unicode.h>
+#include <wtf/unicode/Unicode.h>
#include "string_object.lut.h"
uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
uint16_t* destIfNeeded;
- int len = KXMLCore::Unicode::toLower(dataPtr, u.size(), destIfNeeded);
+ int len = WTF::Unicode::toLower(dataPtr, u.size(), destIfNeeded);
if (len >= 0)
result = jsString(UString(reinterpret_cast<UChar *>(destIfNeeded ? destIfNeeded : dataPtr), len));
else
uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
uint16_t* destIfNeeded;
- int len = KXMLCore::Unicode::toUpper(dataPtr, u.size(), destIfNeeded);
+ int len = WTF::Unicode::toUpper(dataPtr, u.size(), destIfNeeded);
if (len >= 0)
result = jsString(UString(reinterpret_cast<UChar *>(destIfNeeded ? destIfNeeded : dataPtr), len));
else
#endif
using namespace KJS;
-using namespace KXMLCore;
+using namespace WTF;
static void testIsInteger();
static char* createStringWithContentsOfFile(const char* fileName);
static void testIsInteger()
{
- // Unit tests for KXMLCore::IsInteger. Don't have a better place for them now.
- // FIXME: move these once we create a unit test directory for KXMLCore.
+ // Unit tests for WTF::IsInteger. Don't have a better place for them now.
+ // FIXME: move these once we create a unit test directory for WTF.
assert(IsInteger<bool>::value);
assert(IsInteger<char>::value);
#include <math.h>
#include "dtoa.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
using std::max;
#ifndef _KJS_USTRING_H_
#define _KJS_USTRING_H_
-#include <kxmlcore/FastMalloc.h>
-#include <kxmlcore/RefPtr.h>
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/FastMalloc.h>
+#include <wtf/RefPtr.h>
+#include <wtf/PassRefPtr.h>
#include <stdint.h>
#include "pcre_internal.h"
-#include <kxmlcore/UnusedParam.h>
+#include <wtf/UnusedParam.h>
/*************************************************
vfprintf_no_warning(stderr, format, args);
}
-void KXCReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
+void WTFReportAssertionFailure(const char *file, int line, const char *function, const char *assertion)
{
if (assertion)
fprintf(stderr, "=================\nASSERTION FAILED: %s (%s:%d %s)\n=================\n", assertion, file, line, function);
fprintf(stderr, "=================\nSHOULD NEVER BE REACHED (%s:%d %s)\n=================\n", file, line, function);
}
-void KXCReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...)
+void WTFReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...)
{
fprintf(stderr, "=================\nASSERTION FAILED: ");
va_list args;
fprintf(stderr, "\n%s (%s:%d %s)\n=================\n", assertion, file, line, function);
}
-void KXCReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion)
+void WTFReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion)
{
fprintf(stderr, "=================\nARGUMENT BAD: %s, %s (%s:%d %s)\n=================\n", argName, assertion, file, line, function);
}
-void KXCReportFatalError(const char *file, int line, const char *function, const char *format, ...)
+void WTFReportFatalError(const char *file, int line, const char *function, const char *format, ...)
{
fprintf(stderr, "=================\nFATAL ERROR: ");
va_list args;
fprintf(stderr, "\n(%s:%d %s)\n=================\n", file, line, function);
}
-void KXCReportError(const char *file, int line, const char *function, const char *format, ...)
+void WTFReportError(const char *file, int line, const char *function, const char *format, ...)
{
fprintf(stderr, "=================\nERROR: ");
va_list args;
fprintf(stderr, "\n(%s:%d %s)\n=================\n", file, line, function);
}
-void KXCLog(const char*, int, const char*, KXCLogChannel *channel, const char *format, ...)
+void WTFLog(const char*, int, const char*, WTFLogChannel *channel, const char *format, ...)
{
- if (channel->state != KXCLogChannelOn)
+ if (channel->state != WTFLogChannelOn)
return;
va_list args;
extern "C" {
#endif
-typedef enum { KXCLogChannelOff, KXCLogChannelOn } KXCLogChannelState;
+typedef enum { WTFLogChannelOff, WTFLogChannelOn } WTFLogChannelState;
typedef struct {
unsigned mask;
const char *defaultName;
- KXCLogChannelState state;
-} KXCLogChannel;
+ WTFLogChannelState state;
+} WTFLogChannel;
-void KXCReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
-void KXCReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...);
-void KXCReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion);
-void KXCReportFatalError(const char *file, int line, const char *function, const char *format, ...) ;
-void KXCReportError(const char *file, int line, const char *function, const char *format, ...);
-void KXCLog(const char *file, int line, const char *function, KXCLogChannel *channel, const char *format, ...);
+void WTFReportAssertionFailure(const char *file, int line, const char *function, const char *assertion);
+void WTFReportAssertionFailureWithMessage(const char *file, int line, const char *function, const char *assertion, const char *format, ...);
+void WTFReportArgumentAssertionFailure(const char *file, int line, const char *function, const char *argName, const char *assertion);
+void WTFReportFatalError(const char *file, int line, const char *function, const char *format, ...) ;
+void WTFReportError(const char *file, int line, const char *function, const char *format, ...);
+void WTFLog(const char *file, int line, const char *function, WTFLogChannel *channel, const char *format, ...);
#ifdef __cplusplus
}
#define ASSERT(assertion) do \
if (!(assertion)) { \
- KXCReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion); \
+ WTFReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion); \
CRASH(); \
} \
while (0)
#define ASSERT_WITH_MESSAGE(assertion, ...) do \
if (!(assertion)) { \
- KXCReportAssertionFailureWithMessage(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion, __VA_ARGS__); \
+ WTFReportAssertionFailureWithMessage(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #assertion, __VA_ARGS__); \
CRASH(); \
} \
while (0)
#define ASSERT_NOT_REACHED() do { \
- KXCReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, 0); \
+ WTFReportAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, 0); \
CRASH(); \
} while (0)
#define ASSERT_ARG(argName, assertion) do \
if (!(assertion)) { \
- KXCReportArgumentAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #argName, #assertion); \
+ WTFReportArgumentAssertionFailure(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, #argName, #assertion); \
CRASH(); \
} \
while (0)
#define FATAL(...) ((void)0)
#else
#define FATAL(...) do { \
- KXCReportFatalError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__); \
+ WTFReportFatalError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__); \
CRASH(); \
} while (0)
#endif
#if ERROR_DISABLED
#define LOG_ERROR(...) ((void)0)
#else
-#define LOG_ERROR(...) KXCReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__)
+#define LOG_ERROR(...) WTFReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__)
#endif
// LOG
#if LOG_DISABLED
#define LOG(channel, ...) ((void)0)
#else
-#define LOG(channel, ...) KXCLog(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
+#define LOG(channel, ...) WTFLog(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, &JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), __VA_ARGS__)
#define JOIN_LOG_CHANNEL_WITH_PREFIX(prefix, channel) JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel)
#define JOIN_LOG_CHANNEL_WITH_PREFIX_LEVEL_2(prefix, channel) prefix ## channel
#endif
#include <pthread.h>
#endif
-namespace KXMLCore {
+namespace WTF {
void *fastMalloc(size_t n)
{
}
#endif
-} // namespace KXMLCore
+} // namespace WTF
#else
#include <string.h>
#include <unistd.h>
-#if KXC_CHANGES
-namespace KXMLCore {
+#if WTF_CHANGES
+namespace WTF {
#define malloc fastMalloc
#define calloc fastCalloc
return list->next == list;
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
static int DLL_Length(const Span* list) {
int result = 0;
for (Span* s = list->next; s != list; s = s->next) {
}
// Dump state to stderr
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
void Dump(TCMalloc_Printer* out);
#endif
}
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
void TCMalloc_PageHeap::Dump(TCMalloc_Printer* out) {
int nonempty_sizes = 0;
for (int s = 0; s < kMaxPages; s++) {
// that situation by dropping L/2 nodes from the free list. This
// may not release much memory, but if so we will call scavenge again
// pretty soon and the low-water marks will be high on that call.
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
int64 start = CycleClock::Now();
#endif
list->clear_lowwatermark();
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
int64 finish = CycleClock::Now();
CycleTimer ct;
MESSAGE("GC: %.0f ns\n", ct.CyclesToUsec(finish-start)*1000.0);
uint64_t metadata_bytes; // Bytes alloced for metadata
};
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
// Get stats into "r". Also get per-size-class counts if class_count != NULL
static void ExtractStats(TCMallocStats* r, uint64_t* class_count) {
r->central_bytes = 0;
}
#endif
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
// WRITE stats to "out"
static void DumpStats(TCMalloc_Printer* out, int level) {
TCMallocStats stats;
}
#endif
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
// TCMalloc's support for extra malloc interfaces
class TCMallocImplementation : public MallocExtension {
//
// We hack around this problem by disabling all deallocations
// after a global object destructor in this module has been called.
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
static bool tcmalloc_is_destroyed = false;
#endif
// Helpers for the exported routines below
//-------------------------------------------------------------------
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
static Span* DoSampledAllocation(size_t size) {
SpinLockHolder h(&pageheap_lock);
static ALWAYS_INLINE void* do_malloc(size_t size) {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
if (TCMallocDebug::level >= TCMallocDebug::kVerbose)
MESSAGE("In tcmalloc do_malloc(%" PRIuS")\n", size);
#endif
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
// The following call forces module initialization
TCMalloc_ThreadCache* heap = TCMalloc_ThreadCache::GetCache();
if (heap->SampleAllocation(size)) {
if (span == NULL) return NULL;
return reinterpret_cast<void*>(span->start << kPageShift);
} else {
-#ifdef KXC_CHANGES
+#ifdef WTF_CHANGES
TCMalloc_ThreadCache* heap = TCMalloc_ThreadCache::GetCache();
#endif
return heap->Allocate(size);
}
static ALWAYS_INLINE void do_free(void* ptr) {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
if (TCMallocDebug::level >= TCMallocDebug::kVerbose)
MESSAGE("In tcmalloc do_free(%p)\n", ptr);
#endif
-#if KXC_CHANGES
+#if WTF_CHANGES
if (ptr == NULL) return;
-#else KXC_CHANGES
+#else WTF_CHANGES
if (ptr == NULL || tcmalloc_is_destroyed) return;
#endif
const PageID p = reinterpret_cast<uintptr_t>(ptr) >> kPageShift;
Span* span = pageheap->GetDescriptor(p);
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
if (span == NULL) {
// We've seen systems where a piece of memory allocated using the
// allocator built in to libc is deallocated using free() and
}
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
// For use by exported routines below that want specific alignments
//
// Note: this code can be slow, and can significantly fragment memory.
class TCMallocGuard {
public:
TCMallocGuard() {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
char *envval;
if ((envval = getenv("TCMALLOC_DEBUG"))) {
TCMallocDebug::level = atoi(envval);
do_free(do_malloc(1));
TCMalloc_ThreadCache::InitTSD();
do_free(do_malloc(1));
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocExtension::Register(new TCMallocImplementation);
#endif
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
~TCMallocGuard() {
const char* env = getenv("MALLOCSTATS");
if (env != NULL) {
// heap-checker.cc depends on this to start a stack trace from
// the call to the (de)allocation function.
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
extern "C"
#endif
void* malloc(size_t size) {
void* result = do_malloc(size);
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeNewHook(result, size);
#endif
return result;
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
extern "C"
#endif
void free(void* ptr) {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeDeleteHook(ptr);
#endif
do_free(ptr);
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
extern "C"
#endif
void* calloc(size_t n, size_t elem_size) {
if (result != NULL) {
memset(result, 0, n * elem_size);
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeNewHook(result, n * elem_size);
#endif
return result;
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
extern "C"
#endif
void cfree(void* ptr) {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeDeleteHook(ptr);
#endif
do_free(ptr);
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
extern "C"
#endif
void* realloc(void* old_ptr, size_t new_size) {
if (old_ptr == NULL) {
void* result = do_malloc(new_size);
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeNewHook(result, new_size);
#endif
return result;
}
if (new_size == 0) {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeDeleteHook(old_ptr);
#endif
free(old_ptr);
if (new_ptr == NULL) {
return NULL;
}
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeNewHook(new_ptr, new_size);
#endif
memcpy(new_ptr, old_ptr, ((old_size < new_size) ? old_size : new_size));
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
MallocHook::InvokeDeleteHook(old_ptr);
#endif
free(old_ptr);
#define OPDELETE_THROW throw()
#endif
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
void* operator new(size_t size) OPNEW_THROW {
void* p = do_malloc(size);
#endif
-#if KXC_CHANGES
-} // namespace KXMLCore
+#if WTF_CHANGES
+} // namespace WTF
#endif
#endif // USE_SYSTEM_MALLOC
#include <stdlib.h>
#include <new>
-namespace KXMLCore {
+namespace WTF {
void *fastMalloc(size_t n);
void *fastCalloc(size_t n_elements, size_t element_size);
void fastFree(void* p);
void *fastRealloc(void* p, size_t n);
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::fastMalloc;
-using KXMLCore::fastCalloc;
-using KXMLCore::fastRealloc;
-using KXMLCore::fastFree;
+using WTF::fastMalloc;
+using WTF::fastCalloc;
+using WTF::fastRealloc;
+using WTF::fastFree;
#if PLATFORM(GCC) && PLATFORM(DARWIN)
#define KXMLCORE_PRIVATE_INLINE __private_extern__ inline __attribute__((always_inline))
#include <pthread.h>
-namespace KXMLCore {
+namespace WTF {
void fastMallocRegisterThread(pthread_t thread);
}
#include <stddef.h>
-namespace KXMLCore {
+namespace WTF {
template<typename T> class ListRefPtr;
template<typename T> class OwnArrayPtr;
template<typename T> class OwnPtr;
template<typename T> class RefPtr;
}
-using KXMLCore::ListRefPtr;
-using KXMLCore::OwnArrayPtr;
-using KXMLCore::OwnPtr;
-using KXMLCore::PassRefPtr;
-using KXMLCore::RefPtr;
+using WTF::ListRefPtr;
+using WTF::OwnArrayPtr;
+using WTF::OwnPtr;
+using WTF::PassRefPtr;
+using WTF::RefPtr;
#endif
#include "Assertions.h"
#include "HashMap.h"
-namespace KXMLCore {
+namespace WTF {
template<typename Value, typename HashFunctions = typename DefaultHash<Value>::Hash,
typename Traits = HashTraits<Value> > class HashCountedSet {
} // namespace khtml
-using KXMLCore::HashCountedSet;
+using WTF::HashCountedSet;
#endif /* KXMLCORE_HASH_COUNTED_SET_H */
#include "RefPtr.h"
#include <stdint.h>
-namespace KXMLCore {
+namespace WTF {
template<size_t size> struct IntTypes;
template<> struct IntTypes<1> { typedef int8_t SignedType; typedef uint8_t UnsignedType; };
template<typename P> struct DefaultHash<P*> { typedef PtrHash<P*> Hash; };
template<typename P> struct DefaultHash<RefPtr<P> > { typedef PtrHash<RefPtr<P> > Hash; };
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::DefaultHash;
-using KXMLCore::IntHash;
-using KXMLCore::PtrHash;
+using WTF::DefaultHash;
+using WTF::IntHash;
+using WTF::PtrHash;
#endif // KXLMCORE_HASH_FUNCTIONS_H
#include "HashTable.h"
-namespace KXMLCore {
+namespace WTF {
template<typename PairType> struct PairFirstExtractor;
deleteAllPairSeconds<typename HashMap<T, U, V, W, X>::MappedType>(collection);
}
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::HashMap;
+using WTF::HashMap;
#endif /* KXMLCORE_HASH_MAP_H */
#include "HashTable.h"
-namespace KXMLCore {
+namespace WTF {
template<typename T> struct IdentityExtractor;
deleteAllValues<typename HashSet<T, U, V>::ValueType>(collection.m_impl);
}
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::HashSet;
+using WTF::HashSet;
#endif /* KXMLCORE_HASH_SET_H */
#include "config.h"
#include "HashTable.h"
-namespace KXMLCore {
+namespace WTF {
#if DUMP_HASHTABLE_STATS
#endif
-} // namespace KXMLCore
+} // namespace WTF
#include "HashTraits.h"
#include <assert.h>
-namespace KXMLCore {
+namespace WTF {
#define DUMP_HASHTABLE_STATS 0
#define CHECK_HASHTABLE_CONSISTENCY 0
static void derefAll(HashTableType& table) { Base::derefAll(table); }
};
-} // namespace KXMLCore
+} // namespace WTF
#endif // KXMLCORE_HASH_TABLE_H
#include "HashFunctions.h"
#include <utility>
-namespace KXMLCore {
+namespace WTF {
using std::pair;
using std::make_pair;
typedef HashTraits<IntType> Traits;
};
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::HashTraits;
-using KXMLCore::PairHashTraits;
+using WTF::HashTraits;
+using WTF::PairHashTraits;
#endif // KXMLCORE_HASH_TRAITS_H
#ifndef KXMLCORE_LIST_REF_PTR_H
#define KXMLCORE_LIST_REF_PTR_H
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
-namespace KXMLCore {
+namespace WTF {
// Specialized version of RefPtr desgined for use in singly-linked lists.
// Derefs the list iteratively to avoid recursive derefing that can overflow the stack.
template <typename U> ListRefPtr& operator=(const PassRefPtr<U>& o) { RefPtr<T>::operator=(o); return *this; }
};
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::ListRefPtr;
+using WTF::ListRefPtr;
#endif // KXMLCORE_LIST_REF_PTR_H
#ifndef KXMLCORE_NONCOPYABLE
#define KXMLCORE_NONCOPYABLE
-// We don't want argument-dependent lookup to pull in everything from the KXMLCore
+// We don't want argument-dependent lookup to pull in everything from the WTF
// namespace when you use Noncopyable, so put it in its own namespace.
-namespace KXMLCoreNoncopyable {
+namespace WTFNoncopyable {
class Noncopyable {
Noncopyable(const Noncopyable&);
~Noncopyable() { }
};
-} // namespace KXMLCoreNoncopyable
+} // namespace WTFNoncopyable
-using KXMLCoreNoncopyable::Noncopyable;
+using WTFNoncopyable::Noncopyable;
#endif // KXMLCORE_NONCOPYABLE
#define KXMLCORE_OWN_ARRAY_PTR_H
#include <algorithm>
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Assertions.h>
+#include <wtf/Noncopyable.h>
-namespace KXMLCore {
+namespace WTF {
template <typename T> class OwnArrayPtr : Noncopyable {
public:
template <typename T> inline void swap(OwnArrayPtr<T>& a, OwnArrayPtr<T>& b) { a.swap(b); }
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::OwnArrayPtr;
+using WTF::OwnArrayPtr;
#endif // KXMLCORE_OWN_ARRAY_PTR_H
#define KXMLCORE_OWN_PTR_H
#include <algorithm>
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Assertions.h>
+#include <wtf/Noncopyable.h>
-namespace KXMLCore {
+namespace WTF {
template <typename T> class OwnPtr : Noncopyable {
public:
template <typename T> inline void swap(OwnPtr<T>& a, OwnPtr<T>& b) { a.swap(b); }
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::OwnPtr;
+using WTF::OwnPtr;
#endif // KXMLCORE_OWN_PTR_H
#ifndef KXMLCORE_PASS_REF_PTR_H
#define KXMLCORE_PASS_REF_PTR_H
-namespace KXMLCore {
+namespace WTF {
template<typename T> class RefPtr;
template<typename T> class PassRefPtr;
return adoptRef(const_cast<T *>(p.release()));
}
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::PassRefPtr;
-using KXMLCore::adoptRef;
-using KXMLCore::static_pointer_cast;
-using KXMLCore::const_pointer_cast;
+using WTF::PassRefPtr;
+using WTF::adoptRef;
+using WTF::static_pointer_cast;
+using WTF::const_pointer_cast;
#endif // KXMLCORE_PASS_REF_PTR_H
#include <algorithm>
-namespace KXMLCore {
+namespace WTF {
template <typename T> class PassRefPtr;
return RefPtr<T>(const_cast<T *>(p.get()));
}
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::RefPtr;
-using KXMLCore::static_pointer_cast;
-using KXMLCore::const_pointer_cast;
+using WTF::RefPtr;
+using WTF::static_pointer_cast;
+using WTF::const_pointer_cast;
#endif // KXMLCORE_REF_PTR_H
// For 2.2 kernels, it looks like the sbrk address space (500MBish) and
// the mmap address space (1300MBish) are disjoint, so we need both allocators
// to get as much virtual memory as possible.
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
static bool use_devmem = false;
#endif
static bool use_sbrk = false;
static bool sbrk_failure = false;
static bool mmap_failure = false;
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
DEFINE_int32(malloc_devmem_start, 0,
"Physical memory starting location in MB for /dev/mem allocation."
" Setting this to 0 disables /dev/mem allocation");
#endif /* HAVE(MMAP) */
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
static void* TryDevMem(size_t size, size_t alignment) {
static bool initialized = false;
static off_t physmem_base; // next physical memory address to allocate
#endif
void* TCMalloc_SystemAlloc(size_t size, size_t alignment) {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
if (TCMallocDebug::level >= TCMallocDebug::kVerbose) {
MESSAGE("TCMalloc_SystemAlloc(%" PRIuS ", %" PRIuS")\n",
size, alignment);
// more trying all allocators even if they failed before.
for (int i = 0; i < 2; i++) {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
if (use_devmem && !devmem_failure) {
void* result = TryDevMem(size, alignment);
if (result != NULL) return result;
// We should use NOMINMAX instead.
#undef max
-namespace KXMLCore {
+namespace WTF {
using std::min;
using std::max;
delete *it;
}
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::Vector;
+using WTF::Vector;
#endif // KXMLCORE_VECTOR_H
using std::pair;
-namespace KXMLCore {
+namespace WTF {
template <typename T> struct IsPod { static const bool value = false; };
template <> struct IsPod<bool> { static const bool value = true; };
static const bool canFillWithMemset = false;
};
-} // namespace KXMLCore
+} // namespace WTF
-using KXMLCore::VectorTraits;
-using KXMLCore::SimpleClassVectorTraits;
+using WTF::VectorTraits;
+using WTF::SimpleClassVectorTraits;
#endif // KXMLCORE_VECTOR_TRAITS_H
#ifndef KJS_UNICODE_CATEGORY_H
#define KJS_UNICODE_CATEGORY_H
-namespace KXMLCore {
+namespace WTF {
namespace Unicode {
enum CharCategory {
NoCategory = 0,
#include "../UnicodeCategory.h"
-namespace KXMLCore {
+namespace WTF {
namespace Unicode {
inline int toLower(uint16_t* str, int strLength, uint16_t*& destIfNeeded)
+2006-05-09 Maciej Stachowiak <mjs@apple.com>
+
+ Rubber stamped by Anders.
+
+ - renamed kxmlcore to wtf
+
+ kxmlcore --> wtf
+ KXMLCore --> WTF
+ WKC --> WTF
+
+ * config.h:
+ * kxmlcore: Removed.
+ * kxmlcore/AlwaysInline.h: Removed.
+ * kxmlcore/Assertions.h: Removed.
+ * kxmlcore/FastMalloc.h: Removed.
+ * kxmlcore/Forward.h: Removed.
+ * kxmlcore/HashCountedSet.h: Removed.
+ * kxmlcore/HashSet.h: Removed.
+ * kxmlcore/Noncopyable.h: Removed.
+ * kxmlcore/OwnArrayPtr.h: Removed.
+ * kxmlcore/OwnPtr.h: Removed.
+ * kxmlcore/PassRefPtr.h: Removed.
+ * kxmlcore/Platform.h: Removed.
+ * kxmlcore/RefPtr.h: Removed.
+ * kxmlcore/Vector.h: Removed.
+ * wtf: Added.
+
2006-04-11 Darin Adler <darin@apple.com>
- try to fix Windows build
-#include <kxmlcore/Platform.h>
+#include <wtf/Platform.h>
+2006-05-09 Maciej Stachowiak <mjs@apple.com>
+
+ Rubber stamped by Anders.
+
+ - renamed kxmlcore to wtf
+
+ kxmlcore --> wtf
+ KXMLCore --> WTF
+ WKC --> WTF
+
+ * ForwardingHeaders/kxmlcore: Removed.
+ * ForwardingHeaders/kxmlcore/AlwaysInline.h: Removed.
+ * ForwardingHeaders/kxmlcore/Assertions.h: Removed.
+ * ForwardingHeaders/kxmlcore/FastMalloc.h: Removed.
+ * ForwardingHeaders/kxmlcore/Forward.h: Removed.
+ * ForwardingHeaders/kxmlcore/HashCountedSet.h: Removed.
+ * ForwardingHeaders/kxmlcore/HashMap.h: Removed.
+ * ForwardingHeaders/kxmlcore/HashSet.h: Removed.
+ * ForwardingHeaders/kxmlcore/HashTraits.h: Removed.
+ * ForwardingHeaders/kxmlcore/Noncopyable.h: Removed.
+ * ForwardingHeaders/kxmlcore/OwnArrayPtr.h: Removed.
+ * ForwardingHeaders/kxmlcore/OwnPtr.h: Removed.
+ * ForwardingHeaders/kxmlcore/PassRefPtr.h: Removed.
+ * ForwardingHeaders/kxmlcore/Platform.h: Removed.
+ * ForwardingHeaders/kxmlcore/RefPtr.h: Removed.
+ * ForwardingHeaders/kxmlcore/Vector.h: Removed.
+ * ForwardingHeaders/wtf: Added.
+ * bindings/js/JSHTMLElementWrapperFactory.h:
+ * bindings/js/kjs_binding.cpp:
+ * bindings/js/kjs_window.h:
+ * bindings/objc/DOMImplementationFront.h:
+ * bridge/JavaAppletWidget.h:
+ * bridge/mac/WebCoreFrameNamespaces.mm:
+ * bridge/mac/WebCorePageBridge.mm:
+ (initializeLogChannel):
+ * bridge/mac/WebCoreStringTruncator.mm:
+ * bridge/mac/WebCoreViewFactory.m:
+ * config.h:
+ * css/css_base.h:
+ * css/css_valueimpl.h:
+ * css/csshelper.cpp:
+ * css/cssparser.h:
+ * dom/DOMImplementation.h:
+ * dom/Document.h:
+ * dom/NamedNodeMap.h:
+ * dom/Node.h:
+ * dom/NodeList.h:
+ * dom/QualifiedName.cpp:
+ * dom/Range.h:
+ * dom/StyledElement.cpp:
+ * dom/dom2_traversalimpl.h:
+ * dom/xml_tokenizer.h:
+ * editing/RebalanceWhitespaceCommand.cpp:
+ * editing/RemoveCSSPropertyCommand.cpp:
+ * editing/RemoveNodeAttributeCommand.cpp:
+ * editing/RemoveNodeCommand.cpp:
+ * editing/RemoveNodePreservingChildrenCommand.cpp:
+ * editing/ReplaceSelectionCommand.h:
+ * editing/Selection.cpp:
+ * editing/SetNodeAttributeCommand.cpp:
+ * editing/SplitElementCommand.cpp:
+ * editing/SplitTextNodeCommand.cpp:
+ * editing/SplitTextNodeContainingElementCommand.cpp:
+ * editing/TextIterator.h:
+ * editing/htmlediting.h:
+ * editing/markup.h:
+ * html/CanvasGradient.h:
+ * html/CanvasRenderingContext2D.h:
+ * html/CanvasStyle.cpp:
+ * html/HTMLCollection.h:
+ * html/HTMLElementFactory.h:
+ * kcanvas/KCanvasFilters.cpp:
+ * kcanvas/KCanvasPath.h:
+ * kcanvas/RenderPath.cpp:
+ * kcanvas/RenderSVGImage.cpp:
+ * kcanvas/RenderSVGText.cpp:
+ * kcanvas/device/quartz/KCanvasItemQuartz.mm:
+ * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
+ * kcanvas/device/quartz/QuartzSupport.mm:
+ * ksvg2/misc/KSVGTimeScheduler.h:
+ * ksvg2/misc/SVGDocumentExtensions.h:
+ * ksvg2/scripts/make_names.pl:
+ * ksvg2/svg/SVGDOMImplementation.cpp:
+ * ksvg2/svg/SVGExternalResourcesRequired.h:
+ * ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp:
+ * ksvg2/svg/SVGForeignObjectElement.cpp:
+ * ksvg2/svg/SVGImageElement.cpp:
+ * ksvg2/svg/SVGMaskElement.cpp:
+ * ksvg2/svg/SVGStyledElement.cpp:
+ * ksvg2/svg/SVGTests.h:
+ * ksvg2/svg/SVGTransform.h:
+ * ksvg2/svg/SVGTransformable.cpp:
+ * kwq/AccessibilityObjectCache.h:
+ * kwq/KWQCString.cpp:
+ * kwq/KWQFormData.mm:
+ * kwq/KWQListBox.mm:
+ * kwq/KWQResourceLoader.mm:
+ * kwq/KWQTextEdit.mm:
+ * loader/Cache.h:
+ * loader/CachedObject.h:
+ * loader/CachedObjectClientWalker.h:
+ * loader/Decoder.h:
+ * loader/DocLoader.h:
+ * loader/loader.cpp:
+ * loader/loader.h:
+ * page/DOMWindow.h:
+ * page/Frame.h:
+ * page/FramePrivate.h:
+ * page/FrameTree.cpp:
+ * page/Page.cpp:
+ * page/Page.h:
+ * page/Plugin.h:
+ * platform/Arena.cpp:
+ * platform/ArrayImpl.h:
+ * platform/AtomicString.cpp:
+ * platform/CharsetNames.cpp:
+ * platform/Color.cpp:
+ * platform/DeprecatedPtrListImpl.cpp:
+ * platform/DeprecatedValueListImpl.h:
+ * platform/FontFallbackList.h:
+ * platform/GraphicsContext.h:
+ * platform/GraphicsTypes.cpp:
+ * platform/Image.h:
+ * platform/KURL.cpp:
+ * platform/Logging.cpp:
+ * platform/Logging.h:
+ * platform/PlatformString.h:
+ * platform/PlugInInfoStore.h:
+ * platform/StreamingTextDecoder.cpp:
+ * platform/StreamingTextDecoder.h:
+ * platform/String.cpp:
+ * platform/StringHash.h:
+ * platform/StringImpl.cpp:
+ * platform/StringImpl.h:
+ * platform/TextEncoding.cpp:
+ * platform/Timer.cpp:
+ * platform/Timer.h:
+ * platform/TransferJob.h:
+ * platform/TransferJobInternal.h:
+ * platform/mac/BlockExceptions.mm:
+ * platform/mac/ColorMac.mm:
+ * platform/mac/FontData.mm:
+ * platform/mac/KURLMac.mm:
+ * platform/mac/QStringMac.mm:
+ * platform/mac/SharedTimerMac.cpp:
+ * platform/mac/TextEncodingMac.cpp:
+ * platform/mac/WebCoreImageRendererFactory.m:
+ * platform/mac/WebCoreKeyGenerator.m:
+ * platform/mac/WebCoreTextArea.mm:
+ * platform/mac/WebCoreTextField.mm:
+ * platform/mac/WebTextRendererFactory.h:
+ * platform/mac/WebTextRendererFactory.mm:
+ * platform/win/TemporaryLinkStubs.cpp:
+ (JavaAppletWidget::JavaAppletWidget):
+ * rendering/InlineTextBox.cpp:
+ * rendering/RenderText.cpp:
+ * rendering/RenderTreeAsText.cpp:
+ * rendering/bidi.cpp:
+ * xml/XSLTProcessor.h:
+ * xpath/impl/XPathExpressionNode.h:
+ * xpath/impl/XPathParser.h:
+ * xpath/impl/XPathPath.h:
+ * xpath/impl/XPathUtil.h:
+
2006-05-09 Anders Carlsson <acarlsson@apple.com>
Reviewed by Maciej.
#ifndef JSHTMLELEMENTWRAPPERFACTORY_H
#define JSHTMLELEMENTWRAPPERFACTORY_H
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
namespace KJS {
class DOMNode;
#include "kjs_window.h"
#include <kjs/collector.h>
#include <kjs/internal.h> // for InterpreterImp
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
using namespace WebCore;
using namespace EventNames;
#include "DeprecatedString.h"
#include "kjs_binding.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
namespace WebCore {
class AtomicString;
// we should consider increasing the minimum required version of gcc to build
// WebCore, and rolling the change that introduced this file back.
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
namespace WebCore {
#include "StringHash.h"
#include "Widget.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
namespace WebCore {
class Element;
#import "WebCoreFrameNamespaces.h"
#import "Page.h"
-#import <kxmlcore/HashSet.h>
+#import <wtf/HashSet.h>
using namespace WebCore;
@implementation WebCorePageBridge
-static inline void initializeLogChannel(KXCLogChannel &channel)
+static inline void initializeLogChannel(WTFLogChannel &channel)
{
- channel.state = KXCLogChannelOff;
+ channel.state = WTFLogChannelOff;
NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithUTF8String:channel.defaultName]];
if (logLevelString) {
unsigned logLevel;
if (![[NSScanner scannerWithString:logLevelString] scanHexInt:&logLevel])
NSLog(@"unable to parse hex value for %s (%@), logging is off", channel.defaultName, logLevelString);
if ((logLevel & channel.mask) == channel.mask)
- channel.state = KXCLogChannelOn;
+ channel.state = WTFLogChannelOn;
}
}
#import <Cocoa/Cocoa.h>
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import "WebTextRendererFactory.h"
#import "FontData.h"
*/
#include "config.h"
#import "WebCoreViewFactory.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
@implementation WebCoreViewFactory
*
*/
-#include <kxmlcore/Platform.h>
+#include <wtf/Platform.h>
#define KHTML_NO_XBL 1
#define KHTML_XSLT 1
// Helps us catch if anyone uses new or delete by accident in code and doesn't include "config.h".
#undef new
#undef delete
-#include <kxmlcore/FastMalloc.h>
+#include <wtf/FastMalloc.h>
#endif
#define CSS_BASE_H
#include "QualifiedName.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
namespace WebCore {
#include "css_base.h"
#include "DeprecatedPtrList.h"
#include "DeprecatedValueList.h"
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/PassRefPtr.h>
class QPaintDeviceMetrics;
#include "csshelper.h"
#include "PlatformString.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
namespace WebCore {
#include "AtomicString.h"
#include "Color.h"
-#include <kxmlcore/HashSet.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/HashSet.h>
+#include <wtf/Vector.h>
namespace WebCore {
#define DOM_DOMImplementationImpl_h
#include "Shared.h"
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
namespace WebCore {
#include "Timer.h"
#include "Decoder.h"
#include "dom2_traversalimpl.h"
-#include <kxmlcore/HashCountedSet.h>
+#include <wtf/HashCountedSet.h>
#include "DeprecatedPtrList.h"
class RenderArena;
static bool equal(const FormElementKey& a, const FormElementKey& b) { return a == b; }
};
-struct FormElementKeyHashTraits : KXMLCore::GenericHashTraits<FormElementKey> {
+struct FormElementKeyHashTraits : WTF::GenericHashTraits<FormElementKey> {
static FormElementKey deletedValue();
};
#define DOM_NamedNodeMapImpl_h
#include "Shared.h"
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/PassRefPtr.h>
namespace WebCore {
#include "DocPtr.h"
#include "PlatformString.h"
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/HashSet.h>
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/Assertions.h>
+#include <wtf/HashSet.h>
+#include <wtf/PassRefPtr.h>
class DeprecatedStringList;
class QTextStream;
#define DOM_NodeList_h
#include "Shared.h"
-#include <kxmlcore/Forward.h>
-#include <kxmlcore/RefPtr.h>
+#include <wtf/Forward.h>
+#include <wtf/RefPtr.h>
namespace WebCore {
#include "QualifiedName.h"
#include "StaticConstructors.h"
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/Assertions.h>
+#include <wtf/HashSet.h>
namespace WebCore {
#define DOM2_RangeImpl_h_
#include "Shared.h"
-#include <kxmlcore/Forward.h>
-#include <kxmlcore/RefPtr.h>
+#include <wtf/Forward.h>
+#include <wtf/RefPtr.h>
namespace WebCore {
static inline bool operator==(const MappedAttributeKey& a, const MappedAttributeKey& b)
{ return a.type == b.type && a.name == b.name && a.value == b.value; }
-struct MappedAttributeKeyTraits : KXMLCore::GenericHashTraits<MappedAttributeKey> {
+struct MappedAttributeKeyTraits : WTF::GenericHashTraits<MappedAttributeKey> {
static const bool emptyValueIsZero = true;
static const bool needsDestruction = false;
static MappedAttributeKey deletedValue() { return eLastEntry; }
#define dom2_traversal_h
#include "Shared.h"
-#include <kxmlcore/Forward.h>
-#include <kxmlcore/Noncopyable.h>
-#include <kxmlcore/RefPtr.h>
+#include <wtf/Forward.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/RefPtr.h>
namespace WebCore {
#define XML_Tokenizer_h_
#include "StringHash.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
namespace WebCore {
#include "Document.h"
#include "htmlediting.h"
#include "TextIterator.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "css_valueimpl.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "RemoveNodeAttributeCommand.h"
#include "Element.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "RemoveNodeCommand.h"
#include "Node.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "RemoveNodePreservingChildrenCommand.h"
#include "Node.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#define replace_selection_command_h__
#include "CompositeEditCommand.h"
-#include <kxmlcore/HashMap.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/HashMap.h>
+#include <wtf/Vector.h>
namespace WebCore {
#include "VisiblePosition.h"
#include "visible_units.h"
#include "Range.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "SetNodeAttributeCommand.h"
#include "Element.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "SplitElementCommand.h"
#include "Element.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "Document.h"
#include "Text.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
using WebCore::Document;
using WebCore::Text;
#include "Element.h"
#include "Text.h"
#include "RenderObject.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "InlineTextBox.h"
#include "Range.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
namespace WebCore {
#ifndef htmlediting_h
#define htmlediting_h
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
namespace WebCore {
#define KHTML_EDITING_MARKUP_H
#include "HTMLInterchange.h"
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
template <class T> class DeprecatedPtrList;
#include "FloatPoint.h"
#include "Shared.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#if __APPLE__
typedef struct CGShading* CGShadingRef;
#include "GraphicsTypes.h"
#include "Path.h"
#include "PlatformString.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#if __APPLE__
#include <ApplicationServices/ApplicationServices.h>
#include "CanvasPattern.h"
#include "GraphicsContext.h"
#include "cssparser.h"
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/PassRefPtr.h>
namespace WebCore {
#define HTMLCollectionImpl_H
#include "Shared.h"
-#include <kxmlcore/Forward.h>
-#include <kxmlcore/HashMap.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/Forward.h>
+#include <wtf/HashMap.h>
+#include <wtf/Vector.h>
template <typename T> class DeprecatedValueList;
#ifndef HTMLELEMENTFACTORY_H
#define HTMLELEMENTFACTORY_H
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
namespace WebCore {
#include "KWQTextStream.h"
#include "KCanvasTreeDebug.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#if SVG_SUPPORT
#include "DeprecatedValueList.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#include "Shared.h"
#include "FloatRect.h"
#include "KRenderingFillPainter.h"
#include "KRenderingStrokePainter.h"
#include "SVGStyledElement.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
namespace WebCore {
#include "SVGImageElement.h"
#include "SVGImageElement.h"
#include "ksvg.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
namespace WebCore {
#include "KRenderingDevice.h"
#include "SVGAnimatedLengthList.h"
#include "SVGTextElement.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
namespace WebCore {
#if SVG_SUPPORT
#import "KCanvasItemQuartz.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import "kcanvas/RenderPath.h"
#import "KCanvasRenderingStyle.h"
#import "KCanvasResourcesQuartz.h"
#import "KCanvasImage.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
namespace WebCore {
#import "KRenderingFillPainter.h"
#import "KRenderingStrokePainter.h"
#import "KCanvasRenderingStyle.h"
-#import "kxmlcore/Assertions.h"
+#import "wtf/Assertions.h"
#import <QuartzCore/CoreImage.h>
#define KSVG_TimeScheduler_H
#if SVG_SUPPORT
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
namespace WebCore {
class Document;
#if SVG_SUPPORT
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
namespace WebCore {
printElementIncludes(@tags);
print <<END
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
using namespace WebCore;
using namespace ${cppNamespace}::${namespace}Names;
typedef ${namespace}Element *(*ConstructorFunc)(Document *doc, bool createdByParser);
-typedef KXMLCore::HashMap<AtomicStringImpl*, ConstructorFunc> FunctionMap;
+typedef WTF::HashMap<AtomicStringImpl*, ConstructorFunc> FunctionMap;
static FunctionMap *gFunctionMap = 0;
#include "SVGSVGElement.h"
#include "css_stylesheetimpl.h"
#include "ksvg.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
using namespace WebCore;
#define KSVG_SVGExternalResourcesRequiredImpl_H
#if SVG_SUPPORT
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
namespace WebCore {
class MappedAttribute;
#include "config.h"
#if SVG_SUPPORT
#include "Attr.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#include "ksvg.h"
#include "SVGNames.h"
#include "SVGAnimatedLength.h"
#include "RenderForeignObject.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#include "CSSPropertyNames.h"
#include <kcanvas/KCanvasCreator.h>
#include <kcanvas/KCanvasImage.h>
#include <kcanvas/KCanvasPath.h>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
using namespace WebCore;
#include "cssstyleselector.h"
#include "ksvg.h"
#include "Attr.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
namespace WebCore {
#include "ksvgcssproperties.h"
#include <kcanvas/KCanvasCreator.h>
#include <kcanvas/device/KRenderingDevice.h>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#define KSVG_SVGTestsImpl_H
#if SVG_SUPPORT
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
namespace WebCore
{
#if SVG_SUPPORT
#include "Shared.h"
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
namespace WebCore {
#if SVG_SUPPORT
#include "RegularExpression.h"
#include "DeprecatedStringList.h"
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
#include "Attr.h"
#ifndef AccessibilityObjectCache_h
#define AccessibilityObjectCache_h
-#include <kxmlcore/HashMap.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
#ifdef __OBJC__
@class WebCoreAXObject;
typedef unsigned AXID;
- struct AXIDHashTraits : KXMLCore::GenericHashTraits<unsigned> {
+ struct AXIDHashTraits : WTF::GenericHashTraits<unsigned> {
static TraitType deletedValue() { return UINT_MAX; }
};
#include "config.h"
#include "KWQCString.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#include <ctype.h>
DeprecatedCString::DeprecatedCString()
#include "config.h"
#import "KWQFormData.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import "FormData.h"
using WebCore::FormData;
#import "FontData.h"
#import "WebTextRendererFactory.h"
#import "WebCoreWidgetHolder.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import "render_form.h"
#import "TransferJob.h"
#import "KURL.h"
#import "loader.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
using namespace WebCore;
#import "KWQLineEdit.h"
#import "WebCoreTextArea.h"
#import "WidgetClient.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
using namespace WebCore;
#include "PlatformString.h"
#include "KWQKIOGlobal.h"
#include "DeprecatedPtrList.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
class KURL;
#include "PlatformString.h"
#include "KWQKIOGlobal.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
#include <time.h>
#if __OBJC__
#ifndef KHTML_CachedObjectClientWalker_h
#define KHTML_CachedObjectClientWalker_h
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
namespace WebCore {
#ifndef KHTMLDECODER_H
#define KHTMLDECODER_H
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
#include "TextEncoding.h"
namespace WebCore {
#include "KWQKIOGlobal.h"
#include "DeprecatedPtrList.h"
#include "DeprecatedStringList.h"
-#include "kxmlcore/HashMap.h"
+#include "wtf/HashMap.h"
#include "StringHash.h"
class KURL;
#include "HTMLDocument.h"
#include "TransferJob.h"
#include "TransferJob.h"
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/Assertions.h>
+#include <wtf/Vector.h>
namespace WebCore {
#define KHTML_Loader_h
#include "TransferJobClient.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
#include "DeprecatedPtrList.h"
#if __OBJC__
#define DOMWindow_h
#include "Shared.h"
-#include <kxmlcore/Noncopyable.h>
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/PassRefPtr.h>
namespace WebCore {
class CSSRuleList;
#include "TextAffinity.h"
#include "TextGranularity.h"
#include "TransferJobClient.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#include "RenderObject.h"
class KHTMLSettings;
#include "css_valueimpl.h"
#include "kjs_proxy.h"
#include "KWQKIOGlobal.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
namespace WebCore {
#include "Frame.h"
#include "Page.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#include <stdarg.h>
using std::swap;
#include "StringHash.h"
#include <kjs/collector.h>
#include <kjs/JSLock.h>
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
using namespace KJS;
#define PAGE_H
#include "PlatformString.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
#if __APPLE__
#ifdef __OBJC__
#define PLUGIN_H
#include "Shared.h"
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
namespace WebCore {
#include <algorithm>
#include <stdlib.h>
#include <string.h>
-#include <kxmlcore/FastMalloc.h>
+#include <wtf/FastMalloc.h>
#include <assert.h>
using std::max;
#ifndef ARRAY_IMPL_H
#define ARRAY_IMPL_H
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
#include "Shared.h"
namespace WebCore {
#include "StaticConstructors.h"
#include "StringHash.h"
#include <kjs/identifier.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
using namespace KJS;
#include "CharsetNames.h"
#include "CharsetData.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
#include <unicode/ucnv.h>
#include <unicode/utypes.h>
-using namespace KXMLCore;
+using namespace WTF;
using namespace WebCore;
namespace WebCore {
}
-namespace KXMLCore {
+namespace WTF {
template<> struct HashKeyStorageTraits<IntHash<TextEncodingID>, TextEncodingIDHashTraits> {
typedef IntTypes<sizeof(TextEncodingID)>::SignedType IntType;
#include "Color.h"
#include "PlatformString.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#include "ColorData.c"
#include <cstddef>
#include <algorithm>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
class KWQListNode
{
#ifndef KWQVALUELIST_H_
#define KWQVALUELIST_H_
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
class DeprecatedValueListImplNode;
// This file has no guards on purpose in order to detect redundant includes. This is a private header
// and so this should catch anyone trying to include this file in public cpp files.
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
namespace WebCore {
#include "IntRect.h"
#include "Pen.h"
#include "TextDirection.h"
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
#if __APPLE__
typedef struct CGContext PlatformGraphicsContext;
#include "GraphicsTypes.h"
#include "PlatformString.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "ImageSource.h"
#include "IntSize.h"
#include "FloatSize.h"
-#include <kxmlcore/Noncopyable.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/Vector.h>
#if __APPLE__
#if __OBJC__
// This complicated-looking declaration tells the framedata Vector that it can copy without
// having to invoke our copy constructor. This allows us to not have to worry about ref counting
// the native frames.
-namespace KXMLCore {
+namespace WTF {
template<> class VectorTraits<WebCore::FrameData> : public SimpleClassVectorTraits {};
}
#include "PlatformString.h"
#include "RegularExpression.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#include <unicode/uidna.h>
#include <assert.h>
#include "config.h"
#include "Logging.h"
-KXCLogChannel LogNotYetImplemented = { 0x00000001, "WebCoreLogLevel", KXCLogChannelOff };
+WTFLogChannel LogNotYetImplemented = { 0x00000001, "WebCoreLogLevel", WTFLogChannelOff };
-KXCLogChannel LogFrames = { 0x00000010, "WebCoreLogLevel", KXCLogChannelOff };
-KXCLogChannel LogLoading = { 0x00000020, "WebCoreLogLevel", KXCLogChannelOff };
+WTFLogChannel LogFrames = { 0x00000010, "WebCoreLogLevel", WTFLogChannelOff };
+WTFLogChannel LogLoading = { 0x00000020, "WebCoreLogLevel", WTFLogChannelOff };
-KXCLogChannel LogPopupBlocking = { 0x00000040, "WebCoreLogLevel", KXCLogChannelOff };
+WTFLogChannel LogPopupBlocking = { 0x00000040, "WebCoreLogLevel", WTFLogChannelOff };
-KXCLogChannel LogEvents = { 0x00000080, "WebCoreLogLevel", KXCLogChannelOff };
-KXCLogChannel LogEditing = { 0x00000100, "WebCoreLogLevel", KXCLogChannelOff };
-KXCLogChannel LogTextConversion = { 0x00000200, "WebCoreLogLevel", KXCLogChannelOff };
-KXCLogChannel LogXPath = { 0x00000400, "WebCoreLogLevel", KXCLogChannelOff };
+WTFLogChannel LogEvents = { 0x00000080, "WebCoreLogLevel", WTFLogChannelOff };
+WTFLogChannel LogEditing = { 0x00000100, "WebCoreLogLevel", WTFLogChannelOff };
+WTFLogChannel LogTextConversion = { 0x00000200, "WebCoreLogLevel", WTFLogChannelOff };
+WTFLogChannel LogXPath = { 0x00000400, "WebCoreLogLevel", WTFLogChannelOff };
#ifndef Logging_H
#define Logging_H
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#ifndef LOG_CHANNEL_PREFIX
#define LOG_CHANNEL_PREFIX Log
#endif
-extern KXCLogChannel LogNotYetImplemented;
+extern WTFLogChannel LogNotYetImplemented;
-extern KXCLogChannel LogFrames;
-extern KXCLogChannel LogLoading;
-extern KXCLogChannel LogPopupBlocking;
-extern KXCLogChannel LogEvents;
-extern KXCLogChannel LogEditing;
-extern KXCLogChannel LogTextConversion;
-extern KXCLogChannel LogXPath;
+extern WTFLogChannel LogFrames;
+extern WTFLogChannel LogLoading;
+extern WTFLogChannel LogPopupBlocking;
+extern WTFLogChannel LogEvents;
+extern WTFLogChannel LogEditing;
+extern WTFLogChannel LogTextConversion;
+extern WTFLogChannel LogXPath;
#endif
}
-namespace KXMLCore {
+namespace WTF {
// StrHash is the default hash for String
template<typename T> struct DefaultHash;
#define PlugInInfoStore_H
#include "PlatformString.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
namespace WebCore {
#include "config.h"
#include "StreamingTextDecoder.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
using std::min;
#define StreamingTextDecoder_H
#include "TextEncoding.h"
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
#include <unicode/ucnv.h>
#include <unicode/utypes.h>
#include "PlatformString.h"
#include <kjs/identifier.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#include <stdarg.h>
using namespace KJS;
#include "AtomicStringImpl.h"
#include "PlatformString.h"
-#include <kxmlcore/HashTraits.h>
+#include <wtf/HashTraits.h>
-namespace KXMLCore {
+namespace WTF {
template<typename T> struct StrHash;
}
-using KXMLCore::CaseInsensitiveHash;
+using WTF::CaseInsensitiveHash;
#endif
#include "Length.h"
#include "StringHash.h"
#include <kjs/identifier.h>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
#include <unicode/ubrk.h>
#include <assert.h>
using namespace KJS;
-using namespace KXMLCore;
+using namespace WTF;
namespace WebCore {
#define StringImpl_h
#include "DeprecatedString.h"
-#include <kxmlcore/Forward.h>
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Forward.h>
+#include <wtf/Noncopyable.h>
#include <limits.h>
#if __OBJC__
}
-namespace KXMLCore {
+namespace WTF {
// StrHash is the default hash for StringImpl* and RefPtr<StringImpl>
template<typename T> struct DefaultHash;
#include "TextEncoding.h"
#include "CharsetNames.h"
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/Assertions.h>
+#include <wtf/HashSet.h>
#include "StreamingTextDecoder.h"
#include <unicode/unorm.h>
#include "SharedTimer.h"
#include "SystemTime.h"
#include <math.h>
-#include <kxmlcore/HashSet.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/HashSet.h>
+#include <wtf/Vector.h>
using namespace std;
#ifndef TIMER_H
#define TIMER_H
-#include <kxmlcore/Noncopyable.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/Vector.h>
namespace WebCore {
#include "StringHash.h"
#include "Timer.h"
#include "TransferJobClient.h" // for PlatformResponse
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
#ifdef WIN32
typedef unsigned long DWORD;
#include "KURL.h"
#include "FormData.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
#ifdef WIN32
typedef void* HANDLE;
#import "config.h"
#import "BlockExceptions.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
void ReportBlockedObjCException(NSException *localException)
{
#import "config.h"
#import "Color.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
@interface WebCoreControlTintObserver : NSObject
+ (void)controlTintDidChange;
#import "Color.h"
#import "WebCoreTextRenderer.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import <ApplicationServices/ApplicationServices.h>
#import <Cocoa/Cocoa.h>
#import "KURL.h"
#import "FoundationExtras.h"
-#import <kxmlcore/Assertions.h>
-#import <kxmlcore/Vector.h>
+#import <wtf/Assertions.h>
+#import <wtf/Vector.h>
// KURL
#include "config.h"
#include "DeprecatedString.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import <Foundation/Foundation.h>
#import "TextEncoding.h"
#import "SharedTimer.h"
#include <CoreFoundation/CoreFoundation.h>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
namespace WebCore {
#include "config.h"
#include "TextEncoding.h"
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/Assertions.h>
+#include <wtf/HashSet.h>
#include "StreamingTextDecoder.h"
namespace WebCore {
#import "config.h"
#import "WebCoreImageRendererFactory.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import "RenderTreeAsText.h"
@implementation WebCoreImageRendererFactory
#import "config.h"
#import "WebCoreKeyGenerator.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
static WebCoreKeyGenerator *sharedGenerator;
#import "FrameMac.h"
#import "WebCoreFrameBridge.h"
#import "render_replaced.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
using namespace std;
using namespace WebCore;
#import "WebCoreFrameBridge.h"
#import "WebCoreWidgetHolder.h"
#import "render_form.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
using namespace WebCore;
class NSFont;
#endif
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
namespace WebCore {
class FontData;
#import "Page.h"
#import "WebCoreFrameBridge.h"
#import "WebCoreStringTruncator.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
#import <mach-o/dyld.h>
GraphicsContext* Widget::lockDrawingFocus() { notImplemented(); return 0; }
void Widget::unlockDrawingFocus(GraphicsContext*) { notImplemented(); }
-JavaAppletWidget::JavaAppletWidget(IntSize const&,Element*,KXMLCore::HashMap<String,String> const&) { notImplemented(); }
+JavaAppletWidget::JavaAppletWidget(IntSize const&,Element*,WTF::HashMap<String,String> const&) { notImplemented(); }
void QLineEdit::selectAll() { notImplemented(); }
void QLineEdit::addSearchResult() { notImplemented(); }
#include "break_lines.h"
#include "Range.h"
#include "RenderArena.h"
-#include <kxmlcore/AlwaysInline.h>
+#include <wtf/AlwaysInline.h>
using namespace std;
#include "break_lines.h"
#include "Range.h"
#include "RenderArena.h"
-#include <kxmlcore/AlwaysInline.h>
+#include <wtf/AlwaysInline.h>
#include <unicode/ubrk.h>
using namespace std;
#include "RenderTableCell.h"
#include "SelectionController.h"
#include "render_replaced.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
#if SVG_SUPPORT
#include "KCanvasTreeDebug.h"
#include "RenderArena.h"
#include "RenderCanvas.h"
#include "break_lines.h"
-#include <kxmlcore/AlwaysInline.h>
+#include <wtf/AlwaysInline.h>
using namespace std;
#include "StringHash.h"
#include "XSLStyleSheet.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
#include <libxml/parserInternals.h>
#include <libxslt/documents.h>
#include "XPathValue.h"
#include "StringHash.h"
-#include <kxmlcore/HashMap.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/HashMap.h>
+#include <wtf/Vector.h>
namespace WebCore {
class XPathNSResolver;
#if XPATH_SUPPORT
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
#include "StringHash.h"
#include "PlatformString.h"
#include "XPathExpressionNode.h"
#include "XPathStep.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
extern int xpathyyparse(void*);
#include "PlatformString.h"
#include "Node.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
namespace WebCore {
+2006-05-09 Maciej Stachowiak <mjs@apple.com>
+
+ Rubber stamped by Anders.
+
+ - renamed kxmlcore to wtf
+
+ kxmlcore --> wtf
+ KXMLCore --> WTF
+ WKC --> WTF
+
+ * Misc/WebKitLogging.h:
+ * Misc/WebKitLogging.m:
+ (initializeLogChannel):
+
2006-05-09 Timothy Hatcher <timothy@apple.com>
Reviewed by Anders.
#define LOG_CHANNEL_PREFIX WebKitLog
#endif
-extern KXCLogChannel WebKitLogTiming;
-extern KXCLogChannel WebKitLogLoading;
-extern KXCLogChannel WebKitLogFontCache;
-extern KXCLogChannel WebKitLogFontSubstitution;
-extern KXCLogChannel WebKitLogFontSelection;
-extern KXCLogChannel WebKitLogDownload;
-extern KXCLogChannel WebKitLogDocumentLoad;
-extern KXCLogChannel WebKitLogPlugins;
-extern KXCLogChannel WebKitLogEvents;
-extern KXCLogChannel WebKitLogView;
-extern KXCLogChannel WebKitLogRedirect;
-extern KXCLogChannel WebKitLogPageCache;
-extern KXCLogChannel WebKitLogCacheSizes;
-extern KXCLogChannel WebKitLogFormDelegate;
-extern KXCLogChannel WebKitLogFileDatabaseActivity;
-extern KXCLogChannel WebKitLogHistory;
-extern KXCLogChannel WebKitLogBindings;
-extern KXCLogChannel WebKitLogEncoding;
-extern KXCLogChannel WebKitLogLiveConnect;
-extern KXCLogChannel WebKitLogBackForward;
-extern KXCLogChannel WebKitLogProgress;
-extern KXCLogChannel WebKitLogPluginEvents;
+extern WTFLogChannel WebKitLogTiming;
+extern WTFLogChannel WebKitLogLoading;
+extern WTFLogChannel WebKitLogFontCache;
+extern WTFLogChannel WebKitLogFontSubstitution;
+extern WTFLogChannel WebKitLogFontSelection;
+extern WTFLogChannel WebKitLogDownload;
+extern WTFLogChannel WebKitLogDocumentLoad;
+extern WTFLogChannel WebKitLogPlugins;
+extern WTFLogChannel WebKitLogEvents;
+extern WTFLogChannel WebKitLogView;
+extern WTFLogChannel WebKitLogRedirect;
+extern WTFLogChannel WebKitLogPageCache;
+extern WTFLogChannel WebKitLogCacheSizes;
+extern WTFLogChannel WebKitLogFormDelegate;
+extern WTFLogChannel WebKitLogFileDatabaseActivity;
+extern WTFLogChannel WebKitLogHistory;
+extern WTFLogChannel WebKitLogBindings;
+extern WTFLogChannel WebKitLogEncoding;
+extern WTFLogChannel WebKitLogLiveConnect;
+extern WTFLogChannel WebKitLogBackForward;
+extern WTFLogChannel WebKitLogProgress;
+extern WTFLogChannel WebKitLogPluginEvents;
void WebKitInitializeLoggingChannelsIfNecessary(void);
#import "WebKitLogging.h"
-KXCLogChannel WebKitLogTiming = { 0x00000020, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogLoading = { 0x00000040, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogFontCache = { 0x00000100, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogFontSubstitution = { 0x00000200, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogDownload = { 0x00000800, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogDocumentLoad = { 0x00001000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogPlugins = { 0x00002000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogEvents = { 0x00010000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogView = { 0x00020000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogRedirect = { 0x00040000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogPageCache = { 0x00080000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogCacheSizes = { 0x00100000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogFormDelegate = { 0x00200000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogFileDatabaseActivity = { 0x00400000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogHistory = { 0x00800000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogBindings = { 0x01000000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogFontSelection = { 0x02000000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogEncoding = { 0x04000000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogLiveConnect = { 0x08000000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogBackForward = { 0x10000000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogProgress = { 0x20000000, "WebKitLogLevel", KXCLogChannelOff };
-KXCLogChannel WebKitLogPluginEvents = { 0x40000000, "WebKitLogLevel", KXCLogChannelOff };
+WTFLogChannel WebKitLogTiming = { 0x00000020, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogLoading = { 0x00000040, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogFontCache = { 0x00000100, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogFontSubstitution = { 0x00000200, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogDownload = { 0x00000800, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogDocumentLoad = { 0x00001000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogPlugins = { 0x00002000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogEvents = { 0x00010000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogView = { 0x00020000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogRedirect = { 0x00040000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogPageCache = { 0x00080000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogCacheSizes = { 0x00100000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogFormDelegate = { 0x00200000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogFileDatabaseActivity = { 0x00400000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogHistory = { 0x00800000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogBindings = { 0x01000000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogFontSelection = { 0x02000000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogEncoding = { 0x04000000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogLiveConnect = { 0x08000000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogBackForward = { 0x10000000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogProgress = { 0x20000000, "WebKitLogLevel", WTFLogChannelOff };
+WTFLogChannel WebKitLogPluginEvents = { 0x40000000, "WebKitLogLevel", WTFLogChannelOff };
-static void initializeLogChannel(KXCLogChannel *channel)
+static void initializeLogChannel(WTFLogChannel *channel)
{
- channel->state = KXCLogChannelOff;
+ channel->state = WTFLogChannelOff;
NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithUTF8String:channel->defaultName]];
if (logLevelString) {
unsigned logLevel;
if (![[NSScanner scannerWithString:logLevelString] scanHexInt:&logLevel])
NSLog(@"unable to parse hex value for %s (%@), logging is off", channel->defaultName, logLevelString);
if ((logLevel & channel->mask) == channel->mask)
- channel->state = KXCLogChannelOn;
+ channel->state = WTFLogChannelOn;
}
}