JavaScriptCore:

author mjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Tue, 9 May 2006 09:27:55 +0000 (09:27 +0000)

committer mjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Tue, 9 May 2006 09:27:55 +0000 (09:27 +0000)
author mjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 May 2006 09:27:55 +0000 (09:27 +0000)
committer mjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 May 2006 09:27:55 +0000 (09:27 +0000)
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog

index 279ffed01c9e83b347721962ab4ad092a735c4b4..ef3ff8b160c8214a0fae326a7c85e2378c2a4c5b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,123 @@
+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.
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

index 6f48ca7a28bdd3a9169b9cedb5538abe25856eaf..f31d0ae9bef877bb74f8f97998392d10b1267ca3 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -549,7 +549,7 @@
                         children = (
                                 937B63CC09E766D200A671DD /* DerivedSources.make */,
                                 65417200039E01BA0058BFEB /* kjs */,
-                               65162EF108E6A21C007556CD /* kxmlcore */,
+                               65162EF108E6A21C007556CD /* wtf */,
                                 51856D950562EE9C008B9D83 /* bindings */,
                                 65417203039E01F90058BFEB /* pcre */,
                                 650FDF8D09D0FCA700769E54 /* Derived Sources */,
@@ -648,7 +648,7 @@
                         path = DerivedSources/JavaScriptCore;
                         sourceTree = BUILT_PRODUCTS_DIR;
                 };
-               65162EF108E6A21C007556CD /* kxmlcore */ = {
+               65162EF108E6A21C007556CD /* wtf */ = {
                         isa = PBXGroup;
                         children = (
                                 E195678D09E7CF1200B89D13 /* unicode */,
@@ -681,7 +681,7 @@
                                 6592C316098B7DE10003D4F6 /* Vector.h */,
                                 6592C317098B7DE10003D4F6 /* VectorTraits.h */,
                         );
-                       path = kxmlcore;
+                       path = wtf;
                         sourceTree = "<group>";
                 };
                 65417200039E01BA0058BFEB /* kjs */ = {
diff --git a/JavaScriptCore/bindings/c/c_instance.cpp b/JavaScriptCore/bindings/c/c_instance.cpp

index 96a6f83ad6ffaa3a00af646910d59643fcbe1ff3..2b1e8ac9e888087122fa19d8b0d45174d7f1bf1e 100644 (file)
--- a/JavaScriptCore/bindings/c/c_instance.cpp
+++ b/JavaScriptCore/bindings/c/c_instance.cpp
@@ -31,7 +31,7 @@
  #include "c_utility.h"
  #include "list.h"
  #include "npruntime_impl.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  namespace KJS {
  namespace Bindings {
diff --git a/JavaScriptCore/bindings/objc/WebScriptObject.mm b/JavaScriptCore/bindings/objc/WebScriptObject.mm

index 9b4711e8eb89cc8e9f0df7ad09a270f2b48e1b22..5afb6daa20e65e6467ad7d50671e8f4da0f1bb93 100644 (file)
--- a/JavaScriptCore/bindings/objc/WebScriptObject.mm
+++ b/JavaScriptCore/bindings/objc/WebScriptObject.mm
@@ -28,7 +28,7 @@
  
  #import "objc_instance.h"
  #import "runtime_object.h"
-#import <kxmlcore/UnusedParam.h>
+#import <wtf/UnusedParam.h>
  
  using namespace KJS;
  using namespace KJS::Bindings;
diff --git a/JavaScriptCore/kjs/JSImmediate.h b/JavaScriptCore/kjs/JSImmediate.h

index 44150fa241f9123d965e317c368d45048c6c972e..fde639f6209f0263330046aab15ffc8585b5a719 100644 (file)
--- a/JavaScriptCore/kjs/JSImmediate.h
+++ b/JavaScriptCore/kjs/JSImmediate.h
@@ -23,7 +23,7 @@
  #define KJS_JS_IMMEDIATE_H
  
  #include "JSType.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  #include <stdint.h>
  #include <stdlib.h>
  
diff --git a/JavaScriptCore/kjs/Parser.cpp b/JavaScriptCore/kjs/Parser.cpp

index 1692ef6893103e2549d76909f5a4691bd4bfd0da..c5992178fa8e50c19cb4231a915ef84ed6cb6669 100644 (file)
--- a/JavaScriptCore/kjs/Parser.cpp
+++ b/JavaScriptCore/kjs/Parser.cpp
@@ -27,8 +27,8 @@
  
  #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();
  
diff --git a/JavaScriptCore/kjs/Parser.h b/JavaScriptCore/kjs/Parser.h

index b2d1f0875c0b3698122ea30d9d9b39c4b0bd3252..f8c15075d49f109da5d8229083640cd45d668a46 100644 (file)
--- a/JavaScriptCore/kjs/Parser.h
+++ b/JavaScriptCore/kjs/Parser.h
@@ -25,7 +25,7 @@
  #ifndef Parser_h
  #define Parser_h
  
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
  
  namespace KJS {
  
diff --git a/JavaScriptCore/kjs/array_object.cpp b/JavaScriptCore/kjs/array_object.cpp

index e3977d1ac2ff71082a1c40770b0f8df1396e708c..455c6485067f2f790b8000f51a5db64814025ed9 100644 (file)
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/array_object.cpp
@@ -28,7 +28,7 @@
  #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"
diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp

index 1718f55bb2b2329d51a21ece5b92788588758640..74b5444bd5185d3bd48e94003e5f52e9e0cf44ee 100644 (file)
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -22,9 +22,9 @@
  #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"
@@ -235,7 +235,7 @@ void Collector::registerThread()
  
    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;
diff --git a/JavaScriptCore/kjs/collector.h b/JavaScriptCore/kjs/collector.h

index 7a8a72b23e0c5c8a4cfa37f051446522efdfd675..5f5fc72541118ec471fdd6c7d098ccd47d5dd3d7 100644 (file)
--- a/JavaScriptCore/kjs/collector.h
+++ b/JavaScriptCore/kjs/collector.h
@@ -25,7 +25,7 @@
  #define KJSCOLLECTOR_H_
  
  #include "value.h"
-#include <kxmlcore/HashCountedSet.h>
+#include <wtf/HashCountedSet.h>
  
  #define KJS_MEM_LIMIT 500000
  
diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h

index d3fbe21c1921a6ed42f22bbf3f03797521b0afc1..ca2cadf528765f867a55fa20e7039a1de252d8c1 100644 (file)
--- a/JavaScriptCore/kjs/config.h
+++ b/JavaScriptCore/kjs/config.h
@@ -1,4 +1,4 @@
-#include <kxmlcore/Platform.h>
+#include <wtf/Platform.h>
  
  #if PLATFORM(DARWIN)
  
@@ -43,10 +43,10 @@
  #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
diff --git a/JavaScriptCore/kjs/function.cpp b/JavaScriptCore/kjs/function.cpp

index a5278b697dfd41f7cd236d3a09c2147da16d5328..62d2c1028e5ff89d4c0cc834eb28039495835eb1 100644 (file)
--- a/JavaScriptCore/kjs/function.cpp
+++ b/JavaScriptCore/kjs/function.cpp
@@ -40,7 +40,7 @@
  #include <string.h>
  #include <ctype.h>
  
-#include <kxmlcore/unicode/Unicode.h>
+#include <wtf/unicode/Unicode.h>
  
  namespace KJS {
  
@@ -661,7 +661,7 @@ static bool isStrWhiteSpace(unsigned short c)
          case 0x2029:
              return true;
          default:
-            return KXMLCore::Unicode::isSeparatorSpace(c);
+            return WTF::Unicode::isSeparatorSpace(c);
      }
  }
  
diff --git a/JavaScriptCore/kjs/function.h b/JavaScriptCore/kjs/function.h

index 18bb3a00aed86383723c12302def16e4dc73b65e..e9b205e5b96326136c200217aa8e851f4ba514d3 100644 (file)
--- a/JavaScriptCore/kjs/function.h
+++ b/JavaScriptCore/kjs/function.h
@@ -25,7 +25,7 @@
  #define KJS_FUNCTION_H
  
  #include "internal.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
  
  namespace KJS {
  
diff --git a/JavaScriptCore/kjs/identifier.cpp b/JavaScriptCore/kjs/identifier.cpp

index 8344a76a19e0abc98f3f4b38d59161a7b9db3baf..1afe000bb7bc528e8d3225ff9af070be21cbe0a9 100644 (file)
--- a/JavaScriptCore/kjs/identifier.cpp
+++ b/JavaScriptCore/kjs/identifier.cpp
@@ -38,12 +38,12 @@
  
  #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;
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp

index 1ed969043c59f76a3d4b17240777f7800f650bb9..7e077cfd84dbd92cd199d8dec9dbe09baf100440 100644 (file)
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -42,9 +42,9 @@
  #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>
  
diff --git a/JavaScriptCore/kjs/internal.h b/JavaScriptCore/kjs/internal.h

index 0f85f6e50752da65b9af230303064f10fe1b8e64..f6f5411e8e636c64305d54cf8bd45025989605a9 100644 (file)
--- a/JavaScriptCore/kjs/internal.h
+++ b/JavaScriptCore/kjs/internal.h
@@ -33,7 +33,7 @@
  #include "types.h"
  #include "ustring.h"
  
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
  
  #define I18N_NOOP(s) s
  
diff --git a/JavaScriptCore/kjs/lexer.cpp b/JavaScriptCore/kjs/lexer.cpp

index deb156e11dc436eaf65f6221c444c36443720463..954e85eb0981f58648d0bcf7e4864b3bae787403 100644 (file)
--- a/JavaScriptCore/kjs/lexer.cpp
+++ b/JavaScriptCore/kjs/lexer.cpp
@@ -29,7 +29,7 @@
  #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);
  
@@ -129,7 +129,7 @@ void Lexer::shift(unsigned int p)
          break;
        }
        next3 = code[pos++].uc;
-    } while (KXMLCore::Unicode::isFormatChar(next3));
+    } while (WTF::Unicode::isFormatChar(next3));
    }
  }
  
@@ -564,7 +564,7 @@ int Lexer::lex()
  
  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()
@@ -580,25 +580,25 @@ 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 == '_';
  }
  
diff --git a/JavaScriptCore/kjs/lookup.cpp b/JavaScriptCore/kjs/lookup.cpp

index 890976e48ebff4371e4bb5815e9d04dda84914a9..73c387fae98da63ac6ecc7de951ffe1a7bc3db79 100644 (file)
--- a/JavaScriptCore/kjs/lookup.cpp
+++ b/JavaScriptCore/kjs/lookup.cpp
@@ -25,7 +25,7 @@
  #include <string.h>
  
  #include "lookup.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  using namespace KJS;
  
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp

index 1cea76fe958d977f08dae8aa857c0d7407037a05..d99041c94fafc1e20d8d8c0b80059df76d02a6a0 100644 (file)
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -36,8 +36,8 @@
  #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;
  
diff --git a/JavaScriptCore/kjs/nodes.h b/JavaScriptCore/kjs/nodes.h

index 98b9dbe5c8dd598b110a5658adab161ebbb3392c..c909298080ba5f59ebf33ade80eab927812318de 100644 (file)
--- a/JavaScriptCore/kjs/nodes.h
+++ b/JavaScriptCore/kjs/nodes.h
@@ -27,7 +27,7 @@
  
  #include "Parser.h"
  #include "internal.h"
