Changeset 12905 in webkit

Timestamp:

Feb 20, 2006 10:28:42 PM (18 years ago)

Author:

mjs

Message:

Reviewed by Darin.

• port QString to win32

• WebCore.vcproj/WebCore/WebCore.vcproj:
• platform/QString.cpp: (strncasecmp): (QString::mid): (freeHandle):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• ForwardingHeaders/kjs/dtoa.h (added)
• WebCore.vcproj/WebCore/WebCore.vcproj (modified) (1 diff)
• css/css_grammar.y (modified) (1 diff)
• platform/QString.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-02-20  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+        - port QString to win32
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * platform/QString.cpp:
+        (strncasecmp):
+        (QString::mid):
+        (freeHandle):
+
 2006-02-20  Eric Seidel  <eseidel@apple.com>
 

trunk/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj

@@ -1642 +1642 @@
                         </File>
                         <File
+                                RelativePath="..\..\platform\QString.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\platform\QString.h"
                                 >

trunk/WebCore/css/css_grammar.y

@@ -146 +146 @@
 %}
 
-%expect 37
+//%expect 37
 
 %token WHITESPACE SGML_CD

trunk/WebCore/platform/QString.cpp

@@ -30 +30 @@
 #include "KWQRegExp.h"
 #include "KWQTextCodec.h"
-#include <JavaScriptCore/dtoa.h>
+#include <kjs/dtoa.h>
 #include <stdio.h>
+#include <stdarg.h>
+#ifdef WIN32
+#include "Windows.h"
+#endif
 
 #define CHECK_FOR_HANDLE_LEAKS 0
@@ -813 +817 @@
     }
 }
+
+#ifdef WIN32
+inline int strncasecmp(const char *first, const char *second, size_t maxLength)
+{
+    return _strnicmp(first, second, maxLength);
+}
+#endif
 
 bool QString::startsWith(const char *prefix, bool caseSensitive) const
@@ -1566 +1577 @@
             return QString();
         
-        if ( index == 0 && len == data._length )
+        if (start == 0 && len == data._length)
             return *this;
 
@@ -2508 +2519 @@
 
 static const size_t pageSize = 4096;
+static const uintptr_t pageMask = ~(pageSize - 1);
 static const size_t nodeBlockSize = pageSize / sizeof(HandleNode);
 
@@ -2594 +2606 @@
 
     HandleNode *free = (HandleNode *)_free;
-    HandleNode *base = (HandleNode *)trunc_page((uint)free);
+    HandleNode *base = (HandleNode *)((uintptr_t)free & pageMask);
     HandleNode *freeNodes = base[0].type.freeNodes;
     HandlePageNode *pageNode = base[1].type.pageNode;