diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebKitTools/DumpRenderTree/chromium/TestShell.cpp | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebKitTools/DumpRenderTree/chromium/TestShell.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/chromium/TestShell.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp index e4229fe..24a895a 100644 --- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp +++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp @@ -85,6 +85,7 @@ TestShell::TestShell() m_eventSender.set(new EventSender(this)); m_plainTextController.set(new PlainTextController()); m_textInputController.set(new TextInputController(this)); + m_notificationPresenter.set(new NotificationPresenter(this)); m_webViewHost = createWebView(); m_webView = m_webViewHost->webView(); @@ -131,6 +132,7 @@ void TestShell::resetWebSettings(WebView& webView) settings->setSerifFontFamily(serif); settings->setStandardFontFamily(serif); settings->setFixedFontFamily(WebString::fromUTF8("Courier")); + settings->setSansSerifFontFamily(WebString::fromUTF8("Helvetica")); settings->setDefaultTextEncodingName(WebString::fromUTF8("ISO-8859-1")); settings->setDefaultFontSize(16); @@ -175,6 +177,7 @@ void TestShell::resetWebSettings(WebView& webView) void TestShell::runFileTest(const TestParams& params) { + ASSERT(params.testUrl.isValid()); m_testIsPreparing = true; m_params = params; string testUrl = m_params.testUrl.spec(); @@ -212,6 +215,7 @@ void TestShell::resetTestController() m_layoutTestController->reset(); m_eventSender->reset(); m_webViewHost->reset(); + m_notificationPresenter->reset(); } void TestShell::loadURL(const WebURL& url) |