diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 21:21:22 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 21:21:22 +0000 |
| commit | 4432769ac309c0c14eeed2769cbbfabef7f9e59a (patch) | |
| tree | d91e06840aa03f0c412077da168be4c0e8b7c682 /content/browser/gpu/gpu_data_manager_impl.h | |
| parent | fef2673b5a02496db07a537143b90a81e6efd055 (diff) | |
| download | chromium_src-4432769ac309c0c14eeed2769cbbfabef7f9e59a.zip chromium_src-4432769ac309c0c14eeed2769cbbfabef7f9e59a.tar.gz chromium_src-4432769ac309c0c14eeed2769cbbfabef7f9e59a.tar.bz2 | |
Fix layering violation in content\browser\renderer_host. That directory shouldn't be including web_contents.
It looks like this regressed because we forgot to update the DEPS exclusion after the tab_contents->web_contents rename. I've fixed the non test case, added exclusion for tests, and put a temporary workaround for the media subdirectory.
It seems that the media subdirectory should move to content\browser since it has dependencies on web_contents.
Review URL: https://codereview.chromium.org/12319119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_data_manager_impl.h')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index e41f191..c862ab0 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h @@ -22,6 +22,7 @@ #include "content/public/browser/gpu_data_manager.h" #include "content/public/common/gpu_info.h" #include "content/public/common/gpu_memory_stats.h" +#include "content/public/common/three_d_api_types.h" class CommandLine; class GURL; @@ -146,7 +147,10 @@ class CONTENT_EXPORT GpuDataManagerImpl // Note that the unblocking API must be part of the content API // because it is called from Chrome side code. void BlockDomainFrom3DAPIs(const GURL& url, DomainGuilt guilt); - DomainBlockStatus Are3DAPIsBlocked(const GURL& url) const; + bool Are3DAPIsBlocked(const GURL& url, + int render_process_id, + int render_view_id, + ThreeDAPIType requester); // Disables domain blocking for 3D APIs. For use only in tests. void DisableDomainBlockingFor3DAPIsForTesting(); @@ -218,6 +222,11 @@ class CONTENT_EXPORT GpuDataManagerImpl const GURL& url, base::Time at_time) const; int64 GetBlockAllDomainsDurationInMs() const; + void Notify3DAPIBlocked(const GURL& url, + int render_process_id, + int render_view_id, + ThreeDAPIType requester); + bool complete_gpu_info_already_requested_; GpuFeatureType blacklisted_features_; |