diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-30 16:58:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-30 17:03:09 +0100 |
| commit | 32ea33253afbbdefd2680aa95ab5f57455272ae7 (patch) | |
| tree | 2389569585b666c310fbb36d3fb8e6ab94462967 /Tools/DumpRenderTree | |
| parent | 41c25f231cbca1babc445187283524cc6c751c71 (diff) | |
| download | qtwebkit-32ea33253afbbdefd2680aa95ab5f57455272ae7.tar.gz | |
Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 (http://svn.webkit.org/repository/webkit/trunk@136242)
Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split
Extra fixes will be cherry-picked.
Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools/DumpRenderTree')
4 files changed, 8 insertions, 5 deletions
diff --git a/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp b/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp index 88143c0ba..40d3cb4ba 100644 --- a/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp +++ b/Tools/DumpRenderTree/chromium/MockWebSpeechRecognizer.cpp @@ -69,10 +69,11 @@ public: WebVector<float> confidences(static_cast<size_t>(1)); transcripts[0] = m_transcript; confidences[0] = m_confidence; - WebSpeechRecognitionResult res; - res.assign(transcripts, confidences, true); + WebVector<WebSpeechRecognitionResult> finalResults(static_cast<size_t>(1)); + WebVector<WebSpeechRecognitionResult> interimResults; + finalResults[0].assign(transcripts, confidences, true); - m_recognizer->client()->didReceiveResult(m_recognizer->handle(), res, 0, WebVector<WebSpeechRecognitionResult>()); + m_recognizer->client()->didReceiveResults(m_recognizer->handle(), finalResults, interimResults); } private: diff --git a/Tools/DumpRenderTree/chromium/WebPreferences.cpp b/Tools/DumpRenderTree/chromium/WebPreferences.cpp index e13939d32..f64a7b156 100644 --- a/Tools/DumpRenderTree/chromium/WebPreferences.cpp +++ b/Tools/DumpRenderTree/chromium/WebPreferences.cpp @@ -30,6 +30,7 @@ #include "config.h" #include "WebPreferences.h" +#include "WebRuntimeFeatures.h" #include "WebView.h" @@ -200,7 +201,7 @@ void WebPreferences::applyTo(WebView* webView) settings->setDefaultTextEncodingName(defaultTextEncodingName); settings->setDeveloperExtrasEnabled(developerExtrasEnabled); settings->setExperimentalWebGLEnabled(experimentalWebGLEnabled); - settings->setExperimentalCSSRegionsEnabled(experimentalCSSRegionsEnabled); + WebRuntimeFeatures::enableCSSRegions(experimentalCSSRegionsEnabled); settings->setExperimentalCSSGridLayoutEnabled(experimentalCSSGridLayoutEnabled); settings->setExperimentalCSSCustomFilterEnabled(cssCustomFilterEnabled); settings->setJavaEnabled(javaEnabled); diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.pro b/Tools/DumpRenderTree/qt/DumpRenderTree.pro index 0bd0b16a6..ff696d398 100644 --- a/Tools/DumpRenderTree/qt/DumpRenderTree.pro +++ b/Tools/DumpRenderTree/qt/DumpRenderTree.pro @@ -16,6 +16,7 @@ INCLUDEPATH += \ $$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 diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp index 88d8ae752..dea0edbc0 100755 --- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp +++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp @@ -915,7 +915,7 @@ void DumpRenderTree::dump() if (m_controller->shouldDumpAsText()) resultString = dumpFramesAsText(mainFrame); else { - resultString = mainFrame->renderTreeDump(); + resultString = DumpRenderTreeSupportQt::frameRenderTreeDump(mainFrame->handle()); resultString += dumpFrameScrollPosition(mainFrame); } if (!resultString.isEmpty()) { |