| Index: webkit/tools/test_shell/test_shell_gtk.cc
|
| ===================================================================
|
| --- webkit/tools/test_shell/test_shell_gtk.cc (revision 197949)
|
| +++ webkit/tools/test_shell/test_shell_gtk.cc (working copy)
|
| @@ -367,14 +367,6 @@
|
| return true;
|
| }
|
|
|
| -void TestShell::TestFinished() {
|
| - if(!test_is_pending_)
|
| - return;
|
| -
|
| - test_is_pending_ = false;
|
| - MessageLoop::current()->Quit();
|
| -}
|
| -
|
| void TestShell::SizeTo(int width, int height) {
|
| GtkWidget* widget = m_webViewHost->view_handle();
|
|
|
| @@ -400,34 +392,6 @@
|
| m_webViewHost->Resize(gfx::Size(width, height));
|
| }
|
|
|
| -static void AlarmHandler(int signatl) {
|
| - // If the alarm alarmed, kill the process since we have a really bad hang.
|
| - puts("\n#TEST_TIMED_OUT\n");
|
| - puts("#EOF\n");
|
| - fflush(stdout);
|
| - TestShell::ShutdownTestShell();
|
| - exit(0);
|
| -}
|
| -
|
| -void TestShell::WaitTestFinished() {
|
| - DCHECK(!test_is_pending_) << "cannot be used recursively";
|
| -
|
| - test_is_pending_ = true;
|
| -
|
| - // Install an alarm signal handler that will kill us if we time out.
|
| - signal(SIGALRM, AlarmHandler);
|
| - alarm(GetLayoutTestTimeoutForWatchDog() / 1000);
|
| -
|
| - // TestFinished() will post a quit message to break this loop when the page
|
| - // finishes loading.
|
| - while (test_is_pending_)
|
| - MessageLoop::current()->Run();
|
| -
|
| - // Remove the alarm.
|
| - alarm(0);
|
| - signal(SIGALRM, SIG_DFL);
|
| -}
|
| -
|
| void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) {
|
| GtkWidget* widget = GTK_WIDGET(host->view_handle());
|
|
|
|
|