Chromium Code Reviews| Index: content/browser/renderer_host/render_message_filter.cc |
| diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc |
| index 0611555a391cdb3ac8cd9df7eac5f27b05e77ce0..ef04d1569927369efb5005d64d1e248853274c56 100644 |
| --- a/content/browser/renderer_host/render_message_filter.cc |
| +++ b/content/browser/renderer_host/render_message_filter.cc |
| @@ -20,6 +20,7 @@ |
| #include "content/browser/dom_storage/dom_storage_context_impl.h" |
| #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
| #include "content/browser/download/download_stats.h" |
| +#include "content/browser/gpu/gpu_data_manager_impl.h" |
| #include "content/browser/plugin_process_host.h" |
| #include "content/browser/plugin_service_impl.h" |
| #include "content/browser/ppapi_plugin_process_host.h" |
| @@ -27,6 +28,7 @@ |
| #include "content/browser/renderer_host/render_view_host_delegate.h" |
| #include "content/browser/renderer_host/render_widget_helper.h" |
| #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" |
| +#include "content/browser/web_contents/web_contents_impl.h" |
| #include "content/common/child_process_host_impl.h" |
| #include "content/common/child_process_messages.h" |
| #include "content/common/desktop_notification_messages.h" |
| @@ -55,6 +57,8 @@ |
| #include "net/http/http_cache.h" |
| #include "net/url_request/url_request_context.h" |
| #include "net/url_request/url_request_context_getter.h" |
| +#include "third_party/khronos/GLES2/gl2.h" |
| +#include "third_party/khronos/GLES2/gl2ext.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" |
| #include "ui/gfx/color_profile.h" |
| #include "webkit/glue/webcookie.h" |
| @@ -191,6 +195,22 @@ class OpenChannelToPpapiBrokerCallback |
| int request_id_; |
| }; |
| +void RaiseInfobarForBlocked3DContentOnUIThread( |
| + int render_process_id, |
| + int render_view_id, |
| + const GURL& url, |
| + content::ThreeDAPIType requester) { |
| + RenderViewHost* rvh = RenderViewHost::FromID( |
| + render_process_id, render_view_id); |
| + if (!rvh) |
| + return; |
| + WebContentsImpl* web_contents = static_cast<WebContentsImpl*>( |
| + WebContents::FromRenderViewHost(rvh)); |
| + if (!web_contents) |
| + return; |
| + web_contents->DidBlock3DAPIs(url, requester); |
| +} |
| + |
| } // namespace |
| class RenderMessageFilter::OpenChannelToNpapiPluginCallback |
| @@ -394,6 +414,8 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message, |
| IPC_MESSAGE_HANDLER(ViewHostMsg_GetMonitorColorProfile, |
| OnGetMonitorColorProfile) |
| IPC_MESSAGE_HANDLER(ViewHostMsg_MediaLogEvent, OnMediaLogEvent) |
| + IPC_MESSAGE_HANDLER(ViewHostMsg_Are3DAPIsBlocked, OnAre3DAPIsBlocked) |
| + IPC_MESSAGE_HANDLER(ViewHostMsg_DidLose3DContext, OnDidLose3DContext) |
| IPC_MESSAGE_UNHANDLED(handled = false) |
| IPC_END_MESSAGE_MAP_EX() |
| @@ -1024,4 +1046,40 @@ void RenderMessageFilter::OnUpdateIsDelayed(const IPC::Message& msg) { |
| render_widget_helper_->DidReceiveBackingStoreMsg(msg); |
| } |
| +void RenderMessageFilter::OnAre3DAPIsBlocked(int render_view_id, |
| + const GURL& url, |
| + content::ThreeDAPIType requester, |
| + bool* blocked) { |
| + content::GpuDataManagerImpl::DomainBlockStatus block_status = |
|
jam
2012/11/15 16:57:25
nit: no "content::" here and below
Ken Russell (switch to Gerrit)
2012/11/15 20:53:25
Done.
|
| + content::GpuDataManagerImpl::GetInstance()->Are3DAPIsBlocked(url); |
| + *blocked = (block_status != |
| + content::GpuDataManagerImpl::DOMAIN_BLOCK_STATUS_NOT_BLOCKED); |
| + if (*blocked) { |
| + BrowserThread::PostTask( |
| + BrowserThread::UI, FROM_HERE, |
| + base::Bind(&RaiseInfobarForBlocked3DContentOnUIThread, |
| + render_process_id_, render_view_id, url, requester)); |
| + } |
| +} |
| + |
| +void RenderMessageFilter::OnDidLose3DContext( |
| + const GURL& url, |
| + content::ThreeDAPIType /* unused */, |
| + int arb_robustness_status_code) { |
| + content::GpuDataManagerImpl::DomainGuilt guilt; |
| + switch (arb_robustness_status_code) { |
| + case GL_GUILTY_CONTEXT_RESET_ARB: |
| + guilt = content::GpuDataManagerImpl::DOMAIN_GUILT_KNOWN; |
| + break; |
| + case GL_UNKNOWN_CONTEXT_RESET_ARB: |
| + guilt = content::GpuDataManagerImpl::DOMAIN_GUILT_UNKNOWN; |
| + break; |
| + default: |
| + // Ignore lost contexts known to be innocent. |
| + return; |
| + } |
| + |
| + content::GpuDataManagerImpl::GetInstance()->BlockDomainFrom3DAPIs(url, guilt); |
| +} |
| + |
| } // namespace content |