[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 14:20:50 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit df250fa30171e83d843915a6236e127a85d18207
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 22:43:14 2010 +0000
2010-10-06 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Add WebKitTestRunner's build files
https://bugs.webkit.org/show_bug.cgi?id=44155
Add the new subdirs.
* DerivedSources.pro:
* WebKit.pro:
2010-10-06 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Add WebKitTestRunner's build files
https://bugs.webkit.org/show_bug.cgi?id=44155
Parts was taken by Zoltan Horvath's patch.
* Scripts/generate-forwarding-headers.pl: Moved from WebKit2.
* Scripts/webkitdirs.pm: Make the generated files needed by WTR.
* WebKitTestRunner/PlatformWebView.h: Addeed typedefs for
PlatformWKView and PlatformWindow (void* for now).
Buildfix the case when __APPLE__ is not defined.
* WebKitTestRunner/qt/DerivedSources.pro: Added.
* WebKitTestRunner/qt/PlatformWebViewQt.cpp: Added.
Empty stub implementation.
(WTR::registerWindowClass):
(WTR::PlatformWebView::PlatformWebView):
(WTR::PlatformWebView::~PlatformWebView):
(WTR::PlatformWebView::resizeTo):
(WTR::PlatformWebView::page):
(WTR::PlatformWebView::focus):
* WebKitTestRunner/qt/TestControllerQt.cpp: Added.
Empty stub implementation.
(WTR::registerWindowClass):
(WTR::TestController::runUntil):
(WTR::TestController::platformInitialize):
(WTR::TestController::initializeInjectedBundlePath):
(WTR::TestController::initializeTestPluginDirectory):
(WTR::TestController::platformInitializeContext):
* WebKitTestRunner/qt/WebKitTestRunner.pro: Added.
* WebKitTestRunner/qt/main.cpp: Added.
(main):
2010-10-06 Balazs Kelemen <kbalazs at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Add WebKitTestRunner's build files
https://bugs.webkit.org/show_bug.cgi?id=44155
* DerivedSources.pro: Changes according the new location
of generate-forwarding-headers.pl.
* UIProcess/API/C/WebKit2.h: Do not check the value of the
__APPLE__ define if it is not defined.
* WebKit2.pro: Changes according the new location
of generate-forwarding-headers.pl. Added missing files
to the build that provides API that is used by WTR.
* generate-forwarding-headers.pl: Moved to WebKitTools/Scripts
since from now this is not only used by WebKit2.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 2311978..4941b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-06 Balazs Kelemen <kbalazs at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Add WebKitTestRunner's build files
+ https://bugs.webkit.org/show_bug.cgi?id=44155
+
+ Add the new subdirs.
+ * DerivedSources.pro:
+ * WebKit.pro:
+
2010-10-04 Gyuyoung Kim <gyuyoung.kim at samsung.com>
Reviewed by Antonio Gomes.
diff --git a/DerivedSources.pro b/DerivedSources.pro
index 880a716..0015af6 100644
--- a/DerivedSources.pro
+++ b/DerivedSources.pro
@@ -8,6 +8,7 @@ SUBDIRS += \
webkit2 {
SUBDIRS += WebKit2/DerivedSources.pro
+ SUBDIRS += WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
}
for(subpro, SUBDIRS) {
diff --git a/WebKit.pro b/WebKit.pro
index 9fd9c2e..02d00c9 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -33,6 +33,9 @@ build-qtscript {
webkit2 {
exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
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
}
symbian {
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8e63b36..6aecdc3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-06 Balazs Kelemen <kbalazs at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Add WebKitTestRunner's build files
+ https://bugs.webkit.org/show_bug.cgi?id=44155
+
+ * DerivedSources.pro: Changes according the new location
+ of generate-forwarding-headers.pl.
+ * UIProcess/API/C/WebKit2.h: Do not check the value of the
+ __APPLE__ define if it is not defined.
+ * WebKit2.pro: Changes according the new location
+ of generate-forwarding-headers.pl. Added missing files
+ to the build that provides API that is used by WTR.
+ * generate-forwarding-headers.pl: Moved to WebKitTools/Scripts
+ since from now this is not only used by WebKit2.
+
2010-10-06 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index b73e935..c802af5 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -64,8 +64,8 @@ processmessagereceiver_generator.target = $${OUTPUT_DIR}/WebKit2/generated/Web
generated_files.depends += processmessagereceiver_generator
QMAKE_EXTRA_TARGETS += processmessagereceiver_generator
-fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKit2/generate-forwarding-headers.pl $${OUTPUT_DIR}/include qt
-fwheader_generator.depends = $${SRC_ROOT_DIR}/WebKit2/generate-forwarding-headers.pl
+fwheader_generator.commands = perl $${SRC_ROOT_DIR}/WebKitTools/Scripts/generate-forwarding-headers.pl $${SRC_ROOT_DIR}/WebKit2 $${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
diff --git a/WebKit2/UIProcess/API/C/WebKit2.h b/WebKit2/UIProcess/API/C/WebKit2.h
index 74e1f8c..5bb9bd7 100644
--- a/WebKit2/UIProcess/API/C/WebKit2.h
+++ b/WebKit2/UIProcess/API/C/WebKit2.h
@@ -50,7 +50,7 @@
#include <WebKit2/WKURLRequest.h>
#include <WebKit2/WKURLResponse.h>
-#if !__APPLE__ || __OBJC__
+#if !(defined(__APPLE__) && __APPLE__) || (defined(__OBJC__) && __OBJC__)
#include <WebKit2/WKView.h>
#endif
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 064fae6..be41d5f 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -213,6 +213,7 @@ HEADERS += \
UIProcess/API/C/WKPageNamespace.h \
UIProcess/API/C/WKPagePrivate.h \
UIProcess/API/C/WKPreferences.h \
+ UIProcess/API/C/WKPreferencesPrivate.h \
UIProcess/API/cpp/qt/WKStringQt.h \
UIProcess/API/cpp/qt/WKURLQt.h \
UIProcess/API/cpp/WKRetainPtr.h \
@@ -338,6 +339,7 @@ SOURCES += \
UIProcess/API/C/WKPage.cpp \
UIProcess/API/C/WKPageNamespace.cpp \
UIProcess/API/C/WKPreferences.cpp \
+ UIProcess/API/C/WKPreferencesPrivate.cpp \
UIProcess/API/qt/ClientImpl.cpp \
UIProcess/API/qt/qgraphicswkview.cpp \
UIProcess/API/qt/qwkpage.cpp \
diff --git a/WebKit2/generate-forwarding-headers.pl b/WebKit2/generate-forwarding-headers.pl
deleted file mode 100755
index e836fa4..0000000
--- a/WebKit2/generate-forwarding-headers.pl
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2010 Andras Becsi (abecsi at inf.u-szeged.hu), University of Szeged
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# A script which searches for headers included by WebKit2 files
-# and generates forwarding headers for these headers.
-
-use strict;
-use Cwd qw(abs_path realpath);
-use File::Find;
-use File::Basename;
-use File::Spec::Functions;
-
-my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), ".."));
-my @platformPrefixes = ("android", "brew", "cf", "chromium", "curl", "efl", "gtk", "haiku", "mac", "qt", "soup", "v8", "win", "wx");
-my @frameworks = ( "JavaScriptCore", "WebCore", "WebKit2");
-my @skippedPrefixes;
-my @frameworkHeaders;
-my $framework;
-my %neededHeaders;
-
-my $outputDirectory = $ARGV[0];
-shift;
-my $platform = $ARGV[0];
-
-foreach my $prefix (@platformPrefixes) {
- push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform);
-}
-
-foreach (@frameworks) {
- $framework = $_;
- find(\&collectNeededHeaders, File::Spec->catfile($srcRoot, "WebKit2"));
- find(\&collectFameworkHeaderPaths, File::Spec->catfile($srcRoot, $framework));
- createForwardingHeadersForFramework();
-}
-
-sub collectNeededHeaders {
- my $filePath = $File::Find::name;
- my $file = $_;
- if ($filePath =~ '\.h$|\.cpp$') {
- open(FILE, "<$file") or die "Could not open $filePath.\n";
- while (<FILE>) {
- if (m/^#.*<$framework\/(.*\.h)/) {
- $neededHeaders{$1} = 1;
- }
- }
- close(FILE);
- }
-}
-
-sub collectFameworkHeaderPaths {
- my $filePath = $File::Find::name;
- my $file = $_;
- if ($filePath =~ '\.h$' && $filePath !~ "ForwardingHeaders" && grep{$file eq $_} keys %neededHeaders) {
- my $headerPath = substr($filePath, length("$srcRoot/$framework/"));
- push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes));
- }
-}
-
-sub createForwardingHeadersForFramework {
- foreach my $header (@frameworkHeaders) {
- my $forwardingHeaderPath = File::Spec->catfile($outputDirectory, $framework, basename($header));
- my $expectedIncludeStatement = "#include \"$header\"";
- my $foundIncludeStatement = 0;
- $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");
- chomp($foundIncludeStatement);
- if (! $foundIncludeStatement || $foundIncludeStatement ne $expectedIncludeStatement) {
- print "[Creating forwarding header for $framework/$header]\n";
- open(FORWARDING_HEADER, ">$forwardingHeaderPath") or die "Could not open $forwardingHeaderPath.";
- print FORWARDING_HEADER "$expectedIncludeStatement\n";
- close(FORWARDING_HEADER);
- }
- close(EXISTING_HEADER);
- }
-}
-
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 26c3261..9f0f112 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,38 @@
+2010-10-06 Balazs Kelemen <kbalazs at webkit.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Add WebKitTestRunner's build files
+ https://bugs.webkit.org/show_bug.cgi?id=44155
+
+ Parts was taken by Zoltan Horvath's patch.
+
+ * Scripts/generate-forwarding-headers.pl: Moved from WebKit2.
+ * Scripts/webkitdirs.pm: Make the generated files needed by WTR.
+ * WebKitTestRunner/PlatformWebView.h: Addeed typedefs for
+ PlatformWKView and PlatformWindow (void* for now).
+ Buildfix the case when __APPLE__ is not defined.
+ * WebKitTestRunner/qt/DerivedSources.pro: Added.
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp: Added.
+ Empty stub implementation.
+ (WTR::registerWindowClass):
+ (WTR::PlatformWebView::PlatformWebView):
+ (WTR::PlatformWebView::~PlatformWebView):
+ (WTR::PlatformWebView::resizeTo):
+ (WTR::PlatformWebView::page):
+ (WTR::PlatformWebView::focus):
+ * WebKitTestRunner/qt/TestControllerQt.cpp: Added.
+ Empty stub implementation.
+ (WTR::registerWindowClass):
+ (WTR::TestController::runUntil):
+ (WTR::TestController::platformInitialize):
+ (WTR::TestController::initializeInjectedBundlePath):
+ (WTR::TestController::initializeTestPluginDirectory):
+ (WTR::TestController::platformInitializeContext):
+ * WebKitTestRunner/qt/WebKitTestRunner.pro: Added.
+ * WebKitTestRunner/qt/main.cpp: Added.
+ (main):
+
2010-10-06 Tony Chang <tony at chromium.org>
Unreviewed, rolling out r69202.
diff --git a/WebKitTools/Scripts/generate-forwarding-headers.pl b/WebKitTools/Scripts/generate-forwarding-headers.pl
new file mode 100755
index 0000000..ed58702
--- /dev/null
+++ b/WebKitTools/Scripts/generate-forwarding-headers.pl
@@ -0,0 +1,99 @@
+#!/usr/bin/perl -w
+# Copyright (C) 2010 Andras Becsi (abecsi at inf.u-szeged.hu), University of Szeged
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UNIVERSITY OF SZEGED OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# A script which searches for headers included by WebKit2 files
+# and generates forwarding headers for these headers.
+
+use strict;
+use Cwd qw(abs_path realpath);
+use File::Find;
+use File::Basename;
+use File::Spec::Functions;
+
+my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
+my $incFromRoot = abs_path($ARGV[0]);
+my @platformPrefixes = ("android", "brew", "cf", "chromium", "curl", "efl", "gtk", "haiku", "mac", "qt", "soup", "v8", "win", "wx");
+my @frameworks = ( "JavaScriptCore", "WebCore", "WebKit2");
+my @skippedPrefixes;
+my @frameworkHeaders;
+my $framework;
+my %neededHeaders;
+
+shift;
+my $outputDirectory = $ARGV[0];
+shift;
+my $platform = $ARGV[0];
+
+foreach my $prefix (@platformPrefixes) {
+ push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform);
+}
+
+foreach (@frameworks) {
+ $framework = $_;
+ find(\&collectNeededHeaders, $incFromRoot);
+ find(\&collectFameworkHeaderPaths, File::Spec->catfile($srcRoot, $framework));
+ createForwardingHeadersForFramework();
+}
+
+sub collectNeededHeaders {
+ my $filePath = $File::Find::name;
+ my $file = $_;
+ if ($filePath =~ '\.h$|\.cpp$') {
+ open(FILE, "<$file") or die "Could not open $filePath.\n";
+ while (<FILE>) {
+ if (m/^#.*<$framework\/(.*\.h)/) {
+ $neededHeaders{$1} = 1;
+ }
+ }
+ close(FILE);
+ }
+}
+
+sub collectFameworkHeaderPaths {
+ my $filePath = $File::Find::name;
+ my $file = $_;
+ if ($filePath =~ '\.h$' && $filePath !~ "ForwardingHeaders" && grep{$file eq $_} keys %neededHeaders) {
+ my $headerPath = substr($filePath, length("$srcRoot/$framework/"));
+ push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes));
+ }
+}
+
+sub createForwardingHeadersForFramework {
+ foreach my $header (@frameworkHeaders) {
+ my $forwardingHeaderPath = File::Spec->catfile($outputDirectory, $framework, basename($header));
+ my $expectedIncludeStatement = "#include \"$header\"";
+ my $foundIncludeStatement = 0;
+ $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");
+ chomp($foundIncludeStatement);
+ if (! $foundIncludeStatement || $foundIncludeStatement ne $expectedIncludeStatement) {
+ print "[Creating forwarding header for $framework/$header]\n";
+ open(FORWARDING_HEADER, ">$forwardingHeaderPath") or die "Could not open $forwardingHeaderPath.";
+ print FORWARDING_HEADER "$expectedIncludeStatement\n";
+ close(FORWARDING_HEADER);
+ }
+ close(EXISTING_HEADER);
+ }
+}
+
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 94ad556..0218e1f 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1530,6 +1530,7 @@ sub buildQMakeProject($@)
my @subdirs = ("JavaScriptCore", "WebCore", "WebKit/qt/Api");
if (grep { $_ eq "CONFIG+=webkit2"} @buildArgs) {
push @subdirs, "WebKit2";
+ push @subdirs, "WebKitTools/WebKitTestRunner/qt";
}
for my $subdir (@subdirs) {
diff --git a/WebKitTools/WebKitTestRunner/PlatformWebView.h b/WebKitTools/WebKitTestRunner/PlatformWebView.h
index 29c63ae..83c34b4 100644
--- a/WebKitTools/WebKitTestRunner/PlatformWebView.h
+++ b/WebKitTools/WebKitTestRunner/PlatformWebView.h
@@ -26,7 +26,7 @@
#ifndef PlatformWebView_h
#define PlatformWebView_h
-#if __APPLE__
+#if defined(__APPLE__) && __APPLE__
#if __OBJC__
@class WKView;
@class NSWindow;
@@ -39,6 +39,9 @@ typedef NSWindow* PlatformWindow;
#elif defined(WIN32) || defined(_WIN32)
typedef WKViewRef PlatformWKView;
typedef HWND PlatformWindow;
+#elif defined(BUILDING_QT__)
+typedef void* PlatformWKView;
+typedef void* PlatformWindow;
#endif
namespace WTR {
diff --git a/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
new file mode 100644
index 0000000..6cd716e
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/qt/DerivedSources.pro
@@ -0,0 +1,18 @@
+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
diff --git a/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp b/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
new file mode 100644
index 0000000..de9389a
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 University of Szeged. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "PlatformWebView.h"
+#include "NotImplemented.h"
+
+namespace WTR {
+
+PlatformWebView::PlatformWebView(WKPageNamespaceRef namespaceRef)
+{
+ notImplemented();
+}
+
+PlatformWebView::~PlatformWebView()
+{
+}
+
+void PlatformWebView::resizeTo(unsigned width, unsigned height)
+{
+ notImplemented();
+}
+
+WKPageRef PlatformWebView::page()
+{
+ notImplemented();
+ return 0;
+}
+
+void PlatformWebView::focus()
+{
+ notImplemented();
+}
+
+} // namespace WTR
diff --git a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
new file mode 100644
index 0000000..b697471
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 University of Szeged. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "TestController.h"
+#include "NotImplemented.h"
+
+namespace WTR {
+
+void TestController::runUntil(bool& done)
+{
+ notImplemented();
+}
+
+void TestController::platformInitialize()
+{
+ notImplemented();
+}
+
+void TestController::initializeInjectedBundlePath()
+{
+ notImplemented();
+}
+
+void TestController::initializeTestPluginDirectory()
+{
+ notImplemented();
+}
+
+void TestController::platformInitializeContext()
+{
+ notImplemented();
+}
+
+} // namespace WTR
diff --git a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
new file mode 100644
index 0000000..6404b86
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -0,0 +1,66 @@
+TARGET = WebKitTestRunner
+CONFIG -= app_bundle
+
+BASEDIR = $$PWD/../
+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
+
+include(../../../WebKit.pri)
+
+!CONFIG(release, debug|release) {
+ OBJECTS_DIR = obj/debug
+} else { # Release
+ OBJECTS_DIR = obj/release
+}
+
+DEFINES += USE_SYSTEM_MALLOC
+
+INCLUDEPATH += \
+ $$BASEDIR \
+ $$BASEDIR/../../JavaScriptCore \
+ $$BASEDIR/../../WebKit2 \
+ $$BASEDIR/../../WebKit2/Shared \
+
+INCLUDEPATH += \
+ $$OUTPUT_DIR/include \
+
+
+DESTDIR = $$OUTPUT_DIR/bin
+
+unix:!mac {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += fontconfig
+}
+
+QT = core gui network
+
+HEADERS = \
+ $$BASEDIR/PlatformWebView.h \
+ $$BASEDIR/StringFunctions.h \
+ $$BASEDIR/TestController.h \
+ $$BASEDIR/TestInvocation.h
+
+SOURCES = \
+ main.cpp \
+ PlatformWebViewQt.cpp \
+ TestControllerQt.cpp \
+ $$BASEDIR/TestController.cpp \
+ $$BASEDIR/TestInvocation.cpp \
+
+PREFIX_HEADER = $$BASEDIR/WebKitTestRunnerPrefix.h
+QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
+
+linux-* {
+ # From Creator's src/rpath.pri:
+ # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+ # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var.
+ QMAKE_RPATHDIR = \$\$ORIGIN/../lib $$QMAKE_RPATHDIR
+ MY_RPATH = $$join(QMAKE_RPATHDIR, ":")
+
+ QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${MY_RPATH}\'
+ QMAKE_RPATHDIR =
+} else {
+ QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+}
+
+include(../../../JavaScriptCore/JavaScriptCore.pri)
+addJavaScriptCoreLib(../../../JavaScriptCore)
diff --git a/WebKitTools/WebKitTestRunner/qt/main.cpp b/WebKitTools/WebKitTestRunner/qt/main.cpp
new file mode 100644
index 0000000..2523f51
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/qt/main.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 University of Szeged.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "TestController.h"
+
+int main(int argc, const char* argv[])
+{
+ WTR::TestController controller(argc, argv);
+
+ return 0;
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list