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/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
681 | 681 |
682 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); | 682 prefs.number_of_cpu_cores = base::SysInfo::NumberOfProcessors(); |
683 | 683 |
684 prefs.apply_page_scale_factor_in_compositor = | 684 prefs.apply_page_scale_factor_in_compositor = |
685 command_line.HasSwitch(switches::kEnablePinchInCompositor); | 685 command_line.HasSwitch(switches::kEnablePinchInCompositor); |
686 | 686 |
687 content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, url, &prefs); | 687 content::GetContentClient()->browser()->OverrideWebkitPrefs(rvh, url, &prefs); |
688 | 688 |
689 // Disable compositing in guests until we have compositing path implemented | 689 // Disable compositing in guests until we have compositing path implemented |
690 // for guests. | 690 // for guests. |
691 if (rvh->GetProcess()->IsGuest()) | 691 if (rvh->GetProcess()->IsGuest()) { |
692 prefs.force_compositing_mode = false; | 692 prefs.force_compositing_mode = false; |
| 693 prefs.accelerated_compositing_enabled = false; |
| 694 } |
693 | 695 |
694 return prefs; | 696 return prefs; |
695 } | 697 } |
696 | 698 |
697 RenderViewHostManager* WebContentsImpl::GetRenderManagerForTesting() { | 699 RenderViewHostManager* WebContentsImpl::GetRenderManagerForTesting() { |
698 return &render_manager_; | 700 return &render_manager_; |
699 } | 701 } |
700 | 702 |
701 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host, | 703 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host, |
702 const IPC::Message& message) { | 704 const IPC::Message& message) { |
(...skipping 2701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3404 } | 3406 } |
3405 } | 3407 } |
3406 | 3408 |
3407 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { | 3409 content::BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { |
3408 return browser_plugin_guest_.get(); | 3410 return browser_plugin_guest_.get(); |
3409 } | 3411 } |
3410 | 3412 |
3411 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { | 3413 content::BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { |
3412 return browser_plugin_embedder_.get(); | 3414 return browser_plugin_embedder_.get(); |
3413 } | 3415 } |
OLD | NEW |