Attachment 70069 Details for Bug 47333 – Patch

[patch] Patch

bug-47333-20101007143527.patch (text/plain), 11.96 KB, created by Jocelyn Turcotte on 2010-10-07 05:35:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jocelyn Turcotte

Created: 2010-10-07 05:35:29 PDT

Size: 11.96 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 4941b74f987ec96ce334e50e253664a71abde790..25f213aeb9a5455ab9852e098534d5a322d960a3 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,13 @@
>+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>, Andras Becsi  <abecsi@webkit.org>, Balazs Kelemen  <kbalazs@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [Qt] Add WTR's InjectedBundle build files.
>+        https://bugs.webkit.org/show_bug.cgi?id=47333
>+
>+        * DerivedSources.pro:
>+        * WebKit.pro:
>+
> 2010-10-06  Balazs Kelemen  <kbalazs@webkit.org>
> 
>         Reviewed by Kenneth Rohde Christiansen.
>diff --git a/DerivedSources.pro b/DerivedSources.pro
>index 0015af6eb79dd014f01e2c911d3a31d52044f150..76cb37e6cb86e0338fa1483116529c87ad53ac5f 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/WebKit.pro b/WebKit.pro
>index 02d00c9bdb5e9611ff96e059ba67cbc4e9d311ab..309f53d8a1f74e24815a04d582d72efa0a4941a3 100644
>--- a/WebKit.pro
>+++ b/WebKit.pro
>@@ -35,7 +35,7 @@ webkit2 {
>     exists($$PWD/WebKitTools/MiniBrowser/qt/MiniBrowser.pro): SUBDIRS += WebKitTools/MiniBrowser/qt/MiniBrowser.pro
> 
>     # Switch it on when the build has been stabilized.
>-    #exists($$PWD/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro): SUBDIRS += WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
>+    #exists($$PWD/WebKitTools/WebKitTestRunner/WebKitTestRunner.pro): SUBDIRS += WebKitTools/WebKitTestRunner/WebKitTestRunner.pro
> }
> 
> symbian {
>diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
>index 63e1c24b1a9a3ea593f46b829bc2964db586e0a1..90447baf02346a3907d18eedd5619b2233c6a9b4 100644
>--- a/WebKit2/ChangeLog
>+++ b/WebKit2/ChangeLog
>@@ -1,3 +1,21 @@
>+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>, Andras Becsi  <abecsi@webkit.org>, Balazs Kelemen  <kbalazs@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [Qt] Add WTR's InjectedBundle build files.
>+        https://bugs.webkit.org/show_bug.cgi?id=47333
>+
>+        * WebKit2.pro:
>+
>+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [Qt] Add WTR's InjectedBundle build files.
>+        https://bugs.webkit.org/show_bug.cgi?id=47333
>+
>+        * WebKit2.pro:
>+
> 2010-10-06  Balazs Kelemen  <kbalazs@webkit.org>
> 
>         Reviewed by Kenneth Rohde Christiansen.
>diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
>index be41d5fe3ae49b3e236fb0a211c6822203375088..3846727ea4350128254f6bd220e24a57985cf9c9 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 ebcdf480d9b7d218ed179c218d4e1a69e0a9b457..ab0702db05f7e196faece9080c93d5eba88aa356 100644
>--- a/WebKitTools/ChangeLog
>+++ b/WebKitTools/ChangeLog
>@@ -1,3 +1,17 @@
>+2010-10-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>, Andras Becsi  <abecsi@webkit.org>, Balazs Kelemen  <kbalazs@webkit.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [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-06  Chris Guillory  <chris.guillory@google.com>
> 
>         Reviewed by Chris Fleizach.
>diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
>index 0218e1fbbc996e94aa7b1ff74f87d0dd5aa94d6e..2dfdae23367561ac7d1e641eb2e53e1596ca1d68 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/DerivedSources.pro b/WebKitTools/WebKitTestRunner/DerivedSources.pro
>new file mode 100644
>index 0000000000000000000000000000000000000000..bab70cc6f6255473c8a4c513ffee85a52b2eafc6
>--- /dev/null
>+++ b/WebKitTools/WebKitTestRunner/DerivedSources.pro
>@@ -0,0 +1,57 @@
>+# DerivedSources - qmake build info
>+
>+CONFIG -= debug_and_release
>+
>+TEMPLATE = lib
>+TARGET = dummy
>+
>+QMAKE_EXTRA_TARGETS += generated_files
>+
>+GENERATED_SOURCES_DIR = generated
>+
>+IDL_BINDINGS += \
>+    InjectedBundle/Bindings/EventSendingController.idl \
>+    InjectedBundle/Bindings/GCController.idl \
>+    InjectedBundle/Bindings/LayoutTestController.idl \
>+
>+defineTest(addExtraCompiler) {
>+    eval($${1}.CONFIG = target_predeps no_link)
>+    eval($${1}.variable_out =)
>+    eval($${1}.dependency_type = TYPE_C)
>+
>+    wkScript = $$eval($${1}.wkScript)
>+    eval($${1}.depends += $$wkScript)
>+
>+    export($${1}.CONFIG)
>+    export($${1}.variable_out)
>+    export($${1}.dependency_type)
>+    export($${1}.depends)
>+
>+    QMAKE_EXTRA_COMPILERS += $$1
>+    generated_files.depends += compiler_$${1}_make_all
>+    export(QMAKE_EXTRA_COMPILERS)
>+    export(generated_files.depends)
>+    return(true)
>+}
>+
>+SRC_ROOT_DIR = $$replace(PWD, /WebKitTools/WebKitTestRunner, /)
>+
>+# Make sure forwarded headers needed by this project are present
>+fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKitTools/WebKitTestRunner $${OUTPUT_DIR}/include qt
>+fwheader_generator.depends  = $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl
>+generated_files.depends     += fwheader_generator
>+QMAKE_EXTRA_TARGETS         += fwheader_generator
>+
>+# GENERATOR 1: IDL compiler
>+idl.output = $${GENERATED_SOURCES_DIR}/JS${QMAKE_FILE_BASE}.cpp
>+idl.input = IDL_BINDINGS
>+idl.wkScript = $$PWD/../../WebCore/bindings/scripts/generate-bindings.pl
>+idl.commands = perl -I$$PWD/../../WebCore/bindings/scripts -I$$PWD/InjectedBundle/Bindings $$idl.wkScript --defines \"\" --generator TestRunner --include $$PWD/InjectedBundle/Bindings --outputDir $$GENERATED_SOURCES_DIR --preprocessor \"$${QMAKE_MOC} -E\" ${QMAKE_FILE_NAME}
>+idl.depends = $$PWD/../../WebCore/bindings/scripts/CodeGenerator.pm \
>+              $$PWD/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm \
>+              $$PWD/../../WebCore/bindings/scripts/IDLParser.pm \
>+              $$PWD/../../WebCore/bindings/scripts/IDLStructure.pm \
>+              $$PWD/../../WebCore/bindings/scripts/InFilesParser.pm \
>+              $$PWD/../../WebCore/bindings/scripts/generate-bindings.pl
>+addExtraCompiler(idl)
>+
>diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
>new file mode 100644
>index 0000000000000000000000000000000000000000..d596f332bfa7795225490321c0b714379897416a
>--- /dev/null
>+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro
>@@ -0,0 +1,69 @@
>+TEMPLATE = lib
>+
>+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
>+
>+SOURCES += \
>+    ../InjectedBundle.cpp \
>+    ../InjectedBundle.h \
>+    ../InjectedBundleMain.cpp \
>+    ../InjectedBundlePage.cpp \
>+    ../InjectedBundlePage.h \
>+    ../EventSendingController.cpp \
>+    ../EventSendingController.h \
>+    ../GCController.cpp \
>+    ../GCController.h \
>+    ../LayoutTestController.cpp \
>+    ../LayoutTestController.h \
>+    ../Bindings/JSWrapper.cpp \
>+    ActivateFontsQt.cpp \
>+    LayoutTestControllerQt.cpp \
>+    $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSEventSendingController.cpp \
>+    $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSGCController.cpp \
>+    $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated/JSLayoutTestController.cpp \
>+
>+HEADERS += \
>+    ../ActivateFonts.h \
>+    ../EventSendingController.h \
>+    ../GCController.h \
>+    ../InjectedBundle.h \
>+    ../InjectedBundlePage.h \
>+    ../LayoutTestController.h \
>+
>+!CONFIG(release, debug|release) {
>+    OBJECTS_DIR = obj/debug
>+} else { # Release
>+    OBJECTS_DIR = obj/release
>+}
>+
>+include(../../../../WebKit.pri)
>+include(../../../../JavaScriptCore/JavaScriptCore.pri)
>+addJavaScriptCoreLib(../../../../JavaScriptCore)
>+include(../../../../WebKit2/WebKit2.pri)
>+addWebKit2Lib(../../../../WebKit2)
>+
>+INCLUDEPATH += \
>+    $$PWD \
>+    $$PWD/.. \
>+    $$PWD/../.. \
>+    $$PWD/../Bindings \
>+    $$PWD/../../../../JavaScriptCore \
>+    $$PWD/../../../../JavaScriptCore/wtf \
>+    $$PWD/../../../../WebKit2 \
>+    $$PWD/../../../../WebKit2/Shared \
>+    $$OUTPUT_DIR/WebKitTools/WebKitTestRunner/generated
>+
>+INCLUDEPATH += \
>+    $$OUTPUT_DIR/include \
>+    $$OUTPUT_DIR/WebCore/generated
>+
>+PREFIX_HEADER = $$PWD/../../WebKitTestRunnerPrefix.h
>+QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
>+
>+unix:!mac {
>+    CONFIG += link_pkgconfig
>+    PKGCONFIG += fontconfig
>+}
>+
>+TARGET = WTRInjectedBundle
>+DESTDIR = $$OUTPUT_DIR/lib
>+!CONFIG(standalone_package): CONFIG -= app_bundle
>diff --git a/WebKitTools/WebKitTestRunner/WebKitTestRunner.pro b/WebKitTools/WebKitTestRunner/WebKitTestRunner.pro
>new file mode 100644
>index 0000000000000000000000000000000000000000..677abb3969dfa550fcbe6898a0ad328cba298ed7
>--- /dev/null
>+++ b/WebKitTools/WebKitTestRunner/WebKitTestRunner.pro
>@@ -0,0 +1,5 @@
>+TEMPLATE = subdirs
>+
>+SUBDIRS = qt/WebKitTestRunner.pro \
>+          InjectedBundle/qt/InjectedBundle.pro \
>+
>diff --git a/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
>deleted file mode 100644
>index 6cd716e9a065935d997dee157d0ecdb76e5e9691..0000000000000000000000000000000000000000
>--- 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

Actions: View | Formatted Diff | Diff

Attachments on bug 47333: 70069