JavaScriptCore:
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Apr 2006 04:46:13 +0000 (04:46 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Apr 2006 04:46:13 +0000 (04:46 +0000)
        - another attempt to fix Windows build -- Vector in Forward.h was not working

        * kxmlcore/Forward.h: Remove Vector.
        * kxmlcore/Vector.h: Add back default arguments, remove include of
        Forward.h.

WebCore:

        - try to fix Windows build

        * html/HTMLCollection.h: Add back include of Vector.h.
        * page/Frame.h: Ditto.
        * platform/Timer.h: Ditto.

        - more changes for no-SVG (not working yet though)

        * editing/CompositeEditCommand.h: Added css_valueimpl.h include.

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

JavaScriptCore/ChangeLog
JavaScriptCore/kxmlcore/Forward.h
JavaScriptCore/kxmlcore/Vector.h
WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/editing/CompositeEditCommand.h
WebCore/html/HTMLCollection.h
WebCore/page/Frame.h
WebCore/platform/Timer.h

index 73283fbbf0500c5d423ffc8ec23dd0c4940de4ca..43a68ecf85a9d900563f841e8d6afd196c26a67f 100644 (file)
@@ -1,3 +1,11 @@
+2006-04-11  Darin Adler  <darin@apple.com>
+
+        - another attempt to fix Windows build -- Vector in Forward.h was not working
+
+        * kxmlcore/Forward.h: Remove Vector.
+        * kxmlcore/Vector.h: Add back default arguments, remove include of
+        Forward.h.
+
 2006-04-11  Darin Adler  <darin@apple.com>
 
         - try to fix Windows build -- HashForward.h was not working
index bf915a035b7cd7a53a2e845fd80a8599095ca16d..fbe97720549a988a6a42f7ff0f5a310d95c0aa02 100644 (file)
@@ -29,7 +29,6 @@ namespace KXMLCore {
     template<typename T> class OwnPtr;
     template<typename T> class PassRefPtr;
     template<typename T> class RefPtr;
-    template<typename T, size_t inlineCapacity = 0> class Vector;
 }
 
 using KXMLCore::ListRefPtr;
@@ -37,6 +36,5 @@ using KXMLCore::OwnArrayPtr;
 using KXMLCore::OwnPtr;
 using KXMLCore::PassRefPtr;
 using KXMLCore::RefPtr;
-using KXMLCore::Vector;
 
 #endif
index ea2ad6d7c38194a47c44874ae36d6f317ca9821a..c62897bbc7d48e855c5468b152856c0887260dd5 100644 (file)
@@ -24,7 +24,6 @@
 #define KXMLCORE_VECTOR_H
 
 #include "Assertions.h"
-#include "Forward.h"
 #include "VectorTraits.h"
 #include <limits>
 #include <stdlib.h>
@@ -302,7 +301,7 @@ namespace KXMLCore {
         char m_inlineBuffer[m_inlineBufferSize];
     };
 
-    template<typename T, size_t inlineCapacity>
+    template<typename T, size_t inlineCapacity = 0>
     class Vector {
     private:
         typedef VectorBuffer<T, inlineCapacity> Impl;
index 83e3221dd27a8c7370d95c69d7ea672bfd4ade63..bf8505fc979c59578b129640bcf0f9155bb43ee5 100644 (file)
@@ -1,3 +1,15 @@
+2006-04-11  Darin Adler  <darin@apple.com>
+
+        - try to fix Windows build
+
+        * html/HTMLCollection.h: Add back include of Vector.h.
+        * page/Frame.h: Ditto.
+        * platform/Timer.h: Ditto.
+
+        - more changes for no-SVG (not working yet though)
+
+        * editing/CompositeEditCommand.h: Added css_valueimpl.h include.
+
 2006-04-11  Darin Adler  <darin@apple.com>
 
         - try to fix no-SVG build
index 73dcbaadcc6060d7c1d95c4236f065ed10bc58c3..3209230c5a2ac8a8adaad6b53fd8ea8708344e88 100644 (file)
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
                                GCC_PREFIX_HEADER = WebCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       SVG_SUPPORT,
-                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
                                HEADER_SEARCH_PATHS = (
                                        ForwardingHeaders,
                                        .,
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
                                GCC_PREFIX_HEADER = WebCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       SVG_SUPPORT,
-                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
                                HEADER_SEARCH_PATHS = (
                                        ForwardingHeaders,
                                        .,
                                DYLIB_CURRENT_VERSION = 1;
                                FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks";
                                GCC_PREFIX_HEADER = WebCorePrefix.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(DEBUG_DEFINES)",
-                                       SVG_SUPPORT,
-                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_DEFINES)";
                                HEADER_SEARCH_PATHS = (
                                        ForwardingHeaders,
                                        .,
index 51e32963c54d43ec73d327a661086c411dcb811f..12723a14c32fd2a3014f4540397fe9362ae6bad2 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef __composite_edit_command_h__
-#define __composite_edit_command_h__
+#ifndef composite_edit_command_h__
+#define composite_edit_command_h__
 
 #include "EditCommand.h"
-#include "qvaluelist.h"
+#include "css_valueimpl.h"
 
 namespace WebCore {
     class CSSStyleDeclaration;
index 630242ab22846b308eacb989d2b9bbd0d6428f10..22b1a1a9984241565f6d9124b7cd3503b99362fa 100644 (file)
@@ -28,6 +28,7 @@
 #include "Shared.h"
 #include <kxmlcore/Forward.h>
 #include <kxmlcore/HashMap.h>
+#include <kxmlcore/Vector.h>
 
 template <typename T> class DeprecatedValueList;
 
index ae07d208a978ab510cbb5f5524165a7b0b070b44..4556f5ceaa7ce5a6b05b87d964b3c3ad80f8ea95 100644 (file)
@@ -37,6 +37,7 @@
 #include "EditAction.h"
 #include "TextAffinity.h"
 #include "TextGranularity.h"
+#include <kxmlcore/Vector.h>
 #include <qscrollbar.h>
 
 class KHTMLSettings;
index 59008cf9614128465bcb5df16040b29a0681f62b..0f8c7e40907e9ebf0783455b85d7934669406107 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-#include <kxmlcore/Forward.h>
 #include <kxmlcore/Noncopyable.h>
+#include <kxmlcore/Vector.h>
 
 namespace WebCore {