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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
243 WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient
* webFrameClient, WebViewClient* webViewClient, void (*updateSettingsFunc)(WebSe
ttings*)) | 243 WebViewImpl* WebViewHelper::initialize(bool enableJavascript, TestWebFrameClient
* webFrameClient, WebViewClient* webViewClient, void (*updateSettingsFunc)(WebSe
ttings*)) |
244 { | 244 { |
245 reset(); | 245 reset(); |
246 | 246 |
247 if (!webFrameClient) | 247 if (!webFrameClient) |
248 webFrameClient = defaultWebFrameClient(); | 248 webFrameClient = defaultWebFrameClient(); |
249 if (!webViewClient) | 249 if (!webViewClient) |
250 webViewClient = defaultWebViewClient(); | 250 webViewClient = defaultWebViewClient(); |
251 m_webView = WebViewImpl::create(webViewClient); | 251 m_webView = WebViewImpl::create(webViewClient); |
252 m_webView->settings()->setJavaScriptEnabled(enableJavascript); | 252 m_webView->settings()->setJavaScriptEnabled(enableJavascript); |
| 253 m_webView->settings()->setPluginsEnabled(true); |
253 if (updateSettingsFunc) | 254 if (updateSettingsFunc) |
254 updateSettingsFunc(m_webView->settings()); | 255 updateSettingsFunc(m_webView->settings()); |
255 else | 256 else |
256 m_webView->settings()->setDeviceSupportsMouse(false); | 257 m_webView->settings()->setDeviceSupportsMouse(false); |
257 if (m_settingOverrider) | 258 if (m_settingOverrider) |
258 m_settingOverrider->overrideSettings(m_webView->settings()); | 259 m_settingOverrider->overrideSettings(m_webView->settings()); |
259 | 260 |
260 m_webView->setDefaultPageScaleLimits(1, 4); | 261 m_webView->setDefaultPageScaleLimits(1, 4); |
261 m_webView->setMainFrame(WebLocalFrameImpl::create(WebTreeScopeType::Document
, webFrameClient)); | 262 m_webView->setMainFrame(WebLocalFrameImpl::create(WebTreeScopeType::Document
, webFrameClient)); |
262 | 263 |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 } | 339 } |
339 | 340 |
340 void TestWebViewClient::initializeLayerTreeView() | 341 void TestWebViewClient::initializeLayerTreeView() |
341 { | 342 { |
342 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); | 343 m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLay
erTreeViewForTesting()); |
343 ASSERT(m_layerTreeView); | 344 ASSERT(m_layerTreeView); |
344 } | 345 } |
345 | 346 |
346 } // namespace FrameTestHelpers | 347 } // namespace FrameTestHelpers |
347 } // namespace blink | 348 } // namespace blink |
OLD | NEW |