-#include <kxmlcore/ListRefPtr.h>
+#include <wtf/ListRefPtr.h>
  
  namespace KJS {
  
diff --git a/JavaScriptCore/kjs/number_object.cpp b/JavaScriptCore/kjs/number_object.cpp

index 63c9971d841fe6669a451927ce0b7d02698ee127..e4090b9b3c1011f85d606d77a4b8ca86d9718ca9 100644 (file)
--- a/JavaScriptCore/kjs/number_object.cpp
+++ b/JavaScriptCore/kjs/number_object.cpp
@@ -26,7 +26,7 @@
  #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"
diff --git a/JavaScriptCore/kjs/object.h b/JavaScriptCore/kjs/object.h

index 28339700d192b5e1933dd4a91dae9792f41dde85..115af08c8a847e2610ac945bdff985294c694ae9 100644 (file)
--- a/JavaScriptCore/kjs/object.h
+++ b/JavaScriptCore/kjs/object.h
@@ -30,7 +30,7 @@
  #include "property_map.h"
  #include "property_slot.h"
  #include "scope_chain.h"
-#include <kxmlcore/AlwaysInline.h>
+#include <wtf/AlwaysInline.h>
  
  namespace KJS {
  
diff --git a/JavaScriptCore/kjs/property_map.cpp b/JavaScriptCore/kjs/property_map.cpp

index 88ceccfad8ca2a86b8fad6126ea0f9bb27b98330..fa400d876969fcf314cd5d8aaf19028130aa38fa 100644 (file)
--- a/JavaScriptCore/kjs/property_map.cpp
+++ b/JavaScriptCore/kjs/property_map.cpp
@@ -26,8 +26,8 @@
  #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;
  
diff --git a/JavaScriptCore/kjs/property_map.h b/JavaScriptCore/kjs/property_map.h

index b002976fd8dbd15c7b464ae7f1ba09fe9df9519c..8f9de08c2bbe0b24655799a413944fe50a854937 100644 (file)
--- a/JavaScriptCore/kjs/property_map.h
+++ b/JavaScriptCore/kjs/property_map.h
@@ -24,7 +24,7 @@
  #define KJS_PROPERTY_MAP_H_
  
  #include "identifier.h"
-#include <kxmlcore/OwnArrayPtr.h>
+#include <wtf/OwnArrayPtr.h>
  
  namespace KJS {
  
diff --git a/JavaScriptCore/kjs/string_object.cpp b/JavaScriptCore/kjs/string_object.cpp

index cab65ad6e6f80d4a203a792ae90c91b30e3126dc..884638e21e23e1cd4942003af6e7224a294369fe 100644 (file)
--- a/JavaScriptCore/kjs/string_object.cpp
+++ b/JavaScriptCore/kjs/string_object.cpp
@@ -28,7 +28,7 @@
  #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"
  
@@ -626,7 +626,7 @@ JSValue *StringProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, con
      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
@@ -642,7 +642,7 @@ JSValue *StringProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, con
      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
diff --git a/JavaScriptCore/kjs/testkjs.cpp b/JavaScriptCore/kjs/testkjs.cpp

index d696a391eba957de1a485fee065fb8e78ca9b23d..e6fbe074b593ba715245bbc0e7c91ab395e99444 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.cpp
+++ b/JavaScriptCore/kjs/testkjs.cpp
@@ -44,7 +44,7 @@
  #endif
  
  using namespace KJS;
-using namespace KXMLCore;
+using namespace WTF;
  
  static void testIsInteger();
  static char* createStringWithContentsOfFile(const char* fileName);
@@ -275,8 +275,8 @@ int kjsmain(int argc, char** argv)
  
  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);
diff --git a/JavaScriptCore/kjs/ustring.cpp b/JavaScriptCore/kjs/ustring.cpp

index ae2c0a81124a402e3cd038faa871900a0c2a890f..df2c1b88392f3b1a1b2e6ec490a521bc8e174966 100644 (file)
--- a/JavaScriptCore/kjs/ustring.cpp
+++ b/JavaScriptCore/kjs/ustring.cpp
@@ -40,7 +40,7 @@
  #include <math.h>
  #include "dtoa.h"
  
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  using std::max;
  
diff --git a/JavaScriptCore/kjs/ustring.h b/JavaScriptCore/kjs/ustring.h

index 664ed57e220ad324b015b95f99c0a37a52a65dc2..3eb11cf4977cdec0a9d79d1a82779ba5c2bf6ec0 100644 (file)
--- a/JavaScriptCore/kjs/ustring.h
+++ b/JavaScriptCore/kjs/ustring.h
@@ -24,9 +24,9 @@
  #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>
  
diff --git a/JavaScriptCore/pcre/pcre_get.c b/JavaScriptCore/pcre/pcre_get.c

index e19406dc1059ebd32dda08e28e0d7d086387e871..95a4152d2fdedb860cbc7db4611fe3305759adef 100644 (file)
--- a/JavaScriptCore/pcre/pcre_get.c
+++ b/JavaScriptCore/pcre/pcre_get.c
@@ -44,7 +44,7 @@ for these functions came from Scott Wimer. */
  
  
  #include "pcre_internal.h"
-#include <kxmlcore/UnusedParam.h>
+#include <wtf/UnusedParam.h>
  
  
  /*************************************************
diff --git a/JavaScriptCore/kxmlcore/AlwaysInline.h b/JavaScriptCore/wtf/AlwaysInline.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/AlwaysInline.h

rename to JavaScriptCore/wtf/AlwaysInline.h
diff --git a/JavaScriptCore/kxmlcore/Assertions.cpp b/JavaScriptCore/wtf/Assertions.cpp

similarity index 90%

rename from JavaScriptCore/kxmlcore/Assertions.cpp

rename to JavaScriptCore/wtf/Assertions.cpp

index 2a50bec5f7a9ccc4d7c310ec4a14998a57b816dc..e501511c92ae7fcd7bda0fe82aa84dd789637bb3 100644 (file)
--- a/JavaScriptCore/kxmlcore/Assertions.cpp
+++ b/JavaScriptCore/wtf/Assertions.cpp
@@ -62,7 +62,7 @@ static void vprintf_stderr_common(const char *format, va_list args)
          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);
@@ -70,7 +70,7 @@ void KXCReportAssertionFailure(const char *file, int line, const char *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;
@@ -80,12 +80,12 @@ void KXCReportAssertionFailureWithMessage(const char *file, int line, const char
      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;
@@ -95,7 +95,7 @@ void KXCReportFatalError(const char *file, int line, const char *function, const
      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;
@@ -105,9 +105,9 @@ void KXCReportError(const char *file, int line, const char *function, const char
      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;
diff --git a/JavaScriptCore/kxmlcore/Assertions.h b/JavaScriptCore/wtf/Assertions.h

similarity index 82%

rename from JavaScriptCore/kxmlcore/Assertions.h

rename to JavaScriptCore/wtf/Assertions.h

index d787d5a92ec09b5ac860ef686b4a229dfc098ef2..7f76ca47d4f79ff84006901af404cc49bb954464 100644 (file)
--- a/JavaScriptCore/kxmlcore/Assertions.h
+++ b/JavaScriptCore/wtf/Assertions.h
@@ -73,20 +73,20 @@
  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
  }
@@ -113,18 +113,18 @@ void KXCLog(const char *file, int line, const char *function, KXCLogChannel *cha
  
  #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)
  
@@ -140,7 +140,7 @@ 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)
@@ -153,7 +153,7 @@ 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
@@ -163,7 +163,7 @@ while (0)
  #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
@@ -171,7 +171,7 @@ while (0)
  #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
diff --git a/JavaScriptCore/kxmlcore/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp

similarity index 98%

rename from JavaScriptCore/kxmlcore/FastMalloc.cpp

rename to JavaScriptCore/wtf/FastMalloc.cpp

index 0d3de8ae2d81a40b6e3e3d1da2789bb03c69b153..54a5722e533b3133b9226bfad3ea5c376d2ea8ea 100644 (file)
--- a/JavaScriptCore/kxmlcore/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -80,7 +80,7 @@
      #include <pthread.h>
  #endif
  
-namespace KXMLCore {
+namespace WTF {
      
  void *fastMalloc(size_t n) 
  {
@@ -108,7 +108,7 @@ void fastMallocRegisterThread(pthread_t)
  }
  #endif
  
-} // namespace KXMLCore
+} // namespace WTF
  
  #else
  
@@ -134,8 +134,8 @@ void fastMallocRegisterThread(pthread_t)
  #include <string.h>
  #include <unistd.h>
  
-#if KXC_CHANGES
-namespace KXMLCore {
+#if WTF_CHANGES
+namespace WTF {
  
  #define malloc fastMalloc
  #define calloc fastCalloc
@@ -536,7 +536,7 @@ static ALWAYS_INLINE bool DLL_IsEmpty(const Span* list) {
    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) {
@@ -653,7 +653,7 @@ class TCMalloc_PageHeap {
    }
  
    // Dump state to stderr
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
    void Dump(TCMalloc_Printer* out);
  #endif
  
@@ -857,7 +857,7 @@ void TCMalloc_PageHeap::RegisterSizeClass(Span* span, size_t sc) {
    }
  }
  
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
  void TCMalloc_PageHeap::Dump(TCMalloc_Printer* out) {
    int nonempty_sizes = 0;
    for (int s = 0; s < kMaxPages; s++) {
@@ -1370,7 +1370,7 @@ inline void TCMalloc_ThreadCache::Scavenge() {
    // 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
  
@@ -1384,7 +1384,7 @@ inline void TCMalloc_ThreadCache::Scavenge() {
      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);
@@ -1588,7 +1588,7 @@ struct TCMallocStats {
    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;
@@ -1622,7 +1622,7 @@ static void ExtractStats(TCMallocStats* r, uint64_t* class_count) {
  }
  #endif
  
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
  // WRITE stats to "out"
  static void DumpStats(TCMalloc_Printer* out, int level) {
    TCMallocStats stats;
@@ -1726,7 +1726,7 @@ static void** DumpStackTraces() {
  }
  #endif
  
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
  
  // TCMalloc's support for extra malloc interfaces
  class TCMallocImplementation : public MallocExtension {
@@ -1817,7 +1817,7 @@ 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
  
@@ -1825,7 +1825,7 @@ static bool tcmalloc_is_destroyed = false;
  // Helpers for the exported routines below
  //-------------------------------------------------------------------
  
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
  
  static Span* DoSampledAllocation(size_t size) {
    SpinLockHolder h(&pageheap_lock);
@@ -1856,12 +1856,12 @@ static Span* DoSampledAllocation(size_t size) {
  
  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)) {
@@ -1882,7 +1882,7 @@ static ALWAYS_INLINE void* do_malloc(size_t 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);
@@ -1890,13 +1890,13 @@ static ALWAYS_INLINE void* do_malloc(size_t 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
  
@@ -1904,7 +1904,7 @@ static ALWAYS_INLINE void do_free(void* ptr) {
    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
@@ -1943,7 +1943,7 @@ static ALWAYS_INLINE void do_free(void* ptr) {
    }
  }
  
-#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.
@@ -2033,7 +2033,7 @@ static void* do_memalign(size_t align, size_t size) {
  class TCMallocGuard {
   public:
    TCMallocGuard() {
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
      char *envval;
      if ((envval = getenv("TCMALLOC_DEBUG"))) {
        TCMallocDebug::level = atoi(envval);
@@ -2043,12 +2043,12 @@ class TCMallocGuard {
      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) {
@@ -2072,28 +2072,28 @@ static TCMallocGuard module_enter_exit_hook;
  //         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) {
@@ -2101,35 +2101,35 @@ 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);
@@ -2154,11 +2154,11 @@ void* realloc(void* old_ptr, size_t new_size) {
      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);
@@ -2176,7 +2176,7 @@ void* realloc(void* old_ptr, size_t new_size) {
  #define OPDELETE_THROW throw()
  #endif
  
-#ifndef KXC_CHANGES
+#ifndef WTF_CHANGES
  
  void* operator new(size_t size) OPNEW_THROW {
    void* p = do_malloc(size);
@@ -2319,8 +2319,8 @@ extern "C" {
  
  #endif
  
-#if KXC_CHANGES
-} // namespace KXMLCore
+#if WTF_CHANGES
+} // namespace WTF
  #endif
  
  #endif // USE_SYSTEM_MALLOC
diff --git a/JavaScriptCore/kxmlcore/FastMalloc.h b/JavaScriptCore/wtf/FastMalloc.h

similarity index 92%

rename from JavaScriptCore/kxmlcore/FastMalloc.h

rename to JavaScriptCore/wtf/FastMalloc.h

index 194bf9a251788eee7a70a5e451234c8224bee5b1..12c4aa2f009be2a3a65cc5721507ebf6d695a6a9 100644 (file)
--- a/JavaScriptCore/kxmlcore/FastMalloc.h
+++ b/JavaScriptCore/wtf/FastMalloc.h
@@ -26,19 +26,19 @@
  #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))
diff --git a/JavaScriptCore/kxmlcore/FastMallocInternal.h b/JavaScriptCore/wtf/FastMallocInternal.h

similarity index 98%

rename from JavaScriptCore/kxmlcore/FastMallocInternal.h

rename to JavaScriptCore/wtf/FastMallocInternal.h

index e94b3f6dbddf03e67ec47b4cfedbf777045afca7..37f03bbd44af60a702d3a47d5b95fe4df42b3b0c 100644 (file)
--- a/JavaScriptCore/kxmlcore/FastMallocInternal.h
+++ b/JavaScriptCore/wtf/FastMallocInternal.h
@@ -27,7 +27,7 @@
  
  #include <pthread.h>
  
-namespace KXMLCore {
+namespace WTF {
      void fastMallocRegisterThread(pthread_t thread);
  }
  
diff --git a/JavaScriptCore/kxmlcore/Forward.h b/JavaScriptCore/wtf/Forward.h

similarity index 88%

rename from JavaScriptCore/kxmlcore/Forward.h

rename to JavaScriptCore/wtf/Forward.h

index fbe97720549a988a6a42f7ff0f5a310d95c0aa02..9690b0ba3a86d076fa5b13d737ad8509b03abb38 100644 (file)
--- a/JavaScriptCore/kxmlcore/Forward.h
+++ b/JavaScriptCore/wtf/Forward.h
@@ -23,7 +23,7 @@
  
  #include <stddef.h>
  
-namespace KXMLCore {
+namespace WTF {
      template<typename T> class ListRefPtr;
      template<typename T> class OwnArrayPtr;
      template<typename T> class OwnPtr;
@@ -31,10 +31,10 @@ namespace KXMLCore {
      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
diff --git a/JavaScriptCore/kxmlcore/HashCountedSet.h b/JavaScriptCore/wtf/HashCountedSet.h

similarity index 99%

rename from JavaScriptCore/kxmlcore/HashCountedSet.h

rename to JavaScriptCore/wtf/HashCountedSet.h

index 7b882a0ea8fa493270bd257dbd98d5ae706d6e49..5ebb6488eb692114b400ea8bebddea4d28624017 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashCountedSet.h
+++ b/JavaScriptCore/wtf/HashCountedSet.h
@@ -26,7 +26,7 @@
  #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 {
@@ -173,6 +173,6 @@ namespace KXMLCore {
  
  } // namespace khtml
  
-using KXMLCore::HashCountedSet;
+using WTF::HashCountedSet;
  
  #endif /* KXMLCORE_HASH_COUNTED_SET_H */
diff --git a/JavaScriptCore/kxmlcore/HashFunctions.h b/JavaScriptCore/wtf/HashFunctions.h

similarity index 96%

rename from JavaScriptCore/kxmlcore/HashFunctions.h

rename to JavaScriptCore/wtf/HashFunctions.h

index 26f030e87d8df0afa1c863d81f793157a519addd..d0728d0f78fffd5303092577e8bf99468517fa22 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashFunctions.h
+++ b/JavaScriptCore/wtf/HashFunctions.h
@@ -26,7 +26,7 @@
  #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; };
@@ -96,10 +96,10 @@ namespace KXMLCore {
      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
diff --git a/JavaScriptCore/kxmlcore/HashMap.h b/JavaScriptCore/wtf/HashMap.h

similarity index 99%

rename from JavaScriptCore/kxmlcore/HashMap.h

rename to JavaScriptCore/wtf/HashMap.h

index 262dcbf24d376c8b5b4315f7fb616483343de4d6..563587bce2338fbcd3dc30e7200abe8fa9b49320 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashMap.h
+++ b/JavaScriptCore/wtf/HashMap.h
@@ -26,7 +26,7 @@
  
  #include "HashTable.h"
  
-namespace KXMLCore {
+namespace WTF {
  
      template<typename PairType> struct PairFirstExtractor;
  
@@ -320,8 +320,8 @@ namespace KXMLCore {
          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 */
diff --git a/JavaScriptCore/kxmlcore/HashSet.h b/JavaScriptCore/wtf/HashSet.h

similarity index 99%

rename from JavaScriptCore/kxmlcore/HashSet.h

rename to JavaScriptCore/wtf/HashSet.h

index 5c0b56bae5d8a2025d26e4dc8ccb7bf749b7152b..308c25e4d071bdce6712c28769131d43f0791f8c 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashSet.h
+++ b/JavaScriptCore/wtf/HashSet.h
@@ -26,7 +26,7 @@
  
  #include "HashTable.h"
  
-namespace KXMLCore {
+namespace WTF {
  
      template<typename T> struct IdentityExtractor;
  
@@ -306,8 +306,8 @@ namespace KXMLCore {
          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 */
diff --git a/JavaScriptCore/kxmlcore/HashTable.cpp b/JavaScriptCore/wtf/HashTable.cpp

similarity index 97%

rename from JavaScriptCore/kxmlcore/HashTable.cpp

rename to JavaScriptCore/wtf/HashTable.cpp

index 2779df22bdf01fa2853c31c6892f7a4b16311df9..ba45aee80ecef681b55bed5c3523027d0eec4665 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashTable.cpp
+++ b/JavaScriptCore/wtf/HashTable.cpp
@@ -22,7 +22,7 @@
  #include "config.h"
  #include "HashTable.h"
  
-namespace KXMLCore {
+namespace WTF {
  
  #if DUMP_HASHTABLE_STATS
  
@@ -59,4 +59,4 @@ void HashTableStats::recordCollisionAtCount(int count)
  
  #endif
  
-} // namespace KXMLCore
+} // namespace WTF
diff --git a/JavaScriptCore/kxmlcore/HashTable.h b/JavaScriptCore/wtf/HashTable.h

similarity index 99%

rename from JavaScriptCore/kxmlcore/HashTable.h

rename to JavaScriptCore/wtf/HashTable.h

index 0d9f2514812f5fce7dca700cadedc1e841d17f40..4e07eec9efbf8d187d57d04dd6bc2a02bbb04783 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashTable.h
+++ b/JavaScriptCore/wtf/HashTable.h
@@ -27,7 +27,7 @@
  #include "HashTraits.h"
  #include <assert.h>
  
-namespace KXMLCore {
+namespace WTF {
  
  #define DUMP_HASHTABLE_STATS 0
  #define CHECK_HASHTABLE_CONSISTENCY 0
@@ -930,6 +930,6 @@ namespace KXMLCore {
          static void derefAll(HashTableType& table) { Base::derefAll(table); }
      };
  
-} // namespace KXMLCore
+} // namespace WTF
  
  #endif // KXMLCORE_HASH_TABLE_H
diff --git a/JavaScriptCore/kxmlcore/HashTraits.h b/JavaScriptCore/wtf/HashTraits.h

similarity index 98%

rename from JavaScriptCore/kxmlcore/HashTraits.h

rename to JavaScriptCore/wtf/HashTraits.h

index e3cf269ff5b27e1414187e8686055e15f9084f80..bdc77e6ceae263eb3dac9624660d142f941be1f3 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashTraits.h
+++ b/JavaScriptCore/wtf/HashTraits.h
@@ -26,7 +26,7 @@
  #include "HashFunctions.h"
  #include <utility>
  
-namespace KXMLCore {
+namespace WTF {
  
      using std::pair;
      using std::make_pair;
@@ -187,9 +187,9 @@ namespace KXMLCore {
          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
diff --git a/JavaScriptCore/kxmlcore/ListRefPtr.h b/JavaScriptCore/wtf/ListRefPtr.h

similarity index 95%

rename from JavaScriptCore/kxmlcore/ListRefPtr.h

rename to JavaScriptCore/wtf/ListRefPtr.h

index 00fc2f52c3e90a0acaa30e0ee246f10c98da3984..60966a67e3f21aaeb0f24ac9052198b27be49e09 100644 (file)
--- a/JavaScriptCore/kxmlcore/ListRefPtr.h
+++ b/JavaScriptCore/wtf/ListRefPtr.h
@@ -23,9 +23,9 @@
  #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.
@@ -51,8 +51,8 @@ namespace KXMLCore {
          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
diff --git a/JavaScriptCore/kxmlcore/Noncopyable.h b/JavaScriptCore/wtf/Noncopyable.h

similarity index 91%

rename from JavaScriptCore/kxmlcore/Noncopyable.h

rename to JavaScriptCore/wtf/Noncopyable.h

index 1004d7b9f819908cb29afa834c4d1311053885d6..b69bd887fbeebe3321461873de00a3d4b26847c2 100644 (file)
--- a/JavaScriptCore/kxmlcore/Noncopyable.h
+++ b/JavaScriptCore/wtf/Noncopyable.h
@@ -22,10 +22,10 @@
  #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&);
@@ -35,8 +35,8 @@ namespace KXMLCoreNoncopyable {
          ~Noncopyable() { }
      };
  
-} // namespace KXMLCoreNoncopyable
+} // namespace WTFNoncopyable
  
-using KXMLCoreNoncopyable::Noncopyable;
+using WTFNoncopyable::Noncopyable;
  
  #endif // KXMLCORE_NONCOPYABLE
diff --git a/JavaScriptCore/kxmlcore/OwnArrayPtr.h b/JavaScriptCore/wtf/OwnArrayPtr.h

similarity index 94%

rename from JavaScriptCore/kxmlcore/OwnArrayPtr.h

rename to JavaScriptCore/wtf/OwnArrayPtr.h

index ebc6b32ee4d01956b3e64b429d30016f24bf6d86..bfe85f2159831f67f53e5c94ee2f910689b22d5f 100644 (file)
--- a/JavaScriptCore/kxmlcore/OwnArrayPtr.h
+++ b/JavaScriptCore/wtf/OwnArrayPtr.h
@@ -23,10 +23,10 @@
  #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:
@@ -60,8 +60,8 @@ namespace KXMLCore {
      
      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
diff --git a/JavaScriptCore/kxmlcore/OwnPtr.h b/JavaScriptCore/wtf/OwnPtr.h

similarity index 93%

rename from JavaScriptCore/kxmlcore/OwnPtr.h

rename to JavaScriptCore/wtf/OwnPtr.h

index 37461634c9fafba4deef0b49e829aa5ad793fbf6..51dd44b94d3b565b8a347248399668af54016f21 100644 (file)
--- a/JavaScriptCore/kxmlcore/OwnPtr.h
+++ b/JavaScriptCore/wtf/OwnPtr.h
@@ -23,10 +23,10 @@
  #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:
@@ -58,8 +58,8 @@ namespace KXMLCore {
      
      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
diff --git a/JavaScriptCore/kxmlcore/PassRefPtr.h b/JavaScriptCore/wtf/PassRefPtr.h

similarity index 97%

rename from JavaScriptCore/kxmlcore/PassRefPtr.h

rename to JavaScriptCore/wtf/PassRefPtr.h

index 46996cf0d76a191e756623e49cadc51fd003dc25..d086ef69294dc7bc22480ab2ec7bea403f1b76ed 100644 (file)
--- a/JavaScriptCore/kxmlcore/PassRefPtr.h
+++ b/JavaScriptCore/wtf/PassRefPtr.h
@@ -23,7 +23,7 @@
  #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;
@@ -178,11 +178,11 @@ namespace KXMLCore {
          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
diff --git a/JavaScriptCore/kxmlcore/Platform.h b/JavaScriptCore/wtf/Platform.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/Platform.h

rename to JavaScriptCore/wtf/Platform.h
diff --git a/JavaScriptCore/kxmlcore/RefPtr.h b/JavaScriptCore/wtf/RefPtr.h

similarity index 97%

rename from JavaScriptCore/kxmlcore/RefPtr.h

rename to JavaScriptCore/wtf/RefPtr.h

index 0ca95d037ca3d5b5c252fcb60f1685f73ab71dc9..4ffdd13f38ec9ad5e4f5f59f295b573459256ad0 100644 (file)
--- a/JavaScriptCore/kxmlcore/RefPtr.h
+++ b/JavaScriptCore/wtf/RefPtr.h
@@ -25,7 +25,7 @@
  
  #include <algorithm>
  
-namespace KXMLCore {
+namespace WTF {
  
      template <typename T> class PassRefPtr;
  
@@ -175,10 +175,10 @@ namespace KXMLCore {
          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
diff --git a/JavaScriptCore/kxmlcore/TCPageMap.h b/JavaScriptCore/wtf/TCPageMap.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/TCPageMap.h

rename to JavaScriptCore/wtf/TCPageMap.h
diff --git a/JavaScriptCore/kxmlcore/TCSpinLock.h b/JavaScriptCore/wtf/TCSpinLock.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/TCSpinLock.h

rename to JavaScriptCore/wtf/TCSpinLock.h
diff --git a/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp b/JavaScriptCore/wtf/TCSystemAlloc.cpp

similarity index 98%

rename from JavaScriptCore/kxmlcore/TCSystemAlloc.cpp

rename to JavaScriptCore/wtf/TCSystemAlloc.cpp

index 4c787fa23c84977d4f4d13b1e53fe8021cc61b41..e32cb383ac86af7c9c4452c1ea2013e3c9992c37 100644 (file)
--- a/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp
+++ b/JavaScriptCore/wtf/TCSystemAlloc.cpp
@@ -68,7 +68,7 @@ static size_t pagesize = 0;
  // 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;
@@ -79,7 +79,7 @@ static bool devmem_failure = 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");
@@ -172,7 +172,7 @@ static void* TryMmap(size_t size, size_t alignment) {
  
  #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
@@ -246,7 +246,7 @@ static void* TryDevMem(size_t size, size_t alignment) {
  #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);
@@ -261,7 +261,7 @@ void* TCMalloc_SystemAlloc(size_t size, size_t 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;
diff --git a/JavaScriptCore/kxmlcore/TCSystemAlloc.h b/JavaScriptCore/wtf/TCSystemAlloc.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/TCSystemAlloc.h

rename to JavaScriptCore/wtf/TCSystemAlloc.h
diff --git a/JavaScriptCore/kxmlcore/UnusedParam.h b/JavaScriptCore/wtf/UnusedParam.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/UnusedParam.h

rename to JavaScriptCore/wtf/UnusedParam.h
diff --git a/JavaScriptCore/kxmlcore/Vector.h b/JavaScriptCore/wtf/Vector.h

similarity index 99%

rename from JavaScriptCore/kxmlcore/Vector.h

rename to JavaScriptCore/wtf/Vector.h

index 935b07f9d73b4972bdc8cb75b7b03585ac6162a9..4dd90ceedb2ff2560c6e94c032f68b4847b9e09e 100644 (file)
--- a/JavaScriptCore/kxmlcore/Vector.h
+++ b/JavaScriptCore/wtf/Vector.h
@@ -33,7 +33,7 @@
  // We should use NOMINMAX instead.
  #undef max
  
-namespace KXMLCore {
+namespace WTF {
  
      using std::min;
      using std::max;
@@ -586,8 +586,8 @@ namespace KXMLCore {
              delete *it;
      }
  
-} // namespace KXMLCore
+} // namespace WTF
  
-using KXMLCore::Vector;
+using WTF::Vector;
  
  #endif // KXMLCORE_VECTOR_H
diff --git a/JavaScriptCore/kxmlcore/VectorTraits.h b/JavaScriptCore/wtf/VectorTraits.h

similarity index 97%

rename from JavaScriptCore/kxmlcore/VectorTraits.h

rename to JavaScriptCore/wtf/VectorTraits.h

index b79eb68ffec0c16519e69be64a019ff50b5289aa..949a984887ba6110fd5cde84d788be4f33f41e84 100644 (file)
--- a/JavaScriptCore/kxmlcore/VectorTraits.h
+++ b/JavaScriptCore/wtf/VectorTraits.h
@@ -28,7 +28,7 @@
  
  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; };
@@ -105,9 +105,9 @@ namespace KXMLCore {
          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
diff --git a/JavaScriptCore/kxmlcore/unicode/Unicode.h b/JavaScriptCore/wtf/unicode/Unicode.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/unicode/Unicode.h

rename to JavaScriptCore/wtf/unicode/Unicode.h
diff --git a/JavaScriptCore/kxmlcore/unicode/UnicodeCategory.h b/JavaScriptCore/wtf/unicode/UnicodeCategory.h

similarity index 99%

rename from JavaScriptCore/kxmlcore/unicode/UnicodeCategory.h

rename to JavaScriptCore/wtf/unicode/UnicodeCategory.h

index a69f7fda61dafbf0e6c2c4d8534206a4f25fe4fa..6632eaca5723bb6d89890a9d5730951a50e5cd24 100644 (file)
--- a/JavaScriptCore/kxmlcore/unicode/UnicodeCategory.h
+++ b/JavaScriptCore/wtf/unicode/UnicodeCategory.h
@@ -23,7 +23,7 @@
  #ifndef KJS_UNICODE_CATEGORY_H
  #define KJS_UNICODE_CATEGORY_H
  
-namespace KXMLCore {
+namespace WTF {
    namespace Unicode {
      enum CharCategory {
        NoCategory = 0,
diff --git a/JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h b/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h

similarity index 99%

rename from JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h

rename to JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h

index c0558280cb3dce9f65ee5d8fb0f7d3ef0dff29f9..16ae478449cddf440e113d5963678621fc33736e 100644 (file)
--- a/JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h
+++ b/JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h
@@ -29,7 +29,7 @@
  
  #include "../UnicodeCategory.h"
  
-namespace KXMLCore {
+namespace WTF {
    namespace Unicode {
  
      inline int toLower(uint16_t* str, int strLength, uint16_t*& destIfNeeded)
diff --git a/JavaScriptCore/kxmlcore/unicode/qt4/UnicodeQt4.h b/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h

similarity index 100%

rename from JavaScriptCore/kxmlcore/unicode/qt4/UnicodeQt4.h

rename to JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog

index b00944d1bb7ea10c6ddd933981860f534d486cbe..a75884e1a94f86515a62e39c0103201dc4e5ddc9 100644 (file)
--- a/JavaScriptGlue/ChangeLog
+++ b/JavaScriptGlue/ChangeLog
@@ -1,3 +1,30 @@
+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
diff --git a/JavaScriptGlue/config.h b/JavaScriptGlue/config.h

index f97f32b616d6a3304e56311b7ec5c2a1c29af637..c91c9061338379db45eef44b6d523ab95c4e69f3 100644 (file)
--- a/JavaScriptGlue/config.h
+++ b/JavaScriptGlue/config.h
@@ -1,2 +1,2 @@
-#include <kxmlcore/Platform.h>
+#include <wtf/Platform.h>
  
diff --git a/JavaScriptGlue/kxmlcore/AlwaysInline.h b/JavaScriptGlue/wtf/AlwaysInline.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/AlwaysInline.h

rename to JavaScriptGlue/wtf/AlwaysInline.h
diff --git a/JavaScriptGlue/kxmlcore/Assertions.h b/JavaScriptGlue/wtf/Assertions.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/Assertions.h

rename to JavaScriptGlue/wtf/Assertions.h
diff --git a/JavaScriptGlue/kxmlcore/FastMalloc.h b/JavaScriptGlue/wtf/FastMalloc.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/FastMalloc.h

rename to JavaScriptGlue/wtf/FastMalloc.h
diff --git a/JavaScriptGlue/kxmlcore/Forward.h b/JavaScriptGlue/wtf/Forward.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/Forward.h

rename to JavaScriptGlue/wtf/Forward.h
diff --git a/JavaScriptGlue/kxmlcore/HashCountedSet.h b/JavaScriptGlue/wtf/HashCountedSet.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/HashCountedSet.h

rename to JavaScriptGlue/wtf/HashCountedSet.h
diff --git a/JavaScriptGlue/kxmlcore/HashSet.h b/JavaScriptGlue/wtf/HashSet.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/HashSet.h

rename to JavaScriptGlue/wtf/HashSet.h
diff --git a/JavaScriptGlue/kxmlcore/Noncopyable.h b/JavaScriptGlue/wtf/Noncopyable.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/Noncopyable.h

rename to JavaScriptGlue/wtf/Noncopyable.h
diff --git a/JavaScriptGlue/kxmlcore/OwnArrayPtr.h b/JavaScriptGlue/wtf/OwnArrayPtr.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/OwnArrayPtr.h

rename to JavaScriptGlue/wtf/OwnArrayPtr.h
diff --git a/JavaScriptGlue/kxmlcore/OwnPtr.h b/JavaScriptGlue/wtf/OwnPtr.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/OwnPtr.h

rename to JavaScriptGlue/wtf/OwnPtr.h
diff --git a/JavaScriptGlue/kxmlcore/PassRefPtr.h b/JavaScriptGlue/wtf/PassRefPtr.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/PassRefPtr.h

rename to JavaScriptGlue/wtf/PassRefPtr.h
diff --git a/JavaScriptGlue/kxmlcore/Platform.h b/JavaScriptGlue/wtf/Platform.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/Platform.h

rename to JavaScriptGlue/wtf/Platform.h
diff --git a/JavaScriptGlue/kxmlcore/RefPtr.h b/JavaScriptGlue/wtf/RefPtr.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/RefPtr.h

rename to JavaScriptGlue/wtf/RefPtr.h
diff --git a/JavaScriptGlue/kxmlcore/Vector.h b/JavaScriptGlue/wtf/Vector.h

similarity index 100%

rename from JavaScriptGlue/kxmlcore/Vector.h

rename to JavaScriptGlue/wtf/Vector.h
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog

index 12f98eaf722e1976044bea8926ff65c3ac3bbe8d..a146a1c2fb87c069d8f9f0caadae2cfd3afb4e9d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,167 @@
+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.
diff --git a/WebCore/ForwardingHeaders/kxmlcore/AlwaysInline.h b/WebCore/ForwardingHeaders/wtf/AlwaysInline.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/AlwaysInline.h

rename to WebCore/ForwardingHeaders/wtf/AlwaysInline.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/Assertions.h b/WebCore/ForwardingHeaders/wtf/Assertions.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/Assertions.h

rename to WebCore/ForwardingHeaders/wtf/Assertions.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/FastMalloc.h b/WebCore/ForwardingHeaders/wtf/FastMalloc.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/FastMalloc.h

rename to WebCore/ForwardingHeaders/wtf/FastMalloc.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/Forward.h b/WebCore/ForwardingHeaders/wtf/Forward.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/Forward.h

rename to WebCore/ForwardingHeaders/wtf/Forward.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/HashCountedSet.h b/WebCore/ForwardingHeaders/wtf/HashCountedSet.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/HashCountedSet.h

rename to WebCore/ForwardingHeaders/wtf/HashCountedSet.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/HashMap.h b/WebCore/ForwardingHeaders/wtf/HashMap.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/HashMap.h

rename to WebCore/ForwardingHeaders/wtf/HashMap.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/HashSet.h b/WebCore/ForwardingHeaders/wtf/HashSet.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/HashSet.h

rename to WebCore/ForwardingHeaders/wtf/HashSet.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/HashTraits.h b/WebCore/ForwardingHeaders/wtf/HashTraits.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/HashTraits.h

rename to WebCore/ForwardingHeaders/wtf/HashTraits.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/Noncopyable.h b/WebCore/ForwardingHeaders/wtf/Noncopyable.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/Noncopyable.h

rename to WebCore/ForwardingHeaders/wtf/Noncopyable.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/OwnArrayPtr.h b/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/OwnArrayPtr.h

rename to WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/OwnPtr.h b/WebCore/ForwardingHeaders/wtf/OwnPtr.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/OwnPtr.h

rename to WebCore/ForwardingHeaders/wtf/OwnPtr.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/PassRefPtr.h b/WebCore/ForwardingHeaders/wtf/PassRefPtr.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/PassRefPtr.h

rename to WebCore/ForwardingHeaders/wtf/PassRefPtr.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/Platform.h b/WebCore/ForwardingHeaders/wtf/Platform.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/Platform.h

rename to WebCore/ForwardingHeaders/wtf/Platform.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/RefPtr.h b/WebCore/ForwardingHeaders/wtf/RefPtr.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/RefPtr.h

rename to WebCore/ForwardingHeaders/wtf/RefPtr.h
diff --git a/WebCore/ForwardingHeaders/kxmlcore/Vector.h b/WebCore/ForwardingHeaders/wtf/Vector.h

similarity index 100%

rename from WebCore/ForwardingHeaders/kxmlcore/Vector.h

rename to WebCore/ForwardingHeaders/wtf/Vector.h
diff --git a/WebCore/bindings/js/JSHTMLElementWrapperFactory.h b/WebCore/bindings/js/JSHTMLElementWrapperFactory.h

index d876c91f9d5eaebfae6609b10703960e08e0b80a..f76de8d6b8f8ac9e1d9f5f8cfe2e2c1681f2a74c 100644 (file)
--- a/WebCore/bindings/js/JSHTMLElementWrapperFactory.h
+++ b/WebCore/bindings/js/JSHTMLElementWrapperFactory.h
@@ -19,7 +19,7 @@
  #ifndef JSHTMLELEMENTWRAPPERFACTORY_H
  #define JSHTMLELEMENTWRAPPERFACTORY_H
  
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
  
  namespace KJS {
      class DOMNode;
diff --git a/WebCore/bindings/js/kjs_binding.cpp b/WebCore/bindings/js/kjs_binding.cpp

index d641d4d11a606ebd91aca8e1cd39d890d4cf77f5..3af9528e3033a0721f38a797c41e0d6897af5270 100644 (file)
--- a/WebCore/bindings/js/kjs_binding.cpp
+++ b/WebCore/bindings/js/kjs_binding.cpp
@@ -36,7 +36,7 @@
  #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;
diff --git a/WebCore/bindings/js/kjs_window.h b/WebCore/bindings/js/kjs_window.h

index 2ff7013b56a9ca4d824d4479e2105a07822e5060..ef102d40ca1990b5d2d122408d8ce1f18174f0cf 100644 (file)
--- a/WebCore/bindings/js/kjs_window.h
+++ b/WebCore/bindings/js/kjs_window.h
@@ -23,7 +23,7 @@
  
  #include "DeprecatedString.h"
  #include "kjs_binding.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  
  namespace WebCore {
      class AtomicString;
diff --git a/WebCore/bindings/objc/DOMImplementationFront.h b/WebCore/bindings/objc/DOMImplementationFront.h

index 33c696532755a66f23c6a1b99fa83b711de3c5b2..3a8bdc987c5d6b61f9e47457f150a81676dd2ba7 100644 (file)
--- a/WebCore/bindings/objc/DOMImplementationFront.h
+++ b/WebCore/bindings/objc/DOMImplementationFront.h
@@ -27,7 +27,7 @@
  // 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 {
  
diff --git a/WebCore/bridge/JavaAppletWidget.h b/WebCore/bridge/JavaAppletWidget.h

index 679ca8050bf160298ade1a58883021e4e6d0bc9e..bf16373729fb6cc2b3ab32b46bb8e943029b15b6 100644 (file)
--- a/WebCore/bridge/JavaAppletWidget.h
+++ b/WebCore/bridge/JavaAppletWidget.h
@@ -25,7 +25,7 @@
  
  #include "StringHash.h"
  #include "Widget.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  
  namespace WebCore {
      class Element;
diff --git a/WebCore/bridge/mac/WebCoreFrameNamespaces.mm b/WebCore/bridge/mac/WebCoreFrameNamespaces.mm

index 02386db1c7d4282f15346eea9887d08cbc0fa846..6ae48b750c024196402216dea7dbda5dd34b1f7c 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameNamespaces.mm
+++ b/WebCore/bridge/mac/WebCoreFrameNamespaces.mm
@@ -30,7 +30,7 @@
  #import "WebCoreFrameNamespaces.h"
  
  #import "Page.h"
-#import <kxmlcore/HashSet.h>
+#import <wtf/HashSet.h>
  
  using namespace WebCore;
  
diff --git a/WebCore/bridge/mac/WebCorePageBridge.mm b/WebCore/bridge/mac/WebCorePageBridge.mm

index 0c2c75f39be888f6ed6b5138d6681daf625cf009..1a2a88d21b42df49b33e1a4a15c845eb49351b3e 100644 (file)
--- a/WebCore/bridge/mac/WebCorePageBridge.mm
+++ b/WebCore/bridge/mac/WebCorePageBridge.mm
@@ -35,16 +35,16 @@ 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;
      }
  }
  
diff --git a/WebCore/bridge/mac/WebCoreStringTruncator.mm b/WebCore/bridge/mac/WebCoreStringTruncator.mm

index 09586c8e17b0791436bd81f3dec50c88988a5a82..595be80a04194c1a635d70796cd34f3dfb8a62ab 100644 (file)
--- a/WebCore/bridge/mac/WebCoreStringTruncator.mm
+++ b/WebCore/bridge/mac/WebCoreStringTruncator.mm
@@ -31,7 +31,7 @@
  
  #import <Cocoa/Cocoa.h>
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  #import "WebTextRendererFactory.h"
  #import "FontData.h"
  
diff --git a/WebCore/bridge/mac/WebCoreViewFactory.m b/WebCore/bridge/mac/WebCoreViewFactory.m

index 75b9171b53a04ba14c1b9f009526655c9f32ae1b..5398989652727bda9e2a2de7c9934965c4519e44 100644 (file)
--- a/WebCore/bridge/mac/WebCoreViewFactory.m
+++ b/WebCore/bridge/mac/WebCoreViewFactory.m
@@ -24,7 +24,7 @@
   */
  #include "config.h"
  #import "WebCoreViewFactory.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  @implementation WebCoreViewFactory
  
diff --git a/WebCore/config.h b/WebCore/config.h

index cc34c2ecb9acbe695a34e7200c1003097b9bbb59..f44eb1b56f2db67cb9c0375ba215b61131b21b30 100644 (file)
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -18,7 +18,7 @@
   *
   */
  
-#include <kxmlcore/Platform.h>
+#include <wtf/Platform.h>
  
  #define KHTML_NO_XBL 1
  #define KHTML_XSLT 1
@@ -57,7 +57,7 @@ typedef float CGFloat;
  // 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
  
diff --git a/WebCore/css/css_base.h b/WebCore/css/css_base.h

index a9e971bbf8710391d1410d58a456faed7d911727..caecd3e68200957a182ef19b25df1ac1c3b67144 100644 (file)
--- a/WebCore/css/css_base.h
+++ b/WebCore/css/css_base.h
@@ -25,7 +25,7 @@
  #define CSS_BASE_H
  
  #include "QualifiedName.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  namespace WebCore {
  
diff --git a/WebCore/css/css_valueimpl.h b/WebCore/css/css_valueimpl.h

index 3b96cd10de040ee2590981d1d740d7d4c15d47f4..6969705cef5a3faaccb58dbdb82c32e1ce9305f2 100644 (file)
--- a/WebCore/css/css_valueimpl.h
+++ b/WebCore/css/css_valueimpl.h
@@ -27,7 +27,7 @@
  #include "css_base.h"
  #include "DeprecatedPtrList.h"
  #include "DeprecatedValueList.h"
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/PassRefPtr.h>
  
  class QPaintDeviceMetrics;
  
diff --git a/WebCore/css/csshelper.cpp b/WebCore/css/csshelper.cpp

index 763810830ffd6f6991bf945e45e9ebc2e5842ea9..ba3c42e24770f88fd3f664725762faabfa1cf1da 100644 (file)
--- a/WebCore/css/csshelper.cpp
+++ b/WebCore/css/csshelper.cpp
@@ -25,7 +25,7 @@
  #include "csshelper.h"
  
  #include "PlatformString.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  namespace WebCore {
  
diff --git a/WebCore/css/cssparser.h b/WebCore/css/cssparser.h

index 60910ab09372abb3942b2b31f090bb2031fff83a..a1754c5f213cf9d1def044c832976a4c488a6eed 100644 (file)
--- a/WebCore/css/cssparser.h
+++ b/WebCore/css/cssparser.h
@@ -25,8 +25,8 @@
  
  #include "AtomicString.h"
  #include "Color.h"
-#include <kxmlcore/HashSet.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/HashSet.h>
+#include <wtf/Vector.h>
  
  namespace WebCore {
  
diff --git a/WebCore/dom/DOMImplementation.h b/WebCore/dom/DOMImplementation.h

index b91a853f300495a78d3915b0913790a38410d51f..a8c2f6b9a15dde4e1d067d6ae019d451678b31b4 100644 (file)
--- a/WebCore/dom/DOMImplementation.h
+++ b/WebCore/dom/DOMImplementation.h
@@ -27,7 +27,7 @@
  #define DOM_DOMImplementationImpl_h
  
  #include "Shared.h"
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
  
  namespace WebCore {
  
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h

index 9faa16af8f95ecbc0f4ac6aba5a3266aa469a09f..7c443f799d145513232c050851cf7fa8ec4eeae1 100644 (file)
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -35,7 +35,7 @@
  #include "Timer.h"
  #include "Decoder.h"
  #include "dom2_traversalimpl.h"
-#include <kxmlcore/HashCountedSet.h>
+#include <wtf/HashCountedSet.h>
  #include "DeprecatedPtrList.h"
  
  class RenderArena;
@@ -128,7 +128,7 @@ struct FormElementKeyHash {
      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();
  };
  
diff --git a/WebCore/dom/NamedNodeMap.h b/WebCore/dom/NamedNodeMap.h

index a45bd05494caa40632f399032c069a0a55a445af..b729bf9d868201c27ba37541ee6a9a6ffbdaf3de 100644 (file)
--- a/WebCore/dom/NamedNodeMap.h
+++ b/WebCore/dom/NamedNodeMap.h
@@ -27,7 +27,7 @@
  #define DOM_NamedNodeMapImpl_h
  
  #include "Shared.h"
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/PassRefPtr.h>
  
  namespace WebCore {
  
diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h

index e01b4a99692901b341ed48016fd8ce2ceef943bf..d02352301521b5aeedd5d13f6f5311eacc2d2d6f 100644 (file)
--- a/WebCore/dom/Node.h
+++ b/WebCore/dom/Node.h
@@ -28,9 +28,9 @@
  
  #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;
diff --git a/WebCore/dom/NodeList.h b/WebCore/dom/NodeList.h

index bf1899793cdd8d94e6ac208c873a1402ae724942..bca2905f329536cca23f48edf01f6ba0fedc86f9 100644 (file)
--- a/WebCore/dom/NodeList.h
+++ b/WebCore/dom/NodeList.h
@@ -27,8 +27,8 @@
  #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 {
  
diff --git a/WebCore/dom/QualifiedName.cpp b/WebCore/dom/QualifiedName.cpp

index 3a5b6cda5d7672e3d43dc849ca8fd77d2efaeb3d..87c810d6cb548289ce3aafe8f9aa12f7b4991aaa 100644 (file)
--- a/WebCore/dom/QualifiedName.cpp
+++ b/WebCore/dom/QualifiedName.cpp
@@ -29,8 +29,8 @@
  
  #include "QualifiedName.h"
  #include "StaticConstructors.h"
-#include <kxmlcore/Assertions.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/Assertions.h>
+#include <wtf/HashSet.h>
  
  namespace WebCore {
  
diff --git a/WebCore/dom/Range.h b/WebCore/dom/Range.h

index 54a219c4340ccea118eaa1b59ce951b7f09485e6..5b306fc75cbe64bedd6951de1783175a103f439e 100644 (file)
--- a/WebCore/dom/Range.h
+++ b/WebCore/dom/Range.h
@@ -28,8 +28,8 @@
  #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 {
  
diff --git a/WebCore/dom/StyledElement.cpp b/WebCore/dom/StyledElement.cpp

index 57e9d32b3dd535acc79d98e51cffbf9b0561b778..aa7bbd28b74774e9804171d15a05af7372889a1b 100644 (file)
--- a/WebCore/dom/StyledElement.cpp
+++ b/WebCore/dom/StyledElement.cpp
@@ -48,7 +48,7 @@ struct MappedAttributeKey {
  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; }
diff --git a/WebCore/dom/dom2_traversalimpl.h b/WebCore/dom/dom2_traversalimpl.h

index 4bd3f4f854b4237747c62952701ab81a7eb6cb1a..25055816a7d69e6de4ba8df4849abaff2ae532aa 100644 (file)
--- a/WebCore/dom/dom2_traversalimpl.h
+++ b/WebCore/dom/dom2_traversalimpl.h
@@ -27,9 +27,9 @@
  #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 {
  
diff --git a/WebCore/dom/xml_tokenizer.h b/WebCore/dom/xml_tokenizer.h

index ba2ca696cf4446b9a0d467574950a36b851f77be..1c829bc6ceaba97453895d2a424c9b0b97d3faaf 100644 (file)
--- a/WebCore/dom/xml_tokenizer.h
+++ b/WebCore/dom/xml_tokenizer.h
@@ -25,7 +25,7 @@
  #define XML_Tokenizer_h_
  
  #include "StringHash.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/RebalanceWhitespaceCommand.cpp b/WebCore/editing/RebalanceWhitespaceCommand.cpp

index d0dc70c7608720d6e860c1b3d5fd7948ae1d9f91..0bd8ee4d0a233f063679d15efdd3f4489fe33185 100644 (file)
--- a/WebCore/editing/RebalanceWhitespaceCommand.cpp
+++ b/WebCore/editing/RebalanceWhitespaceCommand.cpp
@@ -29,7 +29,7 @@
  #include "Document.h"
  #include "htmlediting.h"
  #include "TextIterator.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/RemoveCSSPropertyCommand.cpp b/WebCore/editing/RemoveCSSPropertyCommand.cpp

index 6bd2c83a9cbff41ad503fc527906e174f59534f1..8f7539c56e73cc15277723d90cb62b5242dc2cab 100644 (file)
--- a/WebCore/editing/RemoveCSSPropertyCommand.cpp
+++ b/WebCore/editing/RemoveCSSPropertyCommand.cpp
@@ -28,7 +28,7 @@
  
  #include "css_valueimpl.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/RemoveNodeAttributeCommand.cpp b/WebCore/editing/RemoveNodeAttributeCommand.cpp

index 344ab489824f6eb30e68cf4901c9d483f72098e1..af7a72fd96eb0feda6dabcde3a0e5ba05e95fda0 100644 (file)
--- a/WebCore/editing/RemoveNodeAttributeCommand.cpp
+++ b/WebCore/editing/RemoveNodeAttributeCommand.cpp
@@ -27,7 +27,7 @@
  #include "RemoveNodeAttributeCommand.h"
  #include "Element.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/RemoveNodeCommand.cpp b/WebCore/editing/RemoveNodeCommand.cpp

index b21b77809849ece126fe49018f39bfe7cd4e0fdd..53f08aa2afe58f6a2e851d8891db741bb5b388af 100644 (file)
--- a/WebCore/editing/RemoveNodeCommand.cpp
+++ b/WebCore/editing/RemoveNodeCommand.cpp
@@ -27,7 +27,7 @@
  #include "RemoveNodeCommand.h"
  
  #include "Node.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp b/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp

index bfe192fb918c7ef5a5864bfd1180bc0d2c80a2a6..10d1d6950c48b94a882d7f66be16d1a5f85e770b 100644 (file)
--- a/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp
+++ b/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp
@@ -27,7 +27,7 @@
  #include "RemoveNodePreservingChildrenCommand.h"
  
  #include "Node.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/ReplaceSelectionCommand.h b/WebCore/editing/ReplaceSelectionCommand.h

index aeb6b320819c2d7d7064b3aacd57d852d3f11792..ce75f0912d12928a4e41665a6f13543b847d77f8 100644 (file)
--- a/WebCore/editing/ReplaceSelectionCommand.h
+++ b/WebCore/editing/ReplaceSelectionCommand.h
@@ -27,8 +27,8 @@
  #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 {
  
diff --git a/WebCore/editing/Selection.cpp b/WebCore/editing/Selection.cpp

index a9a5acd8cda13b9e68d1d05c2002ab84a9f230e2..bba4149936936cc76e83dc159227f4250d291979 100644 (file)
--- a/WebCore/editing/Selection.cpp
+++ b/WebCore/editing/Selection.cpp
@@ -32,7 +32,7 @@
  #include "VisiblePosition.h"
  #include "visible_units.h"
  #include "Range.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/SetNodeAttributeCommand.cpp b/WebCore/editing/SetNodeAttributeCommand.cpp

index 71b79a8ac87ec91279d91da1225a076d3a807782..59b25aaccc6cdf775bc97320b01190032c7c167a 100644 (file)
--- a/WebCore/editing/SetNodeAttributeCommand.cpp
+++ b/WebCore/editing/SetNodeAttributeCommand.cpp
@@ -27,7 +27,7 @@
  #include "SetNodeAttributeCommand.h"
  #include "Element.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/SplitElementCommand.cpp b/WebCore/editing/SplitElementCommand.cpp

index 1c9532c311e6d7f140d559b92d7027cd7015bda2..ea61549bca7deabfd99503c84692216dd530a219 100644 (file)
--- a/WebCore/editing/SplitElementCommand.cpp
+++ b/WebCore/editing/SplitElementCommand.cpp
@@ -27,7 +27,7 @@
  #include "SplitElementCommand.h"
  #include "Element.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/SplitTextNodeCommand.cpp b/WebCore/editing/SplitTextNodeCommand.cpp

index 56ff37a0b29e7324074511684cb68c9bc1707320..841a8af0c984d1cff2371a94de8728304a7513e6 100644 (file)
--- a/WebCore/editing/SplitTextNodeCommand.cpp
+++ b/WebCore/editing/SplitTextNodeCommand.cpp
@@ -29,7 +29,7 @@
  #include "Document.h"
  #include "Text.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  using WebCore::Document;
  using WebCore::Text;
diff --git a/WebCore/editing/SplitTextNodeContainingElementCommand.cpp b/WebCore/editing/SplitTextNodeContainingElementCommand.cpp

index 6848bb794e965303226ab3297d43e85aa5aa4bda..fe0f4db53fd098f2ef7f7193951e6fba23b92b08 100644 (file)
--- a/WebCore/editing/SplitTextNodeContainingElementCommand.cpp
+++ b/WebCore/editing/SplitTextNodeContainingElementCommand.cpp
@@ -29,7 +29,7 @@
  #include "Element.h"
  #include "Text.h"
  #include "RenderObject.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/TextIterator.h b/WebCore/editing/TextIterator.h

index 04d92fd610934c7e0c84e76fa24cede5096159a1..592cc31d912ac7fb2e616e284480d8e746b1c737 100644 (file)
--- a/WebCore/editing/TextIterator.h
+++ b/WebCore/editing/TextIterator.h
@@ -28,7 +28,7 @@
  
  #include "InlineTextBox.h"
  #include "Range.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/htmlediting.h b/WebCore/editing/htmlediting.h

index df0a294049398140e826b2cc8e22cd3bc5608e03..c1de06248925d0647913b7b0101d63d1d1d9aec6 100644 (file)
--- a/WebCore/editing/htmlediting.h
+++ b/WebCore/editing/htmlediting.h
@@ -26,7 +26,7 @@
  #ifndef htmlediting_h
  #define htmlediting_h
  
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
  
  namespace WebCore {
  
diff --git a/WebCore/editing/markup.h b/WebCore/editing/markup.h

index df62f0fea5c740bee95f64990cf9e876a0af008b..11277aa25366af376013f8899013b9c0e2a93a52 100644 (file)
--- a/WebCore/editing/markup.h
+++ b/WebCore/editing/markup.h
@@ -27,7 +27,7 @@
  #define KHTML_EDITING_MARKUP_H
  
  #include "HTMLInterchange.h"
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
  
  template <class T> class DeprecatedPtrList;
  
diff --git a/WebCore/html/CanvasGradient.h b/WebCore/html/CanvasGradient.h

index b19b286352a48b776e5410aa41b9873484fea4fe..3c960784a9ce06c6c68a265f8cfbf5afbea2754e 100644 (file)
--- a/WebCore/html/CanvasGradient.h
+++ b/WebCore/html/CanvasGradient.h
@@ -28,7 +28,7 @@
  
  #include "FloatPoint.h"
  #include "Shared.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  #if __APPLE__
  typedef struct CGShading* CGShadingRef;
diff --git a/WebCore/html/CanvasRenderingContext2D.h b/WebCore/html/CanvasRenderingContext2D.h

index 79ba15b01a67a558e2d6d67235da82e2b8ee8acb..48590697dce522eca02be70e59dc8c81c455046d 100644 (file)
--- a/WebCore/html/CanvasRenderingContext2D.h
+++ b/WebCore/html/CanvasRenderingContext2D.h
@@ -30,7 +30,7 @@
  #include "GraphicsTypes.h"
  #include "Path.h"
  #include "PlatformString.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  #if __APPLE__
  #include <ApplicationServices/ApplicationServices.h>
diff --git a/WebCore/html/CanvasStyle.cpp b/WebCore/html/CanvasStyle.cpp

index feab48628b98bd3d6d54095072768ce94f3ad02d..c0ef8687c4071c46c42b3befdf7df51f4f728e34 100644 (file)
--- a/WebCore/html/CanvasStyle.cpp
+++ b/WebCore/html/CanvasStyle.cpp
@@ -30,7 +30,7 @@
  #include "CanvasPattern.h"
  #include "GraphicsContext.h"
  #include "cssparser.h"
-#include <kxmlcore/PassRefPtr.h>
+#include <wtf/PassRefPtr.h>
  
  namespace WebCore {
  
diff --git a/WebCore/html/HTMLCollection.h b/WebCore/html/HTMLCollection.h

index 22b1a1a9984241565f6d9124b7cd3503b99362fa..10ebd80a6bec9ae47f9d6889be690461235e8867 100644 (file)
--- a/WebCore/html/HTMLCollection.h
+++ b/WebCore/html/HTMLCollection.h
@@ -26,9 +26,9 @@
  #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;
  
diff --git a/WebCore/html/HTMLElementFactory.h b/WebCore/html/HTMLElementFactory.h

index 2b2eaaea943c065f7989e4bf6574deb668248053..b2cba89a91d1f4eb298af3cd143719fad4207012 100644 (file)
--- a/WebCore/html/HTMLElementFactory.h
+++ b/WebCore/html/HTMLElementFactory.h
@@ -23,7 +23,7 @@
  #ifndef HTMLELEMENTFACTORY_H
  #define HTMLELEMENTFACTORY_H
  
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
  
  namespace WebCore {
  
diff --git a/WebCore/kcanvas/KCanvasFilters.cpp b/WebCore/kcanvas/KCanvasFilters.cpp

index df33e6e0047662c02454079c84124ada5dff670c..bcbd4043cd6be80b48e4524fd9bac0911884172d 100644 (file)
--- a/WebCore/kcanvas/KCanvasFilters.cpp
+++ b/WebCore/kcanvas/KCanvasFilters.cpp
@@ -29,7 +29,7 @@
  
  #include "KWQTextStream.h"
  #include "KCanvasTreeDebug.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/kcanvas/KCanvasPath.h b/WebCore/kcanvas/KCanvasPath.h

index 59473ea699a3b6b37901892d95fc2aabe67b3421..963936fcab29d0b9ff1814910a2ea138dc94622c 100644 (file)
--- a/WebCore/kcanvas/KCanvasPath.h
+++ b/WebCore/kcanvas/KCanvasPath.h
@@ -26,7 +26,7 @@
  #if SVG_SUPPORT
  
  #include "DeprecatedValueList.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  #include "Shared.h"
  #include "FloatRect.h"
  
diff --git a/WebCore/kcanvas/RenderPath.cpp b/WebCore/kcanvas/RenderPath.cpp

index 800cf3b03918419e4ac989b6ef3c04d9254f92b0..3e40f3ec696cf5844033d548e0af3554cc4f7fa7 100644 (file)
--- a/WebCore/kcanvas/RenderPath.cpp
+++ b/WebCore/kcanvas/RenderPath.cpp
@@ -31,7 +31,7 @@
  #include "KRenderingFillPainter.h"
  #include "KRenderingStrokePainter.h"
  #include "SVGStyledElement.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
  
  namespace WebCore {
  
diff --git a/WebCore/kcanvas/RenderSVGImage.cpp b/WebCore/kcanvas/RenderSVGImage.cpp

index a768db15a6bae334f35a2cc77e45c5532652c72c..a65f0bc0bbe1f1f99a542966fccb83463254318f 100644 (file)
--- a/WebCore/kcanvas/RenderSVGImage.cpp
+++ b/WebCore/kcanvas/RenderSVGImage.cpp
@@ -35,7 +35,7 @@
  #include "SVGImageElement.h"
  #include "SVGImageElement.h"
  #include "ksvg.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
  
  namespace WebCore {
  
diff --git a/WebCore/kcanvas/RenderSVGText.cpp b/WebCore/kcanvas/RenderSVGText.cpp

index a73a40f9f50e490fe46c702700dced88de3447a5..110d7ff3a0e8a25ff4a096ddf3dfb5520d2d10b2 100644 (file)
--- a/WebCore/kcanvas/RenderSVGText.cpp
+++ b/WebCore/kcanvas/RenderSVGText.cpp
@@ -31,7 +31,7 @@
  #include "KRenderingDevice.h"
  #include "SVGAnimatedLengthList.h"
  #include "SVGTextElement.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
  
  namespace WebCore {
  
diff --git a/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm b/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm

index 1b310b909db3140ee4014116746c190a0fd28e9d..d9aca0bdedc8785e7d58c0047fb0154cf95a3301 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm
+++ b/WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm
@@ -28,7 +28,7 @@
  #if SVG_SUPPORT
  #import "KCanvasItemQuartz.h"
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  #import "kcanvas/RenderPath.h"
  #import "KCanvasRenderingStyle.h"
diff --git a/WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm b/WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm

index 8626483f6156958a5770120d6f6b31d868cd05f9..e95395e8b744898477ab14ae49f1b12bb11cb23a 100644 (file)
--- a/WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm
+++ b/WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm
@@ -42,7 +42,7 @@
  #import "KCanvasResourcesQuartz.h"
  #import "KCanvasImage.h"
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  namespace WebCore {
      
diff --git a/WebCore/kcanvas/device/quartz/QuartzSupport.mm b/WebCore/kcanvas/device/quartz/QuartzSupport.mm

index 7cdcedac1c9a8c7f686efeef9b49d6fbc597b7e7..e0f5b4dcb92b9bfc97da5c9770da86e83106a427 100644 (file)
--- a/WebCore/kcanvas/device/quartz/QuartzSupport.mm
+++ b/WebCore/kcanvas/device/quartz/QuartzSupport.mm
@@ -33,7 +33,7 @@
  #import "KRenderingFillPainter.h"
  #import "KRenderingStrokePainter.h"
  #import "KCanvasRenderingStyle.h"
-#import "kxmlcore/Assertions.h"
+#import "wtf/Assertions.h"
  
  #import <QuartzCore/CoreImage.h>
  
diff --git a/WebCore/ksvg2/misc/KSVGTimeScheduler.h b/WebCore/ksvg2/misc/KSVGTimeScheduler.h

index dfbd2050a9130c26165bffa773a739278138214f..71ad357da1bac2b286b2034e59c9ad1bd11717fa 100644 (file)
--- a/WebCore/ksvg2/misc/KSVGTimeScheduler.h
+++ b/WebCore/ksvg2/misc/KSVGTimeScheduler.h
@@ -25,7 +25,7 @@
  #define KSVG_TimeScheduler_H
  #if SVG_SUPPORT
  
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
  
  namespace WebCore {
      class Document;
diff --git a/WebCore/ksvg2/misc/SVGDocumentExtensions.h b/WebCore/ksvg2/misc/SVGDocumentExtensions.h

index 505e93ad3f9bc3d2eb696760f7fc4d2bc82ec5e1..7f82c29d175988dea108fcff54a2533f957343a4 100644 (file)
--- a/WebCore/ksvg2/misc/SVGDocumentExtensions.h
+++ b/WebCore/ksvg2/misc/SVGDocumentExtensions.h
@@ -24,7 +24,7 @@
  
  #if SVG_SUPPORT
  
-#include <kxmlcore/Forward.h>
+#include <wtf/Forward.h>
  
  namespace WebCore {
  
diff --git a/WebCore/ksvg2/scripts/make_names.pl b/WebCore/ksvg2/scripts/make_names.pl

index 2ec4d9812c9fc5be7ec50b77f5ee383e5ef1f3fe..8f36992942e691401c907ab9f00855843fe5109d 100755 (executable)
--- a/WebCore/ksvg2/scripts/make_names.pl
+++ b/WebCore/ksvg2/scripts/make_names.pl
@@ -363,13 +363,13 @@ END
  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;
  
diff --git a/WebCore/ksvg2/svg/SVGDOMImplementation.cpp b/WebCore/ksvg2/svg/SVGDOMImplementation.cpp

index c85cd70ce5aa6e1e93a24bf5c2b24dfd6b74bcac..3f64c0aba155d049423150da6321869a37d30fe6 100644 (file)
--- a/WebCore/ksvg2/svg/SVGDOMImplementation.cpp
+++ b/WebCore/ksvg2/svg/SVGDOMImplementation.cpp
@@ -34,7 +34,7 @@
  #include "SVGSVGElement.h"
  #include "css_stylesheetimpl.h"
  #include "ksvg.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
  
  using namespace WebCore;
  
diff --git a/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h b/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h

index f39277621ae890b55c565c5bd4db8b0dc0dcac60..6631e8641227a691550ff55a7ac5907eb99133f1 100644 (file)
--- a/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h
+++ b/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h
@@ -24,7 +24,7 @@
  #define KSVG_SVGExternalResourcesRequiredImpl_H
  #if SVG_SUPPORT
  
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
  
  namespace WebCore {
      class MappedAttribute;
diff --git a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp

index 812e23c3e5eb26a619613f114459b4f9353784a6..ad8fb80f67b97f1cb5cc1a8427f77c338b5e033f 100644 (file)
--- a/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
+++ b/WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp
@@ -23,7 +23,7 @@
  #include "config.h"
  #if SVG_SUPPORT
  #include "Attr.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  #include "ksvg.h"
  #include "SVGNames.h"
diff --git a/WebCore/ksvg2/svg/SVGForeignObjectElement.cpp b/WebCore/ksvg2/svg/SVGForeignObjectElement.cpp

index c7469e7a8f9476429f11a75a3ea35d29550eec75..8fb0cc793ddbf3b7a7925539e44148e8ef3f3fa1 100644 (file)
--- a/WebCore/ksvg2/svg/SVGForeignObjectElement.cpp
+++ b/WebCore/ksvg2/svg/SVGForeignObjectElement.cpp
@@ -29,7 +29,7 @@
  #include "SVGAnimatedLength.h"
  #include "RenderForeignObject.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  #include "CSSPropertyNames.h"
  
diff --git a/WebCore/ksvg2/svg/SVGImageElement.cpp b/WebCore/ksvg2/svg/SVGImageElement.cpp

index 1c1a306015ba9a2dcaa41f15eb847f066d43e5dc..b0d73913cc3e44b9993f3366b4eae1735bca88e0 100644 (file)
--- a/WebCore/ksvg2/svg/SVGImageElement.cpp
+++ b/WebCore/ksvg2/svg/SVGImageElement.cpp
@@ -41,7 +41,7 @@
  #include <kcanvas/KCanvasCreator.h>
  #include <kcanvas/KCanvasImage.h>
  #include <kcanvas/KCanvasPath.h>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  using namespace WebCore;
  
diff --git a/WebCore/ksvg2/svg/SVGMaskElement.cpp b/WebCore/ksvg2/svg/SVGMaskElement.cpp

index 4ffda2c6edca56946d667dfe8a679d1871aa9acb..385eafe3a1c4cc47f330f80f3515c925debbf0d5 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMaskElement.cpp
+++ b/WebCore/ksvg2/svg/SVGMaskElement.cpp
@@ -37,7 +37,7 @@
  #include "cssstyleselector.h"
  #include "ksvg.h"
  #include "Attr.h"
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
  
  namespace WebCore {
  
diff --git a/WebCore/ksvg2/svg/SVGStyledElement.cpp b/WebCore/ksvg2/svg/SVGStyledElement.cpp

index ad7605a612f34c95db7001f325ebe18c32514507..81e9adf6164ad969aa34202bd5b720c4bfb2e3e3 100644 (file)
--- a/WebCore/ksvg2/svg/SVGStyledElement.cpp
+++ b/WebCore/ksvg2/svg/SVGStyledElement.cpp
@@ -43,7 +43,7 @@
  #include "ksvgcssproperties.h"
  #include <kcanvas/KCanvasCreator.h>
  #include <kcanvas/device/KRenderingDevice.h>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/ksvg2/svg/SVGTests.h b/WebCore/ksvg2/svg/SVGTests.h

index 3c7461d466a47d0ca6eae897f9860156c61168df..d2af80b81ea25f863321e4ffb9b88ada26365d47 100644 (file)
--- a/WebCore/ksvg2/svg/SVGTests.h
+++ b/WebCore/ksvg2/svg/SVGTests.h
@@ -24,7 +24,7 @@
  #define KSVG_SVGTestsImpl_H
  #if SVG_SUPPORT
  
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
  
  namespace WebCore
  {
diff --git a/WebCore/ksvg2/svg/SVGTransform.h b/WebCore/ksvg2/svg/SVGTransform.h

index 4f26ed50ee8f32ecdfbba669882cb302f6bd8f44..e275117d8bef2b01f618b82dfb94d1520140759d 100644 (file)
--- a/WebCore/ksvg2/svg/SVGTransform.h
+++ b/WebCore/ksvg2/svg/SVGTransform.h
@@ -25,7 +25,7 @@
  #if SVG_SUPPORT
  
  #include "Shared.h"
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
  
  namespace WebCore {
  
diff --git a/WebCore/ksvg2/svg/SVGTransformable.cpp b/WebCore/ksvg2/svg/SVGTransformable.cpp

index 471ffafcdab3145259e3b0a07cac5b24720e7506..2c44c1c6bd81ee04a468e52e5d91eaf63d2906c4 100644 (file)
--- a/WebCore/ksvg2/svg/SVGTransformable.cpp
+++ b/WebCore/ksvg2/svg/SVGTransformable.cpp
@@ -24,7 +24,7 @@
  #if SVG_SUPPORT
  #include "RegularExpression.h"
  #include "DeprecatedStringList.h"
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
  
  #include "Attr.h"
  
diff --git a/WebCore/kwq/AccessibilityObjectCache.h b/WebCore/kwq/AccessibilityObjectCache.h

index c83cb39e85bc2e98cb392525fd5ae136a52e7c62..45c3f38f5684db72775454549316fb93d70ad04c 100644 (file)
--- a/WebCore/kwq/AccessibilityObjectCache.h
+++ b/WebCore/kwq/AccessibilityObjectCache.h
@@ -26,8 +26,8 @@
  #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;
@@ -45,7 +45,7 @@ namespace WebCore {
  
      typedef unsigned AXID;
  
-    struct AXIDHashTraits : KXMLCore::GenericHashTraits<unsigned> {
+    struct AXIDHashTraits : WTF::GenericHashTraits<unsigned> {
          static TraitType deletedValue() { return UINT_MAX; }
      };
  
diff --git a/WebCore/kwq/KWQCString.cpp b/WebCore/kwq/KWQCString.cpp

index e65cbefe6d490b5115b6850c29c4996fab89fd47..fd3e5240545a10b81b8c8e164fc2e11acba1f583 100644 (file)
--- a/WebCore/kwq/KWQCString.cpp
+++ b/WebCore/kwq/KWQCString.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "KWQCString.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  #include <ctype.h>
  
  DeprecatedCString::DeprecatedCString()
diff --git a/WebCore/kwq/KWQFormData.mm b/WebCore/kwq/KWQFormData.mm

index db9d4e1891b80cfcdb0e8a29682f833a878e6e0a..ff4fa065feee4458997bd09c7dee81d8dcfedd96 100644 (file)
--- a/WebCore/kwq/KWQFormData.mm
+++ b/WebCore/kwq/KWQFormData.mm
@@ -26,7 +26,7 @@
  #include "config.h"
  #import "KWQFormData.h"
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  #import "FormData.h"
  
  using WebCore::FormData;
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm

index 9fb9af7999bca6bd7592c9e733df2a58aa5c8c20..5222c12db4530728e08b6e0d9ff032447ae22d69 100644 (file)
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -32,7 +32,7 @@
  #import "FontData.h"
  #import "WebTextRendererFactory.h"
  #import "WebCoreWidgetHolder.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  #import "render_form.h"
  
diff --git a/WebCore/kwq/KWQResourceLoader.mm b/WebCore/kwq/KWQResourceLoader.mm

index e0996113a965780b55a697b5b544abc12eb34f79..5fd91a3085503447d84d6ae7636cccaa48f878ac 100644 (file)
--- a/WebCore/kwq/KWQResourceLoader.mm
+++ b/WebCore/kwq/KWQResourceLoader.mm
@@ -29,7 +29,7 @@
  #import "TransferJob.h"
  #import "KURL.h"
  #import "loader.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  using namespace WebCore;
  
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm

index 46feb597c10d1cc885d6a2c05289e9b19d3ce188..8cf13a2ed0d72743eea04b776a7a75a54ade4dba 100644 (file)
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -32,7 +32,7 @@
  #import "KWQLineEdit.h"
  #import "WebCoreTextArea.h"
  #import "WidgetClient.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  using namespace WebCore;
  
diff --git a/WebCore/loader/Cache.h b/WebCore/loader/Cache.h

index c91293872cc515303a2eb5e22ab93ce2d39b9dd0..f3145897663a74499189fe2edab3d2598c53c87d 100644 (file)
--- a/WebCore/loader/Cache.h
+++ b/WebCore/loader/Cache.h
@@ -30,7 +30,7 @@
  #include "PlatformString.h"
  #include "KWQKIOGlobal.h"
  #include "DeprecatedPtrList.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
  
  class KURL;
  
diff --git a/WebCore/loader/CachedObject.h b/WebCore/loader/CachedObject.h

index 2fa59aacccaee4cb555300a1b3c2eec7444aface..2f45ad3481d7b8f2b4d2ff677572a5251e39500d 100644 (file)
--- a/WebCore/loader/CachedObject.h
+++ b/WebCore/loader/CachedObject.h
@@ -29,7 +29,7 @@
  
  #include "PlatformString.h"
  #include "KWQKIOGlobal.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
  #include <time.h>
  
  #if __OBJC__
diff --git a/WebCore/loader/CachedObjectClientWalker.h b/WebCore/loader/CachedObjectClientWalker.h

index d2b36ea102f9b24f46f41326722b9fa5504f6fac..7c3784324b4d9fa727e256d2af2802d23d3f2d7a 100644 (file)
--- a/WebCore/loader/CachedObjectClientWalker.h
+++ b/WebCore/loader/CachedObjectClientWalker.h
@@ -27,7 +27,7 @@
  #ifndef KHTML_CachedObjectClientWalker_h
  #define KHTML_CachedObjectClientWalker_h
  
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
  
  namespace WebCore {
  
diff --git a/WebCore/loader/Decoder.h b/WebCore/loader/Decoder.h

index e04039b992ad0e5ca0417a122e1d31f14d3171db..cbd0203ac21a4b21fe313b8eaf1ca95d35eb9194 100644 (file)
--- a/WebCore/loader/Decoder.h
+++ b/WebCore/loader/Decoder.h
@@ -22,7 +22,7 @@
  #ifndef KHTMLDECODER_H
  #define KHTMLDECODER_H
  
-#include <kxmlcore/OwnPtr.h>
+#include <wtf/OwnPtr.h>
  #include "TextEncoding.h"
  
  namespace WebCore {
diff --git a/WebCore/loader/DocLoader.h b/WebCore/loader/DocLoader.h

index c8ca163ecdd52dc62c13e4ba6b983073c6a52d10..79f5d73ff8ec193ed3283881ea96138a5b3d07d3 100644 (file)
--- a/WebCore/loader/DocLoader.h
+++ b/WebCore/loader/DocLoader.h
@@ -31,7 +31,7 @@
  #include "KWQKIOGlobal.h"
  #include "DeprecatedPtrList.h"
  #include "DeprecatedStringList.h"
-#include "kxmlcore/HashMap.h"
+#include "wtf/HashMap.h"
  #include "StringHash.h"
  
  class KURL;
diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp

index 1ccb627742ce82d253417a4d9cd77ff729f43b7d..1766dab20e5cbbf90453128bf8994dcff34d932d 100644 (file)
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -38,8 +38,8 @@
  #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 {
  
diff --git a/WebCore/loader/loader.h b/WebCore/loader/loader.h

index f6bedd2ae8c55322bb56110c991ed619da98b649..7f848378367ca7c4fbcdc6a836622459c02d1d59 100644 (file)
--- a/WebCore/loader/loader.h
+++ b/WebCore/loader/loader.h
@@ -28,7 +28,7 @@
  #define KHTML_Loader_h
  
  #include "TransferJobClient.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  #include "DeprecatedPtrList.h"
  
  #if __OBJC__
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h

index fd246806fee1e3f2a0f7de5073dbadf395c355e2..4242a8e2c388ca9c969ed965e703b8ee8ad16d3c 100644 (file)
--- a/WebCore/page/DOMWindow.h
+++ b/WebCore/page/DOMWindow.h
@@ -27,8 +27,8 @@
  #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;
diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h

index e557fa724aa905aa6f49b18f8196719276495ad1..853cabdfadf26155817ba2b879cc3e1e0f83ff6a 100644 (file)
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -38,7 +38,7 @@
  #include "TextAffinity.h"
  #include "TextGranularity.h"
  #include "TransferJobClient.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  #include "RenderObject.h"
  
  class KHTMLSettings;
diff --git a/WebCore/page/FramePrivate.h b/WebCore/page/FramePrivate.h

index fc6004c5cbb5de679b1ba6ae73b55d616d04b4d5..5b2d43ff2d2e320e75d83797e077a24b8e7da27a 100644 (file)
--- a/WebCore/page/FramePrivate.h
+++ b/WebCore/page/FramePrivate.h
@@ -37,7 +37,7 @@
  #include "css_valueimpl.h"
  #include "kjs_proxy.h"
  #include "KWQKIOGlobal.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  
  namespace WebCore {
  
diff --git a/WebCore/page/FrameTree.cpp b/WebCore/page/FrameTree.cpp

index d8d0b9f0b2b29b1426530b02e794ecdd513428be..00e2bcfb6db389800bd1bf3dadead3bba0b6a88f 100644 (file)
--- a/WebCore/page/FrameTree.cpp
+++ b/WebCore/page/FrameTree.cpp
@@ -23,7 +23,7 @@
  
  #include "Frame.h"
  #include "Page.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  #include <stdarg.h>
  
  using std::swap;
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp

index d8462a641832897c54045cfd6709847e32913570..0caf88d459d409f856864938697dd93002b27824 100644 (file)
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -26,7 +26,7 @@
  #include "StringHash.h"
  #include <kjs/collector.h>
  #include <kjs/JSLock.h>
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  
  using namespace KJS;
  
diff --git a/WebCore/page/Page.h b/WebCore/page/Page.h

index a1a79928296ee31566812543a4fc95e078cb34ff..801ab6d2bafc2a6ea8fd29c0bda4e4740122dcb1 100644 (file)
--- a/WebCore/page/Page.h
+++ b/WebCore/page/Page.h
@@ -22,7 +22,7 @@
  #define PAGE_H
  
  #include "PlatformString.h"
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
  
  #if __APPLE__
  #ifdef __OBJC__
diff --git a/WebCore/page/Plugin.h b/WebCore/page/Plugin.h

index 84bec226ad238238a77abbad06d790e337fd0ffa..17d52142774dd78d6dda7e188e5671ba3b1c532f 100644 (file)
--- a/WebCore/page/Plugin.h
+++ b/WebCore/page/Plugin.h
@@ -22,7 +22,7 @@
  #define PLUGIN_H
  
  #include "Shared.h"
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
  
  namespace WebCore {
  
diff --git a/WebCore/platform/Arena.cpp b/WebCore/platform/Arena.cpp

index 6e1f9665ac37a3879bacc11387facf2eff7a699b..c0af2b9672b2c196d6590aa5a8aab2ae9377260d 100644 (file)
--- a/WebCore/platform/Arena.cpp
+++ b/WebCore/platform/Arena.cpp
@@ -49,7 +49,7 @@
  #include <algorithm>
  #include <stdlib.h>
  #include <string.h>
-#include <kxmlcore/FastMalloc.h>
+#include <wtf/FastMalloc.h>
  #include <assert.h>
  
  using std::max;
diff --git a/WebCore/platform/ArrayImpl.h b/WebCore/platform/ArrayImpl.h

index 3337264b89c914ed152121952a5a38c4af73f824..1fc6566e90e7f747fb347bb37252df99c6e9eb83 100644 (file)
--- a/WebCore/platform/ArrayImpl.h
+++ b/WebCore/platform/ArrayImpl.h
@@ -26,7 +26,7 @@
  #ifndef ARRAY_IMPL_H
  #define ARRAY_IMPL_H
  
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
  #include "Shared.h"
  
  namespace WebCore {
diff --git a/WebCore/platform/AtomicString.cpp b/WebCore/platform/AtomicString.cpp

index 80f2b754352cf2805158ca9c224b8efc927ede0f..fe919bfdf49bd0554a686f5f4be5a247baa1a349 100644 (file)
--- a/WebCore/platform/AtomicString.cpp
+++ b/WebCore/platform/AtomicString.cpp
@@ -31,7 +31,7 @@
  #include "StaticConstructors.h"
  #include "StringHash.h"
  #include <kjs/identifier.h>
-#include <kxmlcore/HashSet.h>
+#include <wtf/HashSet.h>
  
  using namespace KJS;
  
diff --git a/WebCore/platform/CharsetNames.cpp b/WebCore/platform/CharsetNames.cpp

index ba2cf37537a4d174f9a9b4056c4448a04db0a14f..045ae7d043e20a9c353c5c324ba80904453904d7 100644 (file)
--- a/WebCore/platform/CharsetNames.cpp
+++ b/WebCore/platform/CharsetNames.cpp
@@ -28,11 +28,11 @@
  #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 {
@@ -43,7 +43,7 @@ struct TextEncodingIDHashTraits : GenericHashTraits<TextEncodingID> {
  
  }
  
-namespace KXMLCore {
+namespace WTF {
  
  template<> struct HashKeyStorageTraits<IntHash<TextEncodingID>, TextEncodingIDHashTraits> {
      typedef IntTypes<sizeof(TextEncodingID)>::SignedType IntType;
diff --git a/WebCore/platform/Color.cpp b/WebCore/platform/Color.cpp

index 0d0f8e54e596c6666307125f79de33ba8e783980..2d7b7ba5be6d7c43617969bf2fdce4da0ef6e2cb 100644 (file)
--- a/WebCore/platform/Color.cpp
+++ b/WebCore/platform/Color.cpp
@@ -27,7 +27,7 @@
  #include "Color.h"
  
  #include "PlatformString.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  #include "ColorData.c"
  
diff --git a/WebCore/platform/DeprecatedPtrListImpl.cpp b/WebCore/platform/DeprecatedPtrListImpl.cpp

index 963185ed57aa8641d6fbf8b8398bf32b163bdbe9..523f6b0dab974b1f0429618f6293ea7002ad7edb 100644 (file)
--- a/WebCore/platform/DeprecatedPtrListImpl.cpp
+++ b/WebCore/platform/DeprecatedPtrListImpl.cpp
@@ -28,7 +28,7 @@
  
  #include <cstddef>
  #include <algorithm>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  class KWQListNode
  {
diff --git a/WebCore/platform/DeprecatedValueListImpl.h b/WebCore/platform/DeprecatedValueListImpl.h

index 3d0482f66be4b3438bc3bd53362b1e185cfaaa75..6e714b3f41b3f327eaf8d1401a4b176362e1d07a 100644 (file)
--- a/WebCore/platform/DeprecatedValueListImpl.h
+++ b/WebCore/platform/DeprecatedValueListImpl.h
@@ -26,7 +26,7 @@
  #ifndef KWQVALUELIST_H_
  #define KWQVALUELIST_H_
  
-#include <kxmlcore/RefPtr.h>
+#include <wtf/RefPtr.h>
  
  class DeprecatedValueListImplNode;
  
diff --git a/WebCore/platform/FontFallbackList.h b/WebCore/platform/FontFallbackList.h

index 2cb6e911be68cb9a9fe38e245c149913ecb855cd..f0b59e2fe43c7e727eb4deda8fd9cf6a8550bb45 100644 (file)
--- a/WebCore/platform/FontFallbackList.h
+++ b/WebCore/platform/FontFallbackList.h
@@ -24,7 +24,7 @@
  // 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 {
  
diff --git a/WebCore/platform/GraphicsContext.h b/WebCore/platform/GraphicsContext.h

index 8552ced3eac41788932164bc6789bf8f6e6d36a5..d84771851d92e6ec43f99bd12fd511b80344ee7c 100644 (file)
--- a/WebCore/platform/GraphicsContext.h
+++ b/WebCore/platform/GraphicsContext.h
@@ -31,7 +31,7 @@
  #include "IntRect.h"
  #include "Pen.h"
  #include "TextDirection.h"
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
  
  #if __APPLE__
  typedef struct CGContext PlatformGraphicsContext;
diff --git a/WebCore/platform/GraphicsTypes.cpp b/WebCore/platform/GraphicsTypes.cpp

index ff466d88bd815f0f87a26bdf84bd262f65c8c6ee..736356f451ef01292015036615e25a947afdfad5 100644 (file)
--- a/WebCore/platform/GraphicsTypes.cpp
+++ b/WebCore/platform/GraphicsTypes.cpp
@@ -27,7 +27,7 @@
  #include "GraphicsTypes.h"
  
  #include "PlatformString.h"
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/platform/Image.h b/WebCore/platform/Image.h

index efca12833d263741eaf263c6f2b1c120088baab3..04462f76adeb8d1b21c970d762f9d569b309ee39 100644 (file)
--- a/WebCore/platform/Image.h
+++ b/WebCore/platform/Image.h
@@ -31,8 +31,8 @@
  #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__
@@ -49,7 +49,7 @@ namespace WebCore {
  // 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 {};
  }
  
diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp

index 763443275fce0ace48f98f74e8d84c18dff73f97..3f2f3e9a3e5173a32ff8271b25cd8dcd9ecfff8a 100644 (file)
--- a/WebCore/platform/KURL.cpp
+++ b/WebCore/platform/KURL.cpp
@@ -28,7 +28,7 @@
  
  #include "PlatformString.h"
  #include "RegularExpression.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  #include <unicode/uidna.h>
  #include <assert.h>
  
diff --git a/WebCore/platform/Logging.cpp b/WebCore/platform/Logging.cpp

index 9ec09a29aee814c7d6400470de02a7256e80881d..77ff95f73429b9485b47c9e192f45adadd9bbac0 100644 (file)
--- a/WebCore/platform/Logging.cpp
+++ b/WebCore/platform/Logging.cpp
@@ -26,14 +26,14 @@
  #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 };
diff --git a/WebCore/platform/Logging.h b/WebCore/platform/Logging.h

index 50b9d8a434f8893720c29e864874e984ec51350a..d3cb4a6b49e1a2e6bb4539a4e416794baaabcc51 100644 (file)
--- a/WebCore/platform/Logging.h
+++ b/WebCore/platform/Logging.h
@@ -26,20 +26,20 @@
  #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
diff --git a/WebCore/platform/PlatformString.h b/WebCore/platform/PlatformString.h

index b8b28f76f71cfbd016d1464e2bb119b7016e99b1..c57bbc4f58c1255e341499999fa08aea6de38b18 100644 (file)
--- a/WebCore/platform/PlatformString.h
+++ b/WebCore/platform/PlatformString.h
@@ -168,7 +168,7 @@ inline bool operator!=(const DeprecatedString& b, const String& a ) { return !(a
  
  }
  
-namespace KXMLCore {
+namespace WTF {
  
      // StrHash is the default hash for String
      template<typename T> struct DefaultHash;
diff --git a/WebCore/platform/PlugInInfoStore.h b/WebCore/platform/PlugInInfoStore.h

index 622f1c68ce5fdb285b7f940dbba0a8ae862f1b7e..6a36953158261137d858bbc07239ce458e2643f0 100644 (file)
--- a/WebCore/platform/PlugInInfoStore.h
+++ b/WebCore/platform/PlugInInfoStore.h
@@ -27,7 +27,7 @@
  #define PlugInInfoStore_H
  
  #include "PlatformString.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  namespace WebCore {
  
diff --git a/WebCore/platform/StreamingTextDecoder.cpp b/WebCore/platform/StreamingTextDecoder.cpp

index 0d7a256f7c549bbc5eac6db5564624553ff8928e..416d5582349d877d83168975e7e8c0dc5a83addf 100644 (file)
--- a/WebCore/platform/StreamingTextDecoder.cpp
+++ b/WebCore/platform/StreamingTextDecoder.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "StreamingTextDecoder.h"
  
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  using std::min;
  
diff --git a/WebCore/platform/StreamingTextDecoder.h b/WebCore/platform/StreamingTextDecoder.h

index 5727b38f7919d3b615823f6570ff4c6abf69f15f..a395ed7b87da4b2bb7709bc7368aabc13d55eecb 100644 (file)
--- a/WebCore/platform/StreamingTextDecoder.h
+++ b/WebCore/platform/StreamingTextDecoder.h
@@ -27,7 +27,7 @@
  #define StreamingTextDecoder_H
  
  #include "TextEncoding.h"
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
  #include <unicode/ucnv.h>
  #include <unicode/utypes.h>
  
diff --git a/WebCore/platform/String.cpp b/WebCore/platform/String.cpp

index 4a13a11fbbf4a6c01d6e544450626728e39e12ea..a1bb5f7207f42ab10b7ba4ee4c2669c17ba5cab9 100644 (file)
--- a/WebCore/platform/String.cpp
+++ b/WebCore/platform/String.cpp
@@ -24,7 +24,7 @@
  #include "PlatformString.h"
  
  #include <kjs/identifier.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  #include <stdarg.h>
  
  using namespace KJS;
diff --git a/WebCore/platform/StringHash.h b/WebCore/platform/StringHash.h

index b5b45fadece72a208d16cdaf3875841a073bf806..119444bacd3dc14945cfb06a1516f6cd5df914ef 100644 (file)
--- a/WebCore/platform/StringHash.h
+++ b/WebCore/platform/StringHash.h
@@ -23,9 +23,9 @@
  
  #include "AtomicStringImpl.h"
  #include "PlatformString.h"
-#include <kxmlcore/HashTraits.h>
+#include <wtf/HashTraits.h>
  
-namespace KXMLCore {
+namespace WTF {
  
      template<typename T> struct StrHash;
  
@@ -211,6 +211,6 @@ namespace KXMLCore {
  
  }
  
-using KXMLCore::CaseInsensitiveHash;
+using WTF::CaseInsensitiveHash;
  
  #endif
diff --git a/WebCore/platform/StringImpl.cpp b/WebCore/platform/StringImpl.cpp

index fe27cfe9d9ec84d09af9d59635945070c1420c6e..c7c4ed1d8e2fa5a84a02a4d515b88d38d57105bb 100644 (file)
--- a/WebCore/platform/StringImpl.cpp
+++ b/WebCore/platform/StringImpl.cpp
@@ -31,12 +31,12 @@
  #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 {
  
diff --git a/WebCore/platform/StringImpl.h b/WebCore/platform/StringImpl.h

index 02da493d4b4d8e85dec7d661e79b92ca224ba27b..14cd72a2c304f26fea11760a48537a9a50d6ca03 100644 (file)
--- a/WebCore/platform/StringImpl.h
+++ b/WebCore/platform/StringImpl.h
@@ -25,8 +25,8 @@
  #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__
@@ -141,7 +141,7 @@ bool equalIgnoringCase(const char*, const StringImpl*);
  
  }
  
-namespace KXMLCore {
+namespace WTF {
  
      // StrHash is the default hash for StringImpl* and RefPtr<StringImpl>
      template<typename T> struct DefaultHash;
diff --git a/WebCore/platform/TextEncoding.cpp b/WebCore/platform/TextEncoding.cpp

index 33cf82ed5b08ac73409de71dae537fe8b5ef2f50..e32b79c1cb723d32e29457b5312971393ebac23a 100644 (file)
--- a/WebCore/platform/TextEncoding.cpp
+++ b/WebCore/platform/TextEncoding.cpp
@@ -27,8 +27,8 @@
  #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>
  
diff --git a/WebCore/platform/Timer.cpp b/WebCore/platform/Timer.cpp

index a66680799da60c11f9efc0b47e53ba55b53d5e0c..f08f8eb00092d3ce0fc3354bd02ca85857c12f93 100644 (file)
--- a/WebCore/platform/Timer.cpp
+++ b/WebCore/platform/Timer.cpp
@@ -29,8 +29,8 @@
  #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;
  
diff --git a/WebCore/platform/Timer.h b/WebCore/platform/Timer.h

index 0f8c7e40907e9ebf0783455b85d7934669406107..581ee82e8ec864f6b8427ee18b6a3c5a935a4538 100644 (file)
--- a/WebCore/platform/Timer.h
+++ b/WebCore/platform/Timer.h
@@ -26,8 +26,8 @@
  #ifndef TIMER_H
  #define TIMER_H
  
-#include <kxmlcore/Noncopyable.h>
-#include <kxmlcore/Vector.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/Vector.h>
  
  namespace WebCore {
  
diff --git a/WebCore/platform/TransferJob.h b/WebCore/platform/TransferJob.h

index f5bc1ff5d173825650230141a5aceea6a8684151..e408403bb003f0d1b883325b5ce8b82bc6b2a890 100644 (file)
--- a/WebCore/platform/TransferJob.h
+++ b/WebCore/platform/TransferJob.h
@@ -29,7 +29,7 @@
  #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;
diff --git a/WebCore/platform/TransferJobInternal.h b/WebCore/platform/TransferJobInternal.h

index a424958ff2d09301d83460aaaf6f3b2f1d6f539f..4dd53960900e5eadb077e987b528b93377b41a00 100644 (file)
--- a/WebCore/platform/TransferJobInternal.h
+++ b/WebCore/platform/TransferJobInternal.h
@@ -29,7 +29,7 @@
  
  #include "KURL.h"
  #include "FormData.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  
  #ifdef WIN32
  typedef void* HANDLE;
diff --git a/WebCore/platform/mac/BlockExceptions.mm b/WebCore/platform/mac/BlockExceptions.mm

index e0bcddfd007294b9019a5a58d9ebd51322cd3cdd..da55e34250587fc41a1883e0f891108c4ad2c673 100644 (file)
--- a/WebCore/platform/mac/BlockExceptions.mm
+++ b/WebCore/platform/mac/BlockExceptions.mm
@@ -25,7 +25,7 @@
  
  #import "config.h"
  #import "BlockExceptions.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  void ReportBlockedObjCException(NSException *localException)
  {
diff --git a/WebCore/platform/mac/ColorMac.mm b/WebCore/platform/mac/ColorMac.mm

index b2dfc06954154e525e57ac21d802471baeabd787..086898bb32fa5ffe93591682b35e86f43f7f0095 100644 (file)
--- a/WebCore/platform/mac/ColorMac.mm
+++ b/WebCore/platform/mac/ColorMac.mm
@@ -26,7 +26,7 @@
  #import "config.h"
  #import "Color.h"
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  @interface WebCoreControlTintObserver : NSObject
  + (void)controlTintDidChange;
diff --git a/WebCore/platform/mac/FontData.mm b/WebCore/platform/mac/FontData.mm

index 4f35f93f9deb0fa05998e57bf7b6d9a0d19fc02b..36130b3a388120998c56652220a09ff9ef0bbd62 100644 (file)
--- a/WebCore/platform/mac/FontData.mm
+++ b/WebCore/platform/mac/FontData.mm
@@ -32,7 +32,7 @@
  #import "Color.h"
  #import "WebCoreTextRenderer.h"
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  #import <ApplicationServices/ApplicationServices.h>
  #import <Cocoa/Cocoa.h>
diff --git a/WebCore/platform/mac/KURLMac.mm b/WebCore/platform/mac/KURLMac.mm

index a1029d771f6e5abcf59e53c42ee19640a63c4369..a3c2f07af3ba20ca9f534e598ad2f77abd585dad 100644 (file)
--- a/WebCore/platform/mac/KURLMac.mm
+++ b/WebCore/platform/mac/KURLMac.mm
@@ -27,8 +27,8 @@
  #import "KURL.h"
  
  #import "FoundationExtras.h"
-#import <kxmlcore/Assertions.h>
-#import <kxmlcore/Vector.h>
+#import <wtf/Assertions.h>
+#import <wtf/Vector.h>
  
  // KURL
  
diff --git a/WebCore/platform/mac/QStringMac.mm b/WebCore/platform/mac/QStringMac.mm

index a5ca8d0de2ad927616809c2ca304c4c89b15a477..266fb739af234fcc3650761cc1cd64cb8666a3e8 100644 (file)
--- a/WebCore/platform/mac/QStringMac.mm
+++ b/WebCore/platform/mac/QStringMac.mm
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "DeprecatedString.h"
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  #import <Foundation/Foundation.h>
  #import "TextEncoding.h"
  
diff --git a/WebCore/platform/mac/SharedTimerMac.cpp b/WebCore/platform/mac/SharedTimerMac.cpp

index d9ad15928308ecce258e35b5e92c904790a16ca3..4b5f21a1007c65f3f1d255642799e210a2a6c8b5 100644 (file)
--- a/WebCore/platform/mac/SharedTimerMac.cpp
+++ b/WebCore/platform/mac/SharedTimerMac.cpp
@@ -27,7 +27,7 @@
  #import "SharedTimer.h"
  
  #include <CoreFoundation/CoreFoundation.h>
-#include <kxmlcore/Assertions.h>
+#include <wtf/Assertions.h>
  
  namespace WebCore {
  
diff --git a/WebCore/platform/mac/TextEncodingMac.cpp b/WebCore/platform/mac/TextEncodingMac.cpp

index 3e6575051e626b8988fd22326d5df7c0f96467ea..83584cc0f10cbcddf142c20e730b062128a0a502 100644 (file)
--- a/WebCore/platform/mac/TextEncodingMac.cpp
+++ b/WebCore/platform/mac/TextEncodingMac.cpp
@@ -26,8 +26,8 @@
  #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 {
diff --git a/WebCore/platform/mac/WebCoreImageRendererFactory.m b/WebCore/platform/mac/WebCoreImageRendererFactory.m

index 8fc5b2eb9a0d165526cb8f20ec015374d676feef..83f6e069426c601da148950e3a99d9e30ed99621 100644 (file)
--- a/WebCore/platform/mac/WebCoreImageRendererFactory.m
+++ b/WebCore/platform/mac/WebCoreImageRendererFactory.m
@@ -25,7 +25,7 @@
  
  #import "config.h"
  #import "WebCoreImageRendererFactory.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  #import "RenderTreeAsText.h"
  
  @implementation WebCoreImageRendererFactory
diff --git a/WebCore/platform/mac/WebCoreKeyGenerator.m b/WebCore/platform/mac/WebCoreKeyGenerator.m

index f44cbc885c3e9f012b62c643a2108704960ae29a..c1004a70d6b87aa7490353f8b584b18b2453111b 100644 (file)
--- a/WebCore/platform/mac/WebCoreKeyGenerator.m
+++ b/WebCore/platform/mac/WebCoreKeyGenerator.m
@@ -26,7 +26,7 @@
  #import "config.h"
  #import "WebCoreKeyGenerator.h"
  
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  static WebCoreKeyGenerator *sharedGenerator;
  
diff --git a/WebCore/platform/mac/WebCoreTextArea.mm b/WebCore/platform/mac/WebCoreTextArea.mm

index 3940bceb4b8b03d57a94fcb9cb0030487f41d5a9..95cd1f8493245710895dda3fe67fdf3f317c9f32 100644 (file)
--- a/WebCore/platform/mac/WebCoreTextArea.mm
+++ b/WebCore/platform/mac/WebCoreTextArea.mm
@@ -35,7 +35,7 @@
  #import "FrameMac.h"
  #import "WebCoreFrameBridge.h"
  #import "render_replaced.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  using namespace std;
  using namespace WebCore;
diff --git a/WebCore/platform/mac/WebCoreTextField.mm b/WebCore/platform/mac/WebCoreTextField.mm

index 0c5c507f85ae8213e9d3dc6df7e710c333c85c3e..7dd42db18fa2ba315b2bfc03560f2d737c4525c3 100644 (file)
--- a/WebCore/platform/mac/WebCoreTextField.mm
+++ b/WebCore/platform/mac/WebCoreTextField.mm
@@ -32,7 +32,7 @@
  #import "WebCoreFrameBridge.h"
  #import "WebCoreWidgetHolder.h"
  #import "render_form.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  using namespace WebCore;
  
diff --git a/WebCore/platform/mac/WebTextRendererFactory.h b/WebCore/platform/mac/WebTextRendererFactory.h

index 3f7783bf405d7b16c5b943340c2cfa57044ce092..99018e9a9b8d6c79a848fc810a28d9598db16cb9 100644 (file)
--- a/WebCore/platform/mac/WebTextRendererFactory.h
+++ b/WebCore/platform/mac/WebTextRendererFactory.h
@@ -57,7 +57,7 @@
  class NSFont;
  #endif
  
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  
  namespace WebCore {
      class FontData;
diff --git a/WebCore/platform/mac/WebTextRendererFactory.mm b/WebCore/platform/mac/WebTextRendererFactory.mm

index 4a30a9bf9dfb7eddf2248592a55a60c9a34a7911..cb8dc48bf0df30ea2ae61954a6bf715d6091a281 100644 (file)
--- a/WebCore/platform/mac/WebTextRendererFactory.mm
+++ b/WebCore/platform/mac/WebTextRendererFactory.mm
@@ -36,7 +36,7 @@
  #import "Page.h"
  #import "WebCoreFrameBridge.h"
  #import "WebCoreStringTruncator.h"
-#import <kxmlcore/Assertions.h>
+#import <wtf/Assertions.h>
  
  #import <mach-o/dyld.h>
  
diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp

index 5e419f796f337ca743397a39b5687d0f28f0c49e..da53a136693fb5c8683070baeee5f271880286c4 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -104,7 +104,7 @@ void Widget::disableFlushDrawing() { notImplemented(); }
  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(); }
diff --git a/WebCore/rendering/InlineTextBox.cpp b/WebCore/rendering/InlineTextBox.cpp

index 2e95547acc3426a244a37289d51983c5c56dfcf6..2ae422a3110b2ddf0f8b967c98446865313b5a8c 100644 (file)
--- a/WebCore/rendering/InlineTextBox.cpp
+++ b/WebCore/rendering/InlineTextBox.cpp
@@ -32,7 +32,7 @@
  #include "break_lines.h"
  #include "Range.h"
  #include "RenderArena.h"
-#include <kxmlcore/AlwaysInline.h>
+#include <wtf/AlwaysInline.h>
  
  using namespace std;
  
diff --git a/WebCore/rendering/RenderText.cpp b/WebCore/rendering/RenderText.cpp

index df3564f02b22281269760eb78c1cb37ba4b33054..a4e99b7ee2af82949b8a5a849c3f07568378ade3 100644 (file)
--- a/WebCore/rendering/RenderText.cpp
+++ b/WebCore/rendering/RenderText.cpp
@@ -32,7 +32,7 @@
  #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;
diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp

index 73342db9e856217d404239e5f37f0fdf40ed05e6..7e00863d6ad034afa603b055ffcea940db57ed8a 100644 (file)
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -35,7 +35,7 @@
  #include "RenderTableCell.h"
  #include "SelectionController.h"
  #include "render_replaced.h"
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  #if SVG_SUPPORT
  #include "KCanvasTreeDebug.h"
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp

index 2b2feac8e7c551b031de0fd4a95d0e7e0c44fab2..986c1f93971bf5f258c9845b7295ac591eeed72c 100644 (file)
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -31,7 +31,7 @@
  #include "RenderArena.h"
  #include "RenderCanvas.h"
  #include "break_lines.h"
-#include <kxmlcore/AlwaysInline.h>
+#include <wtf/AlwaysInline.h>
  
  using namespace std;
  
diff --git a/WebCore/xml/XSLTProcessor.h b/WebCore/xml/XSLTProcessor.h

index ac78a06a8f92416afe6c90c96af95c9031de777e..08e8e41d680beed63f75cc6372da2e00b9d6ec61 100644 (file)
--- a/WebCore/xml/XSLTProcessor.h
+++ b/WebCore/xml/XSLTProcessor.h
@@ -27,7 +27,7 @@
  
  #include "StringHash.h"
  #include "XSLStyleSheet.h"
-#include <kxmlcore/HashMap.h>
+#include <wtf/HashMap.h>
  #include <libxml/parserInternals.h>
  #include <libxslt/documents.h>
  
diff --git a/WebCore/xpath/impl/XPathExpressionNode.h b/WebCore/xpath/impl/XPathExpressionNode.h

index 9e3d96dc45dfa5e627e0d528976f4476be2ab517..1d19bc62b4c57a41fc4b19bc1d004f9028ab324b 100644 (file)
--- a/WebCore/xpath/impl/XPathExpressionNode.h
+++ b/WebCore/xpath/impl/XPathExpressionNode.h
@@ -31,8 +31,8 @@
  #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;
diff --git a/WebCore/xpath/impl/XPathParser.h b/WebCore/xpath/impl/XPathParser.h

index a503516e7a9f03ff1f0881def7fd5f96c7491ce4..8c6ec6421aca2f95c8037f8baf1057337874fc04 100644 (file)
--- a/WebCore/xpath/impl/XPathParser.h
+++ b/WebCore/xpath/impl/XPathParser.h
@@ -28,7 +28,7 @@
  
  #if XPATH_SUPPORT
  
-#include <kxmlcore/Noncopyable.h>
+#include <wtf/Noncopyable.h>
  
  #include "StringHash.h"
  #include "PlatformString.h"
diff --git a/WebCore/xpath/impl/XPathPath.h b/WebCore/xpath/impl/XPathPath.h

index da1aa1d84dc33d61e51c13916b0d9c363485a23c..9341d23f14d5153f4b0dd96036085ea99d8ececb 100644 (file)
--- a/WebCore/xpath/impl/XPathPath.h
+++ b/WebCore/xpath/impl/XPathPath.h
@@ -31,7 +31,7 @@
  #include "XPathExpressionNode.h"
  #include "XPathStep.h"
  
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  extern int xpathyyparse(void*);
  
diff --git a/WebCore/xpath/impl/XPathUtil.h b/WebCore/xpath/impl/XPathUtil.h

index 20308ba891cb1e5e31689a30c871ebf6d7c3f013..a10f6dd93197396d6ca4838956725cf9f05aa1d6 100644 (file)
--- a/WebCore/xpath/impl/XPathUtil.h
+++ b/WebCore/xpath/impl/XPathUtil.h
@@ -31,7 +31,7 @@
  #include "PlatformString.h"
  #include "Node.h"
  
-#include <kxmlcore/Vector.h>
+#include <wtf/Vector.h>
  
  namespace WebCore {
  
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog

index afbde8bfd497bf3bad719df007acfb13ae96a975..869f5ad07ee2ecd695ff43fb760472ecd6d9096a 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+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.
diff --git a/WebKit/Misc/WebKitLogging.h b/WebKit/Misc/WebKitLogging.h

index 310cb8b10eb0b849bad2d2f0b4e016c09cd217f9..4f51d28a1e191979c67dab0e0dd7c5bb7d165bc7 100644 (file)
--- a/WebKit/Misc/WebKitLogging.h
+++ b/WebKit/Misc/WebKitLogging.h
@@ -32,27 +32,27 @@
  #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);
diff --git a/WebKit/Misc/WebKitLogging.m b/WebKit/Misc/WebKitLogging.m

index 331dd3703e48f2c27ed6dd48d64f2c844f329595..05bac1cc306c7ea439d26077136693738b593a69 100644 (file)
--- a/WebKit/Misc/WebKitLogging.m
+++ b/WebKit/Misc/WebKitLogging.m
@@ -28,39 +28,39 @@
  
  #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;
      }
  }
author	mjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Tue, 9 May 2006 09:27:55 +0000 (09:27 +0000)
committer	mjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Tue, 9 May 2006 09:27:55 +0000 (09:27 +0000)
JavaScriptCore/ChangeLog		patch \| blob \| history
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj		patch \| blob \| history
JavaScriptCore/bindings/c/c_instance.cpp		patch \| blob \| history
JavaScriptCore/bindings/objc/WebScriptObject.mm		patch \| blob \| history
JavaScriptCore/kjs/JSImmediate.h		patch \| blob \| history
JavaScriptCore/kjs/Parser.cpp		patch \| blob \| history
JavaScriptCore/kjs/Parser.h		patch \| blob \| history
JavaScriptCore/kjs/array_object.cpp		patch \| blob \| history
JavaScriptCore/kjs/collector.cpp		patch \| blob \| history
JavaScriptCore/kjs/collector.h		patch \| blob \| history
JavaScriptCore/kjs/config.h		patch \| blob \| history
JavaScriptCore/kjs/function.cpp		patch \| blob \| history
JavaScriptCore/kjs/function.h		patch \| blob \| history
JavaScriptCore/kjs/identifier.cpp		patch \| blob \| history
JavaScriptCore/kjs/internal.cpp		patch \| blob \| history
JavaScriptCore/kjs/internal.h		patch \| blob \| history
JavaScriptCore/kjs/lexer.cpp		patch \| blob \| history
JavaScriptCore/kjs/lookup.cpp		patch \| blob \| history
JavaScriptCore/kjs/nodes.cpp		patch \| blob \| history
JavaScriptCore/kjs/nodes.h		patch \| blob \| history
JavaScriptCore/kjs/number_object.cpp		patch \| blob \| history
JavaScriptCore/kjs/object.h		patch \| blob \| history
JavaScriptCore/kjs/property_map.cpp		patch \| blob \| history
JavaScriptCore/kjs/property_map.h		patch \| blob \| history
JavaScriptCore/kjs/string_object.cpp		patch \| blob \| history
JavaScriptCore/kjs/testkjs.cpp		patch \| blob \| history
JavaScriptCore/kjs/ustring.cpp		patch \| blob \| history
JavaScriptCore/kjs/ustring.h		patch \| blob \| history
JavaScriptCore/pcre/pcre_get.c		patch \| blob \| history
JavaScriptCore/wtf/AlwaysInline.h	[moved from JavaScriptCore/kxmlcore/AlwaysInline.h with 100% similarity]	patch \| blob \| history
JavaScriptCore/wtf/Assertions.cpp	[moved from JavaScriptCore/kxmlcore/Assertions.cpp with 90% similarity]	patch \| blob \| history
JavaScriptCore/wtf/Assertions.h	[moved from JavaScriptCore/kxmlcore/Assertions.h with 82% similarity]	patch \| blob \| history
JavaScriptCore/wtf/FastMalloc.cpp	[moved from JavaScriptCore/kxmlcore/FastMalloc.cpp with 98% similarity]	patch \| blob \| history
JavaScriptCore/wtf/FastMalloc.h	[moved from JavaScriptCore/kxmlcore/FastMalloc.h with 92% similarity]	patch \| blob \| history
JavaScriptCore/wtf/FastMallocInternal.h	[moved from JavaScriptCore/kxmlcore/FastMallocInternal.h with 98% similarity]	patch \| blob \| history
JavaScriptCore/wtf/Forward.h	[moved from JavaScriptCore/kxmlcore/Forward.h with 88% similarity]	patch \| blob \| history
JavaScriptCore/wtf/HashCountedSet.h	[moved from JavaScriptCore/kxmlcore/HashCountedSet.h with 99% similarity]	patch \| blob \| history
JavaScriptCore/wtf/HashFunctions.h	[moved from JavaScriptCore/kxmlcore/HashFunctions.h with 96% similarity]	patch \| blob \| history
JavaScriptCore/wtf/HashMap.h	[moved from JavaScriptCore/kxmlcore/HashMap.h with 99% similarity]	patch \| blob \| history
JavaScriptCore/wtf/HashSet.h	[moved from JavaScriptCore/kxmlcore/HashSet.h with 99% similarity]	patch \| blob \| history
JavaScriptCore/wtf/HashTable.cpp	[moved from JavaScriptCore/kxmlcore/HashTable.cpp with 97% similarity]	patch \| blob \| history
JavaScriptCore/wtf/HashTable.h	[moved from JavaScriptCore/kxmlcore/HashTable.h with 99% similarity]	patch \| blob \| history
JavaScriptCore/wtf/HashTraits.h	[moved from JavaScriptCore/kxmlcore/HashTraits.h with 98% similarity]	patch \| blob \| history
JavaScriptCore/wtf/ListRefPtr.h	[moved from JavaScriptCore/kxmlcore/ListRefPtr.h with 95% similarity]	patch \| blob \| history
JavaScriptCore/wtf/Noncopyable.h	[moved from JavaScriptCore/kxmlcore/Noncopyable.h with 91% similarity]	patch \| blob \| history
JavaScriptCore/wtf/OwnArrayPtr.h	[moved from JavaScriptCore/kxmlcore/OwnArrayPtr.h with 94% similarity]	patch \| blob \| history
JavaScriptCore/wtf/OwnPtr.h	[moved from JavaScriptCore/kxmlcore/OwnPtr.h with 93% similarity]	patch \| blob \| history
JavaScriptCore/wtf/PassRefPtr.h	[moved from JavaScriptCore/kxmlcore/PassRefPtr.h with 97% similarity]	patch \| blob \| history
JavaScriptCore/wtf/Platform.h	[moved from JavaScriptCore/kxmlcore/Platform.h with 100% similarity]	patch \| blob \| history
JavaScriptCore/wtf/RefPtr.h	[moved from JavaScriptCore/kxmlcore/RefPtr.h with 97% similarity]	patch \| blob \| history
JavaScriptCore/wtf/TCPageMap.h	[moved from JavaScriptCore/kxmlcore/TCPageMap.h with 100% similarity]	patch \| blob \| history
JavaScriptCore/wtf/TCSpinLock.h	[moved from JavaScriptCore/kxmlcore/TCSpinLock.h with 100% similarity]	patch \| blob \| history
JavaScriptCore/wtf/TCSystemAlloc.cpp	[moved from JavaScriptCore/kxmlcore/TCSystemAlloc.cpp with 98% similarity]	patch \| blob \| history
JavaScriptCore/wtf/TCSystemAlloc.h	[moved from JavaScriptCore/kxmlcore/TCSystemAlloc.h with 100% similarity]	patch \| blob \| history
JavaScriptCore/wtf/UnusedParam.h	[moved from JavaScriptCore/kxmlcore/UnusedParam.h with 100% similarity]	patch \| blob \| history
JavaScriptCore/wtf/Vector.h	[moved from JavaScriptCore/kxmlcore/Vector.h with 99% similarity]	patch \| blob \| history
JavaScriptCore/wtf/VectorTraits.h	[moved from JavaScriptCore/kxmlcore/VectorTraits.h with 97% similarity]	patch \| blob \| history
JavaScriptCore/wtf/unicode/Unicode.h	[moved from JavaScriptCore/kxmlcore/unicode/Unicode.h with 100% similarity]	patch \| blob \| history
JavaScriptCore/wtf/unicode/UnicodeCategory.h	[moved from JavaScriptCore/kxmlcore/unicode/UnicodeCategory.h with 99% similarity]	patch \| blob \| history
JavaScriptCore/wtf/unicode/icu/UnicodeIcu.h	[moved from JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h with 99% similarity]	patch \| blob \| history
JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h	[moved from JavaScriptCore/kxmlcore/unicode/qt4/UnicodeQt4.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/ChangeLog		patch \| blob \| history
JavaScriptGlue/config.h		patch \| blob \| history
JavaScriptGlue/wtf/AlwaysInline.h	[moved from JavaScriptGlue/kxmlcore/AlwaysInline.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/Assertions.h	[moved from JavaScriptGlue/kxmlcore/Assertions.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/FastMalloc.h	[moved from JavaScriptGlue/kxmlcore/FastMalloc.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/Forward.h	[moved from JavaScriptGlue/kxmlcore/Forward.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/HashCountedSet.h	[moved from JavaScriptGlue/kxmlcore/HashCountedSet.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/HashSet.h	[moved from JavaScriptGlue/kxmlcore/HashSet.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/Noncopyable.h	[moved from JavaScriptGlue/kxmlcore/Noncopyable.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/OwnArrayPtr.h	[moved from JavaScriptGlue/kxmlcore/OwnArrayPtr.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/OwnPtr.h	[moved from JavaScriptGlue/kxmlcore/OwnPtr.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/PassRefPtr.h	[moved from JavaScriptGlue/kxmlcore/PassRefPtr.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/Platform.h	[moved from JavaScriptGlue/kxmlcore/Platform.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/RefPtr.h	[moved from JavaScriptGlue/kxmlcore/RefPtr.h with 100% similarity]	patch \| blob \| history
JavaScriptGlue/wtf/Vector.h	[moved from JavaScriptGlue/kxmlcore/Vector.h with 100% similarity]	patch \| blob \| history
WebCore/ChangeLog		patch \| blob \| history
WebCore/ForwardingHeaders/wtf/AlwaysInline.h	[moved from WebCore/ForwardingHeaders/kxmlcore/AlwaysInline.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/Assertions.h	[moved from WebCore/ForwardingHeaders/kxmlcore/Assertions.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/FastMalloc.h	[moved from WebCore/ForwardingHeaders/kxmlcore/FastMalloc.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/Forward.h	[moved from WebCore/ForwardingHeaders/kxmlcore/Forward.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/HashCountedSet.h	[moved from WebCore/ForwardingHeaders/kxmlcore/HashCountedSet.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/HashMap.h	[moved from WebCore/ForwardingHeaders/kxmlcore/HashMap.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/HashSet.h	[moved from WebCore/ForwardingHeaders/kxmlcore/HashSet.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/HashTraits.h	[moved from WebCore/ForwardingHeaders/kxmlcore/HashTraits.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/Noncopyable.h	[moved from WebCore/ForwardingHeaders/kxmlcore/Noncopyable.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h	[moved from WebCore/ForwardingHeaders/kxmlcore/OwnArrayPtr.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/OwnPtr.h	[moved from WebCore/ForwardingHeaders/kxmlcore/OwnPtr.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/PassRefPtr.h	[moved from WebCore/ForwardingHeaders/kxmlcore/PassRefPtr.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/Platform.h	[moved from WebCore/ForwardingHeaders/kxmlcore/Platform.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/RefPtr.h	[moved from WebCore/ForwardingHeaders/kxmlcore/RefPtr.h with 100% similarity]	patch \| blob \| history
WebCore/ForwardingHeaders/wtf/Vector.h	[moved from WebCore/ForwardingHeaders/kxmlcore/Vector.h with 100% similarity]	patch \| blob \| history
WebCore/bindings/js/JSHTMLElementWrapperFactory.h		patch \| blob \| history
WebCore/bindings/js/kjs_binding.cpp		patch \| blob \| history
WebCore/bindings/js/kjs_window.h		patch \| blob \| history
WebCore/bindings/objc/DOMImplementationFront.h		patch \| blob \| history
WebCore/bridge/JavaAppletWidget.h		patch \| blob \| history
WebCore/bridge/mac/WebCoreFrameNamespaces.mm		patch \| blob \| history
WebCore/bridge/mac/WebCorePageBridge.mm		patch \| blob \| history
WebCore/bridge/mac/WebCoreStringTruncator.mm		patch \| blob \| history
WebCore/bridge/mac/WebCoreViewFactory.m		patch \| blob \| history
WebCore/config.h		patch \| blob \| history
WebCore/css/css_base.h		patch \| blob \| history
WebCore/css/css_valueimpl.h		patch \| blob \| history
WebCore/css/csshelper.cpp		patch \| blob \| history
WebCore/css/cssparser.h		patch \| blob \| history
WebCore/dom/DOMImplementation.h		patch \| blob \| history
WebCore/dom/Document.h		patch \| blob \| history
WebCore/dom/NamedNodeMap.h		patch \| blob \| history
WebCore/dom/Node.h		patch \| blob \| history
WebCore/dom/NodeList.h		patch \| blob \| history
WebCore/dom/QualifiedName.cpp		patch \| blob \| history
WebCore/dom/Range.h		patch \| blob \| history
WebCore/dom/StyledElement.cpp		patch \| blob \| history
WebCore/dom/dom2_traversalimpl.h		patch \| blob \| history
WebCore/dom/xml_tokenizer.h		patch \| blob \| history
WebCore/editing/RebalanceWhitespaceCommand.cpp		patch \| blob \| history
WebCore/editing/RemoveCSSPropertyCommand.cpp		patch \| blob \| history
WebCore/editing/RemoveNodeAttributeCommand.cpp		patch \| blob \| history
WebCore/editing/RemoveNodeCommand.cpp		patch \| blob \| history
WebCore/editing/RemoveNodePreservingChildrenCommand.cpp		patch \| blob \| history
WebCore/editing/ReplaceSelectionCommand.h		patch \| blob \| history
WebCore/editing/Selection.cpp		patch \| blob \| history
WebCore/editing/SetNodeAttributeCommand.cpp		patch \| blob \| history
WebCore/editing/SplitElementCommand.cpp		patch \| blob \| history
WebCore/editing/SplitTextNodeCommand.cpp		patch \| blob \| history
WebCore/editing/SplitTextNodeContainingElementCommand.cpp		patch \| blob \| history
WebCore/editing/TextIterator.h		patch \| blob \| history
WebCore/editing/htmlediting.h		patch \| blob \| history
WebCore/editing/markup.h		patch \| blob \| history
WebCore/html/CanvasGradient.h		patch \| blob \| history
WebCore/html/CanvasRenderingContext2D.h		patch \| blob \| history
WebCore/html/CanvasStyle.cpp		patch \| blob \| history
WebCore/html/HTMLCollection.h		patch \| blob \| history
WebCore/html/HTMLElementFactory.h		patch \| blob \| history
WebCore/kcanvas/KCanvasFilters.cpp		patch \| blob \| history
WebCore/kcanvas/KCanvasPath.h		patch \| blob \| history
WebCore/kcanvas/RenderPath.cpp		patch \| blob \| history
WebCore/kcanvas/RenderSVGImage.cpp		patch \| blob \| history
WebCore/kcanvas/RenderSVGText.cpp		patch \| blob \| history
WebCore/kcanvas/device/quartz/KCanvasItemQuartz.mm		patch \| blob \| history
WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm		patch \| blob \| history
WebCore/kcanvas/device/quartz/QuartzSupport.mm		patch \| blob \| history
WebCore/ksvg2/misc/KSVGTimeScheduler.h		patch \| blob \| history
WebCore/ksvg2/misc/SVGDocumentExtensions.h		patch \| blob \| history
WebCore/ksvg2/scripts/make_names.pl		patch \| blob \| history
WebCore/ksvg2/svg/SVGDOMImplementation.cpp		patch \| blob \| history
WebCore/ksvg2/svg/SVGExternalResourcesRequired.h		patch \| blob \| history
WebCore/ksvg2/svg/SVGFilterPrimitiveStandardAttributes.cpp		patch \| blob \| history
WebCore/ksvg2/svg/SVGForeignObjectElement.cpp		patch \| blob \| history
WebCore/ksvg2/svg/SVGImageElement.cpp		patch \| blob \| history
WebCore/ksvg2/svg/SVGMaskElement.cpp		patch \| blob \| history
WebCore/ksvg2/svg/SVGStyledElement.cpp		patch \| blob \| history
WebCore/ksvg2/svg/SVGTests.h		patch \| blob \| history
WebCore/ksvg2/svg/SVGTransform.h		patch \| blob \| history
WebCore/ksvg2/svg/SVGTransformable.cpp		patch \| blob \| history
WebCore/kwq/AccessibilityObjectCache.h		patch \| blob \| history
WebCore/kwq/KWQCString.cpp		patch \| blob \| history
WebCore/kwq/KWQFormData.mm		patch \| blob \| history
WebCore/kwq/KWQListBox.mm		patch \| blob \| history
WebCore/kwq/KWQResourceLoader.mm		patch \| blob \| history
WebCore/kwq/KWQTextEdit.mm		patch \| blob \| history
WebCore/loader/Cache.h		patch \| blob \| history
WebCore/loader/CachedObject.h		patch \| blob \| history
WebCore/loader/CachedObjectClientWalker.h		patch \| blob \| history
WebCore/loader/Decoder.h		patch \| blob \| history
WebCore/loader/DocLoader.h		patch \| blob \| history
WebCore/loader/loader.cpp		patch \| blob \| history
WebCore/loader/loader.h		patch \| blob \| history
WebCore/page/DOMWindow.h		patch \| blob \| history
WebCore/page/Frame.h		patch \| blob \| history
WebCore/page/FramePrivate.h		patch \| blob \| history
WebCore/page/FrameTree.cpp		patch \| blob \| history
WebCore/page/Page.cpp		patch \| blob \| history
WebCore/page/Page.h		patch \| blob \| history
WebCore/page/Plugin.h		patch \| blob \| history
WebCore/platform/Arena.cpp		patch \| blob \| history
WebCore/platform/ArrayImpl.h		patch \| blob \| history
WebCore/platform/AtomicString.cpp		patch \| blob \| history
WebCore/platform/CharsetNames.cpp		patch \| blob \| history
WebCore/platform/Color.cpp		patch \| blob \| history
WebCore/platform/DeprecatedPtrListImpl.cpp		patch \| blob \| history
WebCore/platform/DeprecatedValueListImpl.h		patch \| blob \| history
WebCore/platform/FontFallbackList.h		patch \| blob \| history
WebCore/platform/GraphicsContext.h		patch \| blob \| history
WebCore/platform/GraphicsTypes.cpp		patch \| blob \| history
WebCore/platform/Image.h		patch \| blob \| history
WebCore/platform/KURL.cpp		patch \| blob \| history
WebCore/platform/Logging.cpp		patch \| blob \| history
WebCore/platform/Logging.h		patch \| blob \| history
WebCore/platform/PlatformString.h		patch \| blob \| history
WebCore/platform/PlugInInfoStore.h		patch \| blob \| history
WebCore/platform/StreamingTextDecoder.cpp		patch \| blob \| history
WebCore/platform/StreamingTextDecoder.h		patch \| blob \| history
WebCore/platform/String.cpp		patch \| blob \| history
WebCore/platform/StringHash.h		patch \| blob \| history
WebCore/platform/StringImpl.cpp		patch \| blob \| history
WebCore/platform/StringImpl.h		patch \| blob \| history
WebCore/platform/TextEncoding.cpp		patch \| blob \| history
WebCore/platform/Timer.cpp		patch \| blob \| history
WebCore/platform/Timer.h		patch \| blob \| history
WebCore/platform/TransferJob.h		patch \| blob \| history
WebCore/platform/TransferJobInternal.h		patch \| blob \| history
WebCore/platform/mac/BlockExceptions.mm		patch \| blob \| history
WebCore/platform/mac/ColorMac.mm		patch \| blob \| history
WebCore/platform/mac/FontData.mm		patch \| blob \| history
WebCore/platform/mac/KURLMac.mm		patch \| blob \| history
WebCore/platform/mac/QStringMac.mm		patch \| blob \| history
WebCore/platform/mac/SharedTimerMac.cpp		patch \| blob \| history
WebCore/platform/mac/TextEncodingMac.cpp		patch \| blob \| history
WebCore/platform/mac/WebCoreImageRendererFactory.m		patch \| blob \| history
WebCore/platform/mac/WebCoreKeyGenerator.m		patch \| blob \| history
WebCore/platform/mac/WebCoreTextArea.mm		patch \| blob \| history
WebCore/platform/mac/WebCoreTextField.mm		patch \| blob \| history
WebCore/platform/mac/WebTextRendererFactory.h		patch \| blob \| history
WebCore/platform/mac/WebTextRendererFactory.mm		patch \| blob \| history
WebCore/platform/win/TemporaryLinkStubs.cpp		patch \| blob \| history
WebCore/rendering/InlineTextBox.cpp		patch \| blob \| history
WebCore/rendering/RenderText.cpp		patch \| blob \| history
WebCore/rendering/RenderTreeAsText.cpp		patch \| blob \| history
WebCore/rendering/bidi.cpp		patch \| blob \| history
WebCore/xml/XSLTProcessor.h		patch \| blob \| history
WebCore/xpath/impl/XPathExpressionNode.h		patch \| blob \| history
WebCore/xpath/impl/XPathParser.h		patch \| blob \| history
WebCore/xpath/impl/XPathPath.h		patch \| blob \| history
WebCore/xpath/impl/XPathUtil.h		patch \| blob \| history
WebKit/ChangeLog		patch \| blob \| history
WebKit/Misc/WebKitLogging.h		patch \| blob \| history
WebKit/Misc/WebKitLogging.m		patch \| blob \| history