| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 #include "third_party/WebKit/public/web/WebDocument.h" | 53 #include "third_party/WebKit/public/web/WebDocument.h" |
| 54 #include "third_party/WebKit/public/web/WebElement.h" | 54 #include "third_party/WebKit/public/web/WebElement.h" |
| 55 #include "third_party/WebKit/public/web/WebFrame.h" | 55 #include "third_party/WebKit/public/web/WebFrame.h" |
| 56 #include "third_party/WebKit/public/web/WebHistoryItem.h" | 56 #include "third_party/WebKit/public/web/WebHistoryItem.h" |
| 57 #include "third_party/WebKit/public/web/WebKit.h" | 57 #include "third_party/WebKit/public/web/WebKit.h" |
| 58 #include "third_party/WebKit/public/web/WebScriptSource.h" | 58 #include "third_party/WebKit/public/web/WebScriptSource.h" |
| 59 #include "third_party/WebKit/public/web/WebTestingSupport.h" | 59 #include "third_party/WebKit/public/web/WebTestingSupport.h" |
| 60 #include "third_party/WebKit/public/web/WebView.h" | 60 #include "third_party/WebKit/public/web/WebView.h" |
| 61 #include "ui/gfx/rect.h" | 61 #include "ui/gfx/rect.h" |
| 62 #include "webkit/common/webpreferences.h" | 62 #include "webkit/common/webpreferences.h" |
| 63 #include "webkit/glue/webkit_glue.h" | |
| 64 | 63 |
| 65 using blink::Platform; | 64 using blink::Platform; |
| 66 using blink::WebArrayBufferView; | 65 using blink::WebArrayBufferView; |
| 67 using blink::WebContextMenuData; | 66 using blink::WebContextMenuData; |
| 68 using blink::WebDevToolsAgent; | 67 using blink::WebDevToolsAgent; |
| 69 using blink::WebDeviceMotionData; | 68 using blink::WebDeviceMotionData; |
| 70 using blink::WebDeviceOrientationData; | 69 using blink::WebDeviceOrientationData; |
| 71 using blink::WebElement; | 70 using blink::WebElement; |
| 72 using blink::WebFrame; | 71 using blink::WebFrame; |
| 73 using blink::WebGamepads; | 72 using blink::WebGamepads; |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 WebURLRequest(GURL(kAboutBlankURL))); | 695 WebURLRequest(GURL(kAboutBlankURL))); |
| 697 Send(new ShellViewHostMsg_ResetDone(routing_id())); | 696 Send(new ShellViewHostMsg_ResetDone(routing_id())); |
| 698 } | 697 } |
| 699 | 698 |
| 700 void WebKitTestRunner::OnNotifyDone() { | 699 void WebKitTestRunner::OnNotifyDone() { |
| 701 render_view()->GetWebView()->mainFrame()->executeScript( | 700 render_view()->GetWebView()->mainFrame()->executeScript( |
| 702 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();"))); | 701 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();"))); |
| 703 } | 702 } |
| 704 | 703 |
| 705 } // namespace content | 704 } // namespace content |
| OLD | NEW |