| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "FrameTestHelpers.h" | 32 #include "FrameTestHelpers.h" |
| 33 | 33 |
| 34 #include "URLTestHelpers.h" | 34 #include "URLTestHelpers.h" |
| 35 #include "wtf/StdLibExtras.h" | 35 #include "WebLocalFrameImpl.h" |
| 36 #include "WebFrameImpl.h" | |
| 37 #include "WebSettings.h" | 36 #include "WebSettings.h" |
| 38 #include "WebViewClient.h" | 37 #include "WebViewClient.h" |
| 39 #include "public/platform/Platform.h" | 38 #include "public/platform/Platform.h" |
| 40 #include "public/platform/WebString.h" | 39 #include "public/platform/WebString.h" |
| 41 #include "public/platform/WebThread.h" | 40 #include "public/platform/WebThread.h" |
| 42 #include "public/platform/WebURLRequest.h" | 41 #include "public/platform/WebURLRequest.h" |
| 43 #include "public/platform/WebURLResponse.h" | 42 #include "public/platform/WebURLResponse.h" |
| 44 #include "public/platform/WebUnitTestSupport.h" | 43 #include "public/platform/WebUnitTestSupport.h" |
| 44 #include "wtf/StdLibExtras.h" |
| 45 | 45 |
| 46 namespace blink { | 46 namespace blink { |
| 47 namespace FrameTestHelpers { | 47 namespace FrameTestHelpers { |
| 48 | 48 |
| 49 namespace { | 49 namespace { |
| 50 | 50 |
| 51 class QuitTask : public WebThread::Task { | 51 class QuitTask : public WebThread::Task { |
| 52 public: | 52 public: |
| 53 void PostThis(WebCore::Timer<QuitTask>*) | 53 void PostThis(WebCore::Timer<QuitTask>*) |
| 54 { | 54 { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 webViewClient = defaultWebViewClient(); | 115 webViewClient = defaultWebViewClient(); |
| 116 m_webView = WebViewImpl::create(webViewClient); | 116 m_webView = WebViewImpl::create(webViewClient); |
| 117 m_webView->settings()->setJavaScriptEnabled(enableJavascript); | 117 m_webView->settings()->setJavaScriptEnabled(enableJavascript); |
| 118 if (updateSettingsFunc) { | 118 if (updateSettingsFunc) { |
| 119 updateSettingsFunc(m_webView->settings()); | 119 updateSettingsFunc(m_webView->settings()); |
| 120 } else { | 120 } else { |
| 121 m_webView->settings()->setDeviceSupportsMouse(false); | 121 m_webView->settings()->setDeviceSupportsMouse(false); |
| 122 m_webView->settings()->setForceCompositingMode(true); | 122 m_webView->settings()->setForceCompositingMode(true); |
| 123 } | 123 } |
| 124 | 124 |
| 125 m_webView->setMainFrame(WebFrameImpl::create(webFrameClient)); | 125 m_webView->setMainFrame(WebLocalFrameImpl::create(webFrameClient)); |
| 126 | 126 |
| 127 return m_webView; | 127 return m_webView; |
| 128 } | 128 } |
| 129 | 129 |
| 130 WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enabl
eJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient, void
(*updateSettingsFunc)(WebSettings*)) | 130 WebViewImpl* WebViewHelper::initializeAndLoad(const std::string& url, bool enabl
eJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient, void
(*updateSettingsFunc)(WebSettings*)) |
| 131 { | 131 { |
| 132 initialize(enableJavascript, webFrameClient, webViewClient, updateSettingsFu
nc); | 132 initialize(enableJavascript, webFrameClient, webViewClient, updateSettingsFu
nc); |
| 133 | 133 |
| 134 loadFrame(webView()->mainFrame(), url); | 134 loadFrame(webView()->mainFrame(), url); |
| 135 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); | 135 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 155 void TestWebFrameClient::frameDetached(WebFrame* frame) | 155 void TestWebFrameClient::frameDetached(WebFrame* frame) |
| 156 { | 156 { |
| 157 if (frame->parent()) | 157 if (frame->parent()) |
| 158 frame->parent()->removeChild(frame); | 158 frame->parent()->removeChild(frame); |
| 159 frame->close(); | 159 frame->close(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 | 162 |
| 163 } // namespace FrameTestHelpers | 163 } // namespace FrameTestHelpers |
| 164 } // namespace blink | 164 } // namespace blink |
| OLD | NEW |