diff options
| author | jamesr <jamesr@chromium.org> | 2014-09-11 17:17:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 00:22:39 +0000 |
| commit | 529c759bf153b8eec2178244ddd3e87e5790b7c4 (patch) | |
| tree | a8752076b8f41c070e57d1658c1b8c5bce6c5246 /cc/surfaces | |
| parent | 849b91b440605262311b0fddadaad15422d83424 (diff) | |
| download | chromium_src-529c759bf153b8eec2178244ddd3e87e5790b7c4.zip chromium_src-529c759bf153b8eec2178244ddd3e87e5790b7c4.tar.gz chromium_src-529c759bf153b8eec2178244ddd3e87e5790b7c4.tar.bz2 | |
Convert view manager to surfaces with uploading shim in client lib
This converts the view manager protocol over to specify view contents via
surfaces instead of shuffling a bitmap. To ease the transition, this provides a
wrapper in the client library that accepts an SkBitmap and uploads it into a
texture wrapped in a surface so existing code still works. Next I'll port the
clients over to providing surfaces themselves and remove this shim.
BUG=
Review URL: https://codereview.chromium.org/534843002
Cr-Commit-Position: refs/heads/master@{#294501}
Diffstat (limited to 'cc/surfaces')
| -rw-r--r-- | cc/surfaces/surface_factory.cc | 1 | ||||
| -rw-r--r-- | cc/surfaces/surface_manager.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc index 79bbe5e..549d986 100644 --- a/cc/surfaces/surface_factory.cc +++ b/cc/surfaces/surface_factory.cc @@ -17,7 +17,6 @@ SurfaceFactory::SurfaceFactory(SurfaceManager* manager, } SurfaceFactory::~SurfaceFactory() { - DCHECK_EQ(0u, surface_map_.size()); } void SurfaceFactory::Create(SurfaceId surface_id, const gfx::Size& size) { diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc index 1c3de16..363f092 100644 --- a/cc/surfaces/surface_manager.cc +++ b/cc/surfaces/surface_manager.cc @@ -13,7 +13,6 @@ SurfaceManager::SurfaceManager() { } SurfaceManager::~SurfaceManager() { - DCHECK_EQ(0u, surface_map_.size()); } void SurfaceManager::RegisterSurface(Surface* surface) { |