| 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 WebViewImpl* WebViewHelper::initializeWithOpener(WebFrame* opener, bool enableJa
vascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient,
TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*)) | 192 WebViewImpl* WebViewHelper::initializeWithOpener(WebFrame* opener, bool enableJa
vascript, TestWebFrameClient* webFrameClient, TestWebViewClient* webViewClient,
TestWebWidgetClient* webWidgetClient, void (*updateSettingsFunc)(WebSettings*)) |
| 193 { | 193 { |
| 194 reset(); | 194 reset(); |
| 195 | 195 |
| 196 if (!webFrameClient) | 196 if (!webFrameClient) |
| 197 webFrameClient = defaultWebFrameClient(); | 197 webFrameClient = defaultWebFrameClient(); |
| 198 if (!webViewClient) | 198 if (!webViewClient) |
| 199 webViewClient = defaultWebViewClient(); | 199 webViewClient = defaultWebViewClient(); |
| 200 if (!webWidgetClient) | 200 if (!webWidgetClient) |
| 201 webWidgetClient = webViewClient->widgetClient(); | 201 webWidgetClient = webViewClient->widgetClient(); |
| 202 m_webView = WebViewImpl::create(webViewClient); | 202 m_webView = WebViewImpl::create(webViewClient, true); |
| 203 m_webView->settings()->setJavaScriptEnabled(enableJavascript); | 203 m_webView->settings()->setJavaScriptEnabled(enableJavascript); |
| 204 m_webView->settings()->setPluginsEnabled(true); | 204 m_webView->settings()->setPluginsEnabled(true); |
| 205 // Enable (mocked) network loads of image URLs, as this simplifies | 205 // Enable (mocked) network loads of image URLs, as this simplifies |
| 206 // the completion of resource loads upon test shutdown & helps avoid | 206 // the completion of resource loads upon test shutdown & helps avoid |
| 207 // dormant loads trigger Resource leaks for image loads. | 207 // dormant loads trigger Resource leaks for image loads. |
| 208 // | 208 // |
| 209 // Consequently, all external image resources must be mocked. | 209 // Consequently, all external image resources must be mocked. |
| 210 m_webView->settings()->setLoadsImagesAutomatically(true); | 210 m_webView->settings()->setLoadsImagesAutomatically(true); |
| 211 if (updateSettingsFunc) | 211 if (updateSettingsFunc) |
| 212 updateSettingsFunc(m_webView->settings()); | 212 updateSettingsFunc(m_webView->settings()); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 m_frame->close(); | 304 m_frame->close(); |
| 305 } | 305 } |
| 306 | 306 |
| 307 void TestWebViewClient::initializeLayerTreeView() | 307 void TestWebViewClient::initializeLayerTreeView() |
| 308 { | 308 { |
| 309 m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting); | 309 m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting); |
| 310 } | 310 } |
| 311 | 311 |
| 312 } // namespace FrameTestHelpers | 312 } // namespace FrameTestHelpers |
| 313 } // namespace blink | 313 } // namespace blink |
| OLD | NEW |