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/public/browser/gpu_data_manager_observer.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/public/browser/gpu_data_manager_observer.h')
-rw-r--r-- | content/public/browser/gpu_data_manager_observer.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/content/public/browser/gpu_data_manager_observer.h b/content/public/browser/gpu_data_manager_observer.h index c5b1b3d..1db650b 100644 --- a/content/public/browser/gpu_data_manager_observer.h +++ b/content/public/browser/gpu_data_manager_observer.h @@ -7,6 +7,9 @@ #include "content/common/content_export.h" #include "content/public/common/gpu_memory_stats.h" +#include "content/public/common/three_d_api_types.h" + +class GURL; namespace content { @@ -15,11 +18,18 @@ namespace content { class GpuDataManagerObserver { public: // Called for any observers whenever there is a GPU info update. - virtual void OnGpuInfoUpdate() = 0; + virtual void OnGpuInfoUpdate() {} // Called for any observers whenever there is a GPU video memory update. virtual void OnVideoMemoryUsageStatsUpdate( - const GPUVideoMemoryUsageStats& video_memory_usage_stats) = 0; + const GPUVideoMemoryUsageStats& video_memory_usage_stats) {} + + // Indicates that client 3D APIs (Pepper 3D, WebGL) were just blocked on the + // given page, specifically because the GPU was reset recently. + virtual void DidBlock3DAPIs(const GURL& url, + int render_process_id, + int render_view_id, + ThreeDAPIType requester) {} protected: virtual ~GpuDataManagerObserver() {} |