| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/renderer/webkit_test_runner.h" | 5 #include "content/shell/renderer/webkit_test_runner.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <clocale> | 8 #include <clocale> |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" | 50 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" |
| 51 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 51 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 52 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" | 52 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" |
| 53 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h" | 53 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h" |
| 54 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 54 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 55 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
Task.h" | 55 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
Task.h" |
| 56 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestInterfaces.h" | 56 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestInterfaces.h" |
| 57 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestProxy.h" | 57 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestProxy.h" |
| 58 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestRunner.h" | 58 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web
TestRunner.h" |
| 59 #include "ui/gfx/rect.h" | 59 #include "ui/gfx/rect.h" |
| 60 #include "webkit/base/file_path_string_conversions.h" | 60 #include "webkit/common/base/file_path_string_conversions.h" |
| 61 #include "webkit/common/webpreferences.h" | 61 #include "webkit/common/webpreferences.h" |
| 62 #include "webkit/glue/webkit_glue.h" | 62 #include "webkit/glue/webkit_glue.h" |
| 63 #include "webkit/mocks/test_media_stream_client.h" | 63 #include "webkit/mocks/test_media_stream_client.h" |
| 64 #include "webkit/renderer/media/webmediaplayer_impl.h" | 64 #include "webkit/renderer/media/webmediaplayer_impl.h" |
| 65 #include "webkit/renderer/media/webmediaplayer_ms.h" | 65 #include "webkit/renderer/media/webmediaplayer_ms.h" |
| 66 #include "webkit/renderer/media/webmediaplayer_params.h" | 66 #include "webkit/renderer/media/webmediaplayer_params.h" |
| 67 | 67 |
| 68 using WebKit::Platform; | 68 using WebKit::Platform; |
| 69 using WebKit::WebArrayBufferView; | 69 using WebKit::WebArrayBufferView; |
| 70 using WebKit::WebContextMenuData; | 70 using WebKit::WebContextMenuData; |
| (...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 722 ->loadRequest(WebURLRequest(GURL("about:blank"))); | 722 ->loadRequest(WebURLRequest(GURL("about:blank"))); |
| 723 Send(new ShellViewHostMsg_ResetDone(routing_id())); | 723 Send(new ShellViewHostMsg_ResetDone(routing_id())); |
| 724 } | 724 } |
| 725 | 725 |
| 726 void WebKitTestRunner::OnNotifyDone() { | 726 void WebKitTestRunner::OnNotifyDone() { |
| 727 render_view()->GetWebView()->mainFrame()->executeScript( | 727 render_view()->GetWebView()->mainFrame()->executeScript( |
| 728 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();"))); | 728 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();"))); |
| 729 } | 729 } |
| 730 | 730 |
| 731 } // namespace content | 731 } // namespace content |
| OLD | NEW |