Changeset 27899 in webkit


Ignore:
Timestamp:
Nov 19, 2007 4:37:13 AM (16 years ago)
Author:
mrowe@apple.com
Message:

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-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):
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r27898 r27899  
     12007-11-19  Kevin Ollivier  <kevino@theolliviers.com>
     2
     3        Update wx port build sources with recent changes, update
     4        wx FontPlatformData to be a class (MSVC7 gets confused
     5        otherwise...) and implement its hash() method.
     6
     7        Reviewed by Adam.
     8
     9        * WebCoreSources.bkl:
     10        * platform/wx/FontPlatformData.h:
     11        (WebCore::FontPlatformData::hash):
     12
    1132007-11-19  Julien Chaffraix  <julien.chaffraix@gmail.com>
    214

  • trunk/WebCore/WebCoreSources.bkl

    r27631 r27899  
    4141        bindings/js/JSCSSStyleDeclarationCustom.cpp
    4242        bindings/js/JSCSSValueCustom.cpp
    43         bindings/js/JSCustomSQLCallback.cpp
    44         bindings/js/JSCustomVersionChangeCallback.cpp
     43        bindings/js/JSCustomSQLStatementCallback.cpp
     44        bindings/js/JSCustomSQLStatementErrorCallback.cpp
     45        bindings/js/JSCustomSQLTransactionCallback.cpp
     46        bindings/js/JSCustomSQLTransactionErrorCallback.cpp
     47        bindings/js/JSCustomVoidCallback.cpp
    4548        bindings/js/JSCustomXPathNSResolver.cpp
    4649        bindings/js/JSDatabaseCustom.cpp
    … …  
    5255        bindings/js/JSEventTargetNode.cpp
    5356        bindings/js/JSHTMLAppletElementCustom.cpp
     57        bindings/js/JSHTMLAudioElementConstructor.cpp
    5458        bindings/js/JSHTMLCollectionCustom.cpp
    5559        bindings/js/JSHTMLDocumentCustom.cpp
    … …  
    7478        bindings/js/JSNodeListCustom.cpp
    7579        bindings/js/JSSQLResultSetRowListCustom.cpp
     80        bindings/js/JSSQLTransactionCustom.cpp
    7681        bindings/js/JSStyleSheetCustom.cpp
    7782        bindings/js/JSStyleSheetListCustom.cpp
    … …  
    252257        DerivedSources/WebCore/JSRect.cpp
    253258        DerivedSources/WebCore/JSScreen.cpp
    254         DerivedSources/WebCore/JSSQLCallback.cpp
     259        DerivedSources/WebCore/JSSQLError.cpp
    255260        DerivedSources/WebCore/JSSQLResultSet.cpp
    256261        DerivedSources/WebCore/JSSQLResultSetRowList.cpp
     262        DerivedSources/WebCore/JSSQLTransaction.cpp
    257263        DerivedSources/WebCore/JSStyleSheet.cpp
    258264        DerivedSources/WebCore/JSStyleSheetList.cpp
    … …  
    556562        platform/ScrollBar.cpp
    557563        platform/SecurityOrigin.cpp
     564        platform/SecurityOriginData.cpp
    558565        platform/SegmentedString.cpp
    559566        platform/SharedBuffer.cpp
    … …  
    593600        platform/network/ResourceHandle.cpp
    594601        platform/network/ResourceRequestBase.cpp
    595         platform/network/ResourceResponse.cpp
     602        platform/network/ResourceResponseBase.cpp
    596603        platform/sql/SQLiteAuthorizer.cpp
    597604        platform/sql/SQLiteDatabase.cpp
    … …  
    599606        platform/sql/SQLiteTransaction.cpp
    600607        platform/sql/SQLValue.cpp
    601     </set>
    602    
    603     <set append="1" var="WEBCORE_SOURCES_STORAGE">
    604         storage/Database.cpp
    605         storage/DatabaseAuthorizer.cpp
    606         storage/DatabaseCallback.cpp
    607         storage/DatabaseTask.cpp
    608         storage/DatabaseThread.cpp
    609         storage/DatabaseTracker.cpp
    610         storage/SQLResultSet.cpp
    611         storage/SQLResultSetRowList.cpp
    612608    </set>
    613609
    … …  
    651647        platform/image-decoders/xbm/XBMImageDecoder.cpp
    652648    </set>
    653 
    654649
    655650    <set append="1" var="WEBCORE_SOURCES_RENDERING">
    … …  
    711706    </set>
    712707
     708    <set append="1" var="WEBCORE_SOURCES_STORAGE">
     709        storage/ChangeVersionWrapper.cpp
     710        storage/Database.cpp
     711        storage/DatabaseAuthorizer.cpp
     712        storage/DatabaseTask.cpp
     713        storage/DatabaseThread.cpp
     714        storage/DatabaseTracker.cpp
     715        storage/SQLResultSet.cpp
     716        storage/SQLResultSetRowList.cpp
     717        storage/SQLStatement.cpp
     718        storage/SQLTransaction.cpp
     719    </set>
     720
    713721    <set append="1" var="WEBCORE_SOURCES_XML">
    714722        xml/DOMParser.cpp

  • trunk/WebCore/platform/wx/FontPlatformData.h

    r27186 r27899  
    3434#include "StringImpl.h"
    3535
    36 class wxFont;
     36#include <wx/defs.h>
     37#include <wx/font.h>
    3738
    3839namespace WebCore {
    3940
    40 struct FontPlatformData {
     41class FontPlatformData {
     42public:
    4143    class Deleted {};
    4244
    … …  
    6264   
    6365    unsigned hash() const
    64     {
    65         return StringImpl::computeHash((UChar*)0, 0);
     66    {
     67        uintptr_t hashCodes[1] = { reinterpret_cast<uintptr_t>(m_font) };
     68        return StringImpl::computeHash(reinterpret_cast<UChar*>(hashCodes), sizeof(hashCodes) / sizeof(UChar));
    6669    }
    6770

  • trunk/WebKit/wx/ChangeLog

    r27883 r27899  
     12007-11-19  Kevin Ollivier  <kevino@theolliviers.com>
     2
     3        Add pcre directory to JSCore includes, and update the wx port
     4        to reflect the Shared -> RefCounted name change. Also, fix
     5        WebFrame.cpp to re-enable code that should never have been
     6        committed disabled.
     7
     8        Reviewed by Adam.
     9
     10        * WebFrame.cpp:
     11        (wxWebFrame::wxWebFrame):
     12        * WebKitSupport/FrameLoaderClientWx.cpp:
     13        (WebCore::FrameLoaderClientWx::ref):
     14        (WebCore::FrameLoaderClientWx::deref):
     15        * WebKitSupport/FrameLoaderClientWx.h:
     16        * presets/wxwebkit.bkl:
     17
    1182007-11-17  Timothy Hatcher  <timothy@apple.com>
    219

  • trunk/WebKit/wx/WebFrame.cpp

    r27631 r27899  
    132132    // ... and attach this menu bar to the frame
    133133    SetMenuBar(menuBar);
    134 /*
     134   
    135135    wxToolBar* toolbar = CreateToolBar();
    136136    toolbar->SetToolBitmapSize(wxSize(32, 32));
    … …  
    150150   
    151151    SetToolBar(toolbar);
    152 */
     152
    153153    // Create the wxWebView Window
    154154    webview = new wxWebView((wxWindow*)this, 1001, wxDefaultPosition, wxSize(200, 200));

  • trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r27631 r27899  
    9090void FrameLoaderClientWx::ref()
    9191{
    92     Shared<FrameLoaderClientWx>::ref();
     92    RefCounted<FrameLoaderClientWx>::ref();
    9393}
    9494
    9595void FrameLoaderClientWx::deref()
    9696{
    97     Shared<FrameLoaderClientWx>::deref();
     97    RefCounted<FrameLoaderClientWx>::deref();
    9898}
    9999

  • trunk/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

    r27631 r27899  
    3232#include "FrameLoader.h"
    3333#include "KURL.h"
     34#include "RefCounted.h"
    3435#include "ResourceResponse.h"
    35 #include "Shared.h"
    3636
    3737
    … …  
    4848    struct LoadErrorResetToken;
    4949
    50     class FrameLoaderClientWx : public FrameLoaderClient, public Shared<FrameLoaderClientWx> {
     50    class FrameLoaderClientWx : public FrameLoaderClient, public RefCounted<FrameLoaderClientWx> {
    5151    public:
    5252        FrameLoaderClientWx();

  • trunk/WebKit/wx/presets/wxwebkit.bkl

    r27631 r27899  
    7373   
    7474    <template id="jscore">
     75        <include>$(WK_ROOT)</include>
    7576        <include>$(WK_ROOT)/JavaScriptCore</include>
    76         <include>$(WK_ROOT)</include>
    7777        <include>$(WK_ROOT)/JavaScriptCore/kjs</include>
     78        <include>$(WK_ROOT)/JavaScriptCore/pcre</include>
    7879        <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
    7980        <include>$(WK_ROOT)/WebKitLibraries/unix/include</include>

  • trunk/WebKitTools/ChangeLog

    r27891 r27899  
     12007-11-19  Kevin Ollivier  <kevino@theolliviers.com>
     2
     3        Build script fixes to ensure they do the right thing for the
     4        wx port, and update build-wxwebkit to reflect the way the
     5        build scripts now work.
     6
     7        Reviewed by Adam.
     8
     9        * Scripts/build-testkjs:
     10        * Scripts/build-webkit:
     11        * Scripts/run-javascriptcore-tests:
     12        * Scripts/webkitdirs.pm:
     13        * wx/build-wxwebkit:
     14
    1152007-11-18  Eric Seidel  <eric@webkit.org>
    216

  • trunk/WebKitTools/Scripts/build-testkjs

    r27500 r27899  
    4646} elsif (isCygwin()) {
    4747    $result = buildVisualStudioProject("JavaScriptCore.vcproj/JavaScriptCore.sln");
    48 } elsif (isQt() or isGtk()) {
     48} elsif (isQt() or isGtk() or isWx()) {
    4949    # Qt and Gtk build everything in one-shot. No need to build anything here.
    5050    $result = 0;

  • trunk/WebKitTools/Scripts/build-webkit

    r27889 r27899  
    8484if (isWx()) {
    8585    my @opts = ();
     86    $ENV{"WEBKITOUTPUTDIR"} = productDir();
    8687    foreach (@ARGV) {
    8788        if ($_ eq "wxgc" || $_ eq "wxpython") {
    … …  
    9394    }
    9495    system "WebKitTools/wx/build-wxwebkit @opts";
    95     exit 0;
     96    exit exitStatus($?);
    9697}
    9798

  • trunk/WebKitTools/Scripts/run-javascriptcore-tests

    r27891 r27899  
    6666    if( $arg =~ /root=(.*)/ ){
    6767        $root = $1;
    68     } elsif( $arg =~ /^--gtk$/i || $arg =~ /^--qt$/i ){
     68    } elsif( $arg =~ /^--gtk$/i || $arg =~ /^--qt$/i || $arg =~ /^--wx$/i ){
    6969    } elsif( $arg =~ /^-/ or !($arg =~/=/)){
    7070        push( @jsArgs, $arg );
    … …  
    8484    push(@xcodeArgs, "--qt")  if isQt();
    8585    push(@xcodeArgs, "--gtk")  if isGtk();
     86    push(@xcodeArgs, "--wx")  if isWx();
    8687
    8788    my $buildResult = system "perl", "WebKitTools/Scripts/build-testkjs", @xcodeArgs;

  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r27889 r27899  
    172172    return if defined $configurationProductDir;
    173173    determineBaseProductDir();
    174     if(isCygwin()) {
     174    if(isCygwin() && !isWx()) {
    175175        $configurationProductDir = "$baseProductDir/bin";
    176176    } else {

  • trunk/WebKitTools/wx/build-wxwebkit

    r27889 r27899  
    3838cd $scriptDir
    3939
    40 export WXWEBKIT=1
    4140if [ -z $WEBKITOUTPUTDIR ]; then
    42     WEBKITOUTPUTDIR=`cd $WK_ROOT/WebKitTools/Scripts; perl -e "use webkitdirs; print baseProductDir()"`
     41    WEBKITOUTPUTDIR=`cd $WK_ROOT/WebKitTools/Scripts; perl -e "use webkitdirs; print productDir()"`
    4342fi
    4443
    … …  
    147146        make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags" $@
    148147    fi
     148    if [ $? != 0 ]; then
     149        exit $?
     150    fi
    149151}
    150152
    … …  
    309311        echo "Next steps:"
    310312        echo ""
    311         echo "-- Add WXWEBKIT=1 to your environment variables. This will let WebKit scripts know you're using the wx build."
    312         echo ""
    313313        if [ "${OSTYPE:0:5}" = "linux" ]; then
    314314            echo "-- Add /usr/local/lib and $WEBKITOUTPUTDIR to your LD_LIBRARY_PATH environment variable."
    315315            echo ""
    316316        fi
    317         echo "-- Run the 'run-javascriptcore-tests' script to ensure JSCore tests pass."
     317        echo "-- Run '$WK_ROOT/WebKitTools/Scripts/run-javascriptcore-tests --wx' to ensure JSCore tests pass."
    318318        echo ""
    319319        echo "-- Run $WEBKITOUTPUTDIR/$BROWSERAPP to test your wxWebKit build."
Note: See TracChangeset for help on using the changeset viewer.