Remove Qt code from Tools/
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Oct 2013 21:27:12 +0000 (21:27 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 2 Oct 2013 21:27:12 +0000 (21:27 +0000)
https://bugs.webkit.org/show_bug.cgi?id=122227

Reviewed by Andreas Kling.

* DumpRenderTree/WorkQueue.cpp:
* DumpRenderTree/blackberry/src.pro: Removed.
* DumpRenderTree/qt/DumpRenderTree.pro: Removed.
* DumpRenderTree/qt/DumpRenderTree.qrc: Removed.
* DumpRenderTree/qt/DumpRenderTreeMain.cpp: Removed.
* DumpRenderTree/qt/DumpRenderTreeQt.cpp: Removed.
* DumpRenderTree/qt/DumpRenderTreeQt.h: Removed.
* DumpRenderTree/qt/EventSenderQt.cpp: Removed.
* DumpRenderTree/qt/EventSenderQt.h: Removed.
* DumpRenderTree/qt/GCControllerQt.cpp: Removed.
* DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: Removed.
* DumpRenderTree/qt/TestRunnerQt.cpp: Removed.
* DumpRenderTree/qt/TestRunnerQt.h: Removed.
* DumpRenderTree/qt/TextInputControllerQt.cpp: Removed.
* DumpRenderTree/qt/TextInputControllerQt.h: Removed.
* DumpRenderTree/qt/WorkQueueItemQt.cpp: Removed.
* DumpRenderTree/qt/WorkQueueItemQt.h: Removed.
* DumpRenderTree/qt/fonts/AHEM____.TTF: Removed.
* DumpRenderTree/qt/resources/user.css: Removed.
* DumpRenderTree/qt/testplugin.cpp: Removed.
* DumpRenderTree/qt/testplugin.h: Removed.
* ImageDiff/ImageDiff.pro: Removed.
* ImageDiff/qt/ImageDiff.cpp: Removed.
* MiniBrowser/qt/BrowserWindow.cpp: Removed.
* MiniBrowser/qt/BrowserWindow.h: Removed.
* MiniBrowser/qt/MiniBrowser.pro: Removed.
* MiniBrowser/qt/MiniBrowser.qrc: Removed.
* MiniBrowser/qt/MiniBrowserApplication.cpp: Removed.
* MiniBrowser/qt/MiniBrowserApplication.h: Removed.
* MiniBrowser/qt/UrlLoader.cpp: Removed.
* MiniBrowser/qt/UrlLoader.h: Removed.
* MiniBrowser/qt/icons/checkbox_checked.png: Removed.
* MiniBrowser/qt/icons/checkbox_unchecked.png: Removed.
* MiniBrowser/qt/icons/contents_width.png: Removed.
* MiniBrowser/qt/icons/favicon.png: Removed.
* MiniBrowser/qt/icons/find.png: Removed.
* MiniBrowser/qt/icons/folder.png: Removed.
* MiniBrowser/qt/icons/info.png: Removed.
* MiniBrowser/qt/icons/next.png: Removed.
* MiniBrowser/qt/icons/plus.png: Removed.
* MiniBrowser/qt/icons/previous.png: Removed.
* MiniBrowser/qt/icons/refresh.png: Removed.
* MiniBrowser/qt/icons/stop.png: Removed.
* MiniBrowser/qt/icons/titlebar.png: Removed.
* MiniBrowser/qt/icons/touch.png: Removed.
* MiniBrowser/qt/icons/touchpoint.png: Removed.
* MiniBrowser/qt/icons/up.png: Removed.
* MiniBrowser/qt/js/MultiSelect.js: Removed.
* MiniBrowser/qt/main.cpp: Removed.
* MiniBrowser/qt/qml/AlertDialog.qml: Removed.
* MiniBrowser/qt/qml/AuthenticationDialog.qml: Removed.
* MiniBrowser/qt/qml/BrowserWindow.qml: Removed.
* MiniBrowser/qt/qml/CheckBox.qml: Removed.
* MiniBrowser/qt/qml/ColorChooser.qml: Removed.
* MiniBrowser/qt/qml/ConfirmDialog.qml: Removed.
* MiniBrowser/qt/qml/Dialog.qml: Removed.
* MiniBrowser/qt/qml/DialogButton.qml: Removed.
* MiniBrowser/qt/qml/DialogLineInput.qml: Removed.
* MiniBrowser/qt/qml/FilePicker.qml: Removed.
* MiniBrowser/qt/qml/ItemSelector.qml: Removed.
* MiniBrowser/qt/qml/MockTouchPoint.qml: Removed.
* MiniBrowser/qt/qml/PromptDialog.qml: Removed.
* MiniBrowser/qt/qml/ProxyAuthenticationDialog.qml: Removed.
* MiniBrowser/qt/qml/ScrollIndicator.qml: Removed.
* MiniBrowser/qt/qml/ViewportInfoItem.qml: Removed.
* MiniBrowser/qt/raw/DerivedSources.pri: Removed.
* MiniBrowser/qt/raw/MiniBrowserRaw.pro: Removed.
* MiniBrowser/qt/raw/Target.pri: Removed.
* MiniBrowser/qt/raw/View.cpp: Removed.
* MiniBrowser/qt/raw/View.h: Removed.
* MiniBrowser/qt/utils.cpp: Removed.
* MiniBrowser/qt/utils.h: Removed.
* QtTestBrowser/QtTestBrowser.pro: Removed.
* QtTestBrowser/QtTestBrowser.qrc: Removed.
* QtTestBrowser/cookiejar.cpp: Removed.
* QtTestBrowser/cookiejar.h: Removed.
* QtTestBrowser/favicon.png: Removed.
* QtTestBrowser/fpstimer.cpp: Removed.
* QtTestBrowser/fpstimer.h: Removed.
* QtTestBrowser/launcherwindow.cpp: Removed.
* QtTestBrowser/launcherwindow.h: Removed.
* QtTestBrowser/locationedit.cpp: Removed.
* QtTestBrowser/locationedit.h: Removed.
* QtTestBrowser/mainwindow.cpp: Removed.
* QtTestBrowser/mainwindow.h: Removed.
* QtTestBrowser/qttestbrowser.cpp: Removed.
* QtTestBrowser/urlloader.cpp: Removed.
* QtTestBrowser/urlloader.h: Removed.
* QtTestBrowser/useragentlist.txt: Removed.
* QtTestBrowser/utils.cpp: Removed.
* QtTestBrowser/utils.h: Removed.
* QtTestBrowser/webinspector.h: Removed.
* QtTestBrowser/webpage.cpp: Removed.
* QtTestBrowser/webpage.h: Removed.
* QtTestBrowser/webview.cpp: Removed.
* QtTestBrowser/webview.h: Removed.
* TestWebKitAPI/DerivedSources.pri: Removed.
* TestWebKitAPI/InjectedBundle.pri: Removed.
* TestWebKitAPI/PlatformWebView.h:
* TestWebKitAPI/TestWebKitAPI.pri: Removed.
* TestWebKitAPI/TestWebKitAPI.pro: Removed.
* TestWebKitAPI/Tests.pri: Removed.
* TestWebKitAPI/Tests/JavaScriptCore/JavaScriptCore.pro: Removed.
* TestWebKitAPI/Tests/WTF/IntegerToStringConversion.cpp:
* TestWebKitAPI/Tests/WTF/WTF.pro: Removed.
* TestWebKitAPI/Tests/WebKit2/WebKit2.pro: Removed.
* TestWebKitAPI/qt/InjectedBundleControllerQt.cpp: Removed.
* TestWebKitAPI/qt/PlatformUtilitiesQt.cpp: Removed.
* TestWebKitAPI/qt/PlatformWebViewQt.cpp: Removed.
* TestWebKitAPI/qt/main.cpp: Removed.
* Tools.pro: Removed.
* WebKitTestRunner/DerivedSources.pri: Removed.
* WebKitTestRunner/EventSenderProxy.h:
* WebKitTestRunner/InjectedBundle/DerivedSources.pri: Removed.
* WebKitTestRunner/InjectedBundle/InjectedBundle.pro: Removed.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::resetAfterTest):
(WTR::InjectedBundlePage::dumpDOMAsWebArchive):
(WTR::InjectedBundlePage::didClearWindowForFrame):
* WebKitTestRunner/InjectedBundle/Target.pri: Removed.
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp: Removed.
* WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp: Removed.
* WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp: Removed.
* WebKitTestRunner/PlatformWebView.h:
* WebKitTestRunner/Target.pri: Removed.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/WebKitTestRunner.pro: Removed.
* WebKitTestRunner/qt/EventSenderProxyQt.cpp: Removed.
* WebKitTestRunner/qt/PlatformWebViewQt.cpp: Removed.
* WebKitTestRunner/qt/TestControllerQt.cpp: Removed.
* WebKitTestRunner/qt/TestInvocationQt.cpp: Removed.
* WebKitTestRunner/qt/WebKitTestRunner.qrc: Removed.
* WebKitTestRunner/qt/main.cpp: Removed.
* WebKitTestRunner/qt/resources/user.css: Removed.
* qmake/.qmake.cache: Removed.
* qmake/.qmake.conf: Removed.
* qmake/README: Removed.
* qmake/config.tests/README: Removed.
* qmake/config.tests/fontconfig/fontconfig.cpp: Removed.
* qmake/config.tests/fontconfig/fontconfig.pro: Removed.
* qmake/config.tests/gccdepends/empty.cpp: Removed.
* qmake/config.tests/gccdepends/gccdepends.pro: Removed.
* qmake/config.tests/glx/glx.cpp: Removed.
* qmake/config.tests/glx/glx.pro: Removed.
* qmake/config.tests/gnuld/gnuld.pro: Removed.
* qmake/config.tests/gnuld/main.cpp: Removed.
* qmake/config.tests/libXcomposite/libXcomposite.cpp: Removed.
* qmake/config.tests/libXcomposite/libXcomposite.pro: Removed.
* qmake/config.tests/libXrender/libXrender.cpp: Removed.
* qmake/config.tests/libXrender/libXrender.pro: Removed.
* qmake/config.tests/libwebp/libwebp.cpp: Removed.
* qmake/config.tests/libwebp/libwebp.pro: Removed.
* qmake/config.tests/libxml2/libxml2.cpp: Removed.
* qmake/config.tests/libxml2/libxml2.pro: Removed.
* qmake/config.tests/libxslt/libxslt.cpp: Removed.
* qmake/config.tests/libxslt/libxslt.pro: Removed.
* qmake/config.tests/libzlib/libzlib.cpp: Removed.
* qmake/config.tests/libzlib/libzlib.pro: Removed.
* qmake/dump-features.pl: Removed.
* qmake/mkspecs/features/configure.prf: Removed.
* qmake/mkspecs/features/default_post.prf: Removed.
* qmake/mkspecs/features/default_pre.prf: Removed.
* qmake/mkspecs/features/features.prf: Removed.
* qmake/mkspecs/features/features.pri: Removed.
* qmake/mkspecs/features/force_static_libs_as_shared.prf: Removed.
* qmake/mkspecs/features/functions.prf: Removed.
* qmake/mkspecs/features/gprof.prf: Removed.
* qmake/mkspecs/features/mac/default_post.prf: Removed.
* qmake/mkspecs/features/mac/default_pre.prf: Removed.
* qmake/mkspecs/features/minimal_qt.prf: Removed.
* qmake/mkspecs/features/production_build.prf: Removed.
* qmake/mkspecs/features/rpath.prf: Removed.
* qmake/mkspecs/features/unix/default_post.prf: Removed.
* qmake/mkspecs/features/unix/default_pre.prf: Removed.
* qmake/mkspecs/features/unix/icc.prf: Removed.
* qmake/mkspecs/features/use_all_in_one_files.prf: Removed.
* qmake/mkspecs/features/valgrind.prf: Removed.
* qmake/mkspecs/features/webkit_modules.prf: Removed.
* qmake/mkspecs/features/win32/default_post.prf: Removed.
* qmake/mkspecs/features/win32/default_pre.prf: Removed.
* qmake/mkspecs/modules/angle.prf: Removed.
* qmake/mkspecs/modules/javascriptcore.prf: Removed.
* qmake/mkspecs/modules/webcore.prf: Removed.
* qmake/mkspecs/modules/webkit1.prf: Removed.
* qmake/mkspecs/modules/webkit2.prf: Removed.
* qmake/mkspecs/modules/wtf.prf: Removed.

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

185 files changed:
Tools/ChangeLog
Tools/DumpRenderTree/WorkQueue.cpp
Tools/DumpRenderTree/blackberry/src.pro [deleted file]
Tools/DumpRenderTree/qt/DumpRenderTree.pro [deleted file]
Tools/DumpRenderTree/qt/DumpRenderTree.qrc [deleted file]
Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp [deleted file]
Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp [deleted file]
Tools/DumpRenderTree/qt/DumpRenderTreeQt.h [deleted file]
Tools/DumpRenderTree/qt/EventSenderQt.cpp [deleted file]
Tools/DumpRenderTree/qt/EventSenderQt.h [deleted file]
Tools/DumpRenderTree/qt/GCControllerQt.cpp [deleted file]
Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro [deleted file]
Tools/DumpRenderTree/qt/TestRunnerQt.cpp [deleted file]
Tools/DumpRenderTree/qt/TestRunnerQt.h [deleted file]
Tools/DumpRenderTree/qt/TextInputControllerQt.cpp [deleted file]
Tools/DumpRenderTree/qt/TextInputControllerQt.h [deleted file]
Tools/DumpRenderTree/qt/WorkQueueItemQt.cpp [deleted file]
Tools/DumpRenderTree/qt/WorkQueueItemQt.h [deleted file]
Tools/DumpRenderTree/qt/resources/user.css [deleted file]
Tools/DumpRenderTree/qt/testplugin.cpp [deleted file]
Tools/DumpRenderTree/qt/testplugin.h [deleted file]
Tools/ImageDiff/ImageDiff.pro [deleted file]
Tools/ImageDiff/qt/ImageDiff.cpp [deleted file]
Tools/MiniBrowser/qt/BrowserWindow.cpp [deleted file]
Tools/MiniBrowser/qt/BrowserWindow.h [deleted file]
Tools/MiniBrowser/qt/MiniBrowser.pro [deleted file]
Tools/MiniBrowser/qt/MiniBrowser.qrc [deleted file]
Tools/MiniBrowser/qt/MiniBrowserApplication.cpp [deleted file]
Tools/MiniBrowser/qt/MiniBrowserApplication.h [deleted file]
Tools/MiniBrowser/qt/UrlLoader.cpp [deleted file]
Tools/MiniBrowser/qt/UrlLoader.h [deleted file]
Tools/MiniBrowser/qt/icons/checkbox_checked.png [deleted file]
Tools/MiniBrowser/qt/icons/checkbox_unchecked.png [deleted file]
Tools/MiniBrowser/qt/icons/contents_width.png [deleted file]
Tools/MiniBrowser/qt/icons/favicon.png [deleted file]
Tools/MiniBrowser/qt/icons/find.png [deleted file]
Tools/MiniBrowser/qt/icons/folder.png [deleted file]
Tools/MiniBrowser/qt/icons/info.png [deleted file]
Tools/MiniBrowser/qt/icons/next.png [deleted file]
Tools/MiniBrowser/qt/icons/plus.png [deleted file]
Tools/MiniBrowser/qt/icons/previous.png [deleted file]
Tools/MiniBrowser/qt/icons/refresh.png [deleted file]
Tools/MiniBrowser/qt/icons/stop.png [deleted file]
Tools/MiniBrowser/qt/icons/titlebar.png [deleted file]
Tools/MiniBrowser/qt/icons/touch.png [deleted file]
Tools/MiniBrowser/qt/icons/touchpoint.png [deleted file]
Tools/MiniBrowser/qt/icons/up.png [deleted file]
Tools/MiniBrowser/qt/js/MultiSelect.js [deleted file]
Tools/MiniBrowser/qt/main.cpp [deleted file]
Tools/MiniBrowser/qt/qml/AlertDialog.qml [deleted file]
Tools/MiniBrowser/qt/qml/AuthenticationDialog.qml [deleted file]
Tools/MiniBrowser/qt/qml/BrowserWindow.qml [deleted file]
Tools/MiniBrowser/qt/qml/CheckBox.qml [deleted file]
Tools/MiniBrowser/qt/qml/ColorChooser.qml [deleted file]
Tools/MiniBrowser/qt/qml/ConfirmDialog.qml [deleted file]
Tools/MiniBrowser/qt/qml/Dialog.qml [deleted file]
Tools/MiniBrowser/qt/qml/DialogButton.qml [deleted file]
Tools/MiniBrowser/qt/qml/DialogLineInput.qml [deleted file]
Tools/MiniBrowser/qt/qml/FilePicker.qml [deleted file]
Tools/MiniBrowser/qt/qml/ItemSelector.qml [deleted file]
Tools/MiniBrowser/qt/qml/MockTouchPoint.qml [deleted file]
Tools/MiniBrowser/qt/qml/PromptDialog.qml [deleted file]
Tools/MiniBrowser/qt/qml/ProxyAuthenticationDialog.qml [deleted file]
Tools/MiniBrowser/qt/qml/ScrollIndicator.qml [deleted file]
Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml [deleted file]
Tools/MiniBrowser/qt/raw/DerivedSources.pri [deleted file]
Tools/MiniBrowser/qt/raw/MiniBrowserRaw.pro [deleted file]
Tools/MiniBrowser/qt/raw/Target.pri [deleted file]
Tools/MiniBrowser/qt/raw/View.cpp [deleted file]
Tools/MiniBrowser/qt/raw/View.h [deleted file]
Tools/MiniBrowser/qt/utils.cpp [deleted file]
Tools/MiniBrowser/qt/utils.h [deleted file]
Tools/QtTestBrowser/QtTestBrowser.pro [deleted file]
Tools/QtTestBrowser/QtTestBrowser.qrc [deleted file]
Tools/QtTestBrowser/cookiejar.cpp [deleted file]
Tools/QtTestBrowser/cookiejar.h [deleted file]
Tools/QtTestBrowser/favicon.png [deleted file]
Tools/QtTestBrowser/fpstimer.cpp [deleted file]
Tools/QtTestBrowser/fpstimer.h [deleted file]
Tools/QtTestBrowser/launcherwindow.cpp [deleted file]
Tools/QtTestBrowser/launcherwindow.h [deleted file]
Tools/QtTestBrowser/locationedit.cpp [deleted file]
Tools/QtTestBrowser/locationedit.h [deleted file]
Tools/QtTestBrowser/mainwindow.cpp [deleted file]
Tools/QtTestBrowser/mainwindow.h [deleted file]
Tools/QtTestBrowser/qttestbrowser.cpp [deleted file]
Tools/QtTestBrowser/urlloader.cpp [deleted file]
Tools/QtTestBrowser/urlloader.h [deleted file]
Tools/QtTestBrowser/useragentlist.txt [deleted file]
Tools/QtTestBrowser/utils.cpp [deleted file]
Tools/QtTestBrowser/utils.h [deleted file]
Tools/QtTestBrowser/webinspector.h [deleted file]
Tools/QtTestBrowser/webpage.cpp [deleted file]
Tools/QtTestBrowser/webpage.h [deleted file]
Tools/QtTestBrowser/webview.cpp [deleted file]
Tools/QtTestBrowser/webview.h [deleted file]
Tools/TestWebKitAPI/DerivedSources.pri [deleted file]
Tools/TestWebKitAPI/InjectedBundle.pri [deleted file]
Tools/TestWebKitAPI/PlatformWebView.h
Tools/TestWebKitAPI/TestWebKitAPI.pri [deleted file]
Tools/TestWebKitAPI/TestWebKitAPI.pro [deleted file]
Tools/TestWebKitAPI/Tests.pri [deleted file]
Tools/TestWebKitAPI/Tests/JavaScriptCore/JavaScriptCore.pro [deleted file]
Tools/TestWebKitAPI/Tests/WTF/IntegerToStringConversion.cpp
Tools/TestWebKitAPI/Tests/WTF/WTF.pro [deleted file]
Tools/TestWebKitAPI/Tests/WebKit2/WebKit2.pro [deleted file]
Tools/TestWebKitAPI/qt/InjectedBundleControllerQt.cpp [deleted file]
Tools/TestWebKitAPI/qt/PlatformUtilitiesQt.cpp [deleted file]
Tools/TestWebKitAPI/qt/PlatformWebViewQt.cpp [deleted file]
Tools/TestWebKitAPI/qt/main.cpp [deleted file]
Tools/Tools.pro [deleted file]
Tools/WebKitTestRunner/DerivedSources.pri [deleted file]
Tools/WebKitTestRunner/EventSenderProxy.h
Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri [deleted file]
Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.pro [deleted file]
Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
Tools/WebKitTestRunner/InjectedBundle/Target.pri [deleted file]
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp [deleted file]
Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp [deleted file]
Tools/WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp [deleted file]
Tools/WebKitTestRunner/PlatformWebView.h
Tools/WebKitTestRunner/Target.pri [deleted file]
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/TestController.h
Tools/WebKitTestRunner/WebKitTestRunner.pro [deleted file]
Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp [deleted file]
Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp [deleted file]
Tools/WebKitTestRunner/qt/TestControllerQt.cpp [deleted file]
Tools/WebKitTestRunner/qt/TestInvocationQt.cpp [deleted file]
Tools/WebKitTestRunner/qt/WebKitTestRunner.qrc [deleted file]
Tools/WebKitTestRunner/qt/main.cpp [deleted file]
Tools/WebKitTestRunner/qt/resources/user.css [deleted file]
Tools/qmake/.qmake.cache [deleted file]
Tools/qmake/.qmake.conf [deleted file]
Tools/qmake/README [deleted file]
Tools/qmake/config.tests/README [deleted file]
Tools/qmake/config.tests/fontconfig/fontconfig.cpp [deleted file]
Tools/qmake/config.tests/fontconfig/fontconfig.pro [deleted file]
Tools/qmake/config.tests/gccdepends/empty.cpp [deleted file]
Tools/qmake/config.tests/gccdepends/gccdepends.pro [deleted file]
Tools/qmake/config.tests/glx/glx.cpp [deleted file]
Tools/qmake/config.tests/glx/glx.pro [deleted file]
Tools/qmake/config.tests/gnuld/gnuld.pro [deleted file]
Tools/qmake/config.tests/gnuld/main.cpp [deleted file]
Tools/qmake/config.tests/libXcomposite/libXcomposite.cpp [deleted file]
Tools/qmake/config.tests/libXcomposite/libXcomposite.pro [deleted file]
Tools/qmake/config.tests/libXrender/libXrender.cpp [deleted file]
Tools/qmake/config.tests/libXrender/libXrender.pro [deleted file]
Tools/qmake/config.tests/libwebp/libwebp.cpp [deleted file]
Tools/qmake/config.tests/libwebp/libwebp.pro [deleted file]
Tools/qmake/config.tests/libxml2/libxml2.cpp [deleted file]
Tools/qmake/config.tests/libxml2/libxml2.pro [deleted file]
Tools/qmake/config.tests/libxslt/libxslt.cpp [deleted file]
Tools/qmake/config.tests/libxslt/libxslt.pro [deleted file]
Tools/qmake/config.tests/libzlib/libzlib.cpp [deleted file]
Tools/qmake/config.tests/libzlib/libzlib.pro [deleted file]
Tools/qmake/dump-features.pl [deleted file]
Tools/qmake/mkspecs/features/configure.prf [deleted file]
Tools/qmake/mkspecs/features/default_post.prf [deleted file]
Tools/qmake/mkspecs/features/default_pre.prf [deleted file]
Tools/qmake/mkspecs/features/features.prf [deleted file]
Tools/qmake/mkspecs/features/features.pri [deleted file]
Tools/qmake/mkspecs/features/force_static_libs_as_shared.prf [deleted file]
Tools/qmake/mkspecs/features/functions.prf [deleted file]
Tools/qmake/mkspecs/features/gprof.prf [deleted file]
Tools/qmake/mkspecs/features/mac/default_post.prf [deleted file]
Tools/qmake/mkspecs/features/mac/default_pre.prf [deleted file]
Tools/qmake/mkspecs/features/minimal_qt.prf [deleted file]
Tools/qmake/mkspecs/features/production_build.prf [deleted file]
Tools/qmake/mkspecs/features/rpath.prf [deleted file]
Tools/qmake/mkspecs/features/unix/default_post.prf [deleted file]
Tools/qmake/mkspecs/features/unix/default_pre.prf [deleted file]
Tools/qmake/mkspecs/features/unix/icc.prf [deleted file]
Tools/qmake/mkspecs/features/use_all_in_one_files.prf [deleted file]
Tools/qmake/mkspecs/features/valgrind.prf [deleted file]
Tools/qmake/mkspecs/features/webkit_modules.prf [deleted file]
Tools/qmake/mkspecs/features/win32/default_post.prf [deleted file]
Tools/qmake/mkspecs/features/win32/default_pre.prf [deleted file]
Tools/qmake/mkspecs/modules/angle.prf [deleted file]
Tools/qmake/mkspecs/modules/javascriptcore.prf [deleted file]
Tools/qmake/mkspecs/modules/webcore.prf [deleted file]
Tools/qmake/mkspecs/modules/webkit1.prf [deleted file]
Tools/qmake/mkspecs/modules/webkit2.prf [deleted file]
Tools/qmake/mkspecs/modules/wtf.prf [deleted file]

index 701c27f9dd6fcd1720f3890103f9f48c853bb0ba..4b5966ba158e0a7a6016189aeef89dd165e88ad6 100644 (file)
@@ -1,3 +1,200 @@
+2013-10-02  Anders Carlsson  <andersca@apple.com>
+
+        Remove Qt code from Tools/
+        https://bugs.webkit.org/show_bug.cgi?id=122227
+
+        Reviewed by Andreas Kling.
+
+        * DumpRenderTree/WorkQueue.cpp:
+        * DumpRenderTree/blackberry/src.pro: Removed.
+        * DumpRenderTree/qt/DumpRenderTree.pro: Removed.
+        * DumpRenderTree/qt/DumpRenderTree.qrc: Removed.
+        * DumpRenderTree/qt/DumpRenderTreeMain.cpp: Removed.
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp: Removed.
+        * DumpRenderTree/qt/DumpRenderTreeQt.h: Removed.
+        * DumpRenderTree/qt/EventSenderQt.cpp: Removed.
+        * DumpRenderTree/qt/EventSenderQt.h: Removed.
+        * DumpRenderTree/qt/GCControllerQt.cpp: Removed.
+        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: Removed.
+        * DumpRenderTree/qt/TestRunnerQt.cpp: Removed.
+        * DumpRenderTree/qt/TestRunnerQt.h: Removed.
+        * DumpRenderTree/qt/TextInputControllerQt.cpp: Removed.
+        * DumpRenderTree/qt/TextInputControllerQt.h: Removed.
+        * DumpRenderTree/qt/WorkQueueItemQt.cpp: Removed.
+        * DumpRenderTree/qt/WorkQueueItemQt.h: Removed.
+        * DumpRenderTree/qt/fonts/AHEM____.TTF: Removed.
+        * DumpRenderTree/qt/resources/user.css: Removed.
+        * DumpRenderTree/qt/testplugin.cpp: Removed.
+        * DumpRenderTree/qt/testplugin.h: Removed.
+        * ImageDiff/ImageDiff.pro: Removed.
+        * ImageDiff/qt/ImageDiff.cpp: Removed.
+        * MiniBrowser/qt/BrowserWindow.cpp: Removed.
+        * MiniBrowser/qt/BrowserWindow.h: Removed.
+        * MiniBrowser/qt/MiniBrowser.pro: Removed.
+        * MiniBrowser/qt/MiniBrowser.qrc: Removed.
+        * MiniBrowser/qt/MiniBrowserApplication.cpp: Removed.
+        * MiniBrowser/qt/MiniBrowserApplication.h: Removed.
+        * MiniBrowser/qt/UrlLoader.cpp: Removed.
+        * MiniBrowser/qt/UrlLoader.h: Removed.
+        * MiniBrowser/qt/icons/checkbox_checked.png: Removed.
+        * MiniBrowser/qt/icons/checkbox_unchecked.png: Removed.
+        * MiniBrowser/qt/icons/contents_width.png: Removed.
+        * MiniBrowser/qt/icons/favicon.png: Removed.
+        * MiniBrowser/qt/icons/find.png: Removed.
+        * MiniBrowser/qt/icons/folder.png: Removed.
+        * MiniBrowser/qt/icons/info.png: Removed.
+        * MiniBrowser/qt/icons/next.png: Removed.
+        * MiniBrowser/qt/icons/plus.png: Removed.
+        * MiniBrowser/qt/icons/previous.png: Removed.
+        * MiniBrowser/qt/icons/refresh.png: Removed.
+        * MiniBrowser/qt/icons/stop.png: Removed.
+        * MiniBrowser/qt/icons/titlebar.png: Removed.
+        * MiniBrowser/qt/icons/touch.png: Removed.
+        * MiniBrowser/qt/icons/touchpoint.png: Removed.
+        * MiniBrowser/qt/icons/up.png: Removed.
+        * MiniBrowser/qt/js/MultiSelect.js: Removed.
+        * MiniBrowser/qt/main.cpp: Removed.
+        * MiniBrowser/qt/qml/AlertDialog.qml: Removed.
+        * MiniBrowser/qt/qml/AuthenticationDialog.qml: Removed.
+        * MiniBrowser/qt/qml/BrowserWindow.qml: Removed.
+        * MiniBrowser/qt/qml/CheckBox.qml: Removed.
+        * MiniBrowser/qt/qml/ColorChooser.qml: Removed.
+        * MiniBrowser/qt/qml/ConfirmDialog.qml: Removed.
+        * MiniBrowser/qt/qml/Dialog.qml: Removed.
+        * MiniBrowser/qt/qml/DialogButton.qml: Removed.
+        * MiniBrowser/qt/qml/DialogLineInput.qml: Removed.
+        * MiniBrowser/qt/qml/FilePicker.qml: Removed.
+        * MiniBrowser/qt/qml/ItemSelector.qml: Removed.
+        * MiniBrowser/qt/qml/MockTouchPoint.qml: Removed.
+        * MiniBrowser/qt/qml/PromptDialog.qml: Removed.
+        * MiniBrowser/qt/qml/ProxyAuthenticationDialog.qml: Removed.
+        * MiniBrowser/qt/qml/ScrollIndicator.qml: Removed.
+        * MiniBrowser/qt/qml/ViewportInfoItem.qml: Removed.
+        * MiniBrowser/qt/raw/DerivedSources.pri: Removed.
+        * MiniBrowser/qt/raw/MiniBrowserRaw.pro: Removed.
+        * MiniBrowser/qt/raw/Target.pri: Removed.
+        * MiniBrowser/qt/raw/View.cpp: Removed.
+        * MiniBrowser/qt/raw/View.h: Removed.
+        * MiniBrowser/qt/utils.cpp: Removed.
+        * MiniBrowser/qt/utils.h: Removed.
+        * QtTestBrowser/QtTestBrowser.pro: Removed.
+        * QtTestBrowser/QtTestBrowser.qrc: Removed.
+        * QtTestBrowser/cookiejar.cpp: Removed.
+        * QtTestBrowser/cookiejar.h: Removed.
+        * QtTestBrowser/favicon.png: Removed.
+        * QtTestBrowser/fpstimer.cpp: Removed.
+        * QtTestBrowser/fpstimer.h: Removed.
+        * QtTestBrowser/launcherwindow.cpp: Removed.
+        * QtTestBrowser/launcherwindow.h: Removed.
+        * QtTestBrowser/locationedit.cpp: Removed.
+        * QtTestBrowser/locationedit.h: Removed.
+        * QtTestBrowser/mainwindow.cpp: Removed.
+        * QtTestBrowser/mainwindow.h: Removed.
+        * QtTestBrowser/qttestbrowser.cpp: Removed.
+        * QtTestBrowser/urlloader.cpp: Removed.
+        * QtTestBrowser/urlloader.h: Removed.
+        * QtTestBrowser/useragentlist.txt: Removed.
+        * QtTestBrowser/utils.cpp: Removed.
+        * QtTestBrowser/utils.h: Removed.
+        * QtTestBrowser/webinspector.h: Removed.
+        * QtTestBrowser/webpage.cpp: Removed.
+        * QtTestBrowser/webpage.h: Removed.
+        * QtTestBrowser/webview.cpp: Removed.
+        * QtTestBrowser/webview.h: Removed.
+        * TestWebKitAPI/DerivedSources.pri: Removed.
+        * TestWebKitAPI/InjectedBundle.pri: Removed.
+        * TestWebKitAPI/PlatformWebView.h:
+        * TestWebKitAPI/TestWebKitAPI.pri: Removed.
+        * TestWebKitAPI/TestWebKitAPI.pro: Removed.
+        * TestWebKitAPI/Tests.pri: Removed.
+        * TestWebKitAPI/Tests/JavaScriptCore/JavaScriptCore.pro: Removed.
+        * TestWebKitAPI/Tests/WTF/IntegerToStringConversion.cpp:
+        * TestWebKitAPI/Tests/WTF/WTF.pro: Removed.
+        * TestWebKitAPI/Tests/WebKit2/WebKit2.pro: Removed.
+        * TestWebKitAPI/qt/InjectedBundleControllerQt.cpp: Removed.
+        * TestWebKitAPI/qt/PlatformUtilitiesQt.cpp: Removed.
+        * TestWebKitAPI/qt/PlatformWebViewQt.cpp: Removed.
+        * TestWebKitAPI/qt/main.cpp: Removed.
+        * Tools.pro: Removed.
+        * WebKitTestRunner/DerivedSources.pri: Removed.
+        * WebKitTestRunner/EventSenderProxy.h:
+        * WebKitTestRunner/InjectedBundle/DerivedSources.pri: Removed.
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.pro: Removed.
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::resetAfterTest):
+        (WTR::InjectedBundlePage::dumpDOMAsWebArchive):
+        (WTR::InjectedBundlePage::didClearWindowForFrame):
+        * WebKitTestRunner/InjectedBundle/Target.pri: Removed.
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp: Removed.
+        * WebKitTestRunner/InjectedBundle/qt/InjectedBundleQt.cpp: Removed.
+        * WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp: Removed.
+        * WebKitTestRunner/PlatformWebView.h:
+        * WebKitTestRunner/Target.pri: Removed.
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetStateToConsistentValues):
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/WebKitTestRunner.pro: Removed.
+        * WebKitTestRunner/qt/EventSenderProxyQt.cpp: Removed.
+        * WebKitTestRunner/qt/PlatformWebViewQt.cpp: Removed.
+        * WebKitTestRunner/qt/TestControllerQt.cpp: Removed.
+        * WebKitTestRunner/qt/TestInvocationQt.cpp: Removed.
+        * WebKitTestRunner/qt/WebKitTestRunner.qrc: Removed.
+        * WebKitTestRunner/qt/main.cpp: Removed.
+        * WebKitTestRunner/qt/resources/user.css: Removed.
+        * qmake/.qmake.cache: Removed.
+        * qmake/.qmake.conf: Removed.
+        * qmake/README: Removed.
+        * qmake/config.tests/README: Removed.
+        * qmake/config.tests/fontconfig/fontconfig.cpp: Removed.
+        * qmake/config.tests/fontconfig/fontconfig.pro: Removed.
+        * qmake/config.tests/gccdepends/empty.cpp: Removed.
+        * qmake/config.tests/gccdepends/gccdepends.pro: Removed.
+        * qmake/config.tests/glx/glx.cpp: Removed.
+        * qmake/config.tests/glx/glx.pro: Removed.
+        * qmake/config.tests/gnuld/gnuld.pro: Removed.
+        * qmake/config.tests/gnuld/main.cpp: Removed.
+        * qmake/config.tests/libXcomposite/libXcomposite.cpp: Removed.
+        * qmake/config.tests/libXcomposite/libXcomposite.pro: Removed.
+        * qmake/config.tests/libXrender/libXrender.cpp: Removed.
+        * qmake/config.tests/libXrender/libXrender.pro: Removed.
+        * qmake/config.tests/libwebp/libwebp.cpp: Removed.
+        * qmake/config.tests/libwebp/libwebp.pro: Removed.
+        * qmake/config.tests/libxml2/libxml2.cpp: Removed.
+        * qmake/config.tests/libxml2/libxml2.pro: Removed.
+        * qmake/config.tests/libxslt/libxslt.cpp: Removed.
+        * qmake/config.tests/libxslt/libxslt.pro: Removed.
+        * qmake/config.tests/libzlib/libzlib.cpp: Removed.
+        * qmake/config.tests/libzlib/libzlib.pro: Removed.
+        * qmake/dump-features.pl: Removed.
+        * qmake/mkspecs/features/configure.prf: Removed.
+        * qmake/mkspecs/features/default_post.prf: Removed.
+        * qmake/mkspecs/features/default_pre.prf: Removed.
+        * qmake/mkspecs/features/features.prf: Removed.
+        * qmake/mkspecs/features/features.pri: Removed.
+        * qmake/mkspecs/features/force_static_libs_as_shared.prf: Removed.
+        * qmake/mkspecs/features/functions.prf: Removed.
+        * qmake/mkspecs/features/gprof.prf: Removed.
+        * qmake/mkspecs/features/mac/default_post.prf: Removed.
+        * qmake/mkspecs/features/mac/default_pre.prf: Removed.
+        * qmake/mkspecs/features/minimal_qt.prf: Removed.
+        * qmake/mkspecs/features/production_build.prf: Removed.
+        * qmake/mkspecs/features/rpath.prf: Removed.
+        * qmake/mkspecs/features/unix/default_post.prf: Removed.
+        * qmake/mkspecs/features/unix/default_pre.prf: Removed.
+        * qmake/mkspecs/features/unix/icc.prf: Removed.
+        * qmake/mkspecs/features/use_all_in_one_files.prf: Removed.
+        * qmake/mkspecs/features/valgrind.prf: Removed.
+        * qmake/mkspecs/features/webkit_modules.prf: Removed.
+        * qmake/mkspecs/features/win32/default_post.prf: Removed.
+        * qmake/mkspecs/features/win32/default_pre.prf: Removed.
+        * qmake/mkspecs/modules/angle.prf: Removed.
+        * qmake/mkspecs/modules/javascriptcore.prf: Removed.
+        * qmake/mkspecs/modules/webcore.prf: Removed.
+        * qmake/mkspecs/modules/webkit1.prf: Removed.
+        * qmake/mkspecs/modules/webkit2.prf: Removed.
+        * qmake/mkspecs/modules/wtf.prf: Removed.
+
 2013-10-02  Tim Horton  <timothy_horton@apple.com>
 
         [mac] Stop using DrawingAreaImpl on PLATFORM(MAC) 
index f38d81a343688eacd99a7f4629e59f705617d4e4..0106fbac120fce6127d639aceba0b949242b9347 100644 (file)
 #include "config.h"
 #include "WorkQueue.h"
 
-#if PLATFORM(QT)
-#include "WorkQueueItemQt.h"
-#else
 #include "WorkQueueItem.h"
-#endif
 #include <wtf/Assertions.h>
 
 static const unsigned queueLength = 1024;
diff --git a/Tools/DumpRenderTree/blackberry/src.pro b/Tools/DumpRenderTree/blackberry/src.pro
deleted file mode 100644 (file)
index 1096795..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-lessThan(QT_VERSION, 4.5) {
-    error("Qt 4.5 or greater is required.")
-}
-
-TEMPLATE = app
-TARGET = ImageDiff
-
-SOURCES += ../qt/ImageDiff.cpp
-DESTDIR = .
-
-unix:CONFIG += debug_and_release
-mac:CONFIG -= app_bundle
-win32: CONFIG += console
-
-QT = core gui
-
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.pro b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
deleted file mode 100644 (file)
index 2d6cfca..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# -------------------------------------------------------------------
-# Project file for the DumpRenderTree binary (DRT)
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-TEMPLATE = app
-
-TARGET = DumpRenderTree
-DESTDIR = $$ROOT_BUILD_DIR/bin
-
-WEBKIT += wtf javascriptcore webcore
-
-INCLUDEPATH += \
-    $$PWD/ \
-    $$PWD/.. \
-    $${ROOT_WEBKIT_DIR}/Source/WebCore/platform/qt \
-    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
-    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WidgetSupport \
-    $${ROOT_WEBKIT_DIR}/Source/WTF
-
-QT = core gui network testlib webkitwidgets widgets
-have?(QTPRINTSUPPORT): QT += printsupport
-macx: QT += xml
-
-HEADERS += \
-    $$PWD/../WorkQueue.h \
-    $$PWD/../DumpRenderTree.h \
-    $$PWD/../GCController.h \
-    $$PWD/../TestRunner.h \
-    DumpRenderTreeQt.h \
-    EventSenderQt.h \
-    TextInputControllerQt.h \
-    WorkQueueItemQt.h \
-    TestRunnerQt.h \
-    testplugin.h
-
-SOURCES += \
-    $$PWD/../WorkQueue.cpp \
-    $$PWD/../DumpRenderTreeCommon.cpp \
-    $$PWD/../GCController.cpp \
-    $$PWD/../TestRunner.cpp \
-    DumpRenderTreeQt.cpp \
-    EventSenderQt.cpp \
-    TextInputControllerQt.cpp \
-    WorkQueueItemQt.cpp \
-    TestRunnerQt.cpp \
-    GCControllerQt.cpp \
-    testplugin.cpp \
-    DumpRenderTreeMain.cpp
-
-wince*: {
-    INCLUDEPATH += $$WCECOMPAT/include
-    LIBS += $$WCECOMPAT/lib/wcecompat.lib
-}
-
-DEFINES -= USE_SYSTEM_MALLOC=0
-DEFINES += USE_SYSTEM_MALLOC=1
-
-RESOURCES = DumpRenderTree.qrc
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.qrc b/Tools/DumpRenderTree/qt/DumpRenderTree.qrc
deleted file mode 100644 (file)
index 71d163a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>resources/user.css</file>
-    </qresource>
-</RCC>
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp
deleted file mode 100644 (file)
index 2649474..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "DumpRenderTreeQt.h"
-
-#include "QtTestSupport.h"
-#include <qapplication.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qfont.h>
-#include <qstringlist.h>
-#include <qstylefactory.h>
-#include <qtimer.h>
-#include <qurl.h>
-#include <qwebdatabase.h>
-
-#ifdef Q_WS_X11
-#include <qx11info_x11.h>
-#endif
-
-#ifdef Q_OS_WIN
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-#include <limits.h>
-
-#include <wtf/Assertions.h>
-
-void messageHandler(QtMsgType type, const QMessageLogContext&, const QString &message)
-{
-    if (type == QtCriticalMsg || type == QtFatalMsg) {
-        fprintf(stderr, "%s\n", qPrintable(message));
-        return;
-    }
-    // do nothing
-}
-
-// We only support -v, -p, --pixel-tests, --stdout, --stderr and -, all the others will be
-// pass as test case name (even -abc.html is a valid test case name)
-bool isOption(const QString& str)
-{
-    return str == QString("-v") || str == QString("-p") || str == QString("--pixel-tests")
-           || str == QString("--stdout") || str == QString("--stderr")
-           || str == QString("--timeout") || str == QString("--no-timeout")
-           || str == QString("-");
-}
-
-QString takeOptionValue(QStringList& arguments, int index)
-{
-    QString result;
-
-    if (index + 1 < arguments.count() && !isOption(arguments.at(index + 1)))
-        result = arguments.takeAt(index + 1);
-    arguments.removeAt(index);
-
-    return result;
-}
-
-void printUsage()
-{
-    fprintf(stderr, "Usage: DumpRenderTree [-v|-p|--pixel-tests] [--stdout output_filename] [-stderr error_filename] [--no-timeout] [--timeout timeout_MS] filename [filename2..n]\n");
-    fprintf(stderr, "Or folder containing test files: DumpRenderTree [-v|--pixel-tests] dirpath\n");
-    fflush(stderr);
-}
-
-int main(int argc, char* argv[])
-{
-#ifdef Q_OS_WIN
-    _setmode(1, _O_BINARY);
-    _setmode(2, _O_BINARY);
-#endif
-
-    // Suppress debug output from Qt if not started with -v
-    bool suppressQtDebugOutput = true;
-    for (int i = 1; i < argc; ++i) {
-        if (!qstrcmp(argv[i], "-v")) {
-            suppressQtDebugOutput = false;
-            break;
-        }
-    }
-
-    // Has to be done before QApplication is constructed in case
-    // QApplication itself produces debug output.
-    if (suppressQtDebugOutput)
-        qInstallMessageHandler(messageHandler);
-
-    WebKit::QtTestSupport::initializeTestFonts();
-
-    QApplication::setStyle(QStyleFactory::create(QLatin1String("windows")));
-    QApplication::setDesktopSettingsAware(false);
-
-    QApplication app(argc, argv);
-    app.setQuitOnLastWindowClosed(false);
-
-    QCoreApplication::setAttribute(Qt::AA_Use96Dpi, true);
-
-    WTFInstallReportBacktraceOnCrashHook();
-
-    QStringList args = app.arguments();
-    if (args.count() < (!suppressQtDebugOutput ? 3 : 2)) {
-        printUsage();
-        exit(1);
-    }
-
-    // Remove the first arguments, it is application name itself
-    args.removeAt(0);
-
-    DumpRenderTree dumper;
-
-    int index = args.indexOf(QLatin1String("--stdout"));
-    if (index != -1) {
-        QString fileName = takeOptionValue(args, index);
-        dumper.setRedirectOutputFileName(fileName);
-        if (fileName.isEmpty() || !freopen(qPrintable(fileName), "w", stdout)) {
-            fprintf(stderr, "STDOUT redirection failed.");
-            exit(1);
-        }
-    }
-    index = args.indexOf(QLatin1String("--stderr"));
-    if (index != -1) {
-        QString fileName = takeOptionValue(args, index);
-        dumper.setRedirectErrorFileName(fileName);
-        if (!freopen(qPrintable(fileName), "w", stderr)) {
-            fprintf(stderr, "STDERR redirection failed.");
-            exit(1);
-        }
-    }
-    index = args.indexOf("--pixel-tests");
-    if (index == -1)
-        index = args.indexOf("-p");
-    if (index != -1) {
-        dumper.setShouldDumpPixelsForAllTests();
-        args.removeAt(index);
-    }
-
-    QWebDatabase::removeAllDatabases();
-
-    index = args.indexOf(QLatin1String("--timeout"));
-    if (index != -1) {
-        int timeout = takeOptionValue(args, index).toInt();
-        dumper.setTimeout(timeout);
-    }
-
-    index = args.indexOf(QLatin1String("--no-timeout"));
-    if (index != -1) {
-        dumper.setShouldTimeout(false);
-        args.removeAt(index);
-    }
-
-    index = args.indexOf(QLatin1String("-"));
-    if (index != -1) {
-        args.removeAt(index);
-
-        // Continue waiting in STDIN for more test case after process one test case
-        QObject::connect(&dumper, SIGNAL(ready()), &dumper, SLOT(readLine()), Qt::QueuedConnection);   
-
-        // Read and only read the first test case, ignore the others 
-        if (args.size() > 0) { 
-            // Process the argument first
-            dumper.processLine(args[0]);
-        } else
-           QTimer::singleShot(0, &dumper, SLOT(readLine()));
-    } else {
-        // Go into standalone mode
-        // Standalone mode need at least one test case
-        if (args.count() < 1) {
-            printUsage();
-            exit(1);
-        }
-        dumper.processArgsLine(args);
-    }
-    return app.exec();
-}
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
deleted file mode 100755 (executable)
index f374b2f..0000000
+++ /dev/null
@@ -1,1228 +0,0 @@
-/*
- * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
- * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "config.h"
-#include "DumpRenderTree.h"
-
-#include "DumpRenderTreeQt.h"
-#include "DumpRenderTreeSupportQt.h"
-#include "EventSenderQt.h"
-#include "GCController.h"
-#include "InitWebCoreQt.h"
-#include "InitWebKitQt.h"
-#include "JSStringRefQt.h"
-#include "QtTestSupport.h"
-#include "TestRunner.h"
-#include "TestRunnerQt.h"
-#include "TextInputControllerQt.h"
-#include "testplugin.h"
-#include "WorkQueue.h"
-
-#include <QApplication>
-#include <QBuffer>
-#include <QCryptographicHash>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QFocusEvent>
-#include <QLabel>
-#include <QLocale>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QPaintDevice>
-#include <QPaintEngine>
-#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
-#include <QPrinter>
-#endif
-#include <QProgressBar>
-#include <QUndoStack>
-#include <QUrl>
-#include <limits.h>
-#include <locale.h>
-#include <qwebsecurityorigin.h>
-#include <qwebsettings.h>
-#ifndef Q_OS_WIN
-#include <unistd.h>
-#endif
-
-using namespace WebCore;
-
-const int databaseDefaultQuota = 5 * 1024 * 1024;
-
-NetworkAccessManager::NetworkAccessManager(QObject* parent)
-    : QNetworkAccessManager(parent)
-{
-#ifndef QT_NO_OPENSSL
-    connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
-            this, SLOT(sslErrorsEncountered(QNetworkReply*, const QList<QSslError>&)));
-#endif
-}
-
-#ifndef QT_NO_OPENSSL
-void NetworkAccessManager::sslErrorsEncountered(QNetworkReply* reply, const QList<QSslError>& errors)
-{
-    if (reply->url().host() == "127.0.0.1" || reply->url().host() == "localhost") {
-        bool ignore = true;
-
-        // Accept any HTTPS certificate.
-        foreach (const QSslError& error, errors) {
-            if (error.error() < QSslError::UnableToGetIssuerCertificate || error.error() > QSslError::HostNameMismatch) {
-                ignore = false;
-                break;
-            }
-        }
-
-        if (ignore)
-            reply->ignoreSslErrors();
-    }
-}
-#endif
-
-
-#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
-class NullPrinter : public QPrinter {
-public:
-    class NullPaintEngine : public QPaintEngine {
-    public:
-        virtual bool begin(QPaintDevice*) { return true; }
-        virtual bool end() { return true; }
-        virtual QPaintEngine::Type type() const { return QPaintEngine::User; }
-        virtual void drawPixmap(const QRectF& r, const QPixmap& pm, const QRectF& sr) { }
-        virtual void updateState(const QPaintEngineState& state) { }
-    };
-
-    virtual QPaintEngine* paintEngine() const { return const_cast<NullPaintEngine*>(&m_engine); }
-
-    NullPaintEngine m_engine;
-};
-#endif
-
-WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
-    : QWebPage(parent)
-    , m_webInspector(0)
-    , m_drt(drt)
-{
-    QWebSettings* globalSettings = QWebSettings::globalSettings();
-
-    globalSettings->setFontSize(QWebSettings::MinimumFontSize, 0);
-    globalSettings->setFontSize(QWebSettings::MinimumLogicalFontSize, 5);
-    globalSettings->setFontSize(QWebSettings::DefaultFontSize, 16);
-    globalSettings->setFontSize(QWebSettings::DefaultFixedFontSize, 13);
-
-    globalSettings->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
-    globalSettings->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true);
-    globalSettings->setAttribute(QWebSettings::LinksIncludedInFocusChain, false);
-    globalSettings->setAttribute(QWebSettings::PluginsEnabled, true);
-    globalSettings->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true);
-    globalSettings->setAttribute(QWebSettings::JavascriptEnabled, true);
-    globalSettings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false);
-    globalSettings->setAttribute(QWebSettings::SpatialNavigationEnabled, false);
-
-    connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
-            this, SLOT(setViewGeometry(const QRect & )));
-
-    setNetworkAccessManager(m_drt->networkAccessManager());
-    setPluginFactory(new TestPlugin(this));
-
-    connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
-    connect(this, SIGNAL(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)), this, SLOT(cancelPermission(QWebFrame*, QWebPage::Feature)));
-}
-
-WebPage::~WebPage()
-{
-    delete m_webInspector;
-}
-
-QWebInspector* WebPage::webInspector()
-{
-    if (!m_webInspector) {
-        m_webInspector = new QWebInspector;
-        m_webInspector->setPage(this);
-    }
-    return m_webInspector;
-}
-
-void WebPage::resetSettings()
-{
-    // After each layout test, reset the settings that may have been changed by
-    // testRunner.overridePreference() or similar.
-    settings()->resetFontSize(QWebSettings::DefaultFontSize);
-    settings()->resetAttribute(QWebSettings::JavascriptCanOpenWindows);
-    settings()->resetAttribute(QWebSettings::JavascriptEnabled);
-    settings()->resetAttribute(QWebSettings::PrivateBrowsingEnabled);
-    settings()->resetAttribute(QWebSettings::SpatialNavigationEnabled);
-    settings()->resetAttribute(QWebSettings::LinksIncludedInFocusChain);
-    settings()->resetAttribute(QWebSettings::OfflineWebApplicationCacheEnabled);
-    settings()->resetAttribute(QWebSettings::LocalContentCanAccessRemoteUrls);
-    settings()->resetAttribute(QWebSettings::LocalContentCanAccessFileUrls);
-    settings()->resetAttribute(QWebSettings::PluginsEnabled);
-    settings()->resetAttribute(QWebSettings::JavascriptCanAccessClipboard);
-    settings()->resetAttribute(QWebSettings::AutoLoadImages);
-    settings()->resetAttribute(QWebSettings::ZoomTextOnly);
-    settings()->resetAttribute(QWebSettings::CSSRegionsEnabled);
-    settings()->resetAttribute(QWebSettings::CSSGridLayoutEnabled);
-    settings()->resetAttribute(QWebSettings::AcceleratedCompositingEnabled);
-
-    m_drt->testRunner()->setCaretBrowsingEnabled(false);
-    m_drt->testRunner()->setAuthorAndUserStylesEnabled(true);
-    m_drt->jscTestRunner()->setDefersLoading(false);
-
-    // globalSettings must be reset explicitly.
-    m_drt->testRunner()->setXSSAuditorEnabled(false);
-
-    QWebSettings::setMaximumPagesInCache(0); // reset to default
-    settings()->setUserStyleSheetUrl(QUrl()); // reset to default
-
-    DumpRenderTreeSupportQt::setSeamlessIFramesEnabled(true);
-
-    DumpRenderTreeSupportQt::resetInternalsObject(mainFrame()->handle());
-
-    m_pendingGeolocationRequests.clear();
-}
-
-QWebPage* WebPage::createWindow(QWebPage::WebWindowType)
-{
-    return m_drt->createWindow();
-}
-
-void WebPage::javaScriptAlert(QWebFrame*, const QString& message)
-{
-    if (!isTextOutputEnabled())
-        return;
-
-    fprintf(stdout, "ALERT: %s\n", message.toUtf8().constData());
-    fflush(stdout);
-}
-
-void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
-{
-    switch (feature) {
-    case Notifications:
-        if (!m_drt->testRunner()->ignoreReqestForPermission())
-            setFeaturePermission(frame, feature, PermissionGrantedByUser);
-        break;
-    case Geolocation:
-        if (m_drt->testRunner()->isGeolocationPermissionSet())
-            if (m_drt->testRunner()->geolocationPermission())
-                setFeaturePermission(frame, feature, PermissionGrantedByUser);
-            else
-                setFeaturePermission(frame, feature, PermissionDeniedByUser);
-        else
-            m_pendingGeolocationRequests.append(frame);
-        break;
-    default:
-        break;
-    }
-}
-
-void WebPage::cancelPermission(QWebFrame* frame, QWebPage::Feature feature)
-{
-    switch (feature) {
-    case Geolocation:
-        m_pendingGeolocationRequests.removeOne(frame);
-        break;
-    default:
-        break;
-    }
-}
-
-void WebPage::permissionSet(QWebPage::Feature feature)
-{
-    switch (feature) {
-    case Geolocation:
-        {
-        Q_ASSERT(m_drt->testRunner()->isGeolocationPermissionSet());
-        foreach (QWebFrame* frame, m_pendingGeolocationRequests)
-            if (m_drt->testRunner()->geolocationPermission())
-                setFeaturePermission(frame, feature, PermissionGrantedByUser);
-            else
-                setFeaturePermission(frame, feature, PermissionDeniedByUser);
-
-        m_pendingGeolocationRequests.clear();
-        break;
-        }
-    default:
-        break;
-    }
-}
-
-// FIXME (119591): Make this match other platforms better.
-static QString urlSuitableForTestResult(const QString& url)
-{
-    if (url.isEmpty() || !url.startsWith(QLatin1String("file://")))
-        return url;
-
-    return QFileInfo(url).fileName();
-}
-
-void WebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString&)
-{
-    if (!isTextOutputEnabled())
-        return;
-
-    QString newMessage;
-    if (!message.isEmpty()) {
-        newMessage = message;
-
-        size_t fileProtocol = newMessage.indexOf(QLatin1String("file://"));
-        if (fileProtocol != -1) {
-            newMessage = newMessage.left(fileProtocol) + urlSuitableForTestResult(newMessage.mid(fileProtocol));
-        }
-    }
-
-    fprintf(stdout, "CONSOLE MESSAGE: ");
-    if (lineNumber)
-        fprintf(stdout, "line %d: ", lineNumber);
-    fprintf(stdout, "%s\n", newMessage.toUtf8().constData());
-}
-
-bool WebPage::javaScriptConfirm(QWebFrame*, const QString& msg)
-{
-    if (!isTextOutputEnabled())
-        return true;
-
-    fprintf(stdout, "CONFIRM: %s\n", msg.toUtf8().constData());
-    return true;
-}
-
-bool WebPage::javaScriptPrompt(QWebFrame*, const QString& msg, const QString& defaultValue, QString* result)
-{
-    if (!isTextOutputEnabled())
-        return true;
-
-    fprintf(stdout, "PROMPT: %s, default text: %s\n", msg.toUtf8().constData(), defaultValue.toUtf8().constData());
-    *result = defaultValue;
-    return true;
-}
-
-bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type)
-{
-    if (m_drt->testRunner()->waitForPolicy())
-        m_drt->testRunner()->notifyDone();
-
-    return QWebPage::acceptNavigationRequest(frame, request, type);
-}
-
-bool WebPage::supportsExtension(QWebPage::Extension extension) const
-{
-    if (extension == QWebPage::ErrorPageExtension)
-        return m_drt->testRunner()->shouldHandleErrorPages();
-
-    return false;
-}
-
-bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output)
-{
-    const QWebPage::ErrorPageExtensionOption* info = static_cast<const QWebPage::ErrorPageExtensionOption*>(option);
-
-    // Lets handle error pages for the main frame for now.
-    if (info->frame != mainFrame())
-        return false;
-
-    QWebPage::ErrorPageExtensionReturn* errorPage = static_cast<QWebPage::ErrorPageExtensionReturn*>(output);
-
-    errorPage->content = QString("data:text/html,<body/>").toUtf8();
-
-    return true;
-}
-
-QObject* WebPage::createPlugin(const QString& classId, const QUrl& url, const QStringList& paramNames, const QStringList& paramValues)
-{
-    Q_UNUSED(url);
-    Q_UNUSED(paramNames);
-    Q_UNUSED(paramValues);
-
-    if (classId == QLatin1String("QProgressBar"))
-        return new QProgressBar(view());
-    if (classId == QLatin1String("QLabel"))
-        return new QLabel(view());
-
-    return 0;
-}
-
-void WebPage::setViewGeometry(const QRect& rect)
-{
-    if (WebViewGraphicsBased* v = qobject_cast<WebViewGraphicsBased*>(view()))
-        v->scene()->setSceneRect(QRectF(rect));
-    else if (QWidget *v = view())
-        v->setGeometry(rect);
-}
-
-WebViewGraphicsBased::WebViewGraphicsBased(QWidget* parent)
-    : m_item(new QGraphicsWebView)
-{
-    setScene(new QGraphicsScene(this));
-    scene()->addItem(m_item);
-}
-
-static DumpRenderTree *s_instance = 0;
-
-DumpRenderTree::DumpRenderTree()
-    : m_dumpPixelsForAllTests(false)
-    , m_stdin(0)
-    , m_enableTextOutput(false)
-    , m_standAloneMode(false)
-    , m_graphicsBased(false)
-    , m_persistentStoragePath(QString(getenv("DUMPRENDERTREE_TEMP")))
-{
-    ASSERT(!s_instance);
-    s_instance = this;
-
-    QByteArray viewMode = getenv("QT_DRT_WEBVIEW_MODE");
-    if (viewMode == "graphics")
-        setGraphicsBased(true);
-
-    WebKit::initializeWebKitWidgets();
-    WebCore::initializeWebCoreQt();
-    DumpRenderTreeSupportQt::initialize();
-
-    // Set running in DRT mode for qwebpage to create testable objects.
-    DumpRenderTreeSupportQt::setDumpRenderTreeModeEnabled(true);
-    DumpRenderTreeSupportQt::overwritePluginDirectories();
-    QWebSettings::enablePersistentStorage(m_persistentStoragePath);
-
-    m_networkAccessManager = new NetworkAccessManager(this);
-    // create our primary testing page/view.
-    if (isGraphicsBased()) {
-        WebViewGraphicsBased* view = new WebViewGraphicsBased(0);
-        m_page = new WebPage(view, this);
-        view->setPage(m_page);
-        m_mainView = view;
-    } else {
-        QWebView* view = new QWebView(0);
-        m_page = new WebPage(view, this);
-        view->setPage(m_page);
-        m_mainView = view;
-    }
-    // Use a frame group name for all pages created by DumpRenderTree to allow
-    // testing of cross-page frame lookup.
-    DumpRenderTreeSupportQt::webPageSetGroupName(pageAdapter(), "org.webkit.qt.DumpRenderTree");
-
-    m_mainView->setContextMenuPolicy(Qt::NoContextMenu);
-    m_mainView->resize(QSize(TestRunner::viewWidth, TestRunner::viewHeight));
-
-    // clean up cache by resetting quota.
-    qint64 quota = webPage()->settings()->offlineWebApplicationCacheQuota();
-    webPage()->settings()->setOfflineWebApplicationCacheQuota(quota);
-
-    // create our controllers. This has to be done before connectFrame,
-    // as it exports there to the JavaScript DOM window.
-    m_controller = new TestRunnerQt(this);
-    connect(m_controller, SIGNAL(showPage()), this, SLOT(showPage()));
-    connect(m_controller, SIGNAL(hidePage()), this, SLOT(hidePage()));
-
-    // async geolocation permission set by controller
-    connect(m_controller, SIGNAL(geolocationPermissionSet()), this, SLOT(geolocationPermissionSet()));
-
-    connect(m_controller, SIGNAL(done()), this, SLOT(dump()));
-    m_eventSender = new EventSender(m_page);
-    m_textInputController = new TextInputController(m_page);
-    m_gcController.reset(new GCController());
-
-    // now connect our different signals
-    connect(m_page, SIGNAL(frameCreated(QWebFrame *)),
-            this, SLOT(connectFrame(QWebFrame *)));
-    connectFrame(m_page->mainFrame());
-
-    connect(m_page, SIGNAL(loadFinished(bool)),
-            m_controller, SLOT(maybeDump(bool)));
-    // We need to connect to loadStarted() because notifyDone should only
-    // dump results itself when the last page loaded in the test has finished loading.
-    connect(m_page, SIGNAL(loadStarted()),
-            m_controller, SLOT(resetLoadFinished()));
-    connect(m_page, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
-    connect(m_page, SIGNAL(printRequested(QWebFrame*)), this, SLOT(dryRunPrint(QWebFrame*)));
-
-    connect(m_page->mainFrame(), SIGNAL(titleChanged(const QString&)),
-            SLOT(titleChanged(const QString&)));
-    connect(m_page, SIGNAL(databaseQuotaExceeded(QWebFrame*,QString)),
-            this, SLOT(dumpDatabaseQuota(QWebFrame*,QString)));
-    connect(m_page, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin *, quint64, quint64)),
-            this, SLOT(dumpApplicationCacheQuota(QWebSecurityOrigin *, quint64, quint64)));
-    connect(m_page, SIGNAL(statusBarMessage(const QString&)),
-            this, SLOT(statusBarMessage(const QString&)));
-
-    QObject::connect(this, SIGNAL(quit()), qApp, SLOT(quit()), Qt::QueuedConnection);
-
-    DumpRenderTreeSupportQt::setDumpRenderTreeModeEnabled(true);
-    DumpRenderTreeSupportQt::setInteractiveFormValidationEnabled(pageAdapter(), true);
-    DumpRenderTreeSupportQt::enableMockScrollbars();
-
-    QFocusEvent event(QEvent::FocusIn, Qt::ActiveWindowFocusReason);
-    QApplication::sendEvent(m_mainView, &event);
-}
-
-DumpRenderTree::~DumpRenderTree()
-{
-    if (!m_redirectOutputFileName.isEmpty())
-        fclose(stdout);
-    if (!m_redirectErrorFileName.isEmpty())
-        fclose(stderr);
-    delete m_mainView;
-    delete m_stdin;
-    s_instance = 0;
-}
-
-DumpRenderTree* DumpRenderTree::instance()
-{
-    return s_instance;
-}
-
-static void clearHistory(QWebPage* page)
-{
-    // QWebHistory::clear() leaves current page, so remove it as well by setting
-    // max item count to 0, and then setting it back to it's original value.
-
-    QWebHistory* history = page->history();
-    int itemCount = history->maximumItemCount();
-
-    history->clear();
-    history->setMaximumItemCount(0);
-    history->setMaximumItemCount(itemCount);
-}
-
-void DumpRenderTree::dryRunPrint(QWebFrame* frame)
-{
-#if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
-    NullPrinter printer;
-    frame->print(&printer);
-#endif
-}
-
-void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
-{
-    // reset so that any current loads are stopped
-    // NOTE: that this has to be done before the testRunner is
-    // reset or we get timeouts for some tests.
-    m_page->blockSignals(true);
-    m_page->triggerAction(QWebPage::Stop);
-    m_page->blockSignals(false);
-
-    QList<QWebSecurityOrigin> knownOrigins = QWebSecurityOrigin::allOrigins();
-    for (int i = 0; i < knownOrigins.size(); ++i)
-        knownOrigins[i].setDatabaseQuota(databaseDefaultQuota);
-
-    // reset the testRunner at this point, so that we under no
-    // circumstance dump (stop the waitUntilDone timer) during the reset
-    // of the DRT.
-    m_controller->reset();
-
-    m_jscController = TestRunner::create(url.toString().toStdString(), m_expectedHash.toStdString());
-
-    // reset mouse clicks counter
-    m_eventSender->resetClickCount();
-
-    closeRemainingWindows();
-    
-    // Call setTextSizeMultiplier(1.0) to reset TextZoomFactor and PageZoomFactor too. 
-    // It should be done before resetSettings() to guarantee resetting QWebSettings::ZoomTextOnly correctly.
-    m_page->mainFrame()->setTextSizeMultiplier(1.0);
-
-    m_page->resetSettings();
-#ifndef QT_NO_UNDOSTACK
-    m_page->undoStack()->clear();
-#endif
-
-    clearHistory(m_page);
-    DumpRenderTreeSupportQt::scalePageBy(mainFrameAdapter(), 1, QPoint(0, 0));
-    DumpRenderTreeSupportQt::clearFrameName(mainFrameAdapter());
-    DumpRenderTreeSupportQt::removeUserStyleSheets(pageAdapter());
-
-    m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
-    m_page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded);
-
-    if (url.scheme() == "http" || url.scheme() == "https") {
-        // credentials may exist from previous tests.
-        m_page->setNetworkAccessManager(0);
-        delete m_networkAccessManager;
-        m_networkAccessManager = new NetworkAccessManager(this);
-        m_page->setNetworkAccessManager(m_networkAccessManager);
-    }
-
-    WorkQueue::shared()->clear();
-    WorkQueue::shared()->setFrozen(false);
-
-    DumpRenderTreeSupportQt::resetOriginAccessWhiteLists();
-
-    DumpRenderTreeSupportQt::setWindowsBehaviorAsEditingBehavior(pageAdapter());
-
-    QLocale::setDefault(QLocale::c());
-
-    testRunner()->setDeveloperExtrasEnabled(true);
-#ifndef Q_OS_WINCE
-    setlocale(LC_ALL, "");
-#endif
-
-    DumpRenderTreeSupportQt::clearOpener(mainFrameAdapter());
-}
-
-static bool isGlobalHistoryTest(const QUrl& url)
-{
-    if (url.path().contains("globalhistory/"))
-        return true;
-    return false;
-}
-
-static bool isWebInspectorTest(const QUrl& url)
-{
-    if (url.path().contains("inspector/"))
-        return true;
-    return false;
-}
-
-static bool isDumpAsTextTest(const QUrl& url)
-{
-    if (url.path().contains("dumpAsText/"))
-        return true;
-    return false;
-}
-
-
-void DumpRenderTree::open(const QUrl& url)
-{
-    DumpRenderTreeSupportQt::dumpResourceLoadCallbacksPath(QFileInfo(url.toString()).path());
-    resetToConsistentStateBeforeTesting(url);
-
-    if (isWebInspectorTest(m_page->mainFrame()->url()))
-        testRunner()->closeWebInspector();
-
-    if (isWebInspectorTest(url))
-        testRunner()->showWebInspector();
-
-    if (isDumpAsTextTest(url))
-        m_jscController->setDumpAsText(true);
-
-    if (isGlobalHistoryTest(url))
-        testRunner()->dumpHistoryCallbacks();
-
-    // W3C SVG tests expect to be 480x360
-    bool isW3CTest = url.toString().contains("svg/W3C-SVG-1.1");
-    int width = isW3CTest ? TestRunner::w3cSVGViewWidth : TestRunner::viewWidth;
-    int height = isW3CTest ? TestRunner::w3cSVGViewHeight : TestRunner::viewHeight;
-    m_mainView->resize(QSize(width, height));
-    m_page->setPreferredContentsSize(QSize());
-    m_page->setViewportSize(QSize(width, height));
-
-    QFocusEvent ev(QEvent::FocusIn);
-    m_page->event(&ev);
-
-    WebKit::QtTestSupport::clearMemoryCaches();
-
-    WebKit::QtTestSupport::initializeTestFonts();
-
-    DumpRenderTreeSupportQt::dumpFrameLoader(url.toString().contains("loading/"));
-    setTextOutputEnabled(true);
-    m_page->mainFrame()->load(url);
-}
-
-void DumpRenderTree::readLine()
-{
-    if (!m_stdin) {
-        m_stdin = new QFile;
-        m_stdin->open(stdin, QFile::ReadOnly);
-
-        if (!m_stdin->isReadable()) {
-            emit quit();
-            return;
-        }
-    }
-
-    QByteArray line = m_stdin->readLine().trimmed();
-
-    if (line.isEmpty()) {
-        emit quit();
-        return;
-    }
-
-    processLine(QString::fromLocal8Bit(line.constData(), line.length()));
-}
-
-void DumpRenderTree::processArgsLine(const QStringList &args)
-{
-    setStandAloneMode(true);
-
-    m_standAloneModeTestList = args;
-
-    QFileInfo firstEntry(m_standAloneModeTestList.first());
-    if (firstEntry.isDir()) {
-        QDir folderEntry(m_standAloneModeTestList.first());
-        QStringList supportedExt;
-        // Check for all supported extensions (from Scripts/webkitpy/layout_tests/layout_package/test_files.py).
-        supportedExt << "*.html" << "*.shtml" << "*.xml" << "*.xhtml" << "*.xhtmlmp" << "*.pl" << "*.php" << "*.svg";
-        m_standAloneModeTestList = folderEntry.entryList(supportedExt, QDir::Files);
-        for (int i = 0; i < m_standAloneModeTestList.size(); ++i)
-            m_standAloneModeTestList[i] = folderEntry.absoluteFilePath(m_standAloneModeTestList[i]);
-    }
-    connect(this, SIGNAL(ready()), this, SLOT(loadNextTestInStandAloneMode()), Qt::QueuedConnection);
-
-    if (!m_standAloneModeTestList.isEmpty()) {
-        QString first = m_standAloneModeTestList.takeFirst();
-        processLine(first);
-    }
-}
-
-void DumpRenderTree::loadNextTestInStandAloneMode()
-{
-    if (m_standAloneModeTestList.isEmpty()) {
-        emit quit();
-        return;
-    }
-    QString first = m_standAloneModeTestList.takeFirst();
-    processLine(first);
-}
-
-void DumpRenderTree::processLine(const QString &input)
-{
-    TestCommand command = parseInputLine(std::string(input.toLatin1().constData()));
-    QString pathOrURL = QLatin1String(command.pathOrURL.c_str());
-    m_dumpPixelsForCurrentTest = command.shouldDumpPixels || m_dumpPixelsForAllTests;
-    m_expectedHash = QLatin1String(command.expectedPixelHash.c_str());
-
-    if (pathOrURL.startsWith(QLatin1String("http:"))
-            || pathOrURL.startsWith(QLatin1String("https:"))
-            || pathOrURL.startsWith(QLatin1String("file:"))
-            || pathOrURL == QLatin1String("about:blank")) {
-        open(QUrl(pathOrURL));
-    } else {
-        QFileInfo fi(pathOrURL);
-
-        if (!fi.exists()) {
-            QDir currentDir = QDir::currentPath();
-
-            // Try to be smart about where the test is located
-            if (currentDir.dirName() == QLatin1String("LayoutTests"))
-                fi = QFileInfo(currentDir, pathOrURL.replace(QRegExp(".*?LayoutTests/(.*)"), "\\1"));
-            else if (!pathOrURL.contains(QLatin1String("LayoutTests")))
-                fi = QFileInfo(currentDir, pathOrURL.prepend(QLatin1String("LayoutTests/")));
-
-            if (!fi.exists()) {
-                emit ready();
-                return;
-            }
-        }
-
-        open(QUrl::fromLocalFile(fi.absoluteFilePath()));
-    }
-
-    if (command.timeout > 0)
-        setTimeout(command.timeout);
-    fflush(stdout);
-}
-
-void DumpRenderTree::closeRemainingWindows()
-{
-    foreach (QObject* widget, windows)
-        delete widget;
-    windows.clear();
-}
-
-void DumpRenderTree::initJSObjects()
-{
-    QWebFrame *frame = qobject_cast<QWebFrame*>(sender());
-    Q_ASSERT(frame);
-
-    JSContextRef context = 0;
-    JSObjectRef window = 0;
-
-    DumpRenderTreeSupportQt::getJSWindowObject(frame->handle(), &context, &window);
-
-    frame->addToJavaScriptWindowObject(QLatin1String("testRunner"), m_controller);
-    frame->addToJavaScriptWindowObject(QLatin1String("eventSender"), m_eventSender);
-    frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController);
-    m_gcController->makeWindowObject(context, window, 0);
-
-    if (m_jscController) {
-        JSObjectRef dummyWindow = JSObjectMake(context, 0, 0);
-        m_jscController->makeWindowObject(context, dummyWindow, 0);
-        JSRetainPtr<JSStringRef> testRunnerName(Adopt, JSStringCreateWithUTF8CString("testRunner"));
-        JSValueRef wrappedTestRunner = JSObjectGetProperty(context, dummyWindow, testRunnerName.get(), 0);
-        JSRetainPtr<JSStringRef> helperScript(Adopt, JSStringCreateWithUTF8CString("(function() {\n"
-                                                                                   "    function bind(fun, thisArg) {\n"
-                                                                                   "        return function() {\n"
-                                                                                   "            return fun.apply(thisArg, Array.prototype.slice.call(arguments));\n"
-                                                                                   "        }\n"
-                                                                                   "    }\n"
-                                                                                   "for (var prop in this.jscBasedTestRunner) {\n"
-                                                                                   "    var pd = Object.getOwnPropertyDescriptor(this.qtBasedTestRunner, prop);\n"
-                                                                                   "    if (pd !== undefined && (pd.writable === false || pd.configurable === false)) continue;\n"
-                                                                                   "    this.qtBasedTestRunner[prop] = bind(this.jscBasedTestRunner[prop], this.jscBasedTestRunner);\n"
-                                                                                   "}\n"
-                                                                                   "}).apply(this)\n"));
-
-        JSRetainPtr<JSStringRef> qtBasedTestRunnerName(Adopt, JSStringCreateWithUTF8CString("qtBasedTestRunner"));
-        JSRetainPtr<JSStringRef> jscBasedTestRunnerName(Adopt, JSStringCreateWithUTF8CString("jscBasedTestRunner"));
-
-        JSObjectRef args = JSObjectMake(context, 0, 0);
-        JSObjectSetProperty(context, args, qtBasedTestRunnerName.get(), JSObjectGetProperty(context, window, testRunnerName.get(), 0), 0, 0);
-        JSObjectSetProperty(context, args, jscBasedTestRunnerName.get(), wrappedTestRunner, 0, 0);
-
-        JSValueRef ex = 0;
-        JSEvaluateScript(context, helperScript.get(), args, 0, 0, &ex);
-        if (ex) {
-            JSRetainPtr<JSStringRef> msg(Adopt, JSValueToStringCopy(context, ex, 0));
-            fprintf(stderr, "Error evaluating TestRunner setup-script: %s\n", qPrintable(JSStringCopyQString(msg.get())));
-        }
-    }
-
-    DumpRenderTreeSupportQt::injectInternalsObject(frame->handle());
-}
-
-void DumpRenderTree::showPage()
-{
-    m_mainView->show();
-    // we need a paint event but cannot process all the events
-    QPixmap pixmap(m_mainView->size());
-    m_mainView->render(&pixmap);
-}
-
-void DumpRenderTree::hidePage()
-{
-    m_mainView->hide();
-}
-
-QString DumpRenderTree::dumpFrameScrollPosition(QWebFrame* frame)
-{
-    if (!frame || !DumpRenderTreeSupportQt::hasDocumentElement(frame->handle()))
-        return QString();
-
-    QString result;
-    QPoint pos = frame->scrollPosition();
-    if (pos.x() > 0 || pos.y() > 0) {
-        QWebFrame* parent = qobject_cast<QWebFrame *>(frame->parent());
-        if (parent)
-            result.append(QString("frame '%1' ").arg(frame->title()));
-        result.append(QString("scrolled to %1,%2\n").arg(pos.x()).arg(pos.y()));
-    }
-
-    if (m_jscController->dumpChildFrameScrollPositions()) {
-        QList<QWebFrame*> children = frame->childFrames();
-        for (int i = 0; i < children.size(); ++i)
-            result += dumpFrameScrollPosition(children.at(i));
-    }
-    return result;
-}
-
-QString DumpRenderTree::dumpFramesAsText(QWebFrame* frame)
-{
-    if (!frame || !DumpRenderTreeSupportQt::hasDocumentElement(frame->handle()))
-        return QString();
-
-    QString result;
-    QWebFrame* parent = qobject_cast<QWebFrame*>(frame->parent());
-    if (parent) {
-        result.append(QLatin1String("\n--------\nFrame: '"));
-        result.append(frame->frameName());
-        result.append(QLatin1String("'\n--------\n"));
-    }
-
-    QString innerText = frame->toPlainText();
-    result.append(innerText);
-    result.append(QLatin1String("\n"));
-
-    if (m_jscController->dumpChildFramesAsText()) {
-        QList<QWebFrame *> children = frame->childFrames();
-        for (int i = 0; i < children.size(); ++i)
-            result += dumpFramesAsText(children.at(i));
-    }
-
-    return result;
-}
-
-static QString dumpHistoryItem(const QWebHistoryItem& item, int indent, bool current)
-{
-    QString result;
-
-    int start = 0;
-    if (current) {
-        result.append(QLatin1String("curr->"));
-        start = 6;
-    }
-    for (int i = start; i < indent; i++)
-        result.append(' ');
-
-    QString url = item.url().toString();
-    if (url.contains("file://")) {
-        static QString layoutTestsString("/LayoutTests/");
-        static QString fileTestString("(file test):");
-
-        QString res = url.mid(url.indexOf(layoutTestsString) + layoutTestsString.length());
-        if (res.isEmpty())
-            return result;
-
-        result.append(fileTestString);
-        result.append(res);
-    } else {
-        result.append(url);
-    }
-
-    QString target = DumpRenderTreeSupportQt::historyItemTarget(item);
-    if (!target.isEmpty())
-        result.append(QString(QLatin1String(" (in frame \"%1\")")).arg(target));
-
-    if (DumpRenderTreeSupportQt::isTargetItem(item))
-        result.append(QLatin1String("  **nav target**"));
-    result.append(QLatin1String("\n"));
-
-    QMap<QString, QWebHistoryItem> children = DumpRenderTreeSupportQt::getChildHistoryItems(item);
-    foreach (QWebHistoryItem item, children)
-        result += dumpHistoryItem(item, 12, false);
-
-    return result;
-}
-
-QString DumpRenderTree::dumpBackForwardList(QWebPage* page)
-{
-    QWebHistory* history = page->history();
-
-    QString result;
-    result.append(QLatin1String("\n============== Back Forward List ==============\n"));
-
-    // FORMAT:
-    // "        (file test):fast/loader/resources/click-fragment-link.html  **nav target**"
-    // "curr->  (file test):fast/loader/resources/click-fragment-link.html#testfragment  **nav target**"
-
-    int maxItems = history->maximumItemCount();
-
-    foreach (const QWebHistoryItem item, history->backItems(maxItems)) {
-        if (!item.isValid())
-            continue;
-        result.append(dumpHistoryItem(item, 8, false));
-    }
-
-    QWebHistoryItem item = history->currentItem();
-    if (item.isValid())
-        result.append(dumpHistoryItem(item, 8, true));
-
-    foreach (const QWebHistoryItem item, history->forwardItems(maxItems)) {
-        if (!item.isValid())
-            continue;
-        result.append(dumpHistoryItem(item, 8, false));
-    }
-
-    result.append(QLatin1String("===============================================\n"));
-    return result;
-}
-
-static const char *methodNameStringForFailedTest(TestRunner *controller)
-{
-    const char *errorMessage;
-    if (controller->dumpAsText())
-        errorMessage = "[documentElement innerText]";
-    // FIXME: Add when we have support
-    //else if (controller->dumpDOMAsWebArchive())
-    //    errorMessage = "[[mainFrame DOMDocument] webArchive]";
-    //else if (controller->dumpSourceAsWebArchive())
-    //    errorMessage = "[[mainFrame dataSource] webArchive]";
-    else
-        errorMessage = "[mainFrame renderTreeAsExternalRepresentation]";
-
-    return errorMessage;
-}
-
-void DumpRenderTree::dump()
-{
-    // Prevent any further frame load or resource load callbacks from appearing after we dump the result.
-    DumpRenderTreeSupportQt::dumpFrameLoader(false);
-    DumpRenderTreeSupportQt::dumpResourceLoadCallbacks(false);
-
-    QWebFrame *mainFrame = m_page->mainFrame();
-
-    if (isStandAloneMode()) {
-        QString markup = mainFrame->toHtml();
-        fprintf(stdout, "Source:\n\n%s\n", markup.toUtf8().constData());
-    }
-
-    QString mimeType = DumpRenderTreeSupportQt::responseMimeType(mainFrame->handle());
-    if (mimeType == "text/plain")
-        m_jscController->setDumpAsText(true);
-
-    // Dump render text...
-    QString resultString;
-    QString resultContentType = "text/plain";
-    QByteArray resultData;
-    if (m_controller->shouldDumpAsAudio()) {
-        resultContentType = "audio/wav";
-        resultData = m_controller->audioData();
-    } else if (m_jscController->dumpAsText())
-        resultString = dumpFramesAsText(mainFrame);
-    else {
-        resultString = DumpRenderTreeSupportQt::frameRenderTreeDump(mainFrame->handle());
-        resultString += dumpFrameScrollPosition(mainFrame);
-    }
-    if (!resultString.isEmpty()) {
-        fprintf(stdout, "Content-Type: %s\n", resultContentType.toUtf8().constData());
-        fprintf(stdout, "%s", resultString.toUtf8().constData());
-
-        if (m_jscController->dumpBackForwardList()) {
-            fprintf(stdout, "%s", dumpBackForwardList(webPage()).toUtf8().constData());
-            foreach (QObject* widget, windows) {
-                QWebPage* page = qobject_cast<QWebPage*>(widget->findChild<QWebPage*>());
-                fprintf(stdout, "%s", dumpBackForwardList(page).toUtf8().constData());
-            }
-        }
-    } else if (!resultData.isEmpty()) {
-        fprintf(stdout, "Content-Type: %s\n", resultContentType.toUtf8().constData());
-        fprintf(stdout, "Content-Transfer-Encoding: base64\n");
-        fprintf(stdout, "%s", resultData.toBase64().constData());
-    } else
-        printf("ERROR: nil result from %s", methodNameStringForFailedTest(m_jscController.get()));
-
-    // signal end of text block
-    fputs("#EOF\n", stdout);
-    fputs("#EOF\n", stderr);
-
-    if (m_dumpPixelsForCurrentTest && m_jscController->generatePixelResults()) {
-        QImage image;
-        if (!m_jscController->isPrinting()) {
-            image = QImage(m_page->viewportSize(), QImage::Format_ARGB32);
-            image.fill(Qt::white);
-            QPainter painter(&image);
-            mainFrame->render(&painter);
-            painter.end();
-        } else
-            image = DumpRenderTreeSupportQt::paintPagesWithBoundaries(mainFrame->handle());
-
-        if (DumpRenderTreeSupportQt::trackRepaintRects(mainFrameAdapter())) {
-            QVector<QRect> repaintRects;
-            DumpRenderTreeSupportQt::getTrackedRepaintRects(mainFrameAdapter(), repaintRects);
-            QImage mask(image.size(), image.format());
-            mask.fill(QColor(0, 0, 0, 0.66 * 255));
-
-            QPainter maskPainter(&mask);
-            maskPainter.setCompositionMode(QPainter::CompositionMode_Source);
-            for (int i = 0; i < repaintRects.size(); ++i)
-                maskPainter.fillRect(repaintRects[i], Qt::transparent);
-
-            QPainter painter(&image);
-            painter.drawImage(image.rect(), mask);
-
-            DumpRenderTreeSupportQt::setTrackRepaintRects(mainFrameAdapter(), false);
-        }
-
-        QCryptographicHash hash(QCryptographicHash::Md5);
-        for (int row = 0; row < image.height(); ++row)
-            hash.addData(reinterpret_cast<const char*>(image.scanLine(row)), image.width() * 4);
-        QString actualHash = hash.result().toHex();
-
-        fprintf(stdout, "\nActualHash: %s\n", qPrintable(actualHash));
-
-        bool dumpImage = true;
-
-        if (!m_expectedHash.isEmpty()) {
-            Q_ASSERT(m_expectedHash.length() == 32);
-            fprintf(stdout, "\nExpectedHash: %s\n", qPrintable(m_expectedHash));
-
-            if (m_expectedHash == actualHash)
-                dumpImage = false;
-        }
-
-        if (dumpImage) {
-            image.setText("checksum", actualHash);
-
-            QBuffer buffer;
-            buffer.open(QBuffer::WriteOnly);
-            image.save(&buffer, "PNG");
-            buffer.close();
-            const QByteArray &data = buffer.data();
-
-            printf("Content-Type: %s\n", "image/png");
-            printf("Content-Length: %lu\n", static_cast<unsigned long>(data.length()));
-
-            const quint32 bytesToWriteInOneChunk = 1 << 15;
-            quint32 dataRemainingToWrite = data.length();
-            const char *ptr = data.data();
-            while (dataRemainingToWrite) {
-                quint32 bytesToWriteInThisChunk = qMin(dataRemainingToWrite, bytesToWriteInOneChunk);
-                quint32 bytesWritten = fwrite(ptr, 1, bytesToWriteInThisChunk, stdout);
-                if (bytesWritten != bytesToWriteInThisChunk)
-                    break;
-                dataRemainingToWrite -= bytesWritten;
-                ptr += bytesWritten;
-            }
-        }
-
-        fflush(stdout);
-    }
-
-    puts("#EOF");   // terminate the (possibly empty) pixels block
-
-    fflush(stdout);
-    fflush(stderr);
-
-     emit ready();
-}
-
-void DumpRenderTree::titleChanged(const QString &s)
-{
-    if (m_jscController->dumpTitleChanges())
-        printf("TITLE CHANGED: '%s'\n", s.toUtf8().data());
-}
-
-void DumpRenderTree::connectFrame(QWebFrame *frame)
-{
-    connect(frame, SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(initJSObjects()));
-    connect(frame, SIGNAL(provisionalLoad()),
-            testRunner(), SLOT(provisionalLoad()));
-}
-
-void DumpRenderTree::dumpDatabaseQuota(QWebFrame* frame, const QString& dbName)
-{
-    if (!m_jscController->dumpDatabaseCallbacks())
-        return;
-    QWebSecurityOrigin origin = frame->securityOrigin();
-    printf("UI DELEGATE DATABASE CALLBACK: exceededDatabaseQuotaForSecurityOrigin:{%s, %s, %i} database:%s\n",
-           origin.scheme().toUtf8().data(),
-           origin.host().toUtf8().data(),
-           origin.port(),
-           dbName.toUtf8().data());
-    origin.setDatabaseQuota(databaseDefaultQuota);
-}
-
-void DumpRenderTree::dumpApplicationCacheQuota(QWebSecurityOrigin* origin, quint64 defaultOriginQuota, quint64 totalSpaceNeeded)
-{
-    if (m_jscController->dumpApplicationCacheDelegateCallbacks()) {
-        // For example, numbers from 30000 - 39999 will output as 30000.
-        // Rounding up or down not really matter for these tests. It's
-        // sufficient to just get a range of 10000 to determine if we were
-        // above or below a threshold.
-        quint64 truncatedSpaceNeeded = (totalSpaceNeeded / 10000) * 10000;
-        printf("UI DELEGATE APPLICATION CACHE CALLBACK: exceededApplicationCacheOriginQuotaForSecurityOrigin:{%s, %s, %i} totalSpaceNeeded:~%llu\n",
-               origin->scheme().toUtf8().data(),
-               origin->host().toUtf8().data(),
-               origin->port(),
-               truncatedSpaceNeeded
-               );
-    }
-
-    if (m_jscController->disallowIncreaseForApplicationCacheQuota())
-        return;
-
-    origin->setApplicationCacheQuota(defaultOriginQuota);
-}
-
-void DumpRenderTree::statusBarMessage(const QString& message)
-{
-    if (!m_jscController->dumpStatusCallbacks())
-        return;
-
-    printf("UI DELEGATE STATUS CALLBACK: setStatusText:%s\n", message.toUtf8().constData());
-}
-
-QWebPage *DumpRenderTree::createWindow()
-{
-    if (!m_jscController->canOpenWindows())
-        return 0;
-
-    // Create a dummy container object to track the page in DRT.
-    // QObject is used instead of QWidget to prevent DRT from
-    // showing the main view when deleting the container.
-
-    QObject* container = new QObject(m_mainView);
-    // create a QWebPage we want to return
-    QWebPage* page = static_cast<QWebPage*>(new WebPage(container, this));
-    // gets cleaned up in closeRemainingWindows()
-    windows.append(container);
-
-    // connect the needed signals to the page
-    connect(page, SIGNAL(frameCreated(QWebFrame*)), this, SLOT(connectFrame(QWebFrame*)));
-    connectFrame(page->mainFrame());
-    connect(page, SIGNAL(loadFinished(bool)), m_controller, SLOT(maybeDump(bool)));
-    connect(page, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
-
-    // Use a frame group name for all pages created by DumpRenderTree to allow
-    // testing of cross-page frame lookup.
-    DumpRenderTreeSupportQt::webPageSetGroupName(page->handle(), "org.webkit.qt.DumpRenderTree");
-
-    return page;
-}
-
-void DumpRenderTree::windowCloseRequested()
-{
-    QWebPage* page = qobject_cast<QWebPage*>(sender());
-    QObject* container = page->parent();
-    windows.removeAll(container);
-    container->deleteLater();
-}
-
-int DumpRenderTree::windowCount() const
-{
-// include the main view in the count
-    return windows.count() + 1;
-}
-
-void DumpRenderTree::geolocationPermissionSet() 
-{
-    m_page->permissionSet(QWebPage::Geolocation);
-}
-
-void DumpRenderTree::switchFocus(bool focused)
-{
-    QFocusEvent event((focused) ? QEvent::FocusIn : QEvent::FocusOut, Qt::ActiveWindowFocusReason);
-    if (!isGraphicsBased())
-        QApplication::sendEvent(m_mainView, &event);
-    else {
-        if (WebViewGraphicsBased* view = qobject_cast<WebViewGraphicsBased*>(m_mainView))
-            view->scene()->sendEvent(view->graphicsView(), &event);
-    }
-
-}
-
-QWebPageAdapter* DumpRenderTree::pageAdapter() const
-{
-    return m_page->handle();
-}
-
-QWebFrameAdapter* DumpRenderTree::mainFrameAdapter() const
-{
-    return m_page->mainFrame()->handle();
-}
-
-QList<WebPage*> DumpRenderTree::getAllPages() const
-{
-    QList<WebPage*> pages;
-    pages.append(m_page);
-    foreach (QObject* widget, windows) {
-        if (WebPage* page = widget->findChild<WebPage*>())
-            pages.append(page);
-    }
-    return pages;
-}
-
-void DumpRenderTree::setTimeout(int timeout)
-{
-    m_controller->setTimeout(timeout);
-}
-
-void DumpRenderTree::setShouldTimeout(bool flag)
-{
-    m_controller->setShouldTimeout(flag);
-}
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
deleted file mode 100644 (file)
index be1559d..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-
-#ifndef DumpRenderTreeQt_h
-#define DumpRenderTreeQt_h
-
-#include <QList>
-#include <QNetworkAccessManager>
-#include <QObject>
-#include <QTextStream>
-#include <QSocketNotifier>
-
-#ifndef QT_NO_OPENSSL
-#include <QSslError>
-#endif
-
-#include "DumpRenderTreeSupportQt.h"
-#include "TestRunner.h"
-#include <qgraphicsview.h>
-#include <qgraphicswebview.h>
-#include <qwebframe.h>
-#include <qwebinspector.h>
-#include <qwebpage.h>
-#include <qwebview.h>
-#include <wtf/RefPtr.h>
-
-QT_BEGIN_NAMESPACE
-class QUrl;
-class QFile;
-QT_END_NAMESPACE
-
-class QWebFrameAdapter;
-class QWebPageAdapter;
-
-class TestRunnerQt;
-class DumpRenderTreeSupportQt;
-class EventSender;
-class TextInputController;
-class GCController;
-
-class WebPage;
-class NetworkAccessManager;
-
-class DumpRenderTree : public QObject {
-Q_OBJECT
-
-public:
-    DumpRenderTree();
-    virtual ~DumpRenderTree();
-
-    static DumpRenderTree* instance();
-
-    // Initialize in single-file mode.
-    void open(const QUrl& url);
-
-    void setTextOutputEnabled(bool enable) { m_enableTextOutput = enable; }
-    bool isTextOutputEnabled() { return m_enableTextOutput; }
-
-    void setGraphicsBased(bool flag) { m_graphicsBased = flag; }
-    bool isGraphicsBased() { return m_graphicsBased; }
-
-    void closeRemainingWindows();
-    void resetToConsistentStateBeforeTesting(const QUrl&);
-
-    TestRunnerQt *testRunner() const { return m_controller; }
-    TestRunner *jscTestRunner() const { return m_jscController.get(); }
-    EventSender *eventSender() const { return m_eventSender; }
-    TextInputController *textInputController() const { return m_textInputController; }
-    QString persistentStoragePath() const { return m_persistentStoragePath; }
-    NetworkAccessManager *networkAccessManager() const { return m_networkAccessManager; }
-
-    QWebPage *createWindow();
-    int windowCount() const;
-
-    void switchFocus(bool focused);
-
-    WebPage *webPage() const { return m_page; }
-    QWebPageAdapter *pageAdapter() const;
-    QWebFrameAdapter *mainFrameAdapter() const;
-
-    QList<WebPage*> getAllPages() const;
-
-    void processArgsLine(const QStringList&);
-    void setRedirectOutputFileName(const QString& fileName) { m_redirectOutputFileName = fileName; }
-    void setRedirectErrorFileName(const QString& fileName) { m_redirectErrorFileName = fileName; }
-
-    void setTimeout(int);
-    void setShouldTimeout(bool flag);
-    void setShouldDumpPixelsForAllTests() { m_dumpPixelsForAllTests = true; }
-
-public Q_SLOTS:
-    void initJSObjects();
-
-    void readLine();
-    void processLine(const QString&);
-
-    void dump();
-    void titleChanged(const QString &s);
-    void connectFrame(QWebFrame *frame);
-    void dumpDatabaseQuota(QWebFrame* frame, const QString& dbName);
-    void dumpApplicationCacheQuota(QWebSecurityOrigin* origin, quint64 defaultOriginQuota, quint64 totalSpaceNeeded);
-    void statusBarMessage(const QString& message);
-    void windowCloseRequested();
-
-Q_SIGNALS:
-    void quit();
-    void ready();
-
-private Q_SLOTS:
-    void showPage();
-    void hidePage();
-    void dryRunPrint(QWebFrame*);
-    void loadNextTestInStandAloneMode();
-    void geolocationPermissionSet();
-
-private:
-    void setStandAloneMode(bool flag) { m_standAloneMode = flag; }
-    bool isStandAloneMode() { return m_standAloneMode; }
-
-    QString dumpFramesAsText(QWebFrame* frame);
-    QString dumpBackForwardList(QWebPage* page);
-    QString dumpFrameScrollPosition(QWebFrame* frame);
-    TestRunnerQt *m_controller;
-    RefPtr<TestRunner> m_jscController;
-
-    bool m_dumpPixelsForCurrentTest;
-    bool m_dumpPixelsForAllTests;
-    QString m_expectedHash;
-    QStringList m_standAloneModeTestList;
-
-    WebPage *m_page;
-    QWidget* m_mainView;
-
-    EventSender *m_eventSender;
-    TextInputController *m_textInputController;
-    QScopedPointer<GCController> m_gcController;
-    NetworkAccessManager* m_networkAccessManager;
-
-    QFile *m_stdin;
-
-    QList<QObject*> windows;
-    bool m_enableTextOutput;
-    bool m_standAloneMode;
-    bool m_graphicsBased;
-    QString m_persistentStoragePath;
-    QString m_redirectOutputFileName;
-    QString m_redirectErrorFileName;
-};
-
-class NetworkAccessManager : public QNetworkAccessManager {
-    Q_OBJECT
-public:
-    NetworkAccessManager(QObject* parent);
-
-private Q_SLOTS:
-#ifndef QT_NO_OPENSSL
-    void sslErrorsEncountered(QNetworkReply*, const QList<QSslError>&);
-#endif
-};
-
-class WebPage : public QWebPage {
-    Q_OBJECT
-public:
-    WebPage(QObject* parent, DumpRenderTree*);
-    virtual ~WebPage();
-    QWebInspector* webInspector();
-    void closeWebInspector();
-
-    QWebPage *createWindow(QWebPage::WebWindowType);
-
-    void javaScriptAlert(QWebFrame *frame, const QString& message);
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
-    bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
-    bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
-
-    void resetSettings();
-
-    virtual bool supportsExtension(QWebPage::Extension extension) const;
-    virtual bool extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output);
-
-    QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&);
-
-    void permissionSet(QWebPage::Feature feature);
-
-    virtual bool shouldInterruptJavaScript() { return false; }
-
-public Q_SLOTS:
-    void requestPermission(QWebFrame* frame, QWebPage::Feature feature);
-    void cancelPermission(QWebFrame* frame, QWebPage::Feature feature);
-
-protected:
-    bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type);
-    bool isTextOutputEnabled() { return m_drt->isTextOutputEnabled(); }
-
-private Q_SLOTS:
-    void setViewGeometry(const QRect&);
-
-private:
-    QWebInspector* m_webInspector;
-    QList<QWebFrame*> m_pendingGeolocationRequests;
-    DumpRenderTree *m_drt;
-};
-
-class WebViewGraphicsBased : public QGraphicsView {
-    Q_OBJECT
-
-public:
-    WebViewGraphicsBased(QWidget* parent);
-    QGraphicsWebView* graphicsView() const { return m_item; }
-    void setPage(QWebPage* page) { m_item->setPage(page); }
-
-private:
-    QGraphicsWebView* m_item;
-};
-
-#endif
diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.cpp b/Tools/DumpRenderTree/qt/EventSenderQt.cpp
deleted file mode 100644 (file)
index 352f1de..0000000
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "config.h"
-#include "EventSenderQt.h"
-
-#include <QGestureEvent>
-#include <QGraphicsSceneMouseEvent>
-#include <QtTest/QtTest>
-#include <qpa/qwindowsysteminterface.h>
-
-#define KEYCODE_DEL         127
-#define KEYCODE_BACKSPACE   8
-#define KEYCODE_LEFTARROW   0xf702
-#define KEYCODE_RIGHTARROW  0xf703
-#define KEYCODE_UPARROW     0xf700
-#define KEYCODE_DOWNARROW   0xf701
-
-// Ports like Gtk and Windows expose a different approach for their zooming
-// API if compared to Qt: they have specific methods for zooming in and out,
-// as well as a settable zoom factor, while Qt has only a 'setZoomValue' method.
-// Hence Qt DRT adopts a fixed zoom-factor (1.2) for compatibility.
-#define ZOOM_STEP           1.2
-
-#define DRT_MESSAGE_DONE (QEvent::User + 1)
-
-struct DRTEventQueue {
-    QEvent* m_event;
-    int m_delay;
-};
-
-static DRTEventQueue eventQueue[1024];
-static unsigned endOfQueue;
-static unsigned startOfQueue;
-
-EventSender::EventSender(QWebPage* parent)
-    : QObject(parent)
-#ifndef QT_NO_GESTURES
-    , m_tapGesture(parent)
-    , m_tapAndHoldGesture(parent)
-#endif
-{
-    m_page = parent;
-    m_mouseButtonPressed = false;
-    m_drag = false;
-    memset(eventQueue, 0, sizeof(eventQueue));
-    endOfQueue = 0;
-    startOfQueue = 0;
-    m_eventLoop = 0;
-    m_currentButton = 0;
-    m_currentDragActionsAllowed = 0;
-    resetClickCount();
-    m_page->view()->installEventFilter(this);
-    // This is a hack that works because we normally scroll 60 pixels (3*20) per tick, but Apple scrolls 120.
-    // But Apple also has a bug where they report lines instead of ticks in PlatformWheelEvent, making 2 lines = 40 pixels match.
-    QApplication::setWheelScrollLines(2);
-}
-
-static Qt::KeyboardModifiers getModifiers(const QStringList& modifiers)
-{
-    Qt::KeyboardModifiers modifs = 0;
-    for (int i = 0; i < modifiers.size(); ++i) {
-        const QString& m = modifiers.at(i);
-        if (m == "ctrlKey")
-            modifs |= Qt::ControlModifier;
-        else if (m == "shiftKey")
-            modifs |= Qt::ShiftModifier;
-        else if (m == "altKey")
-            modifs |= Qt::AltModifier;
-        else if (m == "metaKey")
-            modifs |= Qt::MetaModifier;
-    }
-    return modifs;
-}
-
-void EventSender::mouseDown(int button, const QStringList& modifiers)
-{
-    Qt::KeyboardModifiers modifs = getModifiers(modifiers);
-    Qt::MouseButton mouseButton;
-    switch (button) {
-    case 0:
-        mouseButton = Qt::LeftButton;
-        break;
-    case 1:
-        mouseButton = Qt::MidButton;
-        break;
-    case 2:
-        mouseButton = Qt::RightButton;
-        break;
-    case 3:
-        // fast/events/mouse-click-events expects the 4th button to be treated as the middle button
-        mouseButton = Qt::MidButton;
-        break;
-    default:
-        mouseButton = Qt::LeftButton;
-        break;
-    }
-
-    // only consider a click to count, an event originated by the
-    // same previous button and at the same position.
-    if (m_currentButton == button
-        && m_mousePos == m_clickPos
-        && m_clickTimer.isActive())
-        m_clickCount++;
-    else
-        m_clickCount = 1;
-
-    m_currentButton = button;
-    m_clickPos = m_mousePos;
-    m_mouseButtons |= mouseButton;
-
-//     qDebug() << "EventSender::mouseDown" << frame;
-    QEvent* event;
-    if (isGraphicsBased()) {
-        event = createGraphicsSceneMouseEvent((m_clickCount == 2) ?
-                    QEvent::GraphicsSceneMouseDoubleClick : QEvent::GraphicsSceneMousePress,
-                    m_mousePos, m_mousePos, mouseButton, m_mouseButtons, modifs);
-    } else {
-        event = new QMouseEvent((m_clickCount == 2) ? QEvent::MouseButtonDblClick :
-                    QEvent::MouseButtonPress, m_mousePos, m_mousePos,
-                    mouseButton, m_mouseButtons, modifs);
-    }
-
-    sendOrQueueEvent(event);
-
-    m_clickTimer.start(QApplication::doubleClickInterval(), this);
-}
-
-void EventSender::mouseUp(int button)
-{
-    Qt::MouseButton mouseButton;
-    switch (button) {
-    case 0:
-        mouseButton = Qt::LeftButton;
-        break;
-    case 1:
-        mouseButton = Qt::MidButton;
-        break;
-    case 2:
-        mouseButton = Qt::RightButton;
-        break;
-    case 3:
-        // fast/events/mouse-click-events expects the 4th button to be treated as the middle button
-        mouseButton = Qt::MidButton;
-        break;
-    default:
-        mouseButton = Qt::LeftButton;
-        break;
-    }
-
-    m_mouseButtons &= ~mouseButton;
-
-//     qDebug() << "EventSender::mouseUp" << frame;
-    QEvent* event;
-    if (isGraphicsBased()) {
-        event = createGraphicsSceneMouseEvent(QEvent::GraphicsSceneMouseRelease,
-                    m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
-    } else {
-        event = new QMouseEvent(QEvent::MouseButtonRelease,
-                    m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
-    }
-
-    sendOrQueueEvent(event);
-
-    if (m_currentDragData.urls().isEmpty())
-        return;
-
-    event = new QDropEvent(m_mousePos, m_currentDragActionsAllowed, &m_currentDragData, m_mouseButtons, Qt::NoModifier);
-    sendEvent(m_page, event);
-    m_currentDragData.clear();
-}
-
-void EventSender::mouseMoveTo(int x, int y)
-{
-//     qDebug() << "EventSender::mouseMoveTo" << x << y;
-    m_mousePos = QPoint(x, y);
-
-    QEvent* event;
-    if (isGraphicsBased()) {
-        event = createGraphicsSceneMouseEvent(QEvent::GraphicsSceneMouseMove,
-                    m_mousePos, m_mousePos, Qt::NoButton, m_mouseButtons, Qt::NoModifier);
-    } else {
-        event = new QMouseEvent(QEvent::MouseMove,
-                    m_mousePos, m_mousePos, Qt::NoButton, m_mouseButtons, Qt::NoModifier);
-    }
-
-    sendOrQueueEvent(event);
-
-    if (m_currentDragData.urls().isEmpty())
-        return;
-
-    Qt::MouseButtons mouseButtons = m_mouseButtons | Qt::LeftButton;
-    event = new QDragMoveEvent(m_mousePos, m_currentDragActionsAllowed, &m_currentDragData, mouseButtons, Qt::NoModifier);
-    sendEvent(m_page, event);
-}
-
-// Simulates a mouse down event for drag without sending an actual mouse down event.
-void EventSender::beginDragWithFiles(const QStringList& files)
-{
-    m_currentDragData.clear();
-    QList<QUrl> fileUrls;
-    QUrl baseUrl = m_page->mainFrame()->baseUrl();
-    foreach (const QString& file, files) {
-        QUrl resolvedUrl = baseUrl.resolved(file);
-        fileUrls.append(resolvedUrl);
-    }
-
-    m_currentDragData.setUrls(fileUrls);
-    m_currentDragActionsAllowed = Qt::CopyAction;
-    Qt::MouseButtons mouseButtons = m_mouseButtons | Qt::LeftButton;
-    QDragEnterEvent* event = new QDragEnterEvent(m_mousePos, m_currentDragActionsAllowed, &m_currentDragData, mouseButtons, Qt::NoModifier);
-    sendEvent(m_page, event);
-}
-
-#ifndef QT_NO_WHEELEVENT
-void EventSender::mouseScrollBy(int ticksX, int ticksY)
-{
-    const int tickStep = QApplication::wheelScrollLines() * 20;
-    continuousMouseScrollBy((ticksX * tickStep), (ticksY * tickStep));
-}
-
-void EventSender::continuousMouseScrollBy(int x, int y)
-{
-    // continuousMouseScrollBy() mimics devices that send fine-grained scroll events where the 'delta' specified is not the usual
-    // multiple of 120. See http://doc.qt.nokia.com/4.6/qwheelevent.html#delta for a good explanation of this.
-
-    // A wheel delta of 120 (in 1/8 degrees) corresponds to one wheel tick, and we scroll tickStep pixels per wheel tick.
-    const int tickStep = QApplication::wheelScrollLines() * 20;
-    if (x) {
-        QEvent* event;
-        if (isGraphicsBased()) {
-            event = createGraphicsSceneWheelEvent(QEvent::GraphicsSceneWheel,
-                        m_mousePos, m_mousePos, (x * 120) / tickStep, Qt::NoModifier, Qt::Horizontal);
-        } else
-            event = new QWheelEvent(m_mousePos, m_mousePos, (x * 120) / tickStep, m_mouseButtons, Qt::NoModifier, Qt::Horizontal);
-
-        sendOrQueueEvent(event);
-    }
-    if (y) {
-        QEvent* event;
-        if (isGraphicsBased()) {
-            event = createGraphicsSceneWheelEvent(QEvent::GraphicsSceneWheel,
-                        m_mousePos, m_mousePos, (y * 120) / tickStep, Qt::NoModifier, Qt::Vertical);
-        } else
-            event = new QWheelEvent(m_mousePos, m_mousePos, (y * 120) / tickStep, m_mouseButtons, Qt::NoModifier, Qt::Vertical);
-
-        sendOrQueueEvent(event);
-    }
-}
-#endif
-
-void EventSender::leapForward(int ms)
-{
-    eventQueue[endOfQueue].m_delay = ms;
-    //qDebug() << "EventSender::leapForward" << ms;
-}
-
-void EventSender::keyDown(const QString& string, const QStringList& modifiers, unsigned int location)
-{
-    QString s = string;
-    Qt::KeyboardModifiers modifs = getModifiers(modifiers);
-    if (location == 3)
-        modifs |= Qt::KeypadModifier;
-    int code = 0;
-    if (string.length() == 1) {
-        code = string.unicode()->unicode();
-        //qDebug() << ">>>>>>>>> keyDown" << code << (char)code;
-        // map special keycodes used by the tests to something that works for Qt/X11
-        if (code == '\r') {
-            code = Qt::Key_Return;
-        } else if (code == '\t') {
-            code = Qt::Key_Tab;
-            if (modifs == Qt::ShiftModifier)
-                code = Qt::Key_Backtab;
-            s = QString();
-        } else if (code == KEYCODE_DEL || code == KEYCODE_BACKSPACE) {
-            code = Qt::Key_Backspace;
-            if (modifs == Qt::AltModifier)
-                modifs = Qt::ControlModifier;
-            s = QString();
-        } else if (code == 'o' && modifs == Qt::ControlModifier) {
-            // Mimic the emacs ctrl-o binding on Mac by inserting a paragraph
-            // separator and then putting the cursor back to its original
-            // position. Allows us to pass emacs-ctrl-o.html
-            s = QLatin1String("\n");
-            code = '\n';
-            modifs = 0;
-            QKeyEvent event(QEvent::KeyPress, code, modifs, s);
-            sendEvent(m_page, &event);
-            QKeyEvent event2(QEvent::KeyRelease, code, modifs, s);
-            sendEvent(m_page, &event2);
-            s = QString();
-            code = Qt::Key_Left;
-        } else if (code == 'y' && modifs == Qt::ControlModifier) {
-            s = QLatin1String("c");
-            code = 'c';
-        } else if (code == 'k' && modifs == Qt::ControlModifier) {
-            s = QLatin1String("x");
-            code = 'x';
-        } else if (code == 'a' && modifs == Qt::ControlModifier) {
-            s = QString();
-            code = Qt::Key_Home;
-            modifs = 0;
-        } else if (code == KEYCODE_LEFTARROW) {
-            s = QString();
-            code = Qt::Key_Left;
-            if (modifs & Qt::MetaModifier) {
-                code = Qt::Key_Home;
-                modifs &= ~Qt::MetaModifier;
-            }
-        } else if (code == KEYCODE_RIGHTARROW) {
-            s = QString();
-            code = Qt::Key_Right;
-            if (modifs & Qt::MetaModifier) {
-                code = Qt::Key_End;
-                modifs &= ~Qt::MetaModifier;
-            }
-        } else if (code == KEYCODE_UPARROW) {
-            s = QString();
-            code = Qt::Key_Up;
-            if (modifs & Qt::MetaModifier) {
-                code = Qt::Key_PageUp;
-                modifs &= ~Qt::MetaModifier;
-            }
-        } else if (code == KEYCODE_DOWNARROW) {
-            s = QString();
-            code = Qt::Key_Down;
-            if (modifs & Qt::MetaModifier) {
-                code = Qt::Key_PageDown;
-                modifs &= ~Qt::MetaModifier;
-            }
-        } else if (code == 'a' && modifs == Qt::ControlModifier) {
-            s = QString();
-            code = Qt::Key_Home;
-            modifs = 0;
-        } else
-            code = string.unicode()->toUpper().unicode();
-    } else {
-        //qDebug() << ">>>>>>>>> keyDown" << string;
-
-        if (string.startsWith(QLatin1Char('F')) && string.count() <= 3) {
-            s = s.mid(1);
-            int functionKey = s.toInt();
-            Q_ASSERT(functionKey >= 1 && functionKey <= 35);
-            code = Qt::Key_F1 + (functionKey - 1);
-        // map special keycode strings used by the tests to something that works for Qt/X11
-        } else if (string == QLatin1String("leftArrow")) {
-            s = QString();
-            code = Qt::Key_Left;
-        } else if (string == QLatin1String("rightArrow")) {
-            s = QString();
-            code = Qt::Key_Right;
-        } else if (string == QLatin1String("upArrow")) {
-            s = QString();
-            code = Qt::Key_Up;
-        } else if (string == QLatin1String("downArrow")) {
-            s = QString();
-            code = Qt::Key_Down;
-        } else if (string == QLatin1String("pageUp")) {
-            s = QString();
-            code = Qt::Key_PageUp;
-        } else if (string == QLatin1String("pageDown")) {
-            s = QString();
-            code = Qt::Key_PageDown;
-        } else if (string == QLatin1String("home")) {
-            s = QString();
-            code = Qt::Key_Home;
-        } else if (string == QLatin1String("end")) {
-            s = QString();
-            code = Qt::Key_End;
-        } else if (string == QLatin1String("insert")) {
-            s = QString();
-            code = Qt::Key_Insert;
-        } else if (string == QLatin1String("delete")) {
-            s = QString();
-            code = Qt::Key_Delete;
-        } else if (string == QLatin1String("printScreen")) {
-            s = QString();
-            code = Qt::Key_Print;
-        } else if (string == QLatin1String("menu")) {
-            s = QString();
-            code = Qt::Key_Menu;
-        }
-    }
-    QKeyEvent event(QEvent::KeyPress, code, modifs, s);
-    sendEvent(m_page, &event);
-    QKeyEvent event2(QEvent::KeyRelease, code, modifs, s);
-    sendEvent(m_page, &event2);
-}
-
-QStringList EventSender::contextClick()
-{
-    QMouseEvent event(QEvent::MouseButtonPress, m_mousePos, Qt::RightButton, Qt::RightButton, Qt::NoModifier);
-    sendEvent(m_page, &event);
-    QMouseEvent event2(QEvent::MouseButtonRelease, m_mousePos, Qt::RightButton, Qt::RightButton, Qt::NoModifier);
-    sendEvent(m_page, &event2);
-
-    if (isGraphicsBased()) {
-        QGraphicsSceneContextMenuEvent ctxEvent(QEvent::GraphicsSceneContextMenu);
-        ctxEvent.setReason(QGraphicsSceneContextMenuEvent::Mouse);
-        ctxEvent.setPos(m_mousePos);
-        WebViewGraphicsBased* view = qobject_cast<WebViewGraphicsBased*>(m_page->view());
-        if (view)
-            sendEvent(view->graphicsView(), &ctxEvent);
-    } else {
-        QContextMenuEvent ctxEvent(QContextMenuEvent::Mouse, m_mousePos);
-        sendEvent(m_page->view(), &ctxEvent);
-    }
-    return DumpRenderTreeSupportQt::contextMenu(m_page->handle());
-}
-
-void EventSender::scheduleAsynchronousClick()
-{
-    QMouseEvent* event = new QMouseEvent(QEvent::MouseButtonPress, m_mousePos, Qt::LeftButton, Qt::RightButton, Qt::NoModifier);
-    postEvent(m_page, event);
-    QMouseEvent* event2 = new QMouseEvent(QEvent::MouseButtonRelease, m_mousePos, Qt::LeftButton, Qt::RightButton, Qt::NoModifier);
-    postEvent(m_page, event2);
-}
-
-void EventSender::addTouchPoint(int x, int y)
-{
-    const int id = m_touchPoints.isEmpty() ? 0 : m_touchPoints.last().id() + 1;
-    const QPointF pos(x, y);
-    QTouchEvent::TouchPoint point(id);
-    point.setPos(pos);
-    point.setStartPos(pos);
-    point.setState(Qt::TouchPointPressed);
-    if (!m_touchPointRadius.isNull())
-        point.setRect(QRectF(pos - m_touchPointRadius, pos + m_touchPointRadius));
-    m_touchPoints.append(point);
-}
-
-void EventSender::updateTouchPoint(int index, int x, int y)
-{
-    if (index < 0 || index >= m_touchPoints.count())
-        return;
-
-    const QPointF pos(x, y);
-    QTouchEvent::TouchPoint &point = m_touchPoints[index];
-    point.setPos(pos);
-    point.setState(Qt::TouchPointMoved);
-    if (!m_touchPointRadius.isNull())
-        point.setRect(QRectF(pos - m_touchPointRadius, pos + m_touchPointRadius));
-}
-
-void EventSender::setTouchModifier(const QString &modifier, bool enable)
-{
-    Qt::KeyboardModifier mod = Qt::NoModifier;
-    if (!modifier.compare(QLatin1String("shift"), Qt::CaseInsensitive))
-        mod = Qt::ShiftModifier;
-    else if (!modifier.compare(QLatin1String("alt"), Qt::CaseInsensitive))
-        mod = Qt::AltModifier;
-    else if (!modifier.compare(QLatin1String("meta"), Qt::CaseInsensitive))
-        mod = Qt::MetaModifier;
-    else if (!modifier.compare(QLatin1String("ctrl"), Qt::CaseInsensitive))
-        mod = Qt::ControlModifier;
-
-    if (enable)
-        m_touchModifiers |= mod;
-    else
-        m_touchModifiers &= ~mod;
-}
-
-void EventSender::setTouchPointRadius(int radiusX, int radiusY)
-{
-    m_touchPointRadius = QPoint(radiusX, radiusY);
-}
-
-void EventSender::touchStart()
-{
-    if (!m_touchActive) {
-        sendTouchEvent(QEvent::TouchBegin);
-        m_touchActive = true;
-    } else
-        sendTouchEvent(QEvent::TouchUpdate);
-}
-
-void EventSender::touchMove()
-{
-    sendTouchEvent(QEvent::TouchUpdate);
-}
-
-void EventSender::touchEnd()
-{
-    for (int i = 0; i < m_touchPoints.count(); ++i)
-        if (m_touchPoints[i].state() != Qt::TouchPointReleased) {
-            sendTouchEvent(QEvent::TouchUpdate);
-            return;
-        }
-    sendTouchEvent(QEvent::TouchEnd);
-    m_touchActive = false;
-}
-
-void EventSender::touchCancel()
-{
-    sendTouchEvent(QEvent::TouchCancel);
-    m_touchActive = false;
-}
-
-void EventSender::clearTouchPoints()
-{
-    m_touchPoints.clear();
-    m_touchModifiers = Qt::KeyboardModifiers();
-    m_touchActive = false;
-    m_touchPointRadius = QPoint();
-}
-
-void EventSender::releaseTouchPoint(int index)
-{
-    if (index < 0 || index >= m_touchPoints.count())
-        return;
-
-    m_touchPoints[index].setState(Qt::TouchPointReleased);
-}
-
-void EventSender::cancelTouchPoint(int index)
-{
-    // FIXME: No cancellation state in Qt 5, mapped to release instead.
-    // PlatformTouchEvent conversion later will map all touch points to
-    // cancelled.
-    releaseTouchPoint(index);
-}
-
-void EventSender::sendTouchEvent(QEvent::Type type)
-{
-    static QTouchDevice* device = 0;
-    if (!device) {
-        device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
-    }
-
-    QTouchEvent event(type, device, m_touchModifiers);
-    event.setTouchPoints(m_touchPoints);
-    sendEvent(m_page, &event);
-    QList<QTouchEvent::TouchPoint>::Iterator it = m_touchPoints.begin();
-    while (it != m_touchPoints.end()) {
-        if (it->state() == Qt::TouchPointReleased)
-            it = m_touchPoints.erase(it);
-        else {
-            it->setState(Qt::TouchPointStationary);
-            ++it;
-        }
-    }
-}
-
-#ifndef QT_NO_GESTURES
-void EventSender::gestureTap(int x, int y)
-{
-    m_tapGesture.setPosition(QPointF(x, y));
-    m_gestures.clear();
-    m_gestures.append(&m_tapGesture);
-    QGestureEvent event(m_gestures);
-    sendEvent(m_page, &event);
-}
-
-void EventSender::gestureLongPress(int x, int y)
-{
-    m_tapAndHoldGesture.setPosition(QPointF(x, y));
-    m_gestures.clear();
-    m_gestures.append(&m_tapAndHoldGesture);
-    QGestureEvent event(m_gestures);
-    sendEvent(m_page, &event);
-}
-#endif
-
-void EventSender::zoomPageIn()
-{
-    if (QWebFrame* frame = m_page->mainFrame())
-        frame->setZoomFactor(frame->zoomFactor() * ZOOM_STEP);
-}
-
-void EventSender::zoomPageOut()
-{
-    if (QWebFrame* frame = m_page->mainFrame())
-        frame->setZoomFactor(frame->zoomFactor() / ZOOM_STEP);
-}
-
-void EventSender::textZoomIn()
-{
-    if (QWebFrame* frame = m_page->mainFrame())
-        frame->setTextSizeMultiplier(frame->textSizeMultiplier() * ZOOM_STEP);
-}
-
-void EventSender::textZoomOut()
-{
-    if (QWebFrame* frame = m_page->mainFrame())
-        frame->setTextSizeMultiplier(frame->textSizeMultiplier() / ZOOM_STEP);
-}
-
-void EventSender::scalePageBy(float scaleFactor, float x, float y)
-{
-    if (QWebFrame* frame = m_page->mainFrame())
-        DumpRenderTreeSupportQt::scalePageBy(frame->handle(), scaleFactor, QPoint(x, y));
-}
-
-QWebFrame* EventSender::frameUnderMouse() const
-{
-    QWebFrame* frame = m_page->mainFrame();
-
-redo:
-    QList<QWebFrame*> children = frame->childFrames();
-    for (int i = 0; i < children.size(); ++i) {
-        if (children.at(i)->geometry().contains(m_mousePos)) {
-            frame = children.at(i);
-            goto redo;
-        }
-    }
-    if (frame->geometry().contains(m_mousePos))
-        return frame;
-    return 0;
-}
-
-void EventSender::sendOrQueueEvent(QEvent* event)
-{
-    // Mouse move events are queued if
-    // 1. A previous event was queued.
-    // 2. A delay was set-up by leapForward().
-    // 3. A call to mouseMoveTo while the mouse button is pressed could initiate a drag operation, and that does not return until mouseUp is processed.
-    // To be safe and avoid a deadlock, this event is queued.
-    if (endOfQueue == startOfQueue && !eventQueue[endOfQueue].m_delay && (!(m_mouseButtonPressed && (m_eventLoop && event->type() == QEvent::MouseButtonRelease)))) {
-        sendEvent(m_page->view(), event);
-        delete event;
-        return;
-    }
-    eventQueue[endOfQueue++].m_event = event;
-    eventQueue[endOfQueue].m_delay = 0;
-    replaySavedEvents(event->type() != QEvent::MouseMove);
-}
-
-void EventSender::replaySavedEvents(bool flush)
-{
-    if (startOfQueue < endOfQueue) {
-        // First send all the events that are ready to be sent
-        while (!eventQueue[startOfQueue].m_delay && startOfQueue < endOfQueue) {
-            QEvent* ev = eventQueue[startOfQueue++].m_event;
-            postEvent(m_page->view(), ev);
-        }
-        if (startOfQueue == endOfQueue) {
-            // Reset the queue
-            startOfQueue = 0;
-            endOfQueue = 0;
-        } else {
-            QTest::qWait(eventQueue[startOfQueue].m_delay);
-            eventQueue[startOfQueue].m_delay = 0;
-        }
-    }
-    if (!flush)
-        return;
-
-    // Send a marker event, it will tell us when it is safe to exit the new event loop
-    QEvent* drtEvent = new QEvent((QEvent::Type)DRT_MESSAGE_DONE);
-    QApplication::postEvent(m_page->view(), drtEvent);
-
-    // Start an event loop for async handling of Drag & Drop
-    m_eventLoop = new QEventLoop;
-    m_eventLoop->exec();
-    delete m_eventLoop;
-    m_eventLoop = 0;
-}
-
-bool EventSender::eventFilter(QObject* watched, QEvent* event)
-{
-    if (watched != m_page->view())
-        return false;
-    switch (event->type()) {
-    case QEvent::Leave:
-        return true;
-    case QEvent::MouseButtonPress:
-    case QEvent::GraphicsSceneMousePress:
-        m_mouseButtonPressed = true;
-        break;
-    case QEvent::MouseMove:
-    case QEvent::GraphicsSceneMouseMove:
-        if (m_mouseButtonPressed)
-            m_drag = true;
-        break;
-    case QEvent::MouseButtonRelease:
-    case QEvent::GraphicsSceneMouseRelease:
-        m_mouseButtonPressed = false;
-        m_drag = false;
-        break;
-    case DRT_MESSAGE_DONE:
-        m_eventLoop->exit();
-        return true;
-    }
-    return false;
-}
-
-void EventSender::timerEvent(QTimerEvent* ev)
-{
-    m_clickTimer.stop();
-}
-
-QGraphicsSceneMouseEvent* EventSender::createGraphicsSceneMouseEvent(QEvent::Type type, const QPoint& pos, const QPoint& screenPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
-{
-    QGraphicsSceneMouseEvent* event;
-    event = new QGraphicsSceneMouseEvent(type);
-    event->setPos(pos);
-    event->setScreenPos(screenPos);
-    event->setButton(button);
-    event->setButtons(buttons);
-    event->setModifiers(modifiers);
-
-    return event;
-}
-
-QGraphicsSceneWheelEvent* EventSender::createGraphicsSceneWheelEvent(QEvent::Type type, const QPoint& pos, const QPoint& screenPos, int delta, Qt::KeyboardModifiers modifiers, Qt::Orientation orientation)
-{
-    QGraphicsSceneWheelEvent* event;
-    event = new QGraphicsSceneWheelEvent(type);
-    event->setPos(pos);
-    event->setScreenPos(screenPos);
-    event->setDelta(delta);
-    event->setModifiers(modifiers);
-    event->setOrientation(orientation);
-
-    return event;
-}
-
-void EventSender::sendEvent(QObject* receiver, QEvent* event)
-{
-    if (WebViewGraphicsBased* view = qobject_cast<WebViewGraphicsBased*>(receiver))
-        view->scene()->sendEvent(view->graphicsView(), event);
-    else
-        QApplication::sendEvent(receiver, event);
-}
-
-void EventSender::postEvent(QObject* receiver, QEvent* event)
-{
-    // QGraphicsScene does not have a postEvent method, so send the event in this case
-    // and delete it after that.
-    if (WebViewGraphicsBased* view = qobject_cast<WebViewGraphicsBased*>(receiver)) {
-        view->scene()->sendEvent(view->graphicsView(), event);
-        delete event;
-    } else
-        QApplication::postEvent(receiver, event); // event deleted by the system
-}
-
-#include "moc_EventSenderQt.cpp"
diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.h b/Tools/DumpRenderTree/qt/EventSenderQt.h
deleted file mode 100644 (file)
index ad13cad..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-#ifndef EventSenderQt_h
-#define EventSenderQt_h
-
-
-#include "DumpRenderTreeQt.h"
-
-#include <QApplication>
-#include <QBasicTimer>
-#include <QEvent>
-#include <QEventLoop>
-#include <QGesture>
-#include <QMimeData>
-#include <QMouseEvent>
-#include <QObject>
-#include <QPoint>
-#include <QString>
-#include <QStringList>
-#include <QTouchEvent>
-#include <Qt>
-
-#include <qwebpage.h>
-#include <qwebframe.h>
-
-
-class EventSender : public QObject {
-    Q_OBJECT
-public:
-    EventSender(QWebPage* parent);
-    virtual bool eventFilter(QObject* watched, QEvent* event);
-    void resetClickCount() { m_clickCount = 0; }
-
-public Q_SLOTS:
-    void mouseDown(int button = 0, const QStringList& modifiers = QStringList());
-    void mouseUp(int button = 0);
-    void mouseMoveTo(int x, int y);
-#ifndef QT_NO_WHEELEVENT
-    void mouseScrollBy(int x, int y);
-    void continuousMouseScrollBy(int x, int y);
-#endif
-    void leapForward(int ms);
-    void keyDown(const QString& string, const QStringList& modifiers = QStringList(), unsigned int location = 0);
-    void clearKillRing() {}
-    QStringList contextClick();
-    void scheduleAsynchronousClick();
-    void addTouchPoint(int x, int y);
-    void updateTouchPoint(int index, int x, int y);
-    void setTouchModifier(const QString &modifier, bool enable);
-    void setTouchPointRadius(int radiusX, int radiusY);
-    void touchStart();
-    void touchMove();
-    void touchEnd();
-    void touchCancel();
-    void zoomPageIn();
-    void zoomPageOut();
-    void textZoomIn();
-    void textZoomOut();
-    void scalePageBy(float scaleFactor, float x, float y);
-    void clearTouchPoints();
-    void releaseTouchPoint(int index);
-    void cancelTouchPoint(int index);
-#ifndef QT_NO_GESTURES
-    void gestureTap(int x, int y);
-    void gestureLongPress(int x, int y);
-#endif
-    void beginDragWithFiles(const QStringList& files);
-
-protected:
-    void timerEvent(QTimerEvent*);
-
-private:
-    bool isGraphicsBased() const { return qobject_cast<WebViewGraphicsBased*>(m_page->view()); }
-    QGraphicsSceneMouseEvent* createGraphicsSceneMouseEvent(QEvent::Type, const QPoint& pos, const QPoint& screenPos, Qt::MouseButton, Qt::MouseButtons, Qt::KeyboardModifiers);
-    QGraphicsSceneWheelEvent* createGraphicsSceneWheelEvent(QEvent::Type, const QPoint& pos, const QPoint& screenPos, int delta, Qt::KeyboardModifiers, Qt::Orientation);
-    void sendEvent(QObject* receiver, QEvent* event);
-    void postEvent(QObject* receiver, QEvent* event);
-
-private:
-    void sendTouchEvent(QEvent::Type);
-    void sendOrQueueEvent(QEvent*);
-    void replaySavedEvents(bool flush);
-    QPoint m_mousePos;
-    QPoint m_clickPos;
-    QPoint m_touchPointRadius;
-    Qt::MouseButtons m_mouseButtons;
-    QWebPage* m_page;
-    int m_clickCount;
-    int m_currentButton;
-    bool m_mouseButtonPressed;
-    bool m_drag;
-    QMimeData m_currentDragData;
-    Qt::DropActions m_currentDragActionsAllowed;
-    QEventLoop* m_eventLoop;
-    QWebFrame* frameUnderMouse() const;
-    QBasicTimer m_clickTimer;
-    QList<QTouchEvent::TouchPoint> m_touchPoints;
-    Qt::KeyboardModifiers m_touchModifiers;
-#ifndef QT_NO_GESTURES
-    QTapGesture m_tapGesture;
-    QTapAndHoldGesture m_tapAndHoldGesture;
-    QList<QGesture*> m_gestures;
-#endif
-    bool m_touchActive;
-};
-#endif //  EventSenderQt_h
diff --git a/Tools/DumpRenderTree/qt/GCControllerQt.cpp b/Tools/DumpRenderTree/qt/GCControllerQt.cpp
deleted file mode 100644 (file)
index 9f93698..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "config.h"
-#include "GCController.h"
-
-#include "DumpRenderTreeSupportQt.h"
-
-void GCController::collect() const
-{
-    DumpRenderTreeSupportQt::garbageCollectorCollect();
-}
-
-void GCController::collectOnAlternateThread(bool waitUntilDone) const
-{
-    DumpRenderTreeSupportQt::garbageCollectorCollectOnAlternateThread(waitUntilDone);
-}
-
-size_t GCController::getJSObjectCount() const
-{
-    return DumpRenderTreeSupportQt::javaScriptObjectsCount();
-}
diff --git a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
deleted file mode 100644 (file)
index 3b6ddfc..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# -------------------------------------------------------------------
-# Project file for the NPAPI test plugin
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-TEMPLATE = lib
-TARGET = TestNetscapePlugIn
-
-CONFIG += plugin
-
-SOURCES += \
-    PluginObject.cpp \
-    PluginTest.cpp \
-    TestObject.cpp \
-    main.cpp \
-    Tests/DocumentOpenInDestroyStream.cpp \
-    Tests/EvaluateJSAfterRemovingPluginElement.cpp \
-    Tests/FormValue.cpp \
-    Tests/GetURLNotifyWithURLThatFailsToLoad.cpp \
-    Tests/GetURLWithJavaScriptURL.cpp \
-    Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp \
-    Tests/GetUserAgentWithNullNPPFromNPPNew.cpp \
-    Tests/NPDeallocateCalledBeforeNPShutdown.cpp \
-    Tests/NPPNewFails.cpp \
-    Tests/NPPSetWindowCalledDuringDestruction.cpp \
-    Tests/NPRuntimeCallsWithNullNPP.cpp \
-    Tests/NPRuntimeObjectFromDestroyedPlugin.cpp \
-    Tests/NPRuntimeRemoveProperty.cpp \
-    Tests/NullNPPGetValuePointer.cpp \
-    Tests/PassDifferentNPPStruct.cpp \
-    Tests/PluginScriptableNPObjectInvokeDefault.cpp \
-    Tests/PluginScriptableObjectOverridesAllProperties.cpp \
-    Tests/PrivateBrowsing.cpp \
-    Tests/ToStringAndValueOfObject.cpp
-
-WEBKIT += webcore # For NPAPI headers
-
-VPATH = ../../unix/TestNetscapePlugin ../../TestNetscapePlugIn
-
-
-INCLUDEPATH += \
-    ../../TestNetscapePlugIn/unix/ForwardingHeaders \
-    ../../TestNetscapePlugIn/unix/ForwardingHeaders/WebKit \
-    ../../TestNetscapePlugIn
-
-DESTDIR = $${ROOT_BUILD_DIR}/lib/plugins
-
-mac {
-    CONFIG += plugin_bundle
-    QMAKE_INFO_PLIST = ../../TestNetscapePlugIn/mac/Info.plist
-    QMAKE_PLUGIN_BUNDLE_NAME = $$TARGET
-    QMAKE_BUNDLE_LOCATION += "Contents/MacOS"
-
-    OBJECTIVE_SOURCES += PluginObjectMac.mm
-    LIBS += -framework Carbon -framework Cocoa -framework QuartzCore
-}
-
-!win32:!embedded:!mac {
-    LIBS += -lX11
-    DEFINES += XP_UNIX
-}
diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.cpp b/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
deleted file mode 100644 (file)
index 794c00f..0000000
+++ /dev/null
@@ -1,1207 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "config.h"
-#include "TestRunnerQt.h"
-
-#include "DumpRenderTreeQt.h"
-#include "DumpRenderTreeSupportQt.h"
-#include "NotificationPresenterClientQt.h"
-#include "WorkQueue.h"
-#include "WorkQueueItemQt.h"
-#include <JSStringRefQt.h>
-#include <QCoreApplication>
-#include <QDir>
-#include <QLocale>
-#include <qwebsettings.h>
-
-TestRunnerQt::TestRunnerQt(DumpRenderTree* drt)
-    : QObject()
-    , m_drt(drt)
-    , m_shouldTimeout(true)
-    , m_timeout(30000)
-{
-    reset();
-}
-
-TestRunner::~TestRunner()
-{
-}
-
-void TestRunnerQt::reset()
-{
-    m_hasDumped = false;
-    m_loadFinished = false;
-    m_audioDump = false;
-    m_waitForDone = false;
-    m_timeoutTimer.stop();
-    m_topLoadingFrame = 0;
-    m_waitForPolicy = false;
-    m_handleErrorPages = false;
-    m_webHistory = 0;
-    m_globalFlag = false;
-    m_userStyleSheetEnabled = false;
-    m_ignoreDesktopNotification = false;
-    m_isGeolocationPermissionSet = false;
-    m_geolocationPermission = false;
-    m_audioData.clear();
-
-    DumpRenderTreeSupportQt::dumpEditingCallbacks(false);
-    DumpRenderTreeSupportQt::dumpFrameLoader(false);
-    DumpRenderTreeSupportQt::dumpProgressFinishedCallback(false);
-    DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader(false);
-    DumpRenderTreeSupportQt::dumpResourceLoadCallbacks(false);
-    DumpRenderTreeSupportQt::dumpResourceResponseMIMETypes(false);
-    DumpRenderTreeSupportQt::dumpWillCacheResponseCallbacks(false);
-    DumpRenderTreeSupportQt::setDeferMainResourceDataLoad(true);
-    DumpRenderTreeSupportQt::setWillSendRequestReturnsNullOnRedirect(false);
-    DumpRenderTreeSupportQt::setWillSendRequestReturnsNull(false);
-    DumpRenderTreeSupportQt::setWillSendRequestClearHeaders(QStringList());
-    DumpRenderTreeSupportQt::clearScriptWorlds();
-    DumpRenderTreeSupportQt::setCustomPolicyDelegate(false, false);
-    DumpRenderTreeSupportQt::dumpHistoryCallbacks(false);
-    DumpRenderTreeSupportQt::dumpVisitedLinksCallbacks(false);
-    DumpRenderTreeSupportQt::resetGeolocationMock(m_drt->pageAdapter());
-    DumpRenderTreeSupportQt::dumpNotification(false);
-    DumpRenderTreeSupportQt::setShouldUseFontSmoothing(false);
-    DumpRenderTreeSupportQt::disableDefaultTypesettingFeatures();
-    setIconDatabaseEnabled(false);
-    clearAllDatabases();
-    removeAllWebNotificationPermissions();
-    // The default state for DRT is to block third-party cookies, mimicing the Mac port
-    setAlwaysAcceptCookies(false);
-    emit hidePage();
-}
-
-void TestRunnerQt::dumpNotifications()
-{
-    DumpRenderTreeSupportQt::dumpNotification(true);
-}
-
-void TestRunnerQt::processWork()
-{
-    // qDebug() << ">>>processWork";
-
-    // if we didn't start a new load, then we finished all the commands, so we're ready to dump state
-    if (WorkQueue::shared()->processWork() && !shouldWaitUntilDone()) {
-        emit done();
-        m_hasDumped = true;
-    }
-}
-
-// Called on loadFinished on WebPage
-void TestRunnerQt::maybeDump(bool /*success*/)
-{
-
-    // This can happen on any of the http/tests/security/window-events-*.html tests, where the test opens
-    // a new window, calls the unload and load event handlers on the window's page, and then immediately
-    // issues a notifyDone. Needs investigation.
-    if (!m_topLoadingFrame)
-        return;
-
-    // It is possible that we get called by windows created from the main page that have finished
-    // loading, so we don't ASSERT here. At the moment we do not gather results from such windows,
-    // but may need to in future.
-    if (sender() != m_topLoadingFrame->page())
-        return;
-
-    m_loadFinished = true;
-    // as the function is called on loadFinished, the test might
-    // already have dumped and thus no longer be active, thus
-    // bail out here.
-    if (m_hasDumped)
-        return;
-
-    WorkQueue::shared()->setFrozen(true); // first complete load freezes the queue for the rest of this test
-    if (WorkQueue::shared()->count())
-        QTimer::singleShot(0, this, SLOT(processWork()));
-    else if (!shouldWaitUntilDone()) {
-        emit done();
-        m_hasDumped = true;
-    }
-}
-
-void TestRunnerQt::waitUntilDone()
-{
-    //qDebug() << ">>>>waitForDone";
-    m_waitForDone = true;
-
-    if (!m_shouldTimeout)
-        return;
-
-    m_timeoutTimer.start(m_timeout, this);
-}
-
-void TestRunnerQt::setViewModeMediaFeature(const QString& mode)
-{
-    m_drt->webPage()->setProperty("_q_viewMode", mode);
-}
-
-int TestRunnerQt::webHistoryItemCount()
-{
-    if (!m_webHistory)
-        return -1;
-
-    // Subtract one here as our QWebHistory::count() includes the actual page,
-    // which is not considered in the DRT tests.
-    return m_webHistory->count() - 1;
-}
-
-void TestRunnerQt::keepWebHistory()
-{
-    m_webHistory = m_drt->webPage()->history();
-}
-
-void TestRunnerQt::notifyDone()
-{
-    qDebug() << ">>>>notifyDone";
-
-    if (m_shouldTimeout && !m_timeoutTimer.isActive())
-        return;
-
-    m_timeoutTimer.stop();
-    m_waitForDone = false;
-
-    // If the page has not finished loading (i.e. loadFinished() has not been emitted) then
-    // content created by the likes of document.write() JS methods will not be available yet.
-    // When the page has finished loading, maybeDump above will dump the results now that we have
-    // just set shouldWaitUntilDone to false.
-    if (!m_loadFinished)
-        return;
-
-    emit done();
-
-    // FIXME: investigate why always resetting these result in timeouts
-    m_hasDumped = true;
-    m_waitForPolicy = false;
-}
-
-int TestRunnerQt::windowCount()
-{
-    return m_drt->windowCount();
-}
-
-void TestRunnerQt::grantWebNotificationPermission(const QString& origin)
-{
-    QWebFrame* frame = m_drt->webPage()->mainFrame();
-    m_drt->webPage()->setFeaturePermission(frame, QWebPage::Notifications, QWebPage::PermissionGrantedByUser);
-}
-
-void TestRunnerQt::ignoreLegacyWebNotificationPermissionRequests()
-{
-    m_ignoreDesktopNotification = true;
-}
-
-void TestRunnerQt::denyWebNotificationPermission(const QString& origin)
-{
-    QWebFrame* frame = m_drt->webPage()->mainFrame();
-    m_drt->webPage()->setFeaturePermission(frame, QWebPage::Notifications, QWebPage::PermissionDeniedByUser);
-}
-
-void TestRunnerQt::removeAllWebNotificationPermissions()
-{
-    DumpRenderTreeSupportQt::clearNotificationPermissions();
-}
-
-void TestRunnerQt::simulateLegacyWebNotificationClick(const QString& title)
-{
-    DumpRenderTreeSupportQt::simulateDesktopNotificationClick(title);
-}
-
-void TestRunnerQt::display()
-{
-    DumpRenderTreeSupportQt::setTrackRepaintRects(m_topLoadingFrame->handle(), true);
-    emit showPage();
-}
-
-void TestRunnerQt::displayInvalidatedRegion()
-{
-    display();
-}
-
-void TestRunnerQt::clearBackForwardList()
-{
-    m_drt->webPage()->history()->clear();
-}
-
-QString TestRunnerQt::pathToLocalResource(const QString& url)
-{
-    QString localTmpUrl(QLatin1String("file:///tmp/LayoutTests"));
-
-    // Translate a request for /tmp/LayoutTests to the repository LayoutTests directory.
-    // Do not rely on a symlink to be created via the test runner, which will not work on Windows.
-    if (url.startsWith(localTmpUrl)) {
-        // DumpRenderTree lives in WebKit/WebKitBuild/<build_mode>/bin.
-        // Translate from WebKit/WebKitBuild/Release/bin => WebKit/LayoutTests.
-        QFileInfo layoutTestsRoot(QCoreApplication::applicationDirPath() + QLatin1String("/../../../LayoutTests/"));
-        if (layoutTestsRoot.exists())
-            return QLatin1String("file://") + layoutTestsRoot.absolutePath() + url.mid(localTmpUrl.length());
-    }
-
-    return url;
-}
-
-void TestRunnerQt::dumpEditingCallbacks()
-{
-    qDebug() << ">>>dumpEditingCallbacks";
-    DumpRenderTreeSupportQt::dumpEditingCallbacks(true);
-}
-
-void TestRunnerQt::dumpFrameLoadCallbacks()
-{
-    DumpRenderTreeSupportQt::dumpFrameLoader(true);
-}
-
-void TestRunnerQt::dumpProgressFinishedCallback()
-{
-    DumpRenderTreeSupportQt::dumpProgressFinishedCallback(true);
-}
-
-void TestRunnerQt::dumpUserGestureInFrameLoadCallbacks()
-{
-    DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader(true);
-}
-
-void TestRunnerQt::dumpResourceLoadCallbacks()
-{
-    DumpRenderTreeSupportQt::dumpResourceLoadCallbacks(true);
-}
-
-void TestRunnerQt::dumpResourceResponseMIMETypes()
-{
-    DumpRenderTreeSupportQt::dumpResourceResponseMIMETypes(true);
-}
-
-void TestRunnerQt::dumpWillCacheResponse()
-{
-    DumpRenderTreeSupportQt::dumpWillCacheResponseCallbacks(true);
-}
-
-void TestRunnerQt::dumpHistoryCallbacks()
-{
-    DumpRenderTreeSupportQt::dumpHistoryCallbacks(true);
-}
-
-void TestRunnerQt::setWillSendRequestReturnsNullOnRedirect(bool enabled)
-{
-    DumpRenderTreeSupportQt::setWillSendRequestReturnsNullOnRedirect(enabled);
-}
-
-void TestRunnerQt::setWillSendRequestReturnsNull(bool enabled)
-{
-    DumpRenderTreeSupportQt::setWillSendRequestReturnsNull(enabled);
-}
-
-void TestRunnerQt::setWillSendRequestClearHeader(const QStringList& headers)
-{
-    DumpRenderTreeSupportQt::setWillSendRequestClearHeaders(headers);
-}
-
-void TestRunnerQt::setDeferMainResourceDataLoad(bool defer)
-{
-    DumpRenderTreeSupportQt::setDeferMainResourceDataLoad(defer);
-}
-
-void TestRunnerQt::queueBackNavigation(int howFarBackward)
-{
-    //qDebug() << ">>>queueBackNavigation" << howFarBackward;
-    for (int i = 0; i != howFarBackward; ++i)
-        WorkQueue::shared()->queue(new BackItem(1));
-}
-
-void TestRunnerQt::queueForwardNavigation(int howFarForward)
-{
-    //qDebug() << ">>>queueForwardNavigation" << howFarForward;
-    for (int i = 0; i != howFarForward; ++i)
-        WorkQueue::shared()->queue(new ForwardItem(1));
-}
-
-void TestRunnerQt::queueLoadHTMLString(const QString& content, const QString& baseURL, const QString& failingURL)
-{
-    if (failingURL.isEmpty())
-        WorkQueue::shared()->queue(new LoadHTMLStringItem(JSStringCreateWithQString(content).get(), JSStringCreateWithQString(baseURL).get()));
-    else
-        WorkQueue::shared()->queue(new LoadAlternateHTMLStringItem(JSStringCreateWithQString(content), JSStringCreateWithQString(baseURL), JSStringCreateWithQString(failingURL)));
-}
-
-void TestRunnerQt::queueReload()
-{
-    //qDebug() << ">>>queueReload";
-    WorkQueue::shared()->queue(new ReloadItem());
-}
-
-void TestRunnerQt::queueLoadingScript(const QString& script)
-{
-    //qDebug() << ">>>queueLoadingScript" << script;
-    WorkQueue::shared()->queue(new LoadingScriptItem(JSStringCreateWithQString(script).get()));
-}
-
-void TestRunnerQt::queueNonLoadingScript(const QString& script)
-{
-    //qDebug() << ">>>queueNonLoadingScript" << script;
-    WorkQueue::shared()->queue(new NonLoadingScriptItem(JSStringCreateWithQString(script).get()));
-}
-
-void TestRunnerQt::provisionalLoad()
-{
-    QWebFrame* frame = qobject_cast<QWebFrame*>(sender());
-    if (!m_topLoadingFrame && !m_hasDumped)
-        m_topLoadingFrame = frame;
-}
-
-void TestRunnerQt::timerEvent(QTimerEvent *ev)
-{
-    if (ev->timerId() == m_timeoutTimer.timerId()) {
-        const char* message = "FAIL: Timed out waiting for notifyDone to be called\n";
-        fprintf(stderr, "%s", message);
-        fprintf(stdout, "%s", message);
-        notifyDone();
-    } else
-        QObject::timerEvent(ev);
-}
-
-QString TestRunnerQt::encodeHostName(const QString& host)
-{
-    QString encoded = QString::fromLatin1(QUrl::toAce(host + QLatin1String(".no")));
-    encoded.truncate(encoded.length() - 3); // strip .no
-    return encoded;
-}
-
-QString TestRunnerQt::decodeHostName(const QString& host)
-{
-    QString decoded = QUrl::fromAce(host.toLatin1() + QByteArray(".no"));
-    decoded.truncate(decoded.length() - 3);
-    return decoded;
-}
-
-void TestRunnerQt::closeWebInspector()
-{
-    DumpRenderTreeSupportQt::webInspectorClose(m_drt->pageAdapter());
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false);
-}
-
-void TestRunnerQt::setDeveloperExtrasEnabled(bool enabled)
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, enabled);
-}
-
-void TestRunnerQt::showWebInspector()
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-    DumpRenderTreeSupportQt::webInspectorShow(m_drt->pageAdapter());
-}
-
-void TestRunnerQt::evaluateInWebInspector(long callId, const QString& script)
-{
-    DumpRenderTreeSupportQt::webInspectorExecuteScript(m_drt->pageAdapter(), callId, script);
-}
-
-void TestRunnerQt::setAllowUniversalAccessFromFileURLs(bool enabled)
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, enabled);
-}
-
-void TestRunnerQt::setAllowFileAccessFromFileURLs(bool enabled)
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::LocalContentCanAccessFileUrls, enabled);
-}
-
-void TestRunnerQt::setAppCacheMaximumSize(unsigned long long quota)
-{
-    m_drt->webPage()->settings()->setOfflineWebApplicationCacheQuota(quota);
-}
-
-void TestRunnerQt::setValueForUser(const QWebElement& element, const QString& value)
-{
-    DumpRenderTreeSupportQt::setValueForUser(element, value);
-}
-
-void TestRunnerQt::setFixedContentsSize(int width, int height)
-{
-    m_topLoadingFrame->page()->setPreferredContentsSize(QSize(width, height));
-}
-
-void TestRunnerQt::setPrivateBrowsingEnabled(bool enable)
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, enable);
-}
-
-void TestRunnerQt::setSpatialNavigationEnabled(bool enable)
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, enable);
-}
-
-void TestRunnerQt::setPopupBlockingEnabled(bool enable)
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, !enable);
-}
-
-void TestRunnerQt::setPOSIXLocale(const QString& locale)
-{
-    QLocale qlocale(locale);
-    QLocale::setDefault(qlocale);
-} 
-
-void TestRunnerQt::setWindowIsKey(bool isKey)
-{
-    m_drt->switchFocus(isKey);
-}
-
-void TestRunnerQt::setJavaScriptCanAccessClipboard(bool enable)
-{
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::JavascriptCanAccessClipboard, enable);
-}
-
-void TestRunnerQt::setXSSAuditorEnabled(bool enable)
-{
-    // Set XSSAuditingEnabled globally so that windows created by the test inherit it too.
-    // resetSettings() will call this to reset the page and global setting to false again.
-    // Needed by http/tests/security/xssAuditor/link-opens-new-window.html
-    QWebSettings* globalSettings = QWebSettings::globalSettings();
-    globalSettings->setAttribute(QWebSettings::XSSAuditingEnabled, enable);
-    m_drt->webPage()->settings()->setAttribute(QWebSettings::XSSAuditingEnabled, enable);
-}
-
-void TestRunnerQt::clearAllApplicationCaches()
-{
-    DumpRenderTreeSupportQt::clearAllApplicationCaches();
-}
-
-void TestRunnerQt::setApplicationCacheOriginQuota(unsigned long long quota)
-{
-    if (!m_topLoadingFrame)
-        return;
-    m_topLoadingFrame->securityOrigin().setApplicationCacheQuota(quota);
-}
-
-QStringList TestRunnerQt::originsWithApplicationCache()
-{
-    // FIXME: Implement to get origins that have application caches.
-    return QStringList();
-}
-
-void TestRunnerQt::setDatabaseQuota(int size)
-{
-    if (!m_topLoadingFrame)
-        return;
-    m_topLoadingFrame->securityOrigin().setDatabaseQuota(size);
-}
-
-void TestRunnerQt::clearAllDatabases()
-{
-    QWebDatabase::removeAllDatabases();
-}
-
-void TestRunnerQt::addOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains)
-{
-    DumpRenderTreeSupportQt::whiteListAccessFromOrigin(sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains);
-}
-
-void TestRunnerQt::removeOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains)
-{
-    DumpRenderTreeSupportQt::removeWhiteListAccessFromOrigin(sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains);
-}
-
-void TestRunnerQt::setCustomPolicyDelegate(bool enabled, bool permissive)
-{
-    DumpRenderTreeSupportQt::setCustomPolicyDelegate(enabled, permissive);
-}
-
-void TestRunnerQt::waitForPolicyDelegate()
-{
-    setCustomPolicyDelegate(true);
-    m_waitForPolicy = true;
-    waitUntilDone();
-}
-
-void TestRunnerQt::overridePreference(const QString& name, const QVariant& value)
-{
-    QWebSettings* settings = m_topLoadingFrame->page()->settings();
-
-    if (name == "WebKitJavaScriptEnabled")
-        settings->setAttribute(QWebSettings::JavascriptEnabled, value.toBool());
-    else if (name == "WebKitTabToLinksPreferenceKey")
-        settings->setAttribute(QWebSettings::LinksIncludedInFocusChain, value.toBool());
-    else if (name == "WebKitOfflineWebApplicationCacheEnabled")
-        settings->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, value.toBool());
-    else if (name == "WebKitDefaultFontSize")
-        settings->setFontSize(QWebSettings::DefaultFontSize, value.toInt());
-    else if (name == "WebKitUsesPageCachePreferenceKey")
-        QWebSettings::setMaximumPagesInCache(value.toInt());
-    else if (name == "WebKitEnableCaretBrowsing")
-        setCaretBrowsingEnabled(value.toBool());
-    else if (name == "WebKitPluginsEnabled")
-        settings->setAttribute(QWebSettings::PluginsEnabled, value.toBool());
-    else if (name == "WebKitWebGLEnabled")
-        settings->setAttribute(QWebSettings::WebGLEnabled, value.toBool());
-    else if (name == "WebKitCSSRegionsEnabled")
-        settings->setAttribute(QWebSettings::CSSRegionsEnabled, value.toBool());
-    else if (name == "WebKitCSSGridLayoutEnabled")
-        settings->setAttribute(QWebSettings::CSSGridLayoutEnabled, value.toBool());
-    else if (name == "WebKitHyperlinkAuditingEnabled")
-        settings->setAttribute(QWebSettings::HyperlinkAuditingEnabled, value.toBool());
-    else if (name == "WebKitAcceleratedCompositingEnabled")
-        settings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, value.toBool());
-    else if (name == "WebKitDisplayImagesKey")
-        settings->setAttribute(QWebSettings::AutoLoadImages, value.toBool());
-    else if (name == "WebKitWebAudioEnabled")
-        settings->setAttribute(QWebSettings::WebAudioEnabled, value.toBool());
-    else
-        printf("ERROR: TestRunner::overridePreference() does not support the '%s' preference\n",
-            name.toLatin1().data());
-}
-
-void TestRunnerQt::setUserStyleSheetLocation(const QString& url)
-{
-    QByteArray urlData = pathToLocalResource(url).toLatin1();
-    m_userStyleSheetLocation = QUrl::fromEncoded(urlData, QUrl::StrictMode);
-
-    if (m_userStyleSheetEnabled)
-        setUserStyleSheetEnabled(true);
-}
-
-void TestRunnerQt::setCaretBrowsingEnabled(bool value)
-{
-    DumpRenderTreeSupportQt::setCaretBrowsingEnabled(m_drt->pageAdapter(), value);
-}
-
-void TestRunnerQt::setAuthorAndUserStylesEnabled(bool value)
-{
-    DumpRenderTreeSupportQt::setAuthorAndUserStylesEnabled(m_drt->pageAdapter(), value);
-}
-
-void TestRunnerQt::setUserStyleSheetEnabled(bool enabled)
-{
-    m_userStyleSheetEnabled = enabled;
-
-    if (enabled)
-        m_drt->webPage()->settings()->setUserStyleSheetUrl(m_userStyleSheetLocation);
-    else
-        m_drt->webPage()->settings()->setUserStyleSheetUrl(QUrl());
-}
-
-void TestRunnerQt::setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme)
-{
-    DumpRenderTreeSupportQt::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
-}
-
-bool TestRunnerQt::callShouldCloseOnWebView()
-{
-    return DumpRenderTreeSupportQt::shouldClose(m_drt->mainFrameAdapter());
-}
-
-void TestRunnerQt::setScrollbarPolicy(const QString& orientation, const QString& policy)
-{
-    Qt::Orientation o;
-    Qt::ScrollBarPolicy p;
-
-    if (orientation == "vertical")
-        o = Qt::Vertical;
-    else if (orientation == "horizontal")
-        o = Qt::Horizontal;
-    else
-        return;
-
-    if (policy == "on")
-        p = Qt::ScrollBarAlwaysOn;
-    else if (policy == "auto")
-        p = Qt::ScrollBarAsNeeded;
-    else if (policy == "off")
-        p = Qt::ScrollBarAlwaysOff;
-    else
-        return;
-
-    m_drt->webPage()->mainFrame()->setScrollBarPolicy(o, p);
-}
-
-void TestRunnerQt::execCommand(const QString& name, const QString& value)
-{
-    DumpRenderTreeSupportQt::executeCoreCommandByName(m_drt->pageAdapter(), name, value);
-}
-
-bool TestRunnerQt::isCommandEnabled(const QString& name) const
-{
-    return DumpRenderTreeSupportQt::isCommandEnabled(m_drt->pageAdapter(), name);
-}
-
-bool TestRunner::findString(JSContextRef context, JSStringRef string, JSObjectRef optionsArray)
-{
-    JSRetainPtr<JSStringRef> lengthPropertyName(Adopt, JSStringCreateWithUTF8CString("length"));
-    JSValueRef lengthValue = JSObjectGetProperty(context, optionsArray, lengthPropertyName.get(), 0);
-    if (!JSValueIsNumber(context, lengthValue))
-        return false;
-
-    QWebPage::FindFlags findFlags = QWebPage::FindCaseSensitively;
-
-    int length = static_cast<int>(JSValueToNumber(context, lengthValue, 0));
-    for (int i = 0; i < length; ++i) {
-        JSValueRef value = JSObjectGetPropertyAtIndex(context, optionsArray, i, 0);
-        if (!JSValueIsString(context, value))
-            continue;
-
-        JSRetainPtr<JSStringRef> optionName(Adopt, JSValueToStringCopy(context, value, 0));
-        if (JSStringIsEqualToUTF8CString(optionName.get(), "CaseInsensitive"))
-            findFlags &= ~QWebPage::FindCaseSensitively;
-        else if (JSStringIsEqualToUTF8CString(optionName.get(), "AtWordStarts"))
-            findFlags |= QWebPage::FindAtWordBeginningsOnly;
-        else if (JSStringIsEqualToUTF8CString(optionName.get(), "TreatMedialCapitalAsWordStart"))
-            findFlags |=  QWebPage::TreatMedialCapitalAsWordBeginning;
-        else if (JSStringIsEqualToUTF8CString(optionName.get(), "Backwards"))
-            findFlags |=  QWebPage::FindBackward;
-        else if (JSStringIsEqualToUTF8CString(optionName.get(), "WrapAround"))
-            findFlags |=  QWebPage::FindWrapsAroundDocument;
-        else if (JSStringIsEqualToUTF8CString(optionName.get(), "StartInSelection"))
-            findFlags |=  QWebPage::FindBeginsInSelection;
-    }
-
-    DumpRenderTree* drt = DumpRenderTree::instance();
-    return drt->webPage()->findText(JSStringCopyQString(string), findFlags);
-}
-
-void TestRunnerQt::setIconDatabaseEnabled(bool enable)
-{
-    if (enable && !m_drt->persistentStoragePath().isEmpty())
-        QWebSettings::setIconDatabasePath(m_drt->persistentStoragePath());
-    else
-        QWebSettings::setIconDatabasePath(QString());
-}
-
-void TestRunnerQt::setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
-{
-    QList<WebPage*> pages = m_drt->getAllPages();
-    foreach (WebPage* page, pages)
-        DumpRenderTreeSupportQt::setMockDeviceOrientation(page->handle(), canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma);
-}
-
-void TestRunnerQt::setGeolocationPermission(bool allow)
-{
-    setGeolocationPermissionCommon(allow);
-    QList<WebPage*> pages = m_drt->getAllPages();
-    foreach (WebPage* page, pages)
-        DumpRenderTreeSupportQt::setMockGeolocationPermission(page->handle(), allow);
-}
-
-int TestRunnerQt::numberOfPendingGeolocationPermissionRequests()
-{
-    int pendingPermissionCount = 0;
-    QList<WebPage*> pages = m_drt->getAllPages();
-    foreach (WebPage* page, pages)
-        pendingPermissionCount += DumpRenderTreeSupportQt::numberOfPendingGeolocationPermissionRequests(page->handle());
-
-    return pendingPermissionCount;
-}
-
-void TestRunnerQt::setGeolocationPermissionCommon(bool allow)
-{
-     m_isGeolocationPermissionSet = true;
-     m_geolocationPermission = allow;
-}
-
-void TestRunnerQt::setMockGeolocationPositionUnavailableError(const QString& message)
-{
-    QList<WebPage*> pages = m_drt->getAllPages();
-    foreach (WebPage* page, pages)
-        DumpRenderTreeSupportQt::setMockGeolocationPositionUnavailableError(page->handle(), message);
-}
-
-void TestRunnerQt::setMockGeolocationPosition(double latitude, double longitude, double accuracy)
-{
-    QList<WebPage*> pages = m_drt->getAllPages();
-    foreach (WebPage* page, pages)
-        DumpRenderTreeSupportQt::setMockGeolocationPosition(page->handle(), latitude, longitude, accuracy);
-}
-
-void TestRunnerQt::removeAllVisitedLinks()
-{
-    QWebHistory* history = m_drt->webPage()->history();
-    history->clear();
-    DumpRenderTreeSupportQt::dumpVisitedLinksCallbacks(true);
-}
-
-void TestRunnerQt::addURLToRedirect(const QString& origin, const QString& destination)
-{
-    DumpRenderTreeSupportQt::addURLToRedirect(origin, destination);
-}
-
-void TestRunnerQt::setAlwaysAcceptCookies(bool accept)
-{
-    QWebSettings* globalSettings = QWebSettings::globalSettings();
-    if (accept)
-        globalSettings->setThirdPartyCookiePolicy(QWebSettings::AlwaysAllowThirdPartyCookies);
-    else {
-        // This matches the Safari third-party cookie blocking policy tested in third-party-cookie-relaxing.html
-        globalSettings->setThirdPartyCookiePolicy(QWebSettings::AllowThirdPartyWithExistingCookies);
-    }
-}
-
-void TestRunnerQt::setAlwaysBlockCookies(bool block)
-{
-    QWebSettings* globalSettings = QWebSettings::globalSettings();
-    if (block)
-        globalSettings->setThirdPartyCookiePolicy(QWebSettings::AlwaysBlockThirdPartyCookies);
-    else
-        globalSettings->setThirdPartyCookiePolicy(QWebSettings::AlwaysAllowThirdPartyCookies);
-}
-
-void TestRunnerQt::setAudioResult(const QByteArray& audioData)
-{
-    m_audioData = audioData;
-    m_audioDump = true;
-}
-
-// --- JSC C API stubs
-
-void TestRunner::addDisallowedURL(JSStringRef url)
-{
-}
-
-void TestRunner::queueLoad(JSStringRef url, JSStringRef target)
-{
-    DumpRenderTree* drt = DumpRenderTree::instance();
-    QUrl mainResourceUrl = drt->webPage()->mainFrame()->url();
-    QString absoluteUrl = mainResourceUrl.resolved(QUrl(JSStringCopyQString(url))).toEncoded();
-    WorkQueue::shared()->queue(new LoadItem(JSStringCreateWithQString(absoluteUrl).get(), target));
-}
-
-void TestRunner::removeAllVisitedLinks()
-{
-}
-
-void TestRunner::setAcceptsEditing(bool)
-{
-}
-
-void TestRunner::simulateLegacyWebNotificationClick(JSStringRef title)
-{
-}
-
-void TestRunner::setWindowIsKey(bool)
-{
-}
-
-void TestRunner::setAlwaysAcceptCookies(bool)
-{
-}
-
-void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
-{
-}
-
-void TestRunner::setWebViewEditable(bool)
-{
-}
-
-void TestRunner::clearAllApplicationCaches()
-{
-}
-
-void TestRunner::setTextDirection(JSStringRef directionName)
-{
-    QWebPage* webPage = DumpRenderTree::instance()->webPage();
-    if (JSStringIsEqualToUTF8CString(directionName, "auto"))
-        webPage->triggerAction(QWebPage::SetTextDirectionDefault);
-    else if (JSStringIsEqualToUTF8CString(directionName, "rtl"))
-        webPage->triggerAction(QWebPage::SetTextDirectionRightToLeft);
-    else if (JSStringIsEqualToUTF8CString(directionName, "ltr"))
-        webPage->triggerAction(QWebPage::SetTextDirectionLeftToRight);
-}
-
-void TestRunner::notifyDone()
-{
-}
-
-int TestRunner::numberOfPendingGeolocationPermissionRequests()
-{
-    return 0;
-}
-
-void TestRunner::overridePreference(JSStringRef key, JSStringRef value)
-{
-}
-
-JSStringRef TestRunner::pathToLocalResource(JSContextRef, JSStringRef url)
-{
-    return JSStringCreateWithUTF8CString(0); // ### Take impl from WTR
-}
-
-void TestRunner::removeAllWebNotificationPermissions()
-{
-}
-
-void TestRunner::simulateWebNotificationClick(JSValueRef notification)
-{
-}
-
-void TestRunner::closeIdleLocalStorageDatabases()
-{
-}
-
-void TestRunner::focusWebView()
-{
-}
-
-void TestRunner::setBackingScaleFactor(double)
-{
-}
-
-void TestRunner::removeChromeInputField()
-{
-}
-
-void TestRunner::addChromeInputField()
-{
-}
-
-JSValueRef TestRunner::originsWithLocalStorage(JSContextRef context)
-{
-    return JSValueMakeNull(context);
-}
-
-void TestRunner::deleteAllLocalStorage()
-{
-}
-
-void TestRunner::deleteLocalStorageForOrigin(JSStringRef originIdentifier)
-{
-}
-
-void TestRunner::observeStorageTrackerNotifications(unsigned number)
-{
-}
-
-void TestRunner::syncLocalStorage()
-{
-}
-
-int TestRunner::windowCount()
-{
-    return 0;
-}
-
-void TestRunner::setWaitToDump(bool)
-{
-}
-
-void TestRunner::waitForPolicyDelegate()
-{
-}
-
-size_t TestRunner::webHistoryItemCount()
-{
-    return 0;
-}
-
-void TestRunner::showWebInspector()
-{
-}
-
-void TestRunner::closeWebInspector()
-{
-}
-
-void TestRunner::evaluateInWebInspector(long callId, JSStringRef script)
-{
-}
-
-void TestRunner::setSerializeHTTPLoads(bool)
-{
-}
-
-void TestRunner::apiTestNewWindowDataLoadBaseURL(JSStringRef utf8Data, JSStringRef baseURL)
-{
-}
-
-void TestRunner::setCustomPolicyDelegate(bool setDelegate, bool permissive)
-{
-}
-
-void TestRunner::setDatabaseQuota(unsigned long long quota)
-{
-}
-
-void TestRunner::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
-{
-}
-
-void TestRunner::resetPageVisibility()
-{
-    DumpRenderTreeSupportQt::resetPageVisibility(DumpRenderTree::instance()->pageAdapter());
-}
-
-void TestRunner::setPageVisibility(const char* visibility)
-{
-    QLatin1String newVisibility = QLatin1String(visibility);
-    if (newVisibility == QStringLiteral("visible"))
-        DumpRenderTree::instance()->webPage()->setVisibilityState(QWebPage::VisibilityStateVisible);
-    else if (newVisibility == QStringLiteral("hidden"))
-        DumpRenderTree::instance()->webPage()->setVisibilityState(QWebPage::VisibilityStateHidden);
-    else if (newVisibility == QStringLiteral("prerender"))
-        DumpRenderTree::instance()->webPage()->setVisibilityState(QWebPage::VisibilityStatePrerender);
-    else if (newVisibility == QStringLiteral("unloaded"))
-        DumpRenderTree::instance()->webPage()->setVisibilityState(QWebPage::VisibilityStateUnloaded);
-}
-
-void TestRunner::keepWebHistory()
-{
-}
-
-void TestRunner::goBack()
-{
-    DumpRenderTreeSupportQt::goBack(DumpRenderTree::instance()->pageAdapter());
-}
-
-JSValueRef TestRunner::originsWithApplicationCache(JSContextRef context)
-{
-    return JSValueMakeNull(context);
-}
-
-long long TestRunner::applicationCacheDiskUsageForOrigin(JSStringRef name)
-{
-    return 0;
-}
-
-void TestRunner::display()
-{
-}
-
-void TestRunner::dispatchPendingLoadRequests()
-{
-}
-
-void TestRunner::clearPersistentUserStyleSheet()
-{
-}
-
-bool TestRunner::callShouldCloseOnWebView()
-{
-    return false;
-}
-
-JSStringRef TestRunner::copyDecodedHostName(JSStringRef name)
-{
-    return JSStringCreateWithUTF8CString(0);
-}
-
-void TestRunner::clearBackForwardList()
-{
-}
-
-void TestRunner::clearAllDatabases()
-{
-}
-
-void TestRunner::clearApplicationCacheForOrigin(JSStringRef name)
-{
-}
-
-void TestRunner::apiTestGoToCurrentBackForwardItem()
-{
-}
-
-void TestRunner::authenticateSession(JSStringRef url, JSStringRef username, JSStringRef password)
-{
-}
-
-void TestRunner::abortModal()
-{
-}
-
-void TestRunner::setStorageDatabaseIdleInterval(double)
-{
-}
-
-void TestRunner::setXSSAuditorEnabled(bool flag)
-{
-}
-
-void TestRunner::setSpatialNavigationEnabled(bool)
-{
-}
-
-void TestRunner::setScrollbarPolicy(JSStringRef orientation, JSStringRef policy)
-{
-}
-
-void TestRunner::setJavaScriptCanAccessClipboard(bool flag)
-{
-}
-
-void TestRunner::setAutomaticLinkDetectionEnabled(bool flag)
-{
-}
-
-void TestRunner::setUserStyleSheetEnabled(bool flag)
-{
-}
-
-void TestRunner::setUserStyleSheetLocation(JSStringRef path)
-{
-}
-
-void TestRunner::setUseDashboardCompatibilityMode(bool flag)
-{
-}
-
-void TestRunner::setTabKeyCyclesThroughElements(bool)
-{
-}
-
-void TestRunner::setPrivateBrowsingEnabled(bool)
-{
-}
-
-void TestRunner::setPluginsEnabled(bool)
-{
-}
-
-void TestRunner::setPopupBlockingEnabled(bool)
-{
-}
-
-void TestRunner::setMockSpeechInputDumpRect(bool flag)
-{
-}
-
-void TestRunner::setPersistentUserStyleSheetLocation(JSStringRef path)
-{
-}
-
-void TestRunner::setMockGeolocationPosition(double latitude, double longitude, double accuracy, bool providesAltitude, double altitude, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed)
-{
-}
-
-void TestRunner::setMockGeolocationPositionUnavailableError(JSStringRef message)
-{
-}
-
-void TestRunner::setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
-{
-}
-
-void TestRunner::setMainFrameIsFirstResponder(bool flag)
-{
-}
-
-void TestRunner::setIconDatabaseEnabled(bool)
-{
-}
-
-void TestRunner::setGeolocationPermission(bool allow)
-{
-}
-
-void TestRunner::setDefersLoading(bool flag)
-{
-    DumpRenderTreeSupportQt::setDefersLoading(DumpRenderTree::instance()->pageAdapter(), flag);
-}
-
-void TestRunner::setCacheModel(int)
-{
-}
-
-void TestRunner::setAuthorAndUserStylesEnabled(bool)
-{
-}
-
-void TestRunner::setAllowFileAccessFromFileURLs(bool)
-{
-}
-
-void TestRunner::setAppCacheMaximumSize(unsigned long long quota)
-{
-}
-
-void TestRunner::setAllowUniversalAccessFromFileURLs(bool)
-{
-}
-
-void TestRunner::setApplicationCacheOriginQuota(unsigned long long)
-{
-}
-
-void TestRunner::denyWebNotificationPermission(JSStringRef origin)
-{
-}
-
-void TestRunner::grantWebNotificationPermission(JSStringRef origin)
-{
-}
-
-void TestRunner::setValueForUser(JSContextRef, JSValueRef nodeObject, JSStringRef value)
-{
-}
-
-void TestRunner::setViewModeMediaFeature(JSStringRef)
-{
-}
-
-void TestRunner::addMockSpeechInputResult(JSStringRef result, double confidence, JSStringRef language)
-{
-}
-
-void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
-{
-}
-
-void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
-{
-}
-
-bool TestRunner::isCommandEnabled(JSStringRef name)
-{
-    return false;
-}
-
-void TestRunner::evaluateScriptInIsolatedWorld(unsigned worldID, JSObjectRef globalObject, JSStringRef script)
-{
-    DumpRenderTreeSupportQt::evaluateScriptInIsolatedWorld(DumpRenderTree::instance()->mainFrameAdapter(), worldID, JSStringCopyQString(script));
-}
-
-void TestRunner::evaluateScriptInIsolatedWorldAndReturnValue(unsigned worldID, JSObjectRef globalObject, JSStringRef script)
-{
-}
-
-JSStringRef TestRunner::copyEncodedHostName(JSStringRef name)
-{
-    return JSStringCreateWithUTF8CString(0);
-}
-
-void TestRunner::addUserStyleSheet(JSStringRef source, bool allFrames)
-{
-    DumpRenderTreeSupportQt::addUserStyleSheet(DumpRenderTree::instance()->pageAdapter(), JSStringCopyQString(source));
-}
-
-void TestRunner::execCommand(JSStringRef name, JSStringRef value)
-{
-}
-
-long long TestRunner::localStorageDiskUsageForOrigin(JSStringRef originIdentifier)
-{
-    return 0;
-}
-
diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.h b/Tools/DumpRenderTree/qt/TestRunnerQt.h
deleted file mode 100644 (file)
index 42026e1..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- * Copyright (C) 2012 Apple Inc. 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-
-#ifndef TestRunnerQt_h
-#define TestRunnerQt_h
-
-#include <QBasicTimer>
-#include <QObject>
-#include <QSize>
-#include <QString>
-#include <QTimer>
-#include <QTimerEvent>
-#include <QVariant>
-#include <QtDebug>
-
-#include <qwebdatabase.h>
-#include <qwebelement.h>
-#include <qwebframe.h>
-#include <qwebhistory.h>
-#include <qwebpage.h>
-#include <qwebsecurityorigin.h>
-
-class QWebFrame;
-class DumpRenderTreeSupportQt;
-class DumpRenderTree;
-
-class TestRunnerQt : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
-    Q_PROPERTY(bool globalFlag READ globalFlag WRITE setGlobalFlag)
-public:
-    TestRunnerQt(DumpRenderTree*);
-
-    bool shouldDumpAsAudio() const { return m_audioDump; }
-    bool shouldWaitUntilDone() const { return m_waitForDone; }
-    bool shouldHandleErrorPages() const { return m_handleErrorPages; }
-    bool waitForPolicy() const { return m_waitForPolicy; }
-    bool ignoreReqestForPermission() const { return m_ignoreDesktopNotification; }
-
-    const QByteArray& audioData() const { return m_audioData; }
-
-    void reset();
-
-    void setTimeout(int timeout) { m_timeout = timeout; }
-    void setShouldTimeout(bool flag) { m_shouldTimeout = flag; }
-
-protected:
-    void timerEvent(QTimerEvent*);
-
-Q_SIGNALS:
-    void done();
-
-    void showPage();
-    void hidePage();
-    void geolocationPermissionSet();
-
-public Q_SLOTS:
-    void maybeDump(bool ok);
-    void dumpNotifications();
-    void waitUntilDone();
-    int webHistoryItemCount();
-    void keepWebHistory();
-    void notifyDone();
-    bool globalFlag() const { return m_globalFlag; }
-    void setGlobalFlag(bool flag) { m_globalFlag = flag; }
-    void handleErrorPages() { m_handleErrorPages = true; }
-    void dumpEditingCallbacks();
-    void dumpFrameLoadCallbacks();
-    void dumpProgressFinishedCallback();
-    void dumpUserGestureInFrameLoadCallbacks();
-    void dumpResourceLoadCallbacks();
-    void dumpResourceResponseMIMETypes();
-    void dumpWillCacheResponse();
-    void dumpHistoryCallbacks();
-    void setWillSendRequestReturnsNullOnRedirect(bool enabled);
-    void setWillSendRequestReturnsNull(bool enabled);
-    void setWillSendRequestClearHeader(const QStringList& headers);
-    void queueBackNavigation(int howFarBackward);
-    void queueForwardNavigation(int howFarForward);
-    void queueLoadHTMLString(const QString& content, const QString& baseURL = QString(), const QString& failingURL = QString());
-    void queueReload();
-    void queueLoadingScript(const QString& script);
-    void queueNonLoadingScript(const QString& script);
-    void provisionalLoad();
-    int windowCount();
-    void ignoreLegacyWebNotificationPermissionRequests();
-    void simulateLegacyWebNotificationClick(const QString& title);
-    void grantWebNotificationPermission(const QString& origin);
-    void denyWebNotificationPermission(const QString& origin);
-    void removeAllWebNotificationPermissions();
-    void display();
-    void displayInvalidatedRegion();
-    void clearBackForwardList();
-    QString pathToLocalResource(const QString& url);
-    QString encodeHostName(const QString& host);
-    QString decodeHostName(const QString& host);
-    void dumpSelectionRect() const { }
-    void setDeveloperExtrasEnabled(bool);
-    void showWebInspector();
-    void closeWebInspector();
-    void evaluateInWebInspector(long callId, const QString& script);
-    void removeAllVisitedLinks();
-    void setAllowUniversalAccessFromFileURLs(bool enable);
-    void setAllowFileAccessFromFileURLs(bool enable);
-    void setAppCacheMaximumSize(unsigned long long quota);
-    void setValueForUser(const QWebElement&, const QString& value);
-    void setFixedContentsSize(int width, int height);
-    void setPrivateBrowsingEnabled(bool);
-    void setSpatialNavigationEnabled(bool);
-    void setPopupBlockingEnabled(bool);
-    void setPOSIXLocale(const QString& locale);
-    void resetLoadFinished() { m_loadFinished = false; }
-    void setWindowIsKey(bool);
-    void setDeferMainResourceDataLoad(bool);
-    void setJavaScriptCanAccessClipboard(bool enable);
-    void setXSSAuditorEnabled(bool);
-    void setCaretBrowsingEnabled(bool);
-    void setAuthorAndUserStylesEnabled(bool);
-    void setViewModeMediaFeature(const QString& mode);
-    void execCommand(const QString& name, const QString& value = QString());
-    bool isCommandEnabled(const QString& name) const;
-
-    void addOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
-    void removeOriginAccessWhitelistEntry(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
-
-    void clearAllApplicationCaches();
-    void setApplicationCacheOriginQuota(unsigned long long);
-    QStringList originsWithApplicationCache();
-
-    void setDatabaseQuota(int size);
-    void clearAllDatabases();
-    void setIconDatabaseEnabled(bool);
-
-    void setCustomPolicyDelegate(bool enabled, bool permissive = false);
-    void waitForPolicyDelegate();
-
-    void overridePreference(const QString& name, const QVariant& value);
-    void setUserStyleSheetLocation(const QString& url);
-    void setUserStyleSheetEnabled(bool);
-    void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
-    bool callShouldCloseOnWebView();
-
-    void setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma);
-
-    void setMockGeolocationPositionUnavailableError(const QString& message);
-    void setMockGeolocationPosition(double latitude, double longitude, double accuracy);
-    void setGeolocationPermission(bool allow);
-    int numberOfPendingGeolocationPermissionRequests();
-    bool isGeolocationPermissionSet() const { return m_isGeolocationPermissionSet; }
-    bool geolocationPermission() const { return m_geolocationPermission; }
-
-    void addURLToRedirect(const QString& origin, const QString& destination);
-
-    /*
-        Policy values: 'on', 'auto' or 'off'.
-        Orientation values: 'vertical' or 'horizontal'.
-    */
-    void setScrollbarPolicy(const QString& orientation, const QString& policy);
-
-    void setAlwaysAcceptCookies(bool);
-    void setAlwaysBlockCookies(bool);
-
-    void setAudioResult(const QByteArray&);
-
-private Q_SLOTS:
-    void processWork();
-
-private:
-    void setGeolocationPermissionCommon(bool allow);
-
-private:
-    bool m_hasDumped;
-    bool m_audioDump;
-    bool m_disallowIncreaseForApplicationCacheQuota;
-    bool m_canOpenWindows;
-    bool m_waitForDone;
-    bool m_waitForPolicy;
-    bool m_handleErrorPages;
-    bool m_loadFinished;
-    bool m_globalFlag;
-    bool m_userStyleSheetEnabled;
-    bool m_isGeolocationPermissionSet;
-    bool m_geolocationPermission;
-
-    QUrl m_userStyleSheetLocation;
-    QBasicTimer m_timeoutTimer;
-    QWebFrame* m_topLoadingFrame;
-    DumpRenderTree* m_drt;
-    QWebHistory* m_webHistory;
-    bool m_ignoreDesktopNotification;
-
-    QByteArray m_audioData;
-
-    bool m_shouldTimeout;
-    int m_timeout;
-};
-
-#endif // TestRunnerQt_h
diff --git a/Tools/DumpRenderTree/qt/TextInputControllerQt.cpp b/Tools/DumpRenderTree/qt/TextInputControllerQt.cpp
deleted file mode 100644 (file)
index 38e489d..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "config.h"
-#include "TextInputControllerQt.h"
-#include "DumpRenderTreeSupportQt.h"
-
-#include <QApplication>
-#include <QInputMethodEvent>
-#include <QKeyEvent>
-
-TextInputController::TextInputController(QWebPage* parent)
-    : QObject(parent)
-{
-}
-
-void TextInputController::doCommand(const QString& command)
-{
-    Qt::KeyboardModifiers modifiers = Qt::NoModifier;
-    int keycode = 0;
-    if (command == "moveBackwardAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        keycode = Qt::Key_Left;
-    } else if (command =="moveDown:") {
-        keycode = Qt::Key_Down;
-    } else if (command =="moveDownAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        keycode = Qt::Key_Down;
-    } else if (command =="moveForward:") {
-        keycode = Qt::Key_Right;
-    } else if (command =="moveForwardAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        keycode = Qt::Key_Right;
-    } else if (command =="moveLeft:") {
-        keycode = Qt::Key_Left;
-    } else if (command =="moveLeftAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        keycode = Qt::Key_Left;
-    } else if (command =="moveRight:") {
-        keycode = Qt::Key_Right;
-    } else if (command =="moveRightAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        keycode = Qt::Key_Right;
-    } else if (command =="moveToBeginningOfDocument:") {
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Home;
-    } else if (command =="moveToBeginningOfLine:") {
-        keycode = Qt::Key_Home;
-//     } else if (command =="moveToBeginningOfParagraph:") {
-    } else if (command =="moveToEndOfDocument:") {
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_End;
-    } else if (command =="moveToEndOfLine:") {
-        keycode = Qt::Key_End;
-//     } else if (command =="moveToEndOfParagraph:") {
-    } else if (command =="moveUp:") {
-        keycode = Qt::Key_Up;
-    } else if (command =="moveUpAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        keycode = Qt::Key_Up;
-    } else if (command =="moveWordBackward:") {
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Up;
-    } else if (command =="moveWordBackwardAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Left;
-    } else if (command =="moveWordForward:") {
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Right;
-    } else if (command =="moveWordForwardAndModifySelection:") {
-        modifiers |= Qt::ControlModifier;
-        modifiers |= Qt::ShiftModifier;
-        keycode = Qt::Key_Right;
-    } else if (command =="moveWordLeft:") {
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Left;
-    } else if (command =="moveWordRight:") {
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Left;
-    } else if (command =="moveWordRightAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Right;
-    } else if (command =="moveWordLeftAndModifySelection:") {
-        modifiers |= Qt::ShiftModifier;
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Left;
-    } else if (command =="pageDown:") {
-        keycode = Qt::Key_PageDown;
-    } else if (command =="pageUp:") {
-        keycode = Qt::Key_PageUp;
-    } else if (command == "deleteWordBackward:") {
-        modifiers |= Qt::ControlModifier;
-        keycode = Qt::Key_Backspace;
-    } else if (command == "deleteBackward:") {
-        keycode = Qt::Key_Backspace;
-    } else if (command == "deleteForward:") {
-        keycode = Qt::Key_Delete;
-    }
-
-    QKeyEvent event(QEvent::KeyPress, keycode, modifiers);
-    QApplication::sendEvent(parent(), &event);
-    QKeyEvent event2(QEvent::KeyRelease, keycode, modifiers);
-    QApplication::sendEvent(parent(), &event2);
-}
-
-void TextInputController::setMarkedText(const QString& string, int start, int end)
-{
-    QList<QInputMethodEvent::Attribute> attributes;
-    QInputMethodEvent::Attribute selection(QInputMethodEvent::Selection, start, end, QVariant());
-    attributes << selection;
-    QInputMethodEvent event(string, attributes);
-    QApplication::sendEvent(parent(), &event);
-}
-
-void TextInputController::insertText(const QString& string)
-{
-    QList<QInputMethodEvent::Attribute> attributes;
-    QInputMethodEvent event(string, attributes);
-    event.setCommitString(string);
-    QApplication::sendEvent(parent(), &event);
-}
-
-QVariantList TextInputController::selectedRange()
-{
-    return DumpRenderTreeSupportQt::selectedRange(qobject_cast<QWebPage*>(parent())->handle());
-}
-
-QVariantList TextInputController::firstRectForCharacterRange(int location, int length)
-{
-    return DumpRenderTreeSupportQt::firstRectForCharacterRange(qobject_cast<QWebPage*>(parent())->handle(), location, length);
-}
-
-void TextInputController::unmarkText()
-{
-    DumpRenderTreeSupportQt::confirmComposition(qobject_cast<QWebPage*>(parent())->handle(), 0);
-}
diff --git a/Tools/DumpRenderTree/qt/TextInputControllerQt.h b/Tools/DumpRenderTree/qt/TextInputControllerQt.h
deleted file mode 100644 (file)
index 2940273..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-#ifndef TextInputControllerQt_h
-#define TextInputControllerQt_h
-
-#include <QList>
-#include <QObject>
-#include <QVariant>
-#include <QString>
-#include "qwebpage.h"
-
-class TextInputController : public QObject {
-    Q_OBJECT
-public:
-    TextInputController(QWebPage* parent);
-
-public Q_SLOTS:
-    void doCommand(const QString& command);
-    void setMarkedText(const QString& string, int start, int end);
-//     bool hasMarkedText();
-     void unmarkText();
-//     QList<int> markedRange();
-    QVariantList selectedRange();
-//     void validAttributesForMarkedText();
-    void insertText(const QString& string);
-    QVariantList firstRectForCharacterRange(int location, int length);
-//     void characterIndexForPoint(int, int);
-//     void substringFromRange(int, int);
-//     void conversationIdentifier();
-};
-#endif // TextInputControllerQt_h
diff --git a/Tools/DumpRenderTree/qt/WorkQueueItemQt.cpp b/Tools/DumpRenderTree/qt/WorkQueueItemQt.cpp
deleted file mode 100644 (file)
index 2423a3b..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "config.h"
-#include "WorkQueueItemQt.h"
-
-#include "DumpRenderTreeQt.h"
-#include "DumpRenderTreeSupportQt.h"
-#include "JSStringRefQt.h"
-
-QWebFrame* findFrameNamed(const QString& frameName, QWebFrame* frame)
-{
-    if (frame->frameName() == frameName)
-        return frame;
-
-    foreach (QWebFrame* childFrame, frame->childFrames())
-        if (QWebFrame* f = findFrameNamed(frameName, childFrame))
-            return f;
-
-    return 0;
-}
-
-bool LoadItem::invoke() const
-{
-    //qDebug() << ">>>LoadItem::invoke";
-    WebPage* webPage = DumpRenderTree::instance()->webPage();
-    Q_ASSERT(webPage);
-
-    QWebFrame* frame = 0;
-    if (JSStringGetLength(m_target.get()))
-        frame = findFrameNamed(JSStringCopyQString(m_target.get()), webPage->mainFrame());
-    else
-        frame = webPage->mainFrame();
-
-    if (!frame)
-        return false;
-
-    frame->load(QUrl(JSStringCopyQString(m_url.get())));
-    return true;
-}
-
-bool LoadHTMLStringItem::invoke() const
-{
-    WebPage* webPage = DumpRenderTree::instance()->webPage();
-    Q_ASSERT(webPage);
-
-    QWebFrame* frame = webPage->mainFrame();
-    if (!frame)
-        return false;
-
-    frame->setHtml(JSStringCopyQString(m_content.get()), QUrl(JSStringCopyQString(m_baseURL.get())));
-    return true;
-}
-
-bool LoadAlternateHTMLStringItem::invoke() const
-{
-    WebPage* webPage = DumpRenderTree::instance()->webPage();
-    Q_ASSERT(webPage);
-
-    QWebFrame* frame = webPage->mainFrame();
-    if (!frame)
-        return false;
-
-    DumpRenderTreeSupportQt::setAlternateHtml(frame->handle(), JSStringCopyQString(m_content.get()), QUrl(JSStringCopyQString(m_baseURL.get())), QUrl(JSStringCopyQString(m_failingURL.get())));
-    return true;
-}
-
-bool ReloadItem::invoke() const
-{
-    //qDebug() << ">>>ReloadItem::invoke";
-    WebPage* webPage = DumpRenderTree::instance()->webPage();
-    Q_ASSERT(webPage);
-    webPage->triggerAction(QWebPage::Reload);
-    return true;
-}
-
-bool ScriptItem::invoke() const
-{
-    //qDebug() << ">>>ScriptItem::invoke";
-    WebPage* webPage = DumpRenderTree::instance()->webPage();
-    Q_ASSERT(webPage);
-    webPage->mainFrame()->evaluateJavaScript(JSStringCopyQString(m_script.get()));
-    return true;
-}
-
-bool BackForwardItem::invoke() const
-{
-    //qDebug() << ">>>BackForwardItem::invoke";
-    WebPage* webPage = DumpRenderTree::instance()->webPage();
-    Q_ASSERT(webPage);
-    if (!m_howFar)
-        return false;
-
-    if (m_howFar > 0) {
-        for (int i = 0; i != m_howFar; ++i)
-            webPage->triggerAction(QWebPage::Forward);
-    } else {
-        for (int i = 0; i != m_howFar; --i)
-            webPage->triggerAction(QWebPage::Back);
-    }
-    return true;
-}
diff --git a/Tools/DumpRenderTree/qt/WorkQueueItemQt.h b/Tools/DumpRenderTree/qt/WorkQueueItemQt.h
deleted file mode 100644 (file)
index f57abb0..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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.
- */
-
-#ifndef WorkQueueItemQt_h
-#define WorkQueueItemQt_h
-
-#include "WorkQueueItem.h"
-#include <qwebframe.h>
-#include <qwebpage.h>
-
-class LoadAlternateHTMLStringItem : public WorkQueueItem {
-public:
-    LoadAlternateHTMLStringItem(const JSRetainPtr<JSStringRef>& content, const JSRetainPtr<JSStringRef>& baseURL,  const JSRetainPtr<JSStringRef>& failingURL)
-        : m_content(content)
-        , m_baseURL(baseURL)
-        , m_failingURL(failingURL)
-    {
-    }
-
-private:
-    virtual bool invoke() const;
-
-    JSRetainPtr<JSStringRef> m_content;
-    JSRetainPtr<JSStringRef> m_baseURL;
-    JSRetainPtr<JSStringRef> m_failingURL;
-};
-
-#endif // !defined(WorkQueueItemQt_h)
diff --git a/Tools/DumpRenderTree/qt/resources/user.css b/Tools/DumpRenderTree/qt/resources/user.css
deleted file mode 100644 (file)
index af39819..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-body {
-    font-size: 50px;
-    background-color: rgb(255, 255, 0);
-}
\ No newline at end of file
diff --git a/Tools/DumpRenderTree/qt/testplugin.cpp b/Tools/DumpRenderTree/qt/testplugin.cpp
deleted file mode 100644 (file)
index d5b8bc7..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 "testplugin.h"
-
-TestPlugin::TestPlugin(QObject *parent)
-    : QWebPluginFactory(parent)
-{
-}
-
-TestPlugin::~TestPlugin()
-{
-}
-
-QList<QWebPluginFactory::Plugin> TestPlugin::plugins() const
-{
-    QWebPluginFactory::Plugin plugin;
-
-    plugin.name = "testplugin";
-    plugin.description = "testdescription";
-    MimeType mimeType;
-    mimeType.name = "testtype";
-    mimeType.fileExtensions.append("testsuffixes");
-    plugin.mimeTypes.append(mimeType);
-
-    plugin.name = "testplugin2";
-    plugin.description = "testdescription2";
-    mimeType.name = "testtype2";
-    mimeType.fileExtensions.append("testsuffixes2");
-    mimeType.fileExtensions.append("testsuffixes3");
-    plugin.mimeTypes.append(mimeType);
-
-    return QList<QWebPluginFactory::Plugin>() << plugin;
-}
-
-QObject *TestPlugin::create(const QString&,
-                            const QUrl&,
-                            const QStringList&,
-                            const QStringList&) const
-{
-    return 0;
-}
-
diff --git a/Tools/DumpRenderTree/qt/testplugin.h b/Tools/DumpRenderTree/qt/testplugin.h
deleted file mode 100644 (file)
index 3d8a28c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE 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 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 <qwebpluginfactory.h>
-
-
-class TestPlugin : public QWebPluginFactory
-{
-public:
-    explicit TestPlugin(QObject *parent = 0);
-    virtual ~TestPlugin();
-
-    virtual QList<Plugin> plugins() const;
-
-    virtual QObject *create(const QString &mimeType,
-                            const QUrl &url,
-                            const QStringList &argumentNames,
-                            const QStringList &argumentValues) const;
-
-};
-
diff --git a/Tools/ImageDiff/ImageDiff.pro b/Tools/ImageDiff/ImageDiff.pro
deleted file mode 100644 (file)
index f3e8a49..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# -------------------------------------------------------------------
-# Project file for the ImageDiff binary
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-TEMPLATE = app
-
-TARGET = ImageDiff
-DESTDIR = $$ROOT_BUILD_DIR/bin
-
-QT = core gui widgets
-
-SOURCES = qt/ImageDiff.cpp
diff --git a/Tools/ImageDiff/qt/ImageDiff.cpp b/Tools/ImageDiff/qt/ImageDiff.cpp
deleted file mode 100644 (file)
index 816086a..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/qmath.h>
-
-#include <QApplication>
-#include <QBuffer>
-#include <QByteArray>
-#include <QImage>
-#include <QStringList>
-
-#include <stdio.h>
-
-int main(int argc, char* argv[])
-{
-    QCoreApplication app(argc, argv);
-
-    qreal tolerance = 0; // Tolerated percentage of error pixels.
-
-    QStringList args = app.arguments();
-    for (int i = 0; i < argc; ++i)
-        if (args[i] == "-t" || args[i] == "--tolerance")
-            tolerance = args[i + 1].toDouble();
-
-    char buffer[2048];
-    QImage actualImage;
-    QImage baselineImage;
-
-    while (fgets(buffer, sizeof(buffer), stdin)) {
-        // remove the CR
-        char* newLineCharacter = strchr(buffer, '\n');
-        if (newLineCharacter)
-            *newLineCharacter = '\0';
-
-        if (!strncmp("Content-Length: ", buffer, 16)) {
-            strtok(buffer, " ");
-            int imageSize = strtol(strtok(0, " "), 0, 10);
-
-            if (imageSize <= 0) {
-                fputs("error, image size must be specified.\n", stdout);
-            } else {
-                unsigned char buffer[2048];
-                QBuffer data;
-
-                // Read all the incoming chunks
-                data.open(QBuffer::WriteOnly);
-                while (imageSize > 0) {
-                    size_t bytesToRead = qMin(imageSize, 2048);
-                    size_t bytesRead = fread(buffer, 1, bytesToRead, stdin);
-                    data.write(reinterpret_cast<const char*>(buffer), bytesRead);
-                    imageSize -= static_cast<int>(bytesRead);
-                }
-
-                // Convert into QImage
-                QImage decodedImage;
-                decodedImage.loadFromData(data.data(), "PNG");
-                decodedImage = decodedImage.convertToFormat(QImage::Format_ARGB32);
-
-                // Place it in the right place
-                if (actualImage.isNull())
-                    actualImage = decodedImage;
-                else
-                    baselineImage = decodedImage;
-            }
-        }
-
-        if (!actualImage.isNull() && !baselineImage.isNull()) {
-
-            if (actualImage.size() != baselineImage.size()) {
-                fprintf(stdout, "diff: 100%% failed\n");
-                fprintf(stderr, "error, test and reference image have different properties.\n");
-                fflush(stderr);
-                fflush(stdout);
-            } else {
-
-                int w = actualImage.width();
-                int h = actualImage.height();
-                QImage diffImage(w, h, QImage::Format_ARGB32);
-
-                int errorCount = 0;
-
-                for (int x = 0; x < w; ++x) {
-                    for (int y = 0; y < h; ++y) {
-                        QRgb pixel = actualImage.pixel(x, y);
-                        QRgb basePixel = baselineImage.pixel(x, y);
-                        qreal red = (qRed(pixel) - qRed(basePixel)) / static_cast<float>(qMax(255 - qRed(basePixel), qRed(basePixel)));
-                        qreal green = (qGreen(pixel) - qGreen(basePixel)) / static_cast<float>(qMax(255 - qGreen(basePixel), qGreen(basePixel)));
-                        qreal blue = (qBlue(pixel) - qBlue(basePixel)) / static_cast<float>(qMax(255 - qBlue(basePixel), qBlue(basePixel)));
-                        qreal alpha = (qAlpha(pixel) - qAlpha(basePixel)) / static_cast<float>(qMax(255 - qAlpha(basePixel), qAlpha(basePixel)));
-                        qreal distance = qSqrt(red * red + green * green + blue * blue + alpha * alpha) / 2.0f;
-                        if (distance >= 1 / qreal(255)) {
-                            errorCount++;
-                            diffImage.setPixel(x, y, qRgb(255, 0, 0));
-                        } else
-                            diffImage.setPixel(x, y, qRgba(qRed(basePixel), qGreen(basePixel), qBlue(basePixel), qAlpha(basePixel) * 0.5));
-                    }
-                }
-
-                qreal difference = 0;
-                if (errorCount)
-                    difference = 100 * errorCount / static_cast<qreal>(w * h);
-
-                if (difference <= tolerance)
-                    fprintf(stdout, "diff: %01.2f%% passed\n", difference);
-                else {
-                    QBuffer buffer;
-                    buffer.open(QBuffer::WriteOnly);
-                    diffImage.save(&buffer, "PNG");
-                    buffer.close();
-                    const QByteArray &data = buffer.data();
-                    printf("Content-Length: %lu\n", static_cast<unsigned long>(data.length()));
-
-                    // We have to use the return value of fwrite to avoid "ignoring return value" gcc warning
-                    // See https://bugs.webkit.org/show_bug.cgi?id=45384 for details.
-                    if (fwrite(data.constData(), 1, data.length(), stdout)) {}
-
-                    fprintf(stdout, "diff: %01.2f%% failed\n", difference);
-                }
-
-                fflush(stdout);
-            }
-            actualImage = QImage();
-            baselineImage = QImage();
-        }
-    }
-
-    return 0;
-}
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp
deleted file mode 100644 (file)
index 8472d5c..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2010, 2011 Nokia Corporation and/or its subsidiary(-ies)
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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 "BrowserWindow.h"
-
-#include "private/qquickwebpage_p.h"
-#include "private/qquickwebview_p.h"
-#include "utils.h"
-
-#include <QQmlEngine>
-#include <QDir>
-#include <QPointF>
-
-BrowserWindow::BrowserWindow(WindowOptions* options)
-    : m_windowOptions(options)
-{
-    setTitle("MiniBrowser");
-    setFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
-    setResizeMode(QQuickView::SizeRootObjectToView);
-
-    // This allows starting MiniBrowser from the build directory without previously defining QML_IMPORT_PATH.
-    QDir qmlImportDir = QDir(QCoreApplication::applicationDirPath());
-    qmlImportDir.cd("../imports");
-    engine()->addImportPath(qmlImportDir.canonicalPath());
-
-    Utils* utils = new Utils(this);
-    engine()->rootContext()->setContextProperty("utils", utils);
-    engine()->rootContext()->setContextProperty("options", options);
-    setSource(QUrl("qrc:///qml/BrowserWindow.qml"));
-    connect(rootObject(), SIGNAL(pageTitleChanged(QString)), this, SLOT(onTitleChanged(QString)));
-    connect(rootObject(), SIGNAL(newWindow(QString)), this, SLOT(newWindow(QString)));
-    if (options->startFullScreen())
-        showFullScreen();
-    else {
-        if (options->startMaximized())
-            setWindowState(Qt::WindowMaximized);
-        else
-            resize(options->requestedWindowSize());
-        show();
-    }
-
-    QQmlContext* context = rootContext();
-    context->setContextProperty("Window", this);
-
-    if (!options->userAgent().isNull())
-        webViewExperimental()->setUserAgent(options->userAgent());
-
-    // Zoom values are chosen to be like in Mozilla Firefox 3.
-    m_zoomLevels << 0.3 << 0.5 << 0.67 << 0.8 << 0.9
-                 << 1
-                 << 1.11 << 1.22 << 1.33 << 1.5 << 1.7 << 2 << 2.4 << 3;
-
-    m_currentZoomLevel = m_zoomLevels.indexOf(1);
-}
-
-QQuickWebView* BrowserWindow::webView() const
-{
-    return rootObject()->property("webview").value<QQuickWebView*>();
-}
-
-QQuickWebViewExperimental* BrowserWindow::webViewExperimental() const
-{
-    return webView()->property("experimental").value<QQuickWebViewExperimental*>();
-}
-
-void BrowserWindow::load(const QString& url)
-{
-    QUrl completedUrl = Utils::urlFromUserInput(url);
-    QMetaObject::invokeMethod(rootObject(), "load", Qt::DirectConnection, Q_ARG(QVariant, completedUrl));
-}
-
-void BrowserWindow::reload()
-{
-    QMetaObject::invokeMethod(rootObject(), "reload", Qt::DirectConnection);
-}
-
-void BrowserWindow::focusAddressBar()
-{
-    QMetaObject::invokeMethod(rootObject(), "focusAddressBar", Qt::DirectConnection);
-}
-
-void BrowserWindow::toggleFind()
-{
-    QMetaObject::invokeMethod(rootObject(), "toggleFind", Qt::DirectConnection);
-}
-
-BrowserWindow* BrowserWindow::newWindow(const QString& url)
-{
-    BrowserWindow* window = new BrowserWindow(m_windowOptions);
-    window->load(url);
-    return window;
-}
-
-void BrowserWindow::updateVisualMockTouchPoints(const QList<QTouchEvent::TouchPoint>& touchPoints)
-{
-    if (touchPoints.isEmpty()) {
-        // Hide all touch indicator items.
-        foreach (QQuickItem* item, m_activeMockComponents.values())
-            item->setProperty("pressed", false);
-
-        return;
-    }
-
-    foreach (const QTouchEvent::TouchPoint& touchPoint, touchPoints) {
-        QQuickItem* mockTouchPointItem = m_activeMockComponents.value(touchPoint.id());
-
-        if (!mockTouchPointItem) {
-            QQmlComponent touchMockPointComponent(engine(), QUrl("qrc:///qml/MockTouchPoint.qml"));
-            mockTouchPointItem = qobject_cast<QQuickItem*>(touchMockPointComponent.create());
-            Q_ASSERT(mockTouchPointItem);
-            m_activeMockComponents.insert(touchPoint.id(), mockTouchPointItem);
-            mockTouchPointItem->setProperty("pointId", QVariant(touchPoint.id()));
-            mockTouchPointItem->setParent(rootObject());
-            mockTouchPointItem->setParentItem(rootObject());
-        }
-
-        QRectF touchRect = touchPoint.rect();
-        mockTouchPointItem->setX(touchRect.center().x());
-        mockTouchPointItem->setY(touchRect.center().y());
-        mockTouchPointItem->setWidth(touchRect.width());
-        mockTouchPointItem->setHeight(touchRect.height());
-        mockTouchPointItem->setProperty("pressed", QVariant(touchPoint.state() != Qt::TouchPointReleased));
-    }
-}
-
-void BrowserWindow::screenshot()
-{
-}
-
-BrowserWindow::~BrowserWindow()
-{
-}
-
-void BrowserWindow::onTitleChanged(QString title)
-{
-    if (title.isEmpty())
-        title = QLatin1String("MiniBrowser");
-    setTitle(title);
-}
-
-void BrowserWindow::zoomIn()
-{
-    if (m_currentZoomLevel < m_zoomLevels.size() - 1)
-        ++m_currentZoomLevel;
-    webView()->setZoomFactor(m_zoomLevels[m_currentZoomLevel]);
-}
-
-void BrowserWindow::zoomOut()
-{
-    if (m_currentZoomLevel > 0)
-        --m_currentZoomLevel;
-    webView()->setZoomFactor(m_zoomLevels[m_currentZoomLevel]);
-}
-
-void BrowserWindow::keyPressEvent(QKeyEvent* event)
-{
-
-    if (event->modifiers() & Qt::ControlModifier) {
-        bool handled;
-        if ((handled = event->key() == Qt::Key_Plus))
-            zoomIn();
-        else if ((handled = event->key() == Qt::Key_Minus))
-            zoomOut();
-
-        if (handled) {
-            event->accept();
-            return;
-        }
-    }
-    QQuickView::keyPressEvent(event);
-}
-
-void BrowserWindow::wheelEvent(QWheelEvent* event)
-{
-    if (event->modifiers() & Qt::ControlModifier && event->orientation() == Qt::Vertical) {
-        if (event->delta() > 0)
-            zoomIn();
-        else
-            zoomOut();
-
-        event->accept();
-        return;
-    }
-    QQuickView::wheelEvent(event);
-}
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.h b/Tools/MiniBrowser/qt/BrowserWindow.h
deleted file mode 100644 (file)
index 2ecfc14..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-#ifndef BrowserWindow_h
-#define BrowserWindow_h
-
-#include "MiniBrowserApplication.h"
-#include <QStringList>
-#include <QtQuick/QQuickView>
-
-class QQuickWebView;
-class QQuickWebViewExperimental;
-
-class BrowserWindow : public QQuickView {
-    Q_OBJECT
-
-public:
-    BrowserWindow(WindowOptions*);
-    ~BrowserWindow();
-    void load(const QString& url);
-    void reload();
-    void focusAddressBar();
-    void toggleFind();
-    QQuickWebView* webView() const;
-    QQuickWebViewExperimental* webViewExperimental() const;
-
-    void updateVisualMockTouchPoints(const QList<QTouchEvent::TouchPoint>& touchPoints);
-
-public Q_SLOTS:
-    BrowserWindow* newWindow(const QString& url = "about:blank");
-
-protected Q_SLOTS:
-    void screenshot();
-
-private Q_SLOTS:
-    void onTitleChanged(QString);
-
-private:
-    void zoomIn();
-    void zoomOut();
-
-    virtual void keyPressEvent(QKeyEvent*);
-    virtual void wheelEvent(QWheelEvent*);
-
-    WindowOptions* m_windowOptions;
-    QHash<int, QQuickItem*> m_activeMockComponents;
-    QVector<qreal> m_zoomLevels;
-    unsigned m_currentZoomLevel;
-};
-
-#endif
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
deleted file mode 100644 (file)
index 3db1c78..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-# -------------------------------------------------------------------
-# Project file for the WebKit2 MiniBrowser binary
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-TEMPLATE = app
-
-WEBKIT += wtf
-
-INCLUDEPATH += \
-    $${ROOT_WEBKIT_DIR}/Source/WebCore/platform/qt \
-    $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/
-
-SOURCES += \
-    BrowserWindow.cpp \
-    main.cpp \
-    MiniBrowserApplication.cpp \
-    UrlLoader.cpp \
-    utils.cpp \
-
-HEADERS += \
-    BrowserWindow.h \
-    MiniBrowserApplication.h \
-    UrlLoader.h \
-    utils.h \
-
-TARGET = MiniBrowser
-DESTDIR = $${ROOT_BUILD_DIR}/bin
-
-have?(FONTCONFIG): PKGCONFIG += fontconfig
-
-QT += network gui-private quick quick-private webkit webkit-private
-macx: QT += xml
-
-RESOURCES += MiniBrowser.qrc
-
-OTHER_FILES += qml/*
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.qrc b/Tools/MiniBrowser/qt/MiniBrowser.qrc
deleted file mode 100644 (file)
index 3fa6208..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>icons/checkbox_checked.png</file>
-        <file>icons/checkbox_unchecked.png</file>
-        <file>icons/contents_width.png</file>
-        <file>icons/favicon.png</file>
-        <file>icons/find.png</file>
-        <file>icons/folder.png</file>
-        <file>icons/info.png</file>
-        <file>icons/next.png</file>
-        <file>icons/plus.png</file>
-        <file>icons/previous.png</file>
-        <file>icons/refresh.png</file>
-        <file>icons/stop.png</file>
-        <file>icons/titlebar.png</file>
-        <file>icons/touch.png</file>
-        <file>icons/touchpoint.png</file>
-        <file>icons/up.png</file>
-        <file>js/MultiSelect.js</file>
-        <file>qml/AlertDialog.qml</file>
-        <file>qml/AuthenticationDialog.qml</file>
-        <file>qml/BrowserWindow.qml</file>
-        <file>qml/CheckBox.qml</file>
-        <file>qml/ColorChooser.qml</file>
-        <file>qml/ConfirmDialog.qml</file>
-        <file>qml/Dialog.qml</file>
-        <file>qml/DialogButton.qml</file>
-        <file>qml/DialogLineInput.qml</file>
-        <file>qml/FilePicker.qml</file>
-        <file>qml/ItemSelector.qml</file>
-        <file>qml/MockTouchPoint.qml</file>
-        <file>qml/PromptDialog.qml</file>
-        <file>qml/ProxyAuthenticationDialog.qml</file>
-        <file>qml/ScrollIndicator.qml</file>
-        <file>qml/ViewportInfoItem.qml</file>
-    </qresource>
-</RCC>
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
deleted file mode 100644 (file)
index 5915e77..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2010 University of Szeged
- * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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 "config.h"
-
-#include "MiniBrowserApplication.h"
-
-#include "BrowserWindow.h"
-#if HAVE(QTTESTSUPPORT)
-#include "QtTestSupport.h"
-#endif
-#include "private/qquickwebview_p.h"
-#include "utils.h"
-#include <QRegExp>
-#include <QEvent>
-#include <QMouseEvent>
-#include <QTouchEvent>
-
-static inline QRectF touchRectForPosition(QPointF centerPoint)
-{
-    QRectF touchRect(0, 0, 40, 40);
-    touchRect.moveCenter(centerPoint);
-    return touchRect;
-}
-
-static inline bool isTouchEvent(const QEvent* event)
-{
-    switch (event->type()) {
-    case QEvent::TouchBegin:
-    case QEvent::TouchUpdate:
-    case QEvent::TouchEnd:
-        return true;
-    default:
-        return false;
-    }
-}
-
-static inline bool isMouseEvent(const QEvent* event)
-{
-    switch (event->type()) {
-    case QEvent::MouseButtonPress:
-    case QEvent::MouseMove:
-    case QEvent::MouseButtonRelease:
-    case QEvent::MouseButtonDblClick:
-        return true;
-    default:
-        return false;
-    }
-}
-
-MiniBrowserApplication::MiniBrowserApplication(int& argc, char** argv)
-    : QGuiApplication(argc, argv)
-    , m_realTouchEventReceived(false)
-    , m_pendingFakeTouchEventCount(0)
-    , m_isRobotized(false)
-    , m_robotTimeoutSeconds(0)
-    , m_robotExtraTimeSeconds(0)
-    , m_windowOptions(this)
-    , m_holdingControl(false)
-{
-    setOrganizationName("QtProject");
-    setApplicationName("QtMiniBrowser");
-    setApplicationVersion("0.1");
-
-    handleUserOptions();
-}
-
-bool MiniBrowserApplication::notify(QObject* target, QEvent* event)
-{
-    // We try to be smart, if we received real touch event, we are probably on a device
-    // with touch screen, and we should not have touch mocking.
-
-    if (!event->spontaneous() || m_realTouchEventReceived || !m_windowOptions.touchMockingEnabled())
-        return QGuiApplication::notify(target, event);
-
-    if (isTouchEvent(event)) {
-        if (m_pendingFakeTouchEventCount)
-            --m_pendingFakeTouchEventCount;
-        else
-            m_realTouchEventReceived = true;
-        return QGuiApplication::notify(target, event);
-    }
-
-    BrowserWindow* browserWindow = qobject_cast<BrowserWindow*>(target);
-    if (!browserWindow)
-        return QGuiApplication::notify(target, event);
-
-    m_holdingControl = QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
-
-    // In QML events are propagated through parents. But since the WebView
-    // may consume key events, a shortcut might never reach the top QQuickItem.
-    // Therefore we are checking here for shortcuts.
-    if (event->type() == QEvent::KeyPress) {
-        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-        if ((keyEvent->key() == Qt::Key_R && keyEvent->modifiers() == Qt::ControlModifier) || keyEvent->key() == Qt::Key_F5) {
-            browserWindow->reload();
-            return true;
-        }
-        if ((keyEvent->key() == Qt::Key_L && keyEvent->modifiers() == Qt::ControlModifier) || keyEvent->key() == Qt::Key_F6) {
-            browserWindow->focusAddressBar();
-            return true;
-        }
-        if ((keyEvent->key() == Qt::Key_F && keyEvent->modifiers() == Qt::ControlModifier) || keyEvent->key() == Qt::Key_F3) {
-            browserWindow->toggleFind();
-            return true;
-        }
-    }
-
-    if (event->type() == QEvent::KeyRelease && static_cast<QKeyEvent*>(event)->key() == Qt::Key_Control) {
-        foreach (int id, m_heldTouchPoints)
-            if (m_touchPoints.contains(id) && !QGuiApplication::mouseButtons().testFlag(Qt::MouseButton(id))) {
-                m_touchPoints[id].setState(Qt::TouchPointReleased);
-                m_heldTouchPoints.remove(id);
-            } else
-                m_touchPoints[id].setState(Qt::TouchPointStationary);
-
-        sendTouchEvent(browserWindow, m_heldTouchPoints.isEmpty() ? QEvent::TouchEnd : QEvent::TouchUpdate, static_cast<QKeyEvent*>(event)->timestamp());
-    }
-
-    if (isMouseEvent(event)) {
-        const QMouseEvent* const mouseEvent = static_cast<QMouseEvent*>(event);
-
-        QTouchEvent::TouchPoint touchPoint;
-        touchPoint.setPressure(1);
-
-        QEvent::Type touchType = QEvent::None;
-
-        switch (mouseEvent->type()) {
-        case QEvent::MouseButtonPress:
-            touchPoint.setId(mouseEvent->button());
-            if (m_touchPoints.contains(touchPoint.id())) {
-                touchPoint.setState(Qt::TouchPointMoved);
-                touchType = QEvent::TouchUpdate;
-            } else {
-                touchPoint.setState(Qt::TouchPointPressed);
-                // Check if more buttons are held down than just the event triggering one.
-                if (mouseEvent->buttons() > mouseEvent->button())
-                    touchType = QEvent::TouchUpdate;
-                else
-                    touchType = QEvent::TouchBegin;
-            }
-            break;
-        case QEvent::MouseMove:
-            if (!mouseEvent->buttons()) {
-                // We have to swallow the event instead of propagating it,
-                // since we avoid sending the mouse release events and if the
-                // Flickable is the mouse grabber it would receive the event
-                // and would move the content.
-                event->accept();
-                return true;
-            }
-            touchType = QEvent::TouchUpdate;
-            touchPoint.setId(mouseEvent->buttons());
-            touchPoint.setState(Qt::TouchPointMoved);
-            break;
-        case QEvent::MouseButtonRelease:
-            // Check if any buttons are still held down after this event.
-            if (mouseEvent->buttons())
-                touchType = QEvent::TouchUpdate;
-            else
-                touchType = QEvent::TouchEnd;
-            touchPoint.setId(mouseEvent->button());
-            touchPoint.setState(Qt::TouchPointReleased);
-            break;
-        case QEvent::MouseButtonDblClick:
-            // Eat double-clicks, their accompanying press event is all we need.
-            event->accept();
-            return true;
-        default:
-            Q_ASSERT_X(false, "multi-touch mocking", "unhandled event type");
-        }
-
-        // A move can have resulted in multiple buttons, so we need check them individually.
-        if (touchPoint.id() & Qt::LeftButton)
-            updateTouchPoint(mouseEvent, touchPoint, Qt::LeftButton);
-        if (touchPoint.id() & Qt::MidButton)
-            updateTouchPoint(mouseEvent, touchPoint, Qt::MidButton);
-        if (touchPoint.id() & Qt::RightButton)
-            updateTouchPoint(mouseEvent, touchPoint, Qt::RightButton);
-
-        if (m_holdingControl && touchPoint.state() == Qt::TouchPointReleased) {
-            // We avoid sending the release event because the Flickable is
-            // listening to mouse events and would start a bounce-back
-            // animation if it received a mouse release.
-            event->accept();
-            return true;
-        }
-
-        // Update states for all other touch-points
-        for (QHash<int, QTouchEvent::TouchPoint>::iterator it = m_touchPoints.begin(), end = m_touchPoints.end(); it != end; ++it) {
-            if (!(it.value().id() & touchPoint.id()))
-                it.value().setState(Qt::TouchPointStationary);
-        }
-
-        Q_ASSERT(touchType != QEvent::None);
-
-        if (!sendTouchEvent(browserWindow, touchType, mouseEvent->timestamp()))
-            return QGuiApplication::notify(target, event);
-
-        event->accept();
-        return true;
-    }
-
-    return QGuiApplication::notify(target, event);
-}
-
-void MiniBrowserApplication::updateTouchPoint(const QMouseEvent* mouseEvent, QTouchEvent::TouchPoint touchPoint, Qt::MouseButton mouseButton)
-{
-    // Ignore inserting additional touch points if Ctrl isn't held because it produces
-    // inconsistent touch events and results in assers in the gesture recognizers.
-    if (!m_holdingControl && m_touchPoints.size() && !m_touchPoints.contains(mouseButton))
-        return;
-
-    if (m_holdingControl && touchPoint.state() == Qt::TouchPointReleased) {
-        m_heldTouchPoints.insert(mouseButton);
-        return;
-    }
-
-    // Gesture recognition uses the screen position for the initial threshold
-    // but since the canvas translates touch events we actually need to pass
-    // the screen position as the scene position to deliver the appropriate
-    // coordinates to the target.
-    touchPoint.setRect(touchRectForPosition(mouseEvent->localPos()));
-    touchPoint.setSceneRect(touchRectForPosition(mouseEvent->screenPos()));
-
-    if (touchPoint.state() == Qt::TouchPointPressed)
-        touchPoint.setStartScenePos(mouseEvent->screenPos());
-    else {
-        const QTouchEvent::TouchPoint& oldTouchPoint = m_touchPoints[mouseButton];
-        touchPoint.setStartScenePos(oldTouchPoint.startScenePos());
-        touchPoint.setLastPos(oldTouchPoint.pos());
-        touchPoint.setLastScenePos(oldTouchPoint.scenePos());
-    }
-
-    // Update current touch-point.
-    touchPoint.setId(mouseButton);
-    m_touchPoints.insert(mouseButton, touchPoint);
-}
-
-
-bool MiniBrowserApplication::sendTouchEvent(BrowserWindow* browserWindow, QEvent::Type type, ulong timestamp)
-{
-    static QTouchDevice* device = 0;
-    if (!device) {
-        device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
-    }
-
-    m_pendingFakeTouchEventCount++;
-
-    const QList<QTouchEvent::TouchPoint>& currentTouchPoints = m_touchPoints.values();
-    Qt::TouchPointStates touchPointStates = 0;
-    foreach (const QTouchEvent::TouchPoint& touchPoint, currentTouchPoints)
-        touchPointStates |= touchPoint.state();
-
-    QTouchEvent event(type, device, Qt::NoModifier, touchPointStates, currentTouchPoints);
-    event.setTimestamp(timestamp);
-    event.setAccepted(false);
-
-    QGuiApplication::notify(browserWindow, &event);
-
-    if (QQuickWebViewExperimental::flickableViewportEnabled())
-        browserWindow->updateVisualMockTouchPoints(m_holdingControl ? currentTouchPoints : QList<QTouchEvent::TouchPoint>());
-
-    // Get rid of touch-points that are no longer valid
-    foreach (const QTouchEvent::TouchPoint& touchPoint, currentTouchPoints) {
-        if (touchPoint.state() ==  Qt::TouchPointReleased)
-            m_touchPoints.remove(touchPoint.id());
-    }
-
-    return event.isAccepted();
-}
-
-static void printHelp(const QString& programName)
-{
-    qDebug() << "Usage:" << programName.toLatin1().data()
-         << "[--desktop]"
-         << "[-r list]"
-         << "[--robot-timeout seconds]"
-         << "[--robot-extra-time seconds]"
-         << "[--window-size (width)x(height)]"
-         << "[--maximize]"
-         << "[-f]                                    Full screen mode."
-         << "[--user-agent string]"
-         << "[-v]"
-         << "URL";
-}
-
-void MiniBrowserApplication::handleUserOptions()
-{
-    QStringList args = arguments();
-    QFileInfo program(args.takeAt(0));
-    QString programName("MiniBrowser");
-    if (program.exists())
-        programName = program.baseName();
-
-    if (takeOptionFlag(&args, "--help")) {
-        printHelp(programName);
-        appQuit(0);
-    }
-
-    const bool useDesktopBehavior = takeOptionFlag(&args, "--desktop");
-    if (useDesktopBehavior)
-        windowOptions()->setTouchMockingEnabled(false);
-
-    QQuickWebViewExperimental::setFlickableViewportEnabled(!useDesktopBehavior);
-    if (!useDesktopBehavior)
-        qputenv("QT_WEBKIT_USE_MOBILE_THEME", QByteArray("1"));
-    m_windowOptions.setPrintLoadedUrls(takeOptionFlag(&args, "-v"));
-    m_windowOptions.setStartMaximized(takeOptionFlag(&args, "--maximize"));
-    m_windowOptions.setStartFullScreen(takeOptionFlag(&args, "-f"));
-
-    if (args.contains("--user-agent"))
-        m_windowOptions.setUserAgent(takeOptionValue(&args, "--user-agent"));
-
-    if (args.contains("--window-size")) {
-        QString value = takeOptionValue(&args, "--window-size");
-        QStringList list = value.split(QRegExp("\\D+"), QString::SkipEmptyParts);
-        if (list.length() == 2)
-            m_windowOptions.setRequestedWindowSize(QSize(list.at(0).toInt(), list.at(1).toInt()));
-    }
-
-#if HAVE(QTTESTSUPPORT)
-    if (takeOptionFlag(&args, QStringLiteral("--use-test-fonts")))
-        WebKit::QtTestSupport::initializeTestFonts();
-#endif
-
-    if (args.contains("-r")) {
-        QString listFile = takeOptionValue(&args, "-r");
-        if (listFile.isEmpty())
-            appQuit(1, "-r needs a list file to start in robotized mode");
-        if (!QFile::exists(listFile))
-            appQuit(1, "The list file supplied to -r does not exist.");
-
-        m_isRobotized = true;
-        m_urls = QStringList(listFile);
-
-        // toInt() returns 0 if it fails parsing.
-        m_robotTimeoutSeconds = takeOptionValue(&args, "--robot-timeout").toInt();
-        m_robotExtraTimeSeconds = takeOptionValue(&args, "--robot-extra-time").toInt();
-    } else {
-        int urlArg;
-
-        while ((urlArg = args.indexOf(QRegExp("^[^-].*"))) != -1)
-            m_urls += args.takeAt(urlArg);
-    }
-
-    if (!args.isEmpty()) {
-        printHelp(programName);
-        appQuit(1, QString("Unknown argument(s): %1").arg(args.join(",")));
-    }
-}
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.h b/Tools/MiniBrowser/qt/MiniBrowserApplication.h
deleted file mode 100644 (file)
index 3dc380a..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-#ifndef MiniBrowserApplication_h
-#define MiniBrowserApplication_h
-
-#include <QHash>
-#include <QObject>
-#include <QStringList>
-#include <QtQml>
-#include <QGuiApplication>
-#include <QTouchEvent>
-#include <QUrl>
-#include <qpa/qwindowsysteminterface.h>
-
-class BrowserWindow;
-
-class WindowOptions : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(bool printLoadedUrls READ printLoadedUrls)
-    Q_PROPERTY(bool startMaximized READ startMaximized)
-    Q_PROPERTY(bool touchMockingEnabled READ touchMockingEnabled WRITE setTouchMockingEnabled NOTIFY touchMockingEnabledChanged)
-
-public:
-    WindowOptions(QObject* parent = 0)
-        : QObject(parent)
-        , m_printLoadedUrls(false)
-        , m_startMaximized(false)
-        , m_touchMockingEnabled(true)
-        , m_windowSize(QSize(980, 735))
-    {
-    }
-
-    void setPrintLoadedUrls(bool enabled) { m_printLoadedUrls = enabled; }
-    bool printLoadedUrls() const { return m_printLoadedUrls; }
-    void setStartMaximized(bool enabled) { m_startMaximized = enabled; }
-    bool startMaximized() const { return m_startMaximized; }
-    void setStartFullScreen(bool enabled) { m_startFullScreen = enabled; }
-    bool startFullScreen() const { return m_startFullScreen; }
-    void setRequestedWindowSize(const QSize& size) { m_windowSize = size; }
-    QSize requestedWindowSize() const { return m_windowSize; }
-    void setUserAgent(const QString& userAgent) { m_userAgent = userAgent; }
-    QString userAgent() const { return m_userAgent; }
-    bool touchMockingEnabled() const { return m_touchMockingEnabled; }
-    void setTouchMockingEnabled(bool enabled)
-    {
-        if (enabled != m_touchMockingEnabled) {
-            m_touchMockingEnabled = enabled;
-            emit touchMockingEnabledChanged();
-        }
-    }
-
-Q_SIGNALS:
-    void touchMockingEnabledChanged();
-
-private:
-    bool m_printLoadedUrls;
-    bool m_startMaximized;
-    bool m_startFullScreen;
-    bool m_touchMockingEnabled;
-    QSize m_windowSize;
-    QString m_userAgent;
-};
-
-class MiniBrowserApplication : public QGuiApplication {
-    Q_OBJECT
-
-public:
-    MiniBrowserApplication(int& argc, char** argv);
-    QStringList urls() const { return m_urls; }
-    bool isRobotized() const { return m_isRobotized; }
-    int robotTimeout() const { return m_robotTimeoutSeconds; }
-    int robotExtraTime() const { return m_robotExtraTimeSeconds; }
-    WindowOptions* windowOptions() { return &m_windowOptions; }
-
-    virtual bool notify(QObject*, QEvent*);
-
-private:
-    void updateTouchPoint(const QMouseEvent*, QTouchEvent::TouchPoint, Qt::MouseButton);
-    bool sendTouchEvent(BrowserWindow*, QEvent::Type, ulong timestamp);
-    void handleUserOptions();
-
-private:
-    bool m_realTouchEventReceived;
-    int m_pendingFakeTouchEventCount;
-    bool m_isRobotized;
-    int m_robotTimeoutSeconds;
-    int m_robotExtraTimeSeconds;
-    QStringList m_urls;
-
-    QHash<int, QTouchEvent::TouchPoint> m_touchPoints;
-    QSet<int> m_heldTouchPoints;
-
-    WindowOptions m_windowOptions;
-    bool m_holdingControl;
-};
-
-QML_DECLARE_TYPE(WindowOptions);
-
-#endif
diff --git a/Tools/MiniBrowser/qt/UrlLoader.cpp b/Tools/MiniBrowser/qt/UrlLoader.cpp
deleted file mode 100644 (file)
index a0658e9..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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 "UrlLoader.h"
-#include "private/qquickwebview_p.h"
-#include "private/qwebloadrequest_p.h"
-
-#include <QDebug>
-#include <QFile>
-
-UrlLoader::UrlLoader(BrowserWindow* browserWindow, const QString& inputFileName, int timeoutSeconds, int extraTimeSeconds)
-    : m_browserWindow(browserWindow)
-    , m_stdOut(stdout)
-    , m_loaded(0)
-    , m_numFramesLoading(0)
-{
-    m_checkIfFinishedTimer.setInterval(200);
-    m_checkIfFinishedTimer.setSingleShot(true);
-    connect(&m_checkIfFinishedTimer, SIGNAL(timeout()), this, SLOT(checkIfFinished()));
-    // loadStarted and loadFinished on QWebPage is emitted for each frame/sub-frame
-    connect(m_browserWindow->webView(), SIGNAL(loadingChanged(QWebLoadRequest*)), this, SLOT(loadingChanged(QWebLoadRequest*)));
-    connect(this, SIGNAL(loadStarted()), this, SLOT(frameLoadStarted()));
-    connect(this, SIGNAL(loadFinished()), this, SLOT(frameLoadFinished()));
-
-    if (timeoutSeconds) {
-        m_timeoutTimer.setInterval(timeoutSeconds * 1000);
-        m_timeoutTimer.setSingleShot(true);
-        connect(this, SIGNAL(loadStarted()), &m_timeoutTimer, SLOT(start()));
-        connect(&m_timeoutTimer, SIGNAL(timeout()), this, SLOT(loadNext()));
-    }
-    if (extraTimeSeconds) {
-        m_extraTimeTimer.setInterval(extraTimeSeconds * 1000);
-        m_extraTimeTimer.setSingleShot(true);
-        connect(this, SIGNAL(pageLoadFinished()), &m_extraTimeTimer, SLOT(start()));
-        connect(&m_extraTimeTimer, SIGNAL(timeout()), this, SLOT(loadNext()));
-    } else
-        connect(this, SIGNAL(pageLoadFinished()), this, SLOT(loadNext()));
-    loadUrlList(inputFileName);
-}
-
-void UrlLoader::loadNext()
-{
-    m_timeoutTimer.stop();
-    m_extraTimeTimer.stop();
-    m_checkIfFinishedTimer.stop();
-    m_numFramesLoading = 0;
-    QString qstr;
-    if (getUrl(qstr)) {
-        QUrl url(qstr, QUrl::StrictMode);
-        if (url.isValid()) {
-            m_stdOut << "Loading " << qstr << " ......" << ++m_loaded << endl;
-            m_browserWindow->load(url.toString());
-        } else
-            loadNext();
-    } else
-        disconnect(m_browserWindow, 0, this, 0);
-}
-
-void UrlLoader::checkIfFinished()
-{
-    if (!m_numFramesLoading)
-        emit pageLoadFinished();
-}
-
-void UrlLoader::frameLoadStarted()
-{
-    ++m_numFramesLoading;
-    m_checkIfFinishedTimer.stop();
-}
-
-void UrlLoader::frameLoadFinished()
-{
-    Q_ASSERT(m_numFramesLoading > 0);
-    --m_numFramesLoading;
-    // Once our frame has finished loading, wait a moment to call loadNext for cases
-    // where a sub-frame starts loading or another frame is loaded through JavaScript.
-    m_checkIfFinishedTimer.start();
-}
-
-void UrlLoader::loadUrlList(const QString& inputFileName)
-{
-    QFile inputFile(inputFileName);
-    if (inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        QTextStream stream(&inputFile);
-        QString line;
-        while (true) {
-            line = stream.readLine();
-            if (line.isNull())
-                break;
-            m_urls.append(line);
-        }
-    } else {
-        qDebug() << "Can't open list file";
-        exit(0);
-    }
-    m_index = 0;
-    inputFile.close();
-}
-
-bool UrlLoader::getUrl(QString& qstr)
-{
-    if (m_index == m_urls.size())
-        return false;
-
-    qstr = m_urls[m_index++];
-    return true;
-}
-
-void UrlLoader::loadingChanged(QWebLoadRequest* loadRequest)
-{
-    switch (loadRequest->status()) {
-    case QQuickWebView::LoadStartedStatus:
-        emit loadStarted();
-        break;
-    case QQuickWebView::LoadStoppedStatus:
-    case QQuickWebView::LoadSucceededStatus:
-    case QQuickWebView::LoadFailedStatus:
-    default:
-        emit loadFinished();
-        break;
-    }
-}
diff --git a/Tools/MiniBrowser/qt/UrlLoader.h b/Tools/MiniBrowser/qt/UrlLoader.h
deleted file mode 100644 (file)
index a64548a..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2009 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-#ifndef UrlLoader_h
-#define UrlLoader_h
-
-#include "BrowserWindow.h"
-
-#include <QTextStream>
-#include <QTimer>
-#include <QVector>
-
-class QWebLoadRequest;
-
-class UrlLoader : public QObject {
-    Q_OBJECT
-
-public:
-    UrlLoader(BrowserWindow*, const QString&, int, int);
-
-public Q_SLOTS:
-    void loadNext();
-
-private Q_SLOTS:
-    void checkIfFinished();
-    void frameLoadStarted();
-    void frameLoadFinished();
-    void loadingChanged(QWebLoadRequest*);
-
-Q_SIGNALS:
-    void pageLoadFinished();
-    void loadStarted();
-    void loadFinished();
-
-private:
-    void loadUrlList(const QString& inputFileName);
-    bool getUrl(QString& qstr);
-
-private:
-    QVector<QString> m_urls;
-    int m_index;
-    BrowserWindow* m_browserWindow;
-    QTextStream m_stdOut;
-    int m_loaded;
-    QTimer m_timeoutTimer;
-    QTimer m_extraTimeTimer;
-    QTimer m_checkIfFinishedTimer;
-    int m_numFramesLoading;
-};
-
-#endif
diff --git a/Tools/MiniBrowser/qt/icons/checkbox_checked.png b/Tools/MiniBrowser/qt/icons/checkbox_checked.png
deleted file mode 100644 (file)
index cbf06f6..0000000
Binary files a/Tools/MiniBrowser/qt/icons/checkbox_checked.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/checkbox_unchecked.png b/Tools/MiniBrowser/qt/icons/checkbox_unchecked.png
deleted file mode 100644 (file)
index 5f54655..0000000
Binary files a/Tools/MiniBrowser/qt/icons/checkbox_unchecked.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/contents_width.png b/Tools/MiniBrowser/qt/icons/contents_width.png
deleted file mode 100644 (file)
index f2a79eb..0000000
Binary files a/Tools/MiniBrowser/qt/icons/contents_width.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/favicon.png b/Tools/MiniBrowser/qt/icons/favicon.png
deleted file mode 100644 (file)
index 325d5bd..0000000
Binary files a/Tools/MiniBrowser/qt/icons/favicon.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/find.png b/Tools/MiniBrowser/qt/icons/find.png
deleted file mode 100644 (file)
index b76afa3..0000000
Binary files a/Tools/MiniBrowser/qt/icons/find.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/folder.png b/Tools/MiniBrowser/qt/icons/folder.png
deleted file mode 100644 (file)
index e53e2ad..0000000
Binary files a/Tools/MiniBrowser/qt/icons/folder.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/info.png b/Tools/MiniBrowser/qt/icons/info.png
deleted file mode 100644 (file)
index db483ff..0000000
Binary files a/Tools/MiniBrowser/qt/icons/info.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/next.png b/Tools/MiniBrowser/qt/icons/next.png
deleted file mode 100644 (file)
index 6f3f65d..0000000
Binary files a/Tools/MiniBrowser/qt/icons/next.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/plus.png b/Tools/MiniBrowser/qt/icons/plus.png
deleted file mode 100644 (file)
index f6dfbd0..0000000
Binary files a/Tools/MiniBrowser/qt/icons/plus.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/previous.png b/Tools/MiniBrowser/qt/icons/previous.png
deleted file mode 100644 (file)
index 93be3d1..0000000
Binary files a/Tools/MiniBrowser/qt/icons/previous.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/refresh.png b/Tools/MiniBrowser/qt/icons/refresh.png
deleted file mode 100644 (file)
index cab4d02..0000000
Binary files a/Tools/MiniBrowser/qt/icons/refresh.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/stop.png b/Tools/MiniBrowser/qt/icons/stop.png
deleted file mode 100644 (file)
index b68290b..0000000
Binary files a/Tools/MiniBrowser/qt/icons/stop.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/titlebar.png b/Tools/MiniBrowser/qt/icons/titlebar.png
deleted file mode 100644 (file)
index f3d18aa..0000000
Binary files a/Tools/MiniBrowser/qt/icons/titlebar.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/touch.png b/Tools/MiniBrowser/qt/icons/touch.png
deleted file mode 100644 (file)
index 182ae0f..0000000
Binary files a/Tools/MiniBrowser/qt/icons/touch.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/touchpoint.png b/Tools/MiniBrowser/qt/icons/touchpoint.png
deleted file mode 100644 (file)
index 7649ee9..0000000
Binary files a/Tools/MiniBrowser/qt/icons/touchpoint.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/icons/up.png b/Tools/MiniBrowser/qt/icons/up.png
deleted file mode 100644 (file)
index b05f802..0000000
Binary files a/Tools/MiniBrowser/qt/icons/up.png and /dev/null differ
diff --git a/Tools/MiniBrowser/qt/js/MultiSelect.js b/Tools/MiniBrowser/qt/js/MultiSelect.js
deleted file mode 100644 (file)
index 9e87f5d..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-
-var values = []
-
-function selectedValues() {
-    return values
-}
-
-function isSelected(value) {
-    return (values.indexOf(value) != -1)
-}
-
-function addValue(value) {
-    if (values.indexOf(value) != -1)
-        return
-    values.push(value)
-}
-
-function removeValue(value) {
-    var index = values.indexOf(value)
-
-    if (index == -1)
-        return
-    values.splice(index, 1)
-}
diff --git a/Tools/MiniBrowser/qt/main.cpp b/Tools/MiniBrowser/qt/main.cpp
deleted file mode 100644 (file)
index 4c8cd92..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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 "BrowserWindow.h"
-
-#include "MiniBrowserApplication.h"
-#include "UrlLoader.h"
-
-#include <qqml.h>
-
-#include <QDir>
-#include <QLatin1String>
-#include <QRegExp>
-
-int main(int argc, char** argv)
-{
-    MiniBrowserApplication app(argc, argv);
-
-    if (app.isRobotized()) {
-        BrowserWindow* window = new BrowserWindow(app.windowOptions());
-        UrlLoader loader(window, app.urls().at(0), app.robotTimeout(), app.robotExtraTime());
-        loader.loadNext();
-        window->show();
-        return app.exec();
-    }
-
-    QStringList urls = app.urls();
-
-    if (urls.isEmpty()) {
-        QString defaultIndexFile = QString("%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
-        if (QFile(defaultIndexFile).exists())
-            urls.append(QString("file://") + defaultIndexFile);
-        else
-            urls.append("http://www.google.com");
-    }
-
-    BrowserWindow* window = new BrowserWindow(app.windowOptions());
-    window->load(urls.at(0));
-
-    for (int i = 1; i < urls.size(); ++i)
-        window->newWindow(urls.at(i));
-
-    app.exec();
-
-    return 0;
-}
diff --git a/Tools/MiniBrowser/qt/qml/AlertDialog.qml b/Tools/MiniBrowser/qt/qml/AlertDialog.qml
deleted file mode 100644 (file)
index 50eb1a5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Dialog {
-    title: "JavaScript Alert"
-    message: model.message
-
-    DialogButton {
-        text: "OK"
-        onClicked: model.dismiss()
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/AuthenticationDialog.qml b/Tools/MiniBrowser/qt/qml/AuthenticationDialog.qml
deleted file mode 100644 (file)
index 1d88d3f..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Dialog {
-    id: dialog
-
-    title: "Authentication required." 
-    message: model.hostname + " requires authentication."
-
-    height: 250
-
-    DialogLineInput {
-        id: input
-        width: dialog.width - 30
-        text: model.prefilledUsername
-
-        onAccepted: model.accept(input.text, passwordInput.text)
-    }
-
-    DialogLineInput {
-        id: passwordInput
-        text: "" 
-        width: dialog.width - 30
-        echoMode: TextInput.PasswordEchoOnEdit
-
-        onAccepted: model.accept(input.text, passwordInput.text)
-    }
-
-    Row {
-        id: buttonRow
-        spacing: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        DialogButton {
-            text: "OK"
-            onClicked: model.accept(input.text, passwordInput.text)
-        }
-
-        DialogButton {
-            text: "Cancel"
-            onClicked: model.reject()
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/BrowserWindow.qml b/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
deleted file mode 100644 (file)
index b4b5bc0..0000000
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2010 University of Szeged
- * Copyright (c) 2012 Hewlett-Packard Development Company, L.P.
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-import QtWebKit 3.0
-import QtWebKit.experimental 1.0
-
-Rectangle {
-    id: root
-    // Do not define anchors or an initial size here! This would mess up with QSGView::SizeRootObjectToView.
-
-    property alias webview: webView
-    color: "#333"
-
-    signal pageTitleChanged(string title)
-    signal newWindow(string url)
-
-    function load(address) {
-        webView.url = address
-        webView.forceActiveFocus()
-    }
-
-    function reload() {
-        webView.reload()
-        webView.forceActiveFocus()
-    }
-
-    function focusAddressBar() {
-        addressLine.forceActiveFocus()
-        addressLine.selectAll()
-    }
-    function toggleFind() {
-        findBar.toggle()
-    }
-    Rectangle {
-        id: findBar
-        z: webView.z + 1
-        y: navigationBar.y
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: navigationBar.height
-        color: "#efefef"
-        visible: y > navigationBar.y
-
-        Behavior on y {NumberAnimation {duration: 250}}
-
-        function toggle() {
-            if (y == navigationBar.y) {
-                findTextInput.forceActiveFocus()
-                y += height
-            } else {
-                webView.forceActiveFocus()
-                y = navigationBar.y
-                find("",0);
-            }
-        }
-
-        function find(str, options) {
-            var findOptions = options | WebViewExperimental.FindHighlightAllOccurrences
-            findOptions |= WebViewExperimental.FindWrapsAroundDocument
-            webView.experimental.findText(str, findOptions)
-        }
-
-        Connections {
-            target: webView.experimental
-            onTextFound: {
-                failedOverlay.visible = matchCount == 0
-            }
-        }
-        Item {
-            anchors.fill: parent
-            Rectangle {
-                id: inputArea
-                height: 26
-                anchors {
-                    left: parent.left
-                    right: prevButton.left
-                    margins: 6
-                    verticalCenter: parent.verticalCenter
-                }
-                color: "white"
-                border.width: 1
-                border.color: "#bfbfbf"
-                radius: 3
-                Rectangle {
-                    id: failedOverlay
-                    anchors.fill: parent
-                    color: "red"
-                    opacity: 0.5
-                    radius: 6
-                    visible: false
-                }
-                TextInput {
-                    id: findTextInput
-                    clip: true
-                    selectByMouse: true
-                    horizontalAlignment: TextInput.AlignLeft
-                    anchors.fill: parent
-                    anchors.margins: 3
-                    font {
-                        pointSize: 11
-                        family: "Sans"
-                    }
-                    text: ""
-                    readOnly: !findBar.visible
-                    function doFind() {
-                        if (!findBar.visible) {
-                            return;
-                        }
-                        if (findTextInput.text == "") {
-                            failedOverlay.visible = false
-                        }
-                        findBar.find(findTextInput.text)
-                    }
-                    onTextChanged: {
-                        doFind()
-                    }
-                    Keys.onReturnPressed:{
-                        doFind()
-                    }
-                }
-            }
-            Rectangle {
-                id: prevButton
-                height: inputArea.height
-                width: height
-                anchors.right: nextButton.left
-                anchors.verticalCenter: parent.verticalCenter
-                color: "#efefef"
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    source: "../icons/previous.png"
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: parent.color
-                    radius: parent.radius
-                    opacity: 0.8
-                    visible: !parent.enabled
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onPressed: { if (parent.enabled) parent.color = "#cfcfcf" }
-                    onReleased: { parent.color = "#efefef" }
-                    onClicked: {
-                        findBar.find(findTextInput.text, WebViewExperimental.FindBackward)
-                    }
-                }
-            }
-            Rectangle {
-                id: nextButton
-                height: inputArea.height
-                width: height
-                anchors.right: parent.right
-                anchors.verticalCenter: parent.verticalCenter
-                color: "#efefef"
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    source: "../icons/next.png"
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: parent.color
-                    radius: parent.radius
-                    opacity: 0.8
-                    visible: !parent.enabled
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onPressed: { if (parent.enabled) parent.color = "#cfcfcf" }
-                    onReleased: { parent.color = "#efefef" }
-                    onClicked: {
-                        findBar.find(findTextInput.text, 0)
-                    }
-                }
-            }
-        }
-    }
-    Rectangle {
-        id: navigationBar
-        color: "#efefef"
-        height: 38
-        z: webView.z + 1
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-        }
-
-        Row {
-            height: parent.height - 6
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-                leftMargin: 3
-            }
-            spacing: 3
-            id: controlsRow
-            Rectangle {
-                id: backButton
-                height: parent.height
-                width: height
-                color: "#efefef"
-                radius: 6
-
-                property alias enabled: webView.canGoBack
-
-                Image {
-                    anchors.centerIn: parent
-                    source: "../icons/previous.png"
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: parent.color
-                    radius: parent.radius
-                    opacity: 0.8
-                    visible: !parent.enabled
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onPressed: { if (parent.enabled) parent.color = "#cfcfcf" }
-                    onReleased: { parent.color = "#efefef" }
-                    onClicked: {
-                        if (parent.enabled) {
-                            console.log("MiniBrowser: Going backward in session history.")
-                            webView.goBack()
-                            webView.forceActiveFocus()
-                        }
-                    }
-                }
-            }
-            Rectangle {
-                id: forwardButton
-                height: parent.height
-                width: height
-                color: "#efefef"
-                radius: 6
-
-                property alias enabled: webView.canGoForward
-
-                Image {
-                    anchors.centerIn: parent
-                    source: "../icons/next.png"
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    color: parent.color
-                    radius: parent.radius
-                    opacity: 0.8
-                    visible: !parent.enabled
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onPressed: { if (parent.enabled) parent.color = "#cfcfcf" }
-                    onReleased: { parent.color = "#efefef" }
-                    onClicked: {
-                        if (parent.enabled) {
-                            console.log("MiniBrowser: Going forward in session history.")
-                            webView.goForward()
-                            webView.forceActiveFocus()
-                        }
-                    }
-                }
-            }
-            Rectangle {
-                id: reloadButton
-                height: parent.height
-                width: height
-                color: "#efefef"
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    source: webView.loading ? "../icons/stop.png" : "../icons/refresh.png"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onPressed: { parent.color = "#cfcfcf" }
-                    onReleased: { parent.color = "#efefef" }
-                    onClicked: {
-                        if (webView.loading) {
-                            webView.stop()
-                        } else {
-                            reload()
-                        }
-                    }
-                }
-            }
-
-            Rectangle {
-                id: viewportInfoButton
-                height: parent.height
-                width: height
-                color: { viewportInfoItem.visible ? "#cfcfcf" : "#efefef" }
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    source: "../icons/info.png"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                       viewportInfoItem.visible = !viewportInfoItem.visible
-                    }
-                }
-            }
-
-            Rectangle {
-                id: preferredMininumContentsWidthButton
-                height: parent.height
-                width: height
-                color: "#efefef"
-                opacity: { webView.experimental.preferredMinimumContentsWidth === 0 ? 0.1 : 0.6 }
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    source: "../icons/contents_width.png"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        webView.experimental.preferredMinimumContentsWidth = webView.experimental.preferredMinimumContentsWidth === 0 ? 980 : 0
-                    }
-                }
-            }
-
-            Rectangle {
-                id: findButton
-                height: parent.height
-                width: height
-                color: "#efefef"
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    opacity: 0.6
-                    source: "../icons/find.png"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        findBar.toggle()
-                    }
-                }
-            }
-
-            Rectangle {
-                id: touchEventsButton
-                height: parent.height
-                width: height
-                color: "#efefef"
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    opacity: options.touchMockingEnabled ? 0.6 : 0.1
-                    source: "../icons/touch.png"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        if (options.touchMockingEnabled) {
-                            console.log("Touch Mocking Disabled")
-                        } else {
-                            console.log("Touch Mocking Enabled")
-                        }
-
-                        options.touchMockingEnabled = !options.touchMockingEnabled
-                    }
-                }
-            }
-
-            Rectangle {
-                id: newBrowserWindowButton
-                height: parent.height
-                width: height
-                color: "#efefef"
-                radius: 6
-
-                Image {
-                    anchors.centerIn: parent
-                    source: "../icons/plus.png"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        newWindow("about:blank")
-                    }
-                }
-            }
-        }
-        Rectangle {
-            color: "white"
-            height: 26
-            border.width: 1
-            border.color: "#bfbfbf"
-            radius: 3
-            anchors {
-                left: controlsRow.right
-                right: parent.right
-                margins: 6
-                verticalCenter: parent.verticalCenter
-            }
-            Rectangle {
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                    left: parent.left
-                }
-                radius: 3
-                width: parent.width / 100 * Math.max(5, webView.loadProgress)
-                color: "blue"
-                opacity: 0.3
-                visible: webView.loading
-            }
-            Image {
-                id: favIcon
-                source: webView.icon != '' ? webView.icon : '../icons/favicon.png'
-                width: 16
-                height: 16
-                anchors {
-                    left: parent.left
-                    leftMargin: 6
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-            TextInput {
-                id: addressLine
-                clip: true
-                selectByMouse: true
-                horizontalAlignment: TextInput.AlignLeft
-                font {
-                    pointSize: 11
-                    family: "Sans"
-                }
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                    left: favIcon.right
-                    right: parent.right
-                    margins: 6
-                }
-
-                Keys.onReturnPressed:{
-                    console.log("Navigating to: ", addressLine.text)
-                    load(utils.urlFromUserInput(addressLine.text))
-                }
-
-                property url url
-
-                onUrlChanged: {
-                    if (activeFocus)
-                        return;
-
-                    text = url
-                    cursorPosition = 0
-                }
-
-                onActiveFocusChanged: url = webView.url
-            }
-        }
-    }
-
-    WebView {
-        id: webView
-        clip: false
-
-        anchors {
-            top: findBar.bottom
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-
-        onTitleChanged: pageTitleChanged(title)
-        onUrlChanged: {
-            addressLine.url = webView.url
-
-            if (options.printLoadedUrls)
-                console.log("WebView url changed:", webView.url.toString());
-        }
-
-        onLoadingChanged: {
-            if (!loading && loadRequest.status == WebView.LoadFailedStatus)
-                webView.loadHtml("Failed to load " + loadRequest.url, "", loadRequest.url)
-        }
-
-        experimental.preferences.fullScreenEnabled: true
-        experimental.preferences.webGLEnabled: true
-        experimental.preferences.webAudioEnabled: true
-        experimental.preferredMinimumContentsWidth: 980
-        experimental.itemSelector: ItemSelector { }
-        experimental.alertDialog: AlertDialog { }
-        experimental.confirmDialog: ConfirmDialog { }
-        experimental.promptDialog: PromptDialog { }
-        experimental.authenticationDialog: AuthenticationDialog { }
-        experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog { }
-        experimental.filePicker: FilePicker { }
-        experimental.preferences.developerExtrasEnabled: true
-        experimental.databaseQuotaDialog: Item {
-            Timer {
-                interval: 1
-                running: true
-                onTriggered: {
-                    var size = model.expectedUsage / 1024 / 1024
-                    console.log("Creating database '" + model.displayName + "' of size " + size.toFixed(2) + " MB for " + model.origin.scheme + "://" + model.origin.host + ":" + model.origin.port)
-                    model.accept(model.expectedUsage)
-                }
-            }
-        }
-        experimental.colorChooser: ColorChooser { }
-        experimental.onEnterFullScreenRequested : {
-            navigationBar.visible = false;
-            Window.showFullScreen();
-        }
-        experimental.onExitFullScreenRequested : {
-            Window.showNormal();
-            navigationBar.visible = true;
-        }
-    }
-
-    ScrollIndicator {
-        flickableItem: webView
-    }
-
-    ViewportInfoItem {
-        id: viewportInfoItem
-        anchors {
-            top: navigationBar.bottom
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        visible: false
-        test : webView.experimental.test
-        preferredMinimumContentsWidth: webView.experimental.preferredMinimumContentsWidth
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/CheckBox.qml b/Tools/MiniBrowser/qt/qml/CheckBox.qml
deleted file mode 100644 (file)
index 085b811..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-import QtQuick 2.0
-
-Item {
-    id: checkbox
-    width: 50
-    height: parent.height
-    property bool checked
-
-    Image {
-        width: 24
-        height: 24
-        source: parent.checked ? '../icons/checkbox_checked.png' : '../icons/checkbox_unchecked.png'
-        anchors.verticalCenter: parent.verticalCenter
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/ColorChooser.qml b/Tools/MiniBrowser/qt/qml/ColorChooser.qml
deleted file mode 100644 (file)
index 0d5a9a7..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-MouseArea {
-    anchors.fill: parent
-    onClicked: model.reject()
-
-    Rectangle {
-        id: dialog
-        property int spacing: 10
-
-        color: "gainsboro"
-        opacity: 0.8
-        radius: 5
-        width: 200
-        height: 200
-        x: (model.elementRect.x + width > parent.width) ? parent.width - width : model.elementRect.x
-        y: (model.elementRect.y + model.elementRect.height + height < parent.height ) ? model.elementRect.y + model.elementRect.height
-                                                                                      : model.elementRect.y - height;
-
-        Rectangle {
-            color: "red"
-            anchors.left: parent.left
-            anchors.top: parent.top
-            anchors.margins: dialog.spacing
-            width: parent.width / 2 - dialog.spacing
-            height: parent.height / 2 - dialog.spacing
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: model.accept(parent.color)
-            }
-        }
-
-        Rectangle {
-            color: "blue"
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.margins: dialog.spacing
-            width: parent.width / 2 - dialog.spacing
-            height: parent.height / 2 - dialog.spacing
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: model.accept(parent.color)
-            }
-        }
-
-        Rectangle {
-            color: "green"
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.margins: dialog.spacing
-            width: parent.width / 2 - dialog.spacing
-            height: parent.height / 2 - dialog.spacing
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: model.accept(parent.color)
-            }
-        }
-
-        Rectangle {
-            color: model.currentColor
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-            anchors.margins: dialog.spacing * 2
-            width: parent.width / 2 - dialog.spacing * 4
-            height: parent.height / 2 - dialog.spacing * 4
-
-            Text {
-                text: "Current"
-                anchors.bottom: parent.top
-                anchors.horizontalCenter: parent.horizontalCenter
-            }
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/ConfirmDialog.qml b/Tools/MiniBrowser/qt/qml/ConfirmDialog.qml
deleted file mode 100644 (file)
index 974d065..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Dialog {
-    title: "JavaScript Confirmation"
-    message: model.message
-
-    Row {
-        spacing: 5
-
-        DialogButton {
-            text: "OK"
-            onClicked: model.accept()
-        }
-
-        DialogButton {
-            text: "Cancel"
-            onClicked: model.reject()
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/Dialog.qml b/Tools/MiniBrowser/qt/qml/Dialog.qml
deleted file mode 100644 (file)
index 23b14cd..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Item {
-    id: dialog
-
-    anchors.fill: parent
-    z: 1000
-
-    // We want to be a child of the root item so that we can cover
-    // the whole scene with our "dim" overlay.
-    parent: root
-
-    property alias title: titleText.text
-    property alias message: messageText.text
-
-    default property alias __children: dynamicColumn.children
-
-    MouseArea {
-        id: mouseBlocker
-        anchors.fill: parent
-        onPressed: mouse.accepted = true
-
-        // FIXME: This does not block touch events :(
-    }
-
-    Rectangle {
-        id: dimBackground
-        anchors.fill: parent
-        color: "black"
-        opacity: 0.4
-    }
-
-    Rectangle {
-        id: dialogWindow
-
-        color: "#efefef"
-
-        width: 300
-        height: 150
-
-        border {
-            width: 1
-            color: "#bfbfbf"
-        }
-
-        smooth: true
-        radius: 5
-
-        anchors.centerIn: parent
-
-        Item {
-            id: staticContent
-            anchors.centerIn: parent
-            anchors.fill: parent
-            anchors.margins: 10
-
-            Text {
-                id: titleText
-                width: parent.width
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: 16
-                font.weight: Font.Bold
-                elide: Text.ElideRight
-            }
-
-            Text {
-                id: messageText
-                width: parent.width
-                wrapMode: Text.WordWrap
-                anchors.centerIn: parent
-            }
-
-            Column {
-                id: dynamicColumn
-                spacing: 5
-                anchors {
-                    margins: 10
-                    bottom: staticContent.bottom
-                    horizontalCenter: staticContent.horizontalCenter
-                }
-            }
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/DialogButton.qml b/Tools/MiniBrowser/qt/qml/DialogButton.qml
deleted file mode 100644 (file)
index eaa1f61..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    id: button
-
-    property alias text: buttonText.text
-
-    signal clicked
-
-    color: mouseArea.pressed ? "#eaeaea" : "#fbfbfb"
-
-    width: 60
-    height: 20
-
-    border {
-        width: 1
-        color: "#aeaeae"
-    }
-
-    smooth: true
-    radius: 5
-
-    Text {
-        id: buttonText
-        anchors.centerIn: parent
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: button.clicked()
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/DialogLineInput.qml b/Tools/MiniBrowser/qt/qml/DialogLineInput.qml
deleted file mode 100644 (file)
index 84faa55..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Rectangle {
-    id: dialogLineInput
-
-    property alias text: input.text
-    property alias echoMode: input.echoMode
-    signal accepted()
-
-    height: 20
-    color: "#fefefe"
-
-    border {
-        width: 1
-        color: "#aeaeae"
-    }
-
-    smooth: true
-    radius: 3
-    clip: true
-
-    TextInput {
-        id: input
-        focus: true
-        anchors.fill: parent
-
-        onAccepted: dialogLineInput.accepted()
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/FilePicker.qml b/Tools/MiniBrowser/qt/qml/FilePicker.qml
deleted file mode 100644 (file)
index 222d4c3..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this program; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-import QtQuick 2.0
-import Qt.labs.folderlistmodel 1.0
-import "../js/MultiSelect.js" as MultiSelect
-
-Rectangle {
-    id: filePicker
-
-    property QtObject fileModel: model
-    property alias folder: folders.folder
-
-    color: "white"
-    width: 400
-    height: 500
-
-    smooth: true
-    radius: 5
-    anchors.centerIn: parent
-
-    border {
-        width: 1
-        color: "#bfbfbf"
-    }
-
-    BorderImage {
-        source: "../icons/titlebar.png";
-        width: parent.width;
-        height: 50
-        y: -7
-        id: titleBar
-
-        anchors {
-            top: parent.top
-            bottom: folderListView.top
-        }
-        Rectangle {
-            id: upButton
-            width: 48
-            height: titleBar.height - 7
-            color: "transparent"
-            Image { anchors.centerIn: parent; source: "../icons/up.png" }
-            MouseArea { id: upRegion; anchors.centerIn: parent
-                width: 48
-                height: 48
-                onClicked: if (folders.parentFolder != "") up()
-            }
-        }
-
-        Rectangle {
-            color: "gray"
-            x: 48
-            width: 1
-            height: 44
-        }
-
-        Text {
-            anchors {
-                left: upButton.right
-                right: parent.right
-                leftMargin: 4
-                rightMargin: 4
-            }
-
-            height: parent.height
-            text: folders.folder
-            color: "white"
-            elide: Text.ElideLeft;
-            horizontalAlignment: Text.AlignLeft;
-            verticalAlignment: Text.AlignVCenter
-            font.pixelSize: 24
-        }
-    }
-
-    ListView {
-        id: folderListView
-
-        width: parent.width
-        height: 400
-        anchors.centerIn: parent
-        spacing: 2
-        clip: true
-
-        FolderListModel {
-            id: folders
-        }
-
-        Component {
-            id: fileDelegate
-
-            Rectangle {
-                function selected() {
-                    if (folders.isFolder(index))
-                        openFolder(filePath);
-                    else {
-
-                        if (fileModel.allowMultipleFiles) {
-                            checkbox.checked = !checkbox.checked
-
-                            if (checkbox.checked)
-                                MultiSelect.addValue(filePath)
-                            else
-                                MultiSelect.removeValue(filePath)
-                        }
-                        else
-                            fileModel.accept(filePath)
-                    }
-                }
-
-                height: 50
-                width: parent.width
-                color: folders.isFolder(index) ? "lightgray": "darkgray"
-
-                Item {
-                    width: 50
-                    height: 48
-                    Image {
-                        source: "../icons/folder.png"
-                        anchors.centerIn: parent
-                        visible: folders.isFolder(index)
-                    }
-                }
-
-                Text {
-                    id: fileNameText
-                    anchors.centerIn: parent
-                    anchors.leftMargin: 20
-                    width: 300
-                    text: fileName
-                    elide: Text.ElideLeft;
-                }
-
-                CheckBox {
-                    id: checkbox
-
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    checked: MultiSelect.isSelected(filePath)
-                    visible: fileModel.allowMultipleFiles && !folders.isFolder(index)
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: selected();
-                }
-            }
-        }
-        model: folders
-        delegate: fileDelegate
-    }
-
-    Rectangle {
-        id: button
-
-        height: 50
-
-        border {
-            width: 1
-            color: "#bfbfbf"
-        }
-
-        anchors {
-            bottom: parent.bottom
-            top: folderListView.bottom
-            left: parent.left
-            right: parent.right
-        }
-
-        Row {
-            id: buttonRow
-            spacing: 10
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-
-            DialogButton {
-                id: cancel
-                text: "Cancel"
-                onClicked: fileModel.reject()
-            }
-
-            DialogButton {
-                id: accept
-                text: "Ok"
-                visible: fileModel.allowMultipleFiles
-                onClicked:
-                    fileModel.accept(MultiSelect.selectedValues());
-            }
-        }
-    }
-
-    function openFolder(path) {
-        folders.folder = path;
-    }
-
-    function up() {
-        folders.folder = folders.parentFolder;
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/ItemSelector.qml b/Tools/MiniBrowser/qt/qml/ItemSelector.qml
deleted file mode 100644 (file)
index 6288d22..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-MouseArea {
-    // To avoid conflicting with ListView.model when inside ListView context.
-    property QtObject selectorModel: model
-    anchors.fill: parent
-    onClicked: selectorModel.reject()
-
-    Rectangle {
-        clip: true
-        width: 200
-        height: Math.min(listView.contentItem.height + listView.anchors.topMargin + listView.anchors.bottomMargin
-                         , Math.max(selectorModel.elementRect.y, parent.height - selectorModel.elementRect.y - selectorModel.elementRect.height))
-        x: (selectorModel.elementRect.x + 200 > parent.width) ? parent.width - 200 : selectorModel.elementRect.x
-        y: (selectorModel.elementRect.y + selectorModel.elementRect.height + height < parent.height ) ? selectorModel.elementRect.y + selectorModel.elementRect.height
-                                                         : selectorModel.elementRect.y - height;
-        radius: 5
-        color: "gainsboro"
-        opacity: 0.8
-
-        ListView {
-            id: listView
-            anchors.fill: parent
-            anchors.margins: 10
-            spacing: 5
-            model: selectorModel.items
-
-            delegate: Rectangle {
-                color: model.selected ? "gold" : "silver"
-                height: 50
-                width: parent.width
-
-                Text {
-                    anchors.centerIn: parent
-                    text: model.text
-                    color: model.enabled ? "black" : "gainsboro"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    enabled: model.enabled
-                    onClicked: selectorModel.accept(model.index)
-                }
-            }
-
-            section.property: "group"
-            section.delegate: Rectangle {
-                height: 30
-                width: parent.width
-                color: "silver"
-                Text {
-                    anchors.centerIn: parent
-                    text: section
-                    font.bold: true
-                }
-            }
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/MockTouchPoint.qml b/Tools/MiniBrowser/qt/qml/MockTouchPoint.qml
deleted file mode 100644 (file)
index 4cc5c2c..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Item {
-    id: mockTouchPoint
-
-    property bool pressed: false
-    property int pointId: 0
-
-    Image {
-        source: "../icons/touchpoint.png"
-        x: -(width / 2)
-        y: -(height / 2)
-        height: parent.height
-        width: parent.width
-        opacity: parent.pressed ? 0.6 : 0.0
-
-        Behavior on opacity {
-            NumberAnimation { duration: 200 }
-        }
-
-        Text {
-            text: mockTouchPoint.pointId
-            anchors.centerIn: parent
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/PromptDialog.qml b/Tools/MiniBrowser/qt/qml/PromptDialog.qml
deleted file mode 100644 (file)
index acc5946..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Dialog {
-    id: dialog
-
-    title: "JavaScript Prompt"
-    message: model.message
-
-    height: 180
-
-    DialogLineInput {
-        id: input
-        width: dialog.width - 30
-        text: model.defaultValue
-
-        onAccepted: model.accept(input.text)
-    }
-
-    Row {
-        id: buttonRow
-        spacing: 5
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        DialogButton {
-            text: "OK"
-            onClicked: model.accept(input.text)
-        }
-
-        DialogButton {
-            text: "Cancel"
-            onClicked: model.reject()
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/ProxyAuthenticationDialog.qml b/Tools/MiniBrowser/qt/qml/ProxyAuthenticationDialog.qml
deleted file mode 100644 (file)
index ae27f26..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-AuthenticationDialog {
-    id: dialog
-
-    title: "Proxy authentication required."
-    message: model.hostname + ":" + model.port + " requires authentication."
-}
diff --git a/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml b/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml
deleted file mode 100644 (file)
index 9f100be..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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.
- */
-
-import QtQuick 2.0
-
-Item {
-    id: root
-
-    property Flickable flickableItem
-
-    anchors {
-        fill: flickableItem
-        margins: 5
-    }
-
-    property bool __movingHorizontally: flickableItem ? flickableItem.movingHorizontally : false
-    property bool __movingVertically: flickableItem ? flickableItem.movingVertically : false
-
-    property real __viewWidth:  flickableItem ? flickableItem.width - (anchors.margins * 2) : 0
-    property real __viewHeight:  flickableItem ? flickableItem.height - (anchors.margins * 2) : 0
-
-    property int __hideTimeout: 800
-    property real __indicatorSize: 5
-    property real __indicatorBorder: 1
-
-    Item {
-        id: horizontalIndicator
-        opacity: 0
-
-        width: __viewWidth - __indicatorSize
-        height: __indicatorSize
-
-        anchors.bottom: root.bottom
-
-        Rectangle {
-            radius: 10
-            color: "black"
-            border.color: "gray"
-            border.width: 1
-            opacity: 0.5
-            smooth: true
-
-            width: flickableItem ? flickableItem.visibleArea.widthRatio * horizontalIndicator.width: 0;
-            height: __indicatorSize
-
-            x: flickableItem ? Math.min(parent.width - width, Math.max(0, flickableItem.visibleArea.xPosition * horizontalIndicator.width)) : 0;
-            y: 0
-        }
-
-        states: [
-            State {
-                name: "show"
-                when: __movingHorizontally
-                PropertyChanges {
-                    target: horizontalIndicator
-                    opacity: 1
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                NumberAnimation {
-                    target: horizontalIndicator
-                    properties: "opacity"
-                    duration: __hideTimeout
-                }
-            }
-        ]
-    }
-
-    Item {
-        id: verticalIndicator
-        opacity: 0
-
-        width: __indicatorSize
-        height: __viewHeight - __indicatorSize
-
-        anchors.right: root.right
-
-        Rectangle {
-            radius: 10
-            color: "black"
-            border.color: "gray"
-            border.width: 1
-            opacity: 0.5
-            smooth: true;
-
-            width: __indicatorSize
-            height: flickableItem ? flickableItem.visibleArea.heightRatio * verticalIndicator.height : 0;
-
-            x: 0
-            y: flickableItem ? Math.min(parent.height - height, Math.max(0, flickableItem.visibleArea.yPosition * verticalIndicator.height)) : 0
-        }
-
-        states: [
-            State {
-                name: "show"
-                when: __movingVertically
-                PropertyChanges {
-                    target: verticalIndicator
-                    opacity: 1
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                NumberAnimation {
-                    target: verticalIndicator
-                    properties: "opacity"
-                    duration: __hideTimeout
-                }
-            }
-        ]
-    }
-}
diff --git a/Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml b/Tools/MiniBrowser/qt/qml/ViewportInfoItem.qml
deleted file mode 100644 (file)
index 684cc70..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-import QtQuick 2.0
-import QtWebKit 3.0
-
-Item {
-    property var test
-    property var preferredMinimumContentsWidth
-
-    function formatScale(value) {
-        return "<b>" + parseFloat(value.toFixed(4)) + "</b>x";
-    }
-
-    function formatSize(value) {
-        return "<b>" + value.width.toFixed() + "x" + value.height.toFixed() + "</b>px"
-    }
-
-    function formatBool(value) {
-        return "<b>" + (value ? "yes" : "no") + "</b>"
-    }
-
-    Rectangle {
-        id: title;
-
-        anchors {
-            top: parent.top
-            left: parent.left
-            margins: 10
-        }
-
-        height: 50
-        width: 250
-
-        color: "blue"
-
-        Text {
-            id: viewportInfoLabel
-
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-                leftMargin: 10
-            }
-
-            text: "Viewport Info"
-            color: "white"
-            font.family: "Nokia Pure"
-            font.pointSize: 24
-        }
-    }
-
-    Rectangle {
-        color: "gray"
-        opacity: 0.9
-
-        anchors {
-            top: title.bottom
-            left: title.left
-            topMargin: 10
-        }
-
-        width: 340
-        height: 270
-
-        Item {
-            id: textBox
-
-            anchors {
-                fill: parent
-                margins: 10
-            }
-
-            property string fontFamily: "Nokia Pure"
-            property color fontColor: "black"
-
-            Column {
-                anchors.fill: parent
-                spacing: 20
-                Column {
-                    Text {
-                        text: "Current scale: " + formatScale(test.contentsScale)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                }
-
-                Column {
-                    Text {
-                        text: "Minimum scale: " + formatScale(test.viewport.minimumScale)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                    Text {
-                        text: "Maximum scale: " + formatScale(test.viewport.maximumScale)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                }
-
-                Column {
-                    Text {
-                        text: "Device pixel ratio: " + formatScale(test.devicePixelRatio)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                    Text {
-                        text: "Contents size: " + formatSize(test.contentsSize)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                    Text {
-                        text: "Viewport layout size: " + formatSize(test.viewport.layoutSize)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                }
-
-                Column {
-                    Text {
-                        text: "Adapt for small screens: " + formatBool(preferredMinimumContentsWidth)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                    Text {
-                        text: "Allows scaling: " + formatBool(test.viewport.isScalable)
-                        font.family: textBox.fontFamily
-                        color: textBox.fontColor
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/Tools/MiniBrowser/qt/raw/DerivedSources.pri b/Tools/MiniBrowser/qt/raw/DerivedSources.pri
deleted file mode 100644 (file)
index dc4d2f4..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = derived
-
-# Make sure forwarded headers needed by this project are present
-fwheader_generator.commands = perl $${ROOT_WEBKIT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl $${ROOT_WEBKIT_DIR}/Tools/WebKitTestRunner $${ROOT_BUILD_DIR}/Source/include qt
-fwheader_generator.depends  = $${ROOT_WEBKIT_DIR}/Source/WebKit2/Scripts/generate-forwarding-headers.pl
-GENERATORS += fwheader_generator
diff --git a/Tools/MiniBrowser/qt/raw/MiniBrowserRaw.pro b/Tools/MiniBrowser/qt/raw/MiniBrowserRaw.pro
deleted file mode 100644 (file)
index 0503104..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-derived_sources.file = DerivedSources.pri
-target.file = Target.pri
-
-SUBDIRS = derived_sources target
-
-addStrictSubdirOrderBetween(derived_sources, target)
diff --git a/Tools/MiniBrowser/qt/raw/Target.pri b/Tools/MiniBrowser/qt/raw/Target.pri
deleted file mode 100644 (file)
index afc38ce..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE = app
-TARGET = MiniBrowserRaw
-
-HEADERS += \
-    View.h
-
-SOURCES += \
-    View.cpp
-
-DESTDIR = $${ROOT_BUILD_DIR}/bin
-
-QT = core gui network webkitwidgets
-
-WEBKIT += wtf javascriptcore webkit2
diff --git a/Tools/MiniBrowser/qt/raw/View.cpp b/Tools/MiniBrowser/qt/raw/View.cpp
deleted file mode 100644 (file)
index 4c4d528..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-    Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include "View.h"
-
-#include <QDebug>
-#include <QExposeEvent>
-#include <QGuiApplication>
-#include <QKeyEvent>
-#include <QMatrix4x4>
-#include <QResizeEvent>
-#include <QUrl>
-
-#include <WebKit2/WKContext.h>
-#include <WebKit2/WKPageGroup.h>
-#include <WebKit2/WKPreferences.h>
-#include <WebKit2/WKPreferencesPrivate.h>
-#include <WebKit2/WKStringQt.h>
-#include <WebKit2/WKURL.h>
-
-
-static WKContextRef createWebContext()
-{
-    return WKContextCreate();
-}
-
-static WKPageGroupRef createWebPageGroup(const QString& name)
-{
-    WKPageGroupRef pageGroup =WKPageGroupCreateWithIdentifier(WKStringCreateWithQString(name));
-    WKPreferencesRef preferences = WKPageGroupGetPreferences(pageGroup);
-    WKPreferencesSetAcceleratedCompositingEnabled(preferences, true);
-    WKPreferencesSetFrameFlatteningEnabled(preferences, true);
-
-    return pageGroup;
-}
-
-View::~View()
-{
-    delete m_context;
-    delete m_webView;
-}
-
-View::View(const QString& url)
-    : m_url(url)
-    , m_active(false)
-{
-    setSurfaceType(OpenGLSurface);
-    setGeometry(50, 50, 980, 600);
-    setFlags(Qt::Window | Qt::WindowTitleHint);
-    create();
-
-    m_context = new QOpenGLContext;
-    m_contex