2007-05-18 Holger Hans Peter Freyther <zecke@selfish.org>

        Reviewed by Mark Rowe.

        No test added as this is hard to time.

        * platform/gdk/FrameGdk.cpp: Use needsLayout() to decide if layout()
        is needed.

        (WebCore::FrameGdk::dumpRenderTree):
        (WebCore::FrameGdk::handleGdkEvent):

2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>

        Reviewed by Mark Rowe.

        * kjs/testkjs.pro: Make the Gdk port link to icu

2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>

        Reviewed by Mark Rowe.

        * WebKit.pro: Build testkjs for Gdk and Qt

2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>

        Reviewed by Mark Rowe.

        * GdkLauncher/main.cpp:
        (main): Call Frame::init to catch up with Maciej's changes.
        * Scripts/run-javascriptcore-tests: Remove --gdk from the command line
        passed to the helper scripts.

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

diff --git a/ChangeLog b/ChangeLog
index 159ddda..d0cdea3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Mark Rowe.
+
+        * WebKit.pro: Build testkjs for Gdk and Qt
+
 2007-05-11  Holger Freyther <freyther@kde.org>
 
         Reviewed by Mark Rowe.

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ee82fb3..3e5fac5 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Mark Rowe.
+
+        * kjs/testkjs.pro: Make the Gdk port link to icu
+
 2007-05-15  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Adele Peterson.

diff --git a/JavaScriptCore/kjs/testkjs.pro b/JavaScriptCore/kjs/testkjs.pro
index 59081c1..035956b 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.pro
+++ b/JavaScriptCore/kjs/testkjs.pro
@@ -7,6 +7,10 @@ DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS
 INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
 qt-port:DEFINES += BUILDING_QT__
 qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
+gdk-port {
+    QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+    LIBS += $$system(icu-config --ldflags)
+}
 QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
 
 isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/../..

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3671770..7f616bc 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Mark Rowe.
+
+        No test added as this is hard to time.
+
+        * platform/gdk/FrameGdk.cpp: Use needsLayout() to decide if layout()
+        is needed.
+
+        (WebCore::FrameGdk::dumpRenderTree):
+        (WebCore::FrameGdk::handleGdkEvent):
+
 2007-05-18  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.

diff --git a/WebCore/platform/gdk/FrameGdk.cpp b/WebCore/platform/gdk/FrameGdk.cpp
index 5c6bd31..506eb31 100644 (file)
--- a/WebCore/platform/gdk/FrameGdk.cpp
+++ b/WebCore/platform/gdk/FrameGdk.cpp
@@ -129,7 +129,7 @@ void FrameGdk::onDidFinishLoad()
 
 void FrameGdk::dumpRenderTree() const
 {
-    if (view()->layoutPending())
+    if (view()->needsLayout())
         view()->layout();
     
     String txt = externalRepresentation(renderer());
@@ -206,7 +206,7 @@ void FrameGdk::handleGdkEvent(GdkEvent* event)
             cairo_t* cr = gdk_cairo_create(event->any.window);
             GraphicsContext ctx(cr);
             if (renderer()) {
-                if (view()->layoutPending())
+                if (view()->needsLayout())
                     view()->layout();
                 IntRect rect(clip.x, clip.y, clip.width, clip.height);
                 paint(&ctx, rect);

diff --git a/WebKit.pro b/WebKit.pro
index 45c35a3..eae6a46 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -2,11 +2,11 @@ TEMPLATE = subdirs
 CONFIG += ordered
 !gdk-port:CONFIG += qt-port
 SUBDIRS = \
-        WebCore
+        WebCore \
+        JavaScriptCore/kjs/testkjs.pro
 
 qt-port:SUBDIRS += \
         WebKitQt/QtLauncher \
-        WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro \
-        JavaScriptCore/kjs/testkjs.pro
+        WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
 gdk-port:SUBDIRS += \
         WebKitTools/GdkLauncher

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fed6465..5707bb4 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Mark Rowe.
+
+        * GdkLauncher/main.cpp:
+        (main): Call Frame::init to catch up with Maciej's changes.
+        * Scripts/run-javascriptcore-tests: Remove --gdk from the command line
+        passed to the helper scripts.
+
 2007-05-16  Brady Eidson  <beidson@apple.com>
 
         Build fix for some dev configurations

diff --git a/WebKitTools/GdkLauncher/main.cpp b/WebKitTools/GdkLauncher/main.cpp
index fb14e10..3179811 100644 (file)
--- a/WebKitTools/GdkLauncher/main.cpp
+++ b/WebKitTools/GdkLauncher/main.cpp
@@ -213,6 +213,7 @@ int main(int argc, char* argv[])
     gFrame->setView(frameView);
     frameView->ScrollView::setDrawable(frameWindow->window);
 
+    gFrame->init();
     gFrame->loader()->load(ResourceRequest(url));
     gtk_main();
 #if 0 // FIXME: this crashes at the moment. needs to provide DragClient

diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
index d12344e..37ddf08 100755 (executable)
--- a/WebKitTools/Scripts/run-javascriptcore-tests
+++ b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -45,7 +45,8 @@ my @xcodeArgs;
 # pre-evaluate arguments.  jsDriver args have - preceding, xcode args do not.
 foreach my $arg(@ARGV) {
     print $arg."\n";
-    if( $arg =~ /^-/ ){
+    if( $arg =~ /^--gdk$/i ){
+    } elsif( $arg =~ /^-/ ){
         push( @jsArgs, $arg );
     } else {
         push( @xcodeArgs, $arg );
@@ -70,7 +71,7 @@ exit WEXITSTATUS($result) if WEXITSTATUS($result);
 my $productDir = productDir();
 chdir "tests/mozilla" or die;
 
-$productDir .= "/JavaScriptCore" if (isQt());
+$productDir .= "/JavaScriptCore" if (isQt() or isGdk());
 $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
 
 my $testkjsName;