[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 08272902fce5226a224b949d53c0575b9ea840c0
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 17:12:33 2010 +0000

    [Qt] Build files for the WTR's InjectedBundle
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 4921d6c..5348992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>, Andras Becsi  <abecsi at webkit.org>, Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add WTR's InjectedBundle build files.
+        https://bugs.webkit.org/show_bug.cgi?id=47333
+
+        * DerivedSources.pro:
+        * WebKit.pro:
+
 2010-10-07  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index 0015af6..76cb37e 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -8,7 +8,9 @@ SUBDIRS += \
 
 webkit2 {
     SUBDIRS += WebKit2/DerivedSources.pro
-    SUBDIRS += WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
+
+    # Uncomment when WTR is ready upstream
+    #SUBDIRS += WebKitTools/WebKitTestRunner/DerivedSources.pro
 }
 
 for(subpro, SUBDIRS) {
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 64e5ecb..5d5a852 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>, Andras Becsi  <abecsi at webkit.org>, Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add WTR's InjectedBundle build files.
+        https://bugs.webkit.org/show_bug.cgi?id=47333
+
+        * WebKit2.pro:
+
 2010-10-07  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 021356d..02a8d86 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -103,6 +103,7 @@ INCLUDEPATH = \
     $$INCLUDEPATH
 
 INCLUDEPATH = \
+    $$PWD \
     Platform \
     Platform/CoreIPC \
     Shared \
@@ -306,6 +307,7 @@ SOURCES += \
     Platform/qt/RunLoopQt.cpp \
     Platform/qt/SharedMemoryQt.cpp \
     Platform/qt/WorkQueueQt.cpp \
+    Shared/API/c/WKArray.cpp \
     Shared/API/c/WKCertificateInfo.cpp \
     Shared/API/c/WKNumber.cpp \
     Shared/API/c/WKSerializedScriptValue.cpp \
@@ -376,7 +378,12 @@ SOURCES += \
     UIProcess/WebProcessManager.cpp \
     UIProcess/WebProcessProxy.cpp \
     UIProcess/WebUIClient.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundle.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp \
     WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundlePage.cpp \
+    WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp \
     WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp \
     WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp \
     WebProcess/InjectedBundle/InjectedBundle.cpp \
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b9b9a7d..58e71cd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>, Andras Becsi  <abecsi at webkit.org>, Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add WTR's InjectedBundle build files.
+        https://bugs.webkit.org/show_bug.cgi?id=47333
+
+        * Scripts/webkitdirs.pm:
+        * WebKitTestRunner/DerivedSources.pro: Added.
+        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro: Added.
+        * WebKitTestRunner/WebKitTestRunner.pro: Added.
+        * WebKitTestRunner/qt/DerivedSources.pro: Removed.
+        Content merged in ../DerivedSources.pro
+
 2010-10-07  Balazs Kelemen  <kbalazs at webkit.org>
 
         Unreviewed. Do a renaming that was recommended by the reviewer
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 0218e1f..2dfdae2 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1530,7 +1530,9 @@ sub buildQMakeProject($@)
     my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
     if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
         push @subdirs, "WebKit2";
-        push @subdirs, "WebKitTools/WebKitTestRunner/qt";
+
+        # Uncomment when WTR is ready upstream
+        #push @subdirs, "WebKitTools/WebKitTestRunner";
     }
 
     for my $subdir (@subdirs) {
diff --git a/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
deleted file mode 100644
index 6cd716e..0000000
--- a/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = lib
-TARGET = dummy
-
-CONFIG -= debug_and_release
-
-SRC_ROOT_DIR = $$replace(PWD, /WebKitTools/WebKitTestRunner/qt, /)
-
-wtr_fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
-wtr_fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
-generated_files.depends     += wtr_fwheader_generator
-QMAKE_EXTRA_TARGETS         += wtr_fwheader_generator
-
-jsc_fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/JavaScriptCore/API $${OUTPUT_DIR}/include qt
-jsc_fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
-generated_files.depends     += jsc_fwheader_generator
-QMAKE_EXTRA_TARGETS         += jsc_fwheader_generator
-
-QMAKE_EXTRA_TARGETS        += generated_files

-- 
WebKit Debian packaging