2007-11-19 Kevin Ollivier <kevino@theolliviers.com>
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Nov 2007 12:37:13 +0000 (12:37 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Nov 2007 12:37:13 +0000 (12:37 +0000)
        Build script fixes to ensure they do the right thing for the
        wx port, and update build-wxwebkit to reflect the way the
        build scripts now work.

        Reviewed by Adam.

        * Scripts/build-testkjs:
        * Scripts/build-webkit:
        * Scripts/run-javascriptcore-tests:
        * Scripts/webkitdirs.pm:
        * wx/build-wxwebkit:

2007-11-19  Kevin Ollivier  <kevino@theolliviers.com>

        Add pcre directory to JSCore includes, and update the wx port
        to reflect the Shared -> RefCounted name change. Also, fix
        WebFrame.cpp to re-enable code that should never have been
        committed disabled.

        Reviewed by Adam.

2007-11-19  Kevin Ollivier  <kevino@theolliviers.com>

        Update wx port build sources with recent changes, update
        wx FontPlatformData to be a class (MSVC7 gets confused
        otherwise...) and implement its hash() method.

        Reviewed by Adam.

        * WebCoreSources.bkl:
        * platform/wx/FontPlatformData.h:
        (WebCore::FontPlatformData::hash):

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

14 files changed:
WebCore/ChangeLog
WebCore/WebCoreSources.bkl
WebCore/platform/wx/FontPlatformData.h
WebKit/wx/ChangeLog
WebKit/wx/WebFrame.cpp
WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
WebKit/wx/presets/wxwebkit.bkl
WebKitTools/ChangeLog
WebKitTools/Scripts/build-testkjs
WebKitTools/Scripts/build-webkit
WebKitTools/Scripts/run-javascriptcore-tests
WebKitTools/Scripts/webkitdirs.pm
WebKitTools/wx/build-wxwebkit

index 6e5566d9bd209a50304feef78928c1487a27f7a7..f6cbd9d45c085d544bd4b3ee0b32c550cecb9d25 100644 (file)
@@ -1,3 +1,15 @@
+2007-11-19  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Update wx port build sources with recent changes, update
+        wx FontPlatformData to be a class (MSVC7 gets confused
+        otherwise...) and implement its hash() method.
+
+        Reviewed by Adam.
+
+        * WebCoreSources.bkl:
+        * platform/wx/FontPlatformData.h:
+        (WebCore::FontPlatformData::hash):
+
 2007-11-19  Julien Chaffraix  <julien.chaffraix@gmail.com>
 
         Reviewed by Darin.
index d615540b6f495c63dec4fdfa6c58e3ce63fa68e6..d1b4530da74103359b625f11d9f54a16b8fef7a9 100644 (file)
@@ -40,8 +40,11 @@ This file contains the list of files needed to build WebCore.
         bindings/js/JSCSSRuleCustom.cpp
         bindings/js/JSCSSStyleDeclarationCustom.cpp
         bindings/js/JSCSSValueCustom.cpp
-        bindings/js/JSCustomSQLCallback.cpp
-        bindings/js/JSCustomVersionChangeCallback.cpp
+        bindings/js/JSCustomSQLStatementCallback.cpp
+        bindings/js/JSCustomSQLStatementErrorCallback.cpp
+        bindings/js/JSCustomSQLTransactionCallback.cpp
+        bindings/js/JSCustomSQLTransactionErrorCallback.cpp
+        bindings/js/JSCustomVoidCallback.cpp
         bindings/js/JSCustomXPathNSResolver.cpp
         bindings/js/JSDatabaseCustom.cpp
         bindings/js/JSDOMExceptionConstructor.cpp
@@ -51,6 +54,7 @@ This file contains the list of files needed to build WebCore.
         bindings/js/JSEventCustom.cpp
         bindings/js/JSEventTargetNode.cpp
         bindings/js/JSHTMLAppletElementCustom.cpp
+        bindings/js/JSHTMLAudioElementConstructor.cpp
         bindings/js/JSHTMLCollectionCustom.cpp
         bindings/js/JSHTMLDocumentCustom.cpp
         bindings/js/JSHTMLElementCustom.cpp
@@ -73,6 +77,7 @@ This file contains the list of files needed to build WebCore.
         bindings/js/JSNodeIteratorCustom.cpp
         bindings/js/JSNodeListCustom.cpp
         bindings/js/JSSQLResultSetRowListCustom.cpp
+        bindings/js/JSSQLTransactionCustom.cpp
         bindings/js/JSStyleSheetCustom.cpp
         bindings/js/JSStyleSheetListCustom.cpp
         bindings/js/JSTreeWalkerCustom.cpp
@@ -251,9 +256,10 @@ This file contains the list of files needed to build WebCore.
         DerivedSources/WebCore/JSRangeException.cpp
         DerivedSources/WebCore/JSRect.cpp
         DerivedSources/WebCore/JSScreen.cpp
-        DerivedSources/WebCore/JSSQLCallback.cpp
+        DerivedSources/WebCore/JSSQLError.cpp
         DerivedSources/WebCore/JSSQLResultSet.cpp
         DerivedSources/WebCore/JSSQLResultSetRowList.cpp
+        DerivedSources/WebCore/JSSQLTransaction.cpp
         DerivedSources/WebCore/JSStyleSheet.cpp
         DerivedSources/WebCore/JSStyleSheetList.cpp
         DerivedSources/WebCore/JSText.cpp
@@ -555,6 +561,7 @@ This file contains the list of files needed to build WebCore.
         platform/RegularExpression.cpp
         platform/ScrollBar.cpp
         platform/SecurityOrigin.cpp
+        platform/SecurityOriginData.cpp
         platform/SegmentedString.cpp
         platform/SharedBuffer.cpp
         platform/String.cpp
@@ -592,24 +599,13 @@ This file contains the list of files needed to build WebCore.
         platform/network/ProtectionSpace.cpp
         platform/network/ResourceHandle.cpp
         platform/network/ResourceRequestBase.cpp
-        platform/network/ResourceResponse.cpp
+        platform/network/ResourceResponseBase.cpp
         platform/sql/SQLiteAuthorizer.cpp
         platform/sql/SQLiteDatabase.cpp
         platform/sql/SQLiteStatement.cpp
         platform/sql/SQLiteTransaction.cpp
         platform/sql/SQLValue.cpp
     </set>
-    
-    <set append="1" var="WEBCORE_SOURCES_STORAGE">
-        storage/Database.cpp
-        storage/DatabaseAuthorizer.cpp
-        storage/DatabaseCallback.cpp
-        storage/DatabaseTask.cpp
-        storage/DatabaseThread.cpp
-        storage/DatabaseTracker.cpp
-        storage/SQLResultSet.cpp
-        storage/SQLResultSetRowList.cpp
-    </set>
 
     <set append="1" var="WEBCORE_SOURCES_GIF">
         platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -651,7 +647,6 @@ This file contains the list of files needed to build WebCore.
         platform/image-decoders/xbm/XBMImageDecoder.cpp
     </set>
 
-
     <set append="1" var="WEBCORE_SOURCES_RENDERING">
         rendering/AutoTableLayout.cpp
         rendering/CounterNode.cpp
@@ -710,6 +705,19 @@ This file contains the list of files needed to build WebCore.
         rendering/break_lines.cpp
     </set>
 
+    <set append="1" var="WEBCORE_SOURCES_STORAGE">
+        storage/ChangeVersionWrapper.cpp
+        storage/Database.cpp
+        storage/DatabaseAuthorizer.cpp
+        storage/DatabaseTask.cpp
+        storage/DatabaseThread.cpp
+        storage/DatabaseTracker.cpp
+        storage/SQLResultSet.cpp
+        storage/SQLResultSetRowList.cpp
+        storage/SQLStatement.cpp
+        storage/SQLTransaction.cpp
+    </set>
+
     <set append="1" var="WEBCORE_SOURCES_XML">
         xml/DOMParser.cpp
         xml/NativeXPathNSResolver.cpp
index d499508c62fc526237cb767dc74fb8fc1002244e..d9065d625922d67de14568c37cd1fc64ec919598 100644 (file)
 #include "AtomicString.h"
 #include "StringImpl.h"
 
-class wxFont;
+#include <wx/defs.h>
+#include <wx/font.h>
 
 namespace WebCore {
 
-struct FontPlatformData {
+class FontPlatformData {
+public:
     class Deleted {};
 
     FontPlatformData(Deleted)
@@ -61,8 +63,9 @@ struct FontPlatformData {
     wxFont* font() const { return m_font; }
     
     unsigned hash() const
-    { 
-        return StringImpl::computeHash((UChar*)0, 0);
+    {
+        uintptr_t hashCodes[1] = { reinterpret_cast<uintptr_t>(m_font) };
+        return StringImpl::computeHash(reinterpret_cast<UChar*>(hashCodes), sizeof(hashCodes) / sizeof(UChar));
     }
 
     bool operator==(const FontPlatformData& other) const
index d1988a9bf4d9fc15a482813006b2bca34718ba6c..e2437fa75cfdd85607570acd4fa552075d0f1327 100644 (file)
@@ -1,3 +1,20 @@
+2007-11-19  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Add pcre directory to JSCore includes, and update the wx port
+        to reflect the Shared -> RefCounted name change. Also, fix
+        WebFrame.cpp to re-enable code that should never have been 
+        committed disabled. 
+
+        Reviewed by Adam.
+
+        * WebFrame.cpp:
+        (wxWebFrame::wxWebFrame):
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::ref):
+        (WebCore::FrameLoaderClientWx::deref):
+        * WebKitSupport/FrameLoaderClientWx.h:
+        * presets/wxwebkit.bkl:
+
 2007-11-17  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Mark Rowe.
index 6d3efe881933dca26cf4246c3211b868633cb993..8a73ce33c63db7849ddd0e72b275a59b29d06e8d 100644 (file)
@@ -131,7 +131,7 @@ wxWebFrame::wxWebFrame(const wxString& title) :
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
-/*
+    
     wxToolBar* toolbar = CreateToolBar();
     toolbar->SetToolBitmapSize(wxSize(32, 32));
     
@@ -149,7 +149,7 @@ wxWebFrame::wxWebFrame(const wxString& title) :
     toolbar->Realize();
     
     SetToolBar(toolbar);
-*/
+
     // Create the wxWebView Window
     webview = new wxWebView((wxWindow*)this, 1001, wxDefaultPosition, wxSize(200, 200));
     webview->SetBackgroundColour(*wxWHITE);
index b523eff26ed2aa73fffe022184b1feb3bb95f99b..ba600a0f8d2ae95901ce671f766a0f5732424303 100644 (file)
@@ -89,12 +89,12 @@ void FrameLoaderClientWx::detachFrameLoader()
 
 void FrameLoaderClientWx::ref()
 {
-    Shared<FrameLoaderClientWx>::ref();
+    RefCounted<FrameLoaderClientWx>::ref();
 }
 
 void FrameLoaderClientWx::deref()
 {
-    Shared<FrameLoaderClientWx>::deref();
+    RefCounted<FrameLoaderClientWx>::deref();
 }
 
 bool FrameLoaderClientWx::hasWebView() const
index ce8e8b44407dd1429df42bf6da095bbb9a359c34..a914e262877a1a9f8b3f04761f770c5ab49257ad 100644 (file)
@@ -31,8 +31,8 @@
 #include "FrameLoaderClient.h"
 #include "FrameLoader.h"
 #include "KURL.h"
+#include "RefCounted.h"
 #include "ResourceResponse.h"
-#include "Shared.h"
 
 
 namespace WebCore {
@@ -47,7 +47,7 @@ namespace WebCore {
 
     struct LoadErrorResetToken;
 
-    class FrameLoaderClientWx : public FrameLoaderClient, public Shared<FrameLoaderClientWx> {
+    class FrameLoaderClientWx : public FrameLoaderClient, public RefCounted<FrameLoaderClientWx> {
     public:
         FrameLoaderClientWx();
         ~FrameLoaderClientWx();
index 0171c1f0b85e25cda08a9ae9941832bd8eb65b2c..737fdd15b833c253162bd121a2fa47f491d77088 100644 (file)
@@ -72,9 +72,10 @@ and WebCore. Include this file to use these settings.
     </if>
     
     <template id="jscore">
-        <include>$(WK_ROOT)/JavaScriptCore</include>
         <include>$(WK_ROOT)</include>
+        <include>$(WK_ROOT)/JavaScriptCore</include>
         <include>$(WK_ROOT)/JavaScriptCore/kjs</include>
+        <include>$(WK_ROOT)/JavaScriptCore/pcre</include>
         <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
         <include>$(WK_ROOT)/WebKitLibraries/unix/include</include>
         <if cond="FORMAT in ['msvc', 'msvs2005prj']">
index 25c625c4cfce10afb44001b9c165da0359428bfc..bb1b20e12e9113de25a76841beef76d3e46a5822 100644 (file)
@@ -1,3 +1,17 @@
+2007-11-19  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Build script fixes to ensure they do the right thing for the 
+        wx port, and update build-wxwebkit to reflect the way the
+        build scripts now work.
+
+        Reviewed by Adam.
+
+        * Scripts/build-testkjs:
+        * Scripts/build-webkit:
+        * Scripts/run-javascriptcore-tests:
+        * Scripts/webkitdirs.pm:
+        * wx/build-wxwebkit:
+
 2007-11-18  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Anders.
index e3f1762d97a5b7dc10306fb77858c92a97bbd10c..5dc28ad2171ae79d86a9fef835929c4aa923541d 100755 (executable)
@@ -45,7 +45,7 @@ if (isOSX()) {
     $result = system "sh", "-c", 'xcodebuild -project JavaScriptCore.xcodeproj -target testkjs "$@" | grep -v setenv && exit ${PIPESTATUS[0]}', "xcodebuild",  @options, @ARGV;
 } elsif (isCygwin()) {
     $result = buildVisualStudioProject("JavaScriptCore.vcproj/JavaScriptCore.sln");
-} elsif (isQt() or isGtk()) {
+} elsif (isQt() or isGtk() or isWx()) {
     # Qt and Gtk build everything in one-shot. No need to build anything here.
     $result = 0;
 } else {
index e1707a0b42a9b0ec92bff10a3113c5326fd223e8..1e84b7967500f0b12256868129fea88c3d9e993b 100755 (executable)
@@ -83,6 +83,7 @@ chdirWebKit();
 # FIXME: Migrate build-wxwebkit commands into build-webkit.
 if (isWx()) {
     my @opts = ();
+    $ENV{"WEBKITOUTPUTDIR"} = productDir();
     foreach (@ARGV) {
         if ($_ eq "wxgc" || $_ eq "wxpython") {
             push(@opts, $_);
@@ -92,7 +93,7 @@ if (isWx()) {
         push(@opts, "clean");
     }
     system "WebKitTools/wx/build-wxwebkit @opts";
-    exit 0;
+    exit exitStatus($?);
 }
 
 
index 6dbed9eddc83a24b520f5bada8226cd70689198b..b47d6302bbd211e8b633587b8579e7f8cd054370 100755 (executable)
@@ -65,7 +65,7 @@ foreach my $arg(@ARGV) {
     print $arg."\n";
     if( $arg =~ /root=(.*)/ ){
         $root = $1;
-    } elsif( $arg =~ /^--gtk$/i || $arg =~ /^--qt$/i ){
+    } elsif( $arg =~ /^--gtk$/i || $arg =~ /^--qt$/i || $arg =~ /^--wx$/i ){
     } elsif( $arg =~ /^-/ or !($arg =~/=/)){
         push( @jsArgs, $arg );
     } else {
@@ -83,6 +83,7 @@ if(!defined($root)){
     # FIXME: These should be stored per-config and ignored here
     push(@xcodeArgs, "--qt")  if isQt();
     push(@xcodeArgs, "--gtk")  if isGtk();
+    push(@xcodeArgs, "--wx")  if isWx();
 
     my $buildResult = system "perl", "WebKitTools/Scripts/build-testkjs", @xcodeArgs;
     if ($buildResult) {
index 4d5ffebec1b890110fb634015764e754d88b7cc6..60874ee7281bc7dc830468c0033f4cb4bbb3297a 100644 (file)
@@ -171,7 +171,7 @@ sub determineConfigurationProductDir
 {
     return if defined $configurationProductDir;
     determineBaseProductDir();
-    if(isCygwin()) {
+    if(isCygwin() && !isWx()) {
         $configurationProductDir = "$baseProductDir/bin";
     } else {
         determineConfiguration();
index 5f6d7314a7754b9c5a8c7be06d33a50b88455d6d..57a740c720ed993ce27b428fa6db8c90811dbd53 100755 (executable)
@@ -37,9 +37,8 @@ WK_ROOTDIR=$WK_ROOT
 
 cd $scriptDir
 
-export WXWEBKIT=1
 if [ -z $WEBKITOUTPUTDIR ]; then
-    WEBKITOUTPUTDIR=`cd $WK_ROOT/WebKitTools/Scripts; perl -e "use webkitdirs; print baseProductDir()"`
+    WEBKITOUTPUTDIR=`cd $WK_ROOT/WebKitTools/Scripts; perl -e "use webkitdirs; print productDir()"`
 fi
 
 WINDEPS="pthreads/lib/pthreadVC2.dll icu/bin/icuuc34.dll icu/bin/icudt34.dll libcurl/*.dll sqlite3/sqlite3.dll"
@@ -146,6 +145,9 @@ function do_make {
     else
         make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags" $@
     fi
+    if [ $? != 0 ]; then
+        exit $? 
+    fi
 }
 
 olddir=$PWD
@@ -308,13 +310,11 @@ if [ $do_build == 1 -o $do_clean == 1 ]; then
         echo ""
         echo "Next steps:"
         echo ""
-        echo "-- Add WXWEBKIT=1 to your environment variables. This will let WebKit scripts know you're using the wx build."
-        echo ""
         if [ "${OSTYPE:0:5}" = "linux" ]; then
             echo "-- Add /usr/local/lib and $WEBKITOUTPUTDIR to your LD_LIBRARY_PATH environment variable."
             echo ""
         fi
-        echo "-- Run the 'run-javascriptcore-tests' script to ensure JSCore tests pass."
+        echo "-- Run '$WK_ROOT/WebKitTools/Scripts/run-javascriptcore-tests --wx' to ensure JSCore tests pass."
         echo ""
         echo "-- Run $WEBKITOUTPUTDIR/$BROWSERAPP to test your wxWebKit build."
         echo ""