Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1547793004: Make gpu black list work again on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add a new commandline switch to prevent full gpu info collection in the test Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 1877 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 GpuChannelHost* RenderThreadImpl::GetGpuChannel() { 1888 GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
1889 if (!gpu_channel_.get()) 1889 if (!gpu_channel_.get())
1890 return NULL; 1890 return NULL;
1891 1891
1892 if (gpu_channel_->IsLost()) 1892 if (gpu_channel_->IsLost())
1893 return NULL; 1893 return NULL;
1894 1894
1895 return gpu_channel_.get(); 1895 return gpu_channel_.get();
1896 } 1896 }
1897 1897
1898 bool RenderThreadImpl::HasGpuProcess() {
1899 bool hasGpuProcess = false;
1900 if (!Send(new GpuHostMsg_HasGpuProcess(&hasGpuProcess)))
1901 return false;
1902
1903 return hasGpuProcess;
1904 }
1905
1898 #if defined(ENABLE_PLUGINS) 1906 #if defined(ENABLE_PLUGINS)
1899 void RenderThreadImpl::OnPurgePluginListCache(bool reload_pages) { 1907 void RenderThreadImpl::OnPurgePluginListCache(bool reload_pages) {
1900 EnsureWebKitInitialized(); 1908 EnsureWebKitInitialized();
1901 // The call below will cause a GetPlugins call with refresh=true, but at this 1909 // The call below will cause a GetPlugins call with refresh=true, but at this
1902 // point we already know that the browser has refreshed its list, so disable 1910 // point we already know that the browser has refreshed its list, so disable
1903 // refresh temporarily to prevent each renderer process causing the list to be 1911 // refresh temporarily to prevent each renderer process causing the list to be
1904 // regenerated. 1912 // regenerated.
1905 blink_platform_impl_->set_plugin_refresh_allowed(false); 1913 blink_platform_impl_->set_plugin_refresh_allowed(false);
1906 blink::resetPluginCache(reload_pages); 1914 blink::resetPluginCache(reload_pages);
1907 blink_platform_impl_->set_plugin_refresh_allowed(true); 1915 blink_platform_impl_->set_plugin_refresh_allowed(true);
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
2146 } 2154 }
2147 2155
2148 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2156 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2149 size_t erased = 2157 size_t erased =
2150 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2158 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2151 routing_id_); 2159 routing_id_);
2152 DCHECK_EQ(1u, erased); 2160 DCHECK_EQ(1u, erased);
2153 } 2161 }
2154 2162
2155 } // namespace content 2163 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